From 1a754f9f78f3e9ebaf459c438df6a32c35884161 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 9 Oct 2015 10:44:55 -0500
Subject: [PATCH 0001/1208] Avoid NPE when plugin cannot be instantiated

When there is a problem creating a wrapper plugin,
we should just skip it -- not crash and burn.

Closes #195.

Thanks to Jonathan Hale for catching this.
---
 src/main/java/org/scijava/plugin/AbstractWrapperService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 85e2cea88..4e6910e59 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -78,7 +78,7 @@ public boolean supports(final DT data) {
 	private <D extends DT> PT findWrapper(final D data) {
 		for (final PluginInfo<PT> plugin : getPlugins()) {
 			final PT instance = getPluginService().createInstance(plugin);
-			if (instance.supports(data)) return instance;
+			if (instance != null && instance.supports(data)) return instance;
 		}
 		return null;
 	}

From 1d690c20ea1e8d49671ccb23f63aac71debef7e2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 9 Oct 2015 21:25:04 -0500
Subject: [PATCH 0002/1208] Add a unit test for PluginInfo

Right now, it just verifies that names are populated correctly.

Prompted by exploratory work toward solving imagej/imagej-ops#122.
---
 .../org/scijava/plugin/PluginInfoTest.java    | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 src/test/java/org/scijava/plugin/PluginInfoTest.java

diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
new file mode 100644
index 000000000..602be97c9
--- /dev/null
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.plugin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.InstantiableException;
+import org.scijava.Priority;
+
+/**
+ * Tests {@link PluginInfo}.
+ * 
+ * @author Curtis Rueden
+ */
+public class PluginInfoTest {
+
+	@Test
+	public void testNames() throws InstantiableException {
+		final Context context = new Context(true);
+		final PluginIndex pluginIndex = context.getPluginIndex();
+
+		final List<PluginInfo<?>> infos = pluginIndex.get(IceCream.class);
+		assertEquals(3, infos.size());
+
+		assertPlugin(Chocolate.class, IceCream.class, "chocolate", infos.get(0));
+		assertPlugin(Vanilla.class, IceCream.class, "vanilla", infos.get(1));
+		assertPlugin(Flavorless.class, IceCream.class, "", infos.get(2));
+	}
+
+	private void assertPlugin(Class<?> pluginClass, Class<?> pluginType,
+		String name, PluginInfo<?> info) throws InstantiableException
+	{
+		assertSame(pluginClass, info.loadClass());
+		assertSame(pluginType, info.getPluginType());
+		assertEquals(name, info.getName());
+	}
+
+	public static interface IceCream extends SciJavaPlugin {
+		// NB: Marker interface.
+	}
+
+	@Plugin(type = IceCream.class, priority = Priority.VERY_LOW_PRIORITY)
+	public static class Flavorless implements SciJavaPlugin {
+		// NB: No implementation needed.
+	}
+
+	@Plugin(type = IceCream.class, name = "vanilla",
+		priority = Priority.LOW_PRIORITY)
+	public static class Vanilla implements SciJavaPlugin {
+		// NB: No implementation needed.
+	}
+
+	@Plugin(type = IceCream.class, name = "chocolate",
+		priority = Priority.VERY_HIGH_PRIORITY)
+	public static class Chocolate implements IceCream {
+		// NB: No implementation needed.
+	}
+
+}

From 6738b967f09470873a4bffb84e0d2dbb0c107ac4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 15:17:23 -0500
Subject: [PATCH 0003/1208] XML: expose cdata extraction as a utility method

It is helpful for painlessly extracting CDATA from a Node.
---
 src/main/java/org/scijava/util/XML.java | 28 +++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 70a94474d..f1de67af1 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -181,7 +181,7 @@ public Document getDocument() {
 	public String cdata(final String expression) {
 		final NodeList nodes = xpath(expression);
 		if (nodes == null || nodes.getLength() == 0) return null;
-		return getCData(nodes.item(0));
+		return cdata(nodes.item(0));
 	}
 
 	/** Obtains the nodes identified by the given XPath expression. */
@@ -212,6 +212,20 @@ public String toString() {
 		}
 	}
 
+	// -- Utility methods --
+
+	/** Gets the CData beneath the given node. */
+	public static String cdata(final Node item) {
+		final NodeList children = item.getChildNodes();
+		if (children == null || children.getLength() == 0) return null;
+		for (int i = 0; i < children.getLength(); i++) {
+			final Node child = children.item(i);
+			if (child.getNodeType() != Node.TEXT_NODE) continue;
+			return child.getNodeValue();
+		}
+		return null;
+	}
+
 	// -- Helper methods --
 
 	/** Loads an XML document from the given file. */
@@ -252,18 +266,6 @@ private static DocumentBuilder createBuilder()
 		return DocumentBuilderFactory.newInstance().newDocumentBuilder();
 	}
 
-	/** Gets the CData beneath the given node. */
-	private static String getCData(final Node item) {
-		final NodeList children = item.getChildNodes();
-		if (children == null || children.getLength() == 0) return null;
-		for (int i = 0; i < children.getLength(); i++) {
-			final Node child = children.item(i);
-			if (child.getNodeType() != Node.TEXT_NODE) continue;
-			return child.getNodeValue();
-		}
-		return null;
-	}
-
 	/** Converts the given DOM to a string. */
 	private static String dumpXML(final Document doc)
 		throws TransformerException

From 5e0bf6de5a429a2e3df6cda369c6f48827da8ed6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 15:18:14 -0500
Subject: [PATCH 0004/1208] XML: add method to get list of elements via xpath

It is nice to be able to painlessly write an xpath expression
which you know will return a list of elements.
---
 src/main/java/org/scijava/util/XML.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index f1de67af1..2036b68e7 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -39,6 +39,7 @@
 import java.io.PrintStream;
 import java.io.StringWriter;
 import java.net.URL;
+import java.util.ArrayList;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -56,6 +57,7 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
@@ -184,6 +186,19 @@ public String cdata(final String expression) {
 		return cdata(nodes.item(0));
 	}
 
+	/** Obtains the elements identified by the given XPath expression. */
+	public ArrayList<Element> elements(final String expression) {
+		final NodeList nodes = xpath(expression);
+		final ArrayList<Element> elements = new ArrayList<Element>();
+		if (nodes != null) {
+			for (int i=0; i<nodes.getLength(); i++) {
+				final Node node = nodes.item(i);
+				if (node instanceof Element) elements.add((Element) node);
+			}
+		}
+		return elements;
+	}
+
 	/** Obtains the nodes identified by the given XPath expression. */
 	public NodeList xpath(final String expression) {
 		final Object result;

From 32cdb3509ae61ba5d81824a150c611050d30569d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 15:38:20 -0500
Subject: [PATCH 0005/1208] POM: add accessors for parent GAV info

---
 src/main/java/org/scijava/util/POM.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 3df922752..3fd2d25d5 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -84,11 +84,26 @@ public POM(final String s) throws ParserConfigurationException, SAXException,
 
 	// -- POM methods --
 
+	/** Gets the POM's parent groupId. */
+	public String getParentGroupId() {
+		return cdata("//project/parent/groupId");
+	}
+
+	/** Gets the POM's parent artifactId. */
+	public String getParentArtifactId() {
+		return cdata("//project/parent/artifactId");
+	}
+
+	/** Gets the POM's parent artifactId. */
+	public String getParentVersion() {
+		return cdata("//project/parent/version");
+	}
+
 	/** Gets the POM's groupId. */
 	public String getGroupId() {
 		final String groupId = cdata("//project/groupId");
 		if (groupId != null) return groupId;
-		return cdata("//project/parent/groupId");
+		return getParentGroupId();
 	}
 
 	/** Gets the POM's artifactId. */
@@ -191,7 +206,7 @@ public String getVersion() {
 			synchronized (this) {
 				if (version == null) {
 					version = cdata("//project/version");
-					if (version == null) version = cdata("//project/parent/version");
+					if (version == null) version = getParentVersion();
 				}
 			}
 		}

From 7a22aca5b3b1cdc5fb2ba43d396e609f9f141b67 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 15:38:40 -0500
Subject: [PATCH 0006/1208] XML: add cdata utility method for element children

It makes it much more convenient to ask for, say, the value of the
one and only "id" element beneath the specified "developer" element.
---
 src/main/java/org/scijava/util/XML.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 2036b68e7..5487f4ddb 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -241,6 +241,13 @@ public static String cdata(final Node item) {
 		return null;
 	}
 
+	/** Gets the CData beneath the given element's specified child. */
+	public static String cdata(final Element el, final String child) {
+		NodeList children = el.getElementsByTagName(child);
+		if (children == null || children.getLength() == 0) return null;
+		return cdata(children.item(0));
+	}
+
 	// -- Helper methods --
 
 	/** Loads an XML document from the given file. */

From 25e9524ca43b613fe06b44839f877702589ffc86 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 15:39:43 -0500
Subject: [PATCH 0007/1208] POMTest: beef up the tests

Now we check all the currently existing accessors, as well as
the cdata, xpath and elements methods inherited from XML.
---
 src/test/java/org/scijava/util/POMTest.java | 70 +++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index cd495fb4f..4140d7dae 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -31,9 +31,20 @@
 
 package org.scijava.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.junit.Test;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
 /**
  * Tests methods of {@link POM}.
@@ -73,4 +84,63 @@ public void testCompareVersions() {
 		assertTrue(POM.compareVersions("2.0.0", "2.0.0-beta-1") > 0);
 	}
 
+	@Test
+	public void testAccessors() throws ParserConfigurationException,
+		SAXException, IOException
+	{
+		final POM pom = new POM(new File("pom.xml"));
+		assertEquals("org.scijava", pom.getParentGroupId());
+		assertEquals("pom-scijava", pom.getParentArtifactId());
+		assertNotNull(pom.getParentVersion());
+		assertEquals("org.scijava", pom.getGroupId());
+		assertEquals("scijava-common", pom.getArtifactId());
+		assertNotNull(pom.getVersion());
+		assertEquals("Jenkins", pom.getCIManagementSystem());
+		final String ciManagementURL = pom.getCIManagementURL();
+		assertEquals("http://jenkins.imagej.net/job/SciJava-common/",
+			ciManagementURL);
+		assertEquals("GitHub Issues", pom.getIssueManagementSystem());
+		final String issueManagementURL = pom.getIssueManagementURL();
+		assertEquals("https://github.com/scijava/scijava-common/issues",
+			issueManagementURL);
+		assertNull(pom.getOrganizationName());
+		assertNull(pom.getOrganizationURL());
+		assertTrue(pom.getPath().endsWith("pom.xml"));
+		assertTrue(pom.getProjectDescription().startsWith(
+			"SciJava Common is a shared library for SciJava software."));
+		assertEquals("2009", pom.getProjectInceptionYear());
+		assertEquals("SciJava Common", pom.getProjectName());
+		assertEquals("http://scijava.org/", pom.getProjectURL());
+		final String scmConnection = pom.getSCMConnection();
+		assertEquals("scm:git:git://github.com/scijava/scijava-common",
+			scmConnection);
+		final String scmDeveloperConnection = pom.getSCMDeveloperConnection();
+		assertEquals("scm:git:git@github.com:scijava/scijava-common",
+			scmDeveloperConnection);
+		assertNotNull(pom.getSCMTag()); // won't be HEAD for release tags
+		assertEquals("https://github.com/scijava/scijava-common", pom.getSCMURL());
+	}
+
+	@Test
+	public void testCdata() throws ParserConfigurationException,
+		SAXException, IOException
+	{
+		final POM pom = new POM(new File("pom.xml"));
+		assertEquals("repo", pom.cdata("//project/licenses/license/distribution"));
+		assertEquals("http://scijava.org/", pom.cdata("//project/url"));
+	}
+
+	@Test
+	public void testElements() throws ParserConfigurationException,
+		SAXException, IOException
+	{
+		final POM pom = new POM(new File("pom.xml"));
+		final ArrayList<Element> developers =
+			pom.elements("//project/developers/developer");
+		assertEquals(3, developers.size());
+		assertEquals("ctrueden", XML.cdata(developers.get(0), "id"));
+		assertEquals("dscho", XML.cdata(developers.get(1), "id"));
+		assertEquals("hinerm", XML.cdata(developers.get(2), "id"));
+	}
+
 }

From 12a62dd4042054cc75f2fbe4b7251d997f0697af Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 16:02:58 -0500
Subject: [PATCH 0008/1208] XML: refactor NodeList -> elements logic

Now there is a static utility method for painlessly extracting
a list of Element objects from a given NodeList.
---
 src/main/java/org/scijava/util/XML.java | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 5487f4ddb..40ea351c9 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -188,15 +188,7 @@ public String cdata(final String expression) {
 
 	/** Obtains the elements identified by the given XPath expression. */
 	public ArrayList<Element> elements(final String expression) {
-		final NodeList nodes = xpath(expression);
-		final ArrayList<Element> elements = new ArrayList<Element>();
-		if (nodes != null) {
-			for (int i=0; i<nodes.getLength(); i++) {
-				final Node node = nodes.item(i);
-				if (node instanceof Element) elements.add((Element) node);
-			}
-		}
-		return elements;
+		return elements(xpath(expression));
 	}
 
 	/** Obtains the nodes identified by the given XPath expression. */
@@ -248,6 +240,18 @@ public static String cdata(final Element el, final String child) {
 		return cdata(children.item(0));
 	}
 
+	/** Gets the element nodes from the given node list. */
+	public static ArrayList<Element> elements(final NodeList nodes) {
+		final ArrayList<Element> elements = new ArrayList<Element>();
+		if (nodes != null) {
+			for (int i=0; i<nodes.getLength(); i++) {
+				final Node node = nodes.item(i);
+				if (node instanceof Element) elements.add((Element) node);
+			}
+		}
+		return elements;
+	}
+
 	// -- Helper methods --
 
 	/** Loads an XML document from the given file. */

From a092d3d53a3e0e7fad8f5fe8c167317c3d5f3693 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 16:04:23 -0500
Subject: [PATCH 0009/1208] XML: add utility method to get child elements

When you have an element, and want all child elements with the given
tag name, you can now call this handy new static utility method.
---
 src/main/java/org/scijava/util/XML.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 40ea351c9..9a82a2a6e 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -252,6 +252,13 @@ public static ArrayList<Element> elements(final NodeList nodes) {
 		return elements;
 	}
 
+	/** Gets the given element's specified child elements. */
+	public static ArrayList<Element>
+		elements(final Element el, final String child)
+	{
+		return elements(el.getElementsByTagName(child));
+	}
+
 	// -- Helper methods --
 
 	/** Loads an XML document from the given file. */

From 4a0c4be7a1b08e9d5fad884d2e9e82c7b3611206 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 16:30:55 -0500
Subject: [PATCH 0010/1208] Bump to pom-scijava parent 8.4.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aada3996f..23d2e191c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>8.2.0</version>
+		<version>8.4.0</version>
 		<relativePath />
 	</parent>
 

From 577a7d9145ff35af92892019e19e868fb0bdd91d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Oct 2015 16:32:58 -0500
Subject: [PATCH 0011/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 23d2e191c..6b1ba7c7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.47.1-SNAPSHOT</version>
+	<version>2.48.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From aeccb5774cc2f68bbcb812201e36db073df6f798 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 17 Oct 2015 21:22:51 -0500
Subject: [PATCH 0012/1208] Add support for enums as multiple choice items

Thanks to Christian Dietz for reminding me.
---
 src/main/java/org/scijava/command/CommandModuleItem.java | 9 ++++++---
 src/main/java/org/scijava/module/AbstractModuleItem.java | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index a952a9947..e0f45dfeb 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -155,11 +155,14 @@ public int getColumnCount() {
 
 	@Override
 	public List<T> getChoices() {
-		final ArrayList<T> choices = new ArrayList<T>();
+		final String[] choices = getParameter().choices();
+		if (choices.length == 0) return super.getChoices();
+
+		final ArrayList<T> choiceList = new ArrayList<T>();
 		for (final String choice : getParameter().choices()) {
-			choices.add(tValue(choice));
+			choiceList.add(tValue(choice));
 		}
-		return choices;
+		return choiceList;
 	}
 
 	// -- BasicDetails methods --
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index 678c08b3e..0ae2f9206 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -32,6 +32,7 @@
 package org.scijava.module;
 
 import java.lang.reflect.Type;
+import java.util.Arrays;
 import java.util.List;
 
 import org.scijava.AbstractBasicDetails;
@@ -258,7 +259,8 @@ public int getColumnCount() {
 
 	@Override
 	public List<T> getChoices() {
-		return null;
+		final T[] choices = getType().getEnumConstants();
+		return choices == null ? null : Arrays.asList(choices);
 	}
 
 	@Override

From b9e07b1ea6cf661a2201151aee1c7b33a6eb963f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 29 Oct 2015 16:25:20 -0500
Subject: [PATCH 0013/1208] Manifest: split out JarURLConnection logic

This will be useful momentarily.
---
 src/main/java/org/scijava/util/Manifest.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 6af56872e..61c958ed4 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.util;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.JarURLConnection;
 import java.net.URL;
@@ -134,13 +136,16 @@ public Map<Object, Object> getAll() {
 	/** Gets the JAR manifest associated with the given class. */
 	public static Manifest getManifest(final Class<?> c) {
 		try {
-			// try to grab manifest from the JAR
-			final URL location = new URL("jar:" + ClassUtils.getLocation(c) + "!/");
-			return new Manifest(((JarURLConnection)location.openConnection()).getManifest());
+			return getManifest(new URL("jar:" + ClassUtils.getLocation(c) + "!/"));
 		}
 		catch (final IOException e) {
 			return null;
 		}
 	}
 
+	private static Manifest getManifest(final URL jarURL) throws IOException {
+		final JarURLConnection conn = (JarURLConnection) jarURL.openConnection();
+		return new Manifest(conn.getManifest());
+	}
+
 }

From 97e88a36e554370769eeb93455c703657576081b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 29 Oct 2015 16:25:41 -0500
Subject: [PATCH 0014/1208] Manifest: add more static creation methods

One such allows creation from an org.scijava.util.XML object.
Another enables creation from a JAR file on disk.
---
 src/main/java/org/scijava/util/Manifest.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 61c958ed4..88f45b3b8 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -143,6 +143,23 @@ public static Manifest getManifest(final Class<?> c) {
 		}
 	}
 
+	/**
+	 * Gets the JAR manifest associated with the given XML document. Assumes the
+	 * XML document was loaded as a resource from inside a JAR.
+	 */
+	public static Manifest getManifest(final XML xml) throws IOException {
+		final String path = xml.getPath();
+		if (path == null || !path.startsWith("file:")) return null;
+		final int dotJAR = path.indexOf(".jar!/");
+		return getManifest(new File(path.substring(5, dotJAR + 4)));
+	}
+
+	/** Gets the JAR manifest associated with the given JAR file. */
+	public static Manifest getManifest(final File jarFile) throws IOException {
+		if (!jarFile.exists()) throw new FileNotFoundException();
+		return getManifest(new URL("jar:file:" + jarFile.getAbsolutePath() + "!/"));
+	}
+
 	private static Manifest getManifest(final URL jarURL) throws IOException {
 		final JarURLConnection conn = (JarURLConnection) jarURL.openConnection();
 		return new Manifest(conn.getManifest());

From fa5eb7e329b10960cdde5196a2c8bd22dc9974e1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 4 Nov 2015 13:03:14 -0600
Subject: [PATCH 0015/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6b1ba7c7c..c7dbd6169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.48.1-SNAPSHOT</version>
+	<version>2.49.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 9b9e794a8652a20646c96cb802aed7ab5db188d8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 9 Nov 2015 13:12:15 -0600
Subject: [PATCH 0016/1208] Add Jonathan Hale to mailmap

---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 902cb036c..dd6dafd07 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,4 +2,5 @@ Barry DeZonia <bdezonia@wisc.edu> <bdezonia@users.noreply.github.com>
 Christian Dietz <christian.dietz@uni-konstanz.de>
 Johannes Schindelin <johannes.schindelin@gmx.de>
 Johannes Schindelin <johannes.schindelin@gmx.de> <dscho@users.noreply.github.com>
+Jonathan Hale <Squareys@googlemail.com>
 Mark Hiner <hiner@wisc.edu> <hinerm@gmail.com>

From da9f56210425475bc992377e17025c51245ba2d3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 9 Nov 2015 14:21:00 -0600
Subject: [PATCH 0017/1208] ScriptFinderTest: avoid hardcoding indices

Let's use arrays instead, with for loops, for easier editing later.
---
 .../org/scijava/script/ScriptFinderTest.java  | 119 ++++++++++--------
 1 file changed, 67 insertions(+), 52 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 6f805c607..d5626e993 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -66,18 +66,23 @@ public class ScriptFinderTest {
 	@BeforeClass
 	public static void setUp() throws IOException {
 		scriptsDir = TestUtils.createTemporaryDirectory("script-finder-");
-		TestUtils.createPath(scriptsDir, "ignored.foo");
-		TestUtils.createPath(scriptsDir, "Scripts/quick.foo");
-		TestUtils.createPath(scriptsDir, "Scripts/brown.foo");
-		TestUtils.createPath(scriptsDir, "Scripts/fox.foo");
-		TestUtils.createPath(scriptsDir, "Scripts/The_Lazy_Dog.foo");
-		TestUtils.createPath(scriptsDir, "Math/add.foo");
-		TestUtils.createPath(scriptsDir, "Math/subtract.foo");
-		TestUtils.createPath(scriptsDir, "Math/multiply.foo");
-		TestUtils.createPath(scriptsDir, "Math/divide.foo");
-		TestUtils.createPath(scriptsDir, "Math/Trig/cos.foo");
-		TestUtils.createPath(scriptsDir, "Math/Trig/sin.foo");
-		TestUtils.createPath(scriptsDir, "Math/Trig/tan.foo");
+		final String[] scriptPaths = { //
+			"ignored.foo", //
+			"Scripts/quick.foo", //
+			"Scripts/brown.foo", //
+			"Scripts/fox.foo", //
+			"Scripts/The_Lazy_Dog.foo", //
+			"Math/add.foo", //
+			"Math/subtract.foo", //
+			"Math/multiply.foo", //
+			"Math/divide.foo", //
+			"Math/Trig/cos.foo", //
+			"Math/Trig/sin.foo", //
+			"Math/Trig/tan.foo", //
+		};
+		for (final String scriptPath : scriptPaths) {
+			TestUtils.createPath(scriptsDir, scriptPath);
+		}
 	}
 
 	@AfterClass
@@ -94,18 +99,20 @@ public void testFindScripts() {
 
 		final ArrayList<ScriptInfo> scripts = findScripts(scriptService);
 
-		assertEquals(11, scripts.size());
-		assertMenuPath("Scripts > The Lazy Dog", scripts, 0);
-		assertMenuPath("Math > add", scripts, 1);
-		assertMenuPath("Scripts > brown", scripts, 2);
-		assertMenuPath("Math > Trig > cos", scripts, 3);
-		assertMenuPath("Math > divide", scripts, 4);
-		assertMenuPath("Scripts > fox", scripts, 5);
-		assertMenuPath("Math > multiply", scripts, 6);
-		assertMenuPath("Scripts > quick", scripts, 7);
-		assertMenuPath("Math > Trig > sin", scripts, 8);
-		assertMenuPath("Math > subtract", scripts, 9);
-		assertMenuPath("Math > Trig > tan", scripts, 10);
+		final String[] expected = { //
+			"Scripts > The Lazy Dog", //
+			"Math > add", //
+			"Scripts > brown", //
+			"Math > Trig > cos", //
+			"Math > divide", //
+			"Scripts > fox", //
+			"Math > multiply", //
+			"Scripts > quick", //
+			"Math > Trig > sin", //
+			"Math > subtract", //
+			"Math > Trig > tan", //
+		};
+		assertMenuPaths(expected, scripts);
 	}
 
 	/**
@@ -124,19 +131,21 @@ public void testMenuPrefixes() {
 
 		final ArrayList<ScriptInfo> scripts = findScripts(scriptService);
 
-		assertEquals(12, scripts.size());
-		assertMenuPath("Foo > Bar > Scripts > The Lazy Dog", scripts, 0);
-		assertMenuPath("Foo > Bar > Math > add", scripts, 1);
-		assertMenuPath("Foo > Bar > Scripts > brown", scripts, 2);
-		assertMenuPath("Foo > Bar > Math > Trig > cos", scripts, 3);
-		assertMenuPath("Foo > Bar > Math > divide", scripts, 4);
-		assertMenuPath("Foo > Bar > Scripts > fox", scripts, 5);
-		assertMenuPath("Foo > Bar > ignored", scripts, 6);
-		assertMenuPath("Foo > Bar > Math > multiply", scripts, 7);
-		assertMenuPath("Foo > Bar > Scripts > quick", scripts, 8);
-		assertMenuPath("Foo > Bar > Math > Trig > sin", scripts, 9);
-		assertMenuPath("Foo > Bar > Math > subtract", scripts, 10);
-		assertMenuPath("Foo > Bar > Math > Trig > tan", scripts, 11);
+		final String[] expected = { //
+			"Foo > Bar > Scripts > The Lazy Dog", //
+			"Foo > Bar > Math > add", //
+			"Foo > Bar > Scripts > brown", //
+			"Foo > Bar > Math > Trig > cos", //
+			"Foo > Bar > Math > divide", //
+			"Foo > Bar > Scripts > fox", //
+			"Foo > Bar > ignored", //
+			"Foo > Bar > Math > multiply", //
+			"Foo > Bar > Scripts > quick", //
+			"Foo > Bar > Math > Trig > sin", //
+			"Foo > Bar > Math > subtract", //
+			"Foo > Bar > Math > Trig > tan", //
+		};
+		assertMenuPaths(expected, scripts);
 	}
 
 	/**
@@ -155,18 +164,20 @@ public void testOverlappingDirectories() {
 
 		final ArrayList<ScriptInfo> scripts = findScripts(scriptService);
 
-		assertEquals(11, scripts.size());
-		assertMenuPath("Plugins > The Lazy Dog", scripts, 0);
-		assertMenuPath("Math > add", scripts, 1);
-		assertMenuPath("Plugins > brown", scripts, 2);
-		assertMenuPath("Math > Trig > cos", scripts, 3);
-		assertMenuPath("Math > divide", scripts, 4);
-		assertMenuPath("Plugins > fox", scripts, 5);
-		assertMenuPath("Math > multiply", scripts, 6);
-		assertMenuPath("Plugins > quick", scripts, 7);
-		assertMenuPath("Math > Trig > sin", scripts, 8);
-		assertMenuPath("Math > subtract", scripts, 9);
-		assertMenuPath("Math > Trig > tan", scripts, 10);
+		final String[] expected = { //
+			"Plugins > The Lazy Dog", //
+			"Math > add", //
+			"Plugins > brown", //
+			"Math > Trig > cos", //
+			"Math > divide", //
+			"Plugins > fox", //
+			"Math > multiply", //
+			"Plugins > quick", //
+			"Math > Trig > sin", //
+			"Math > subtract", //
+			"Math > Trig > tan", //
+		};
+		assertMenuPaths(expected, scripts);
 	}
 
 	// -- Helper methods --
@@ -188,10 +199,14 @@ private ArrayList<ScriptInfo> findScripts(final ScriptService scriptService) {
 		return scripts;
 	}
 
-	private void assertMenuPath(final String menuString,
-		final ArrayList<ScriptInfo> scripts, final int i)
+	private void assertMenuPaths(final String[] expected,
+		final ArrayList<ScriptInfo> scripts)
 	{
-		assertEquals(menuString, scripts.get(i).getMenuPath().getMenuString());
+		assertEquals(expected.length, scripts.size());
+		for (int i=0; i<expected.length; i++) {
+			final String actual = scripts.get(i).getMenuPath().getMenuString();
+			assertEquals(expected[i], actual);
+		}
 	}
 
 	// -- Helper classes --

From 6961aed9345b76e265b6334fdcac1a38948e0e50 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Nov 2015 15:21:29 -0600
Subject: [PATCH 0018/1208] POM: remove redundant mailingLists section

---
 pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index c7dbd6169..f1559fc89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,16 +101,6 @@
 		<contributor><name>Jay Warrick</name></contributor>
 	</contributors>
 
-	<mailingLists>
-		<mailingList>
-			<name>SciJava</name>
-			<subscribe>https://groups.google.com/group/scijava</subscribe>
-			<unsubscribe>https://groups.google.com/group/scijava</unsubscribe>
-			<post>scijava@googlegroups.com</post>
-			<archive>https://groups.google.com/group/scijava</archive>
-		</mailingList>
-	</mailingLists>
-
 	<scm>
 		<connection>scm:git:git://github.com/scijava/scijava-common</connection>
 		<developerConnection>scm:git:git@github.com:scijava/scijava-common</developerConnection>

From 125f1fd9d440d747bc15370d65d9430f4214c032 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Nov 2015 15:54:37 -0600
Subject: [PATCH 0019/1208] POM: Update developers and contributors

See: http://imagej.net/Team
---
 pom.xml                                     | 75 ++++++++++-----------
 src/test/java/org/scijava/util/POMTest.java |  5 +-
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index f1559fc89..7b7cfe7eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,21 +33,12 @@
 			<organization>UW-Madison LOCI</organization>
 			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
 			<roles>
-				<role>architect</role>
-				<role>developer</role>
-			</roles>
-			<timezone>-6</timezone>
-		</developer>
-		<developer>
-			<id>dscho</id>
-			<name>Johannes Schindelin</name>
-			<email>schindelin@wisc.edu</email>
-			<url>http://loci.wisc.edu/people/johannes-schindelin</url>
-			<organization>UW-Madison LOCI</organization>
-			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
-			<roles>
-				<role>architect</role>
+				<role>lead</role>
 				<role>developer</role>
+				<role>debugger</role>
+				<role>reviewer</role>
+				<role>support</role>
+				<role>maintainer</role>
 			</roles>
 			<timezone>-6</timezone>
 		</developer>
@@ -59,46 +50,54 @@
 			<organization>UW-Madison LOCI</organization>
 			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
 			<roles>
+				<role>lead</role>
 				<role>developer</role>
+				<role>debugger</role>
+				<role>reviewer</role>
+				<role>support</role>
+				<role>maintainer</role>
 			</roles>
 			<timezone>-6</timezone>
 		</developer>
 	</developers>
 
 	<contributors>
+		<contributor>
+			<name>Johannes Schindelin</name>
+			<url>http://imagej.net/User:Schindelin</url>
+			<properties><id>dscho</id></properties>
+		</contributor>
 		<contributor>
 			<name>Barry DeZonia</name>
-			<url>http://loci.wisc.edu/people/barry-dezonia</url>
-			<organization>UW-Madison LOCI</organization>
-			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-			<timezone>-6</timezone>
+			<url>http://imagej.net/User:Bdezonia</url>
+			<properties><id>bdezonia</id></properties>
 		</contributor>
 		<contributor>
 			<name>Lee Kamentsky</name>
-			<email>leek@broadinstitute.org</email>
-			<url>http://www.broadinstitute.org/~leek/</url>
-			<organization>Broad Institute of MIT and Harvard</organization>
-			<organizationUrl>http://www.broadinstitute.org/</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-			<timezone>-5</timezone>
+			<url>http://imagej.net/User:Leek</url>
+			<properties><id>LeeKamentsky</id></properties>
 		</contributor>
 		<contributor>
 			<name>Christian Dietz</name>
-			<email>christian.dietz@uni-konstanz.de</email>
-			<url>http://www.informatik.uni-konstanz.de/berthold/mitglieder/christian-dietz/</url>
-			<organization>University of Konstanz</organization>
-			<organizationUrl>http://www.informatik.uni-konstanz.de/</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-			<timezone>+1</timezone>
+			<url>http://imagej.net/User:Dietzc</url>
+			<properties><id>dietzc</id></properties>
+		</contributor>
+		<contributor>
+			<name>Gabriel Einsdorf</name>
+			<properties><id>gab1one</id></properties>
+		</contributor>
+		<contributor>
+			<name>Jonathan Hale</name>
+			<properties><id>Squareys</id></properties>
+		</contributor>
+		<contributor>
+			<name>Kevin Mader</name>
+			<properties><id>kmader</id></properties>
+		</contributor>
+		<contributor>
+			<name>Jay Warrick</name>
+			<properties><id>jaywarrick</id></properties>
 		</contributor>
-		<contributor><name>Jay Warrick</name></contributor>
 	</contributors>
 
 	<scm>
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 4140d7dae..d44c18a02 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -137,10 +137,9 @@ public void testElements() throws ParserConfigurationException,
 		final POM pom = new POM(new File("pom.xml"));
 		final ArrayList<Element> developers =
 			pom.elements("//project/developers/developer");
-		assertEquals(3, developers.size());
+		assertEquals(2, developers.size());
 		assertEquals("ctrueden", XML.cdata(developers.get(0), "id"));
-		assertEquals("dscho", XML.cdata(developers.get(1), "id"));
-		assertEquals("hinerm", XML.cdata(developers.get(2), "id"));
+		assertEquals("hinerm", XML.cdata(developers.get(1), "id"));
 	}
 
 }

From af3701dc45c618be1e2ca2332b9e9d1ae04ef186 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Nov 2015 16:00:37 -0600
Subject: [PATCH 0020/1208] mailmap: fix shortlog for ImageJ Jenkins

---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index dd6dafd07..e5a0e733c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,6 @@
 Barry DeZonia <bdezonia@wisc.edu> <bdezonia@users.noreply.github.com>
 Christian Dietz <christian.dietz@uni-konstanz.de>
+ImageJ Jenkins <jenkins@imagej.net> <jenkins@dev.loci.wisc.edu>
 Johannes Schindelin <johannes.schindelin@gmx.de>
 Johannes Schindelin <johannes.schindelin@gmx.de> <dscho@users.noreply.github.com>
 Jonathan Hale <Squareys@googlemail.com>

From 9890a3f16e6d3fc165c1eab6dfad1af5f82cee3a Mon Sep 17 00:00:00 2001
From: The Gitter Badger <badger@gitter.im>
Date: Thu, 12 Nov 2015 21:44:33 +0000
Subject: [PATCH 0021/1208] Add Gitter badge

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index d046a41e6..62c5c7194 100644
--- a/README.md
+++ b/README.md
@@ -5,3 +5,6 @@ plugin framework, with an extensible mechanism for service discovery, backed
 by its own annotation processor, so that plugins can be loaded dynamically.
 It is used by both [ImageJ](https://github.com/imagej/imagej) and
 [SCIFIO](https://github.com/scifio/scifio).
+
+
+[![Join the chat at https://gitter.im/scijava/scijava-common](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scijava/scijava-common?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
\ No newline at end of file

From 7ec75c52269bfda91cb21d6157cda2d468231dfd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 12 Nov 2015 15:49:06 -0600
Subject: [PATCH 0022/1208] README: fix location of Gitter badge

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 62c5c7194..5f8b5ca0c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,8 @@
 [![](http://jenkins.imagej.net/job/SciJava-common/lastBuild/badge/icon)](http://jenkins.imagej.net/job/SciJava-common/)
+[![Join the chat at https://gitter.im/scijava/scijava-common](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scijava/scijava-common?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 SciJava Common is a common library for SciJava software. It provides a
 plugin framework, with an extensible mechanism for service discovery, backed
 by its own annotation processor, so that plugins can be loaded dynamically.
 It is used by both [ImageJ](https://github.com/imagej/imagej) and
 [SCIFIO](https://github.com/scifio/scifio).
-
-
-[![Join the chat at https://gitter.im/scijava/scijava-common](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scijava/scijava-common?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
\ No newline at end of file

From eece780833bc74656ae937e456f7082cc07d1275 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Nov 2015 13:31:56 -0600
Subject: [PATCH 0023/1208] FileUtils: refactor version pattern matching

Hopefully it is a little less arcane now, if more verbose.
---
 src/main/java/org/scijava/util/FileUtils.java | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index f2bff441d..1c199118e 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -70,6 +70,9 @@ public final class FileUtils {
 	public static final String SHORTENER_SLASH = "/";
 	public static final String SHORTENER_ELLIPSE = "...";
 
+	/** A regular expression to match filenames containing version information. */
+	private static final Pattern VERSION_PATTERN = buildVersionPattern();
+
 	private FileUtils() {
 		// prevent instantiation of utility class
 	}
@@ -170,13 +173,8 @@ public static void writeFile(final File file, final byte[] bytes)
 		}
 	}
 
-	/** A regular expression to match filenames containing version information. */
-	private final static Pattern versionPattern =
-		Pattern
-			.compile("(.+?)(-\\d+(\\.\\d+|\\d{7})+[a-z]?\\d?(-[A-Za-z0-9.]+?|\\.GA)*?)?((-(swing|swt|shaded|sources|javadoc|native|linux-x86|linux-x86_64|macosx-x86_64|windows-x86|windows-x86_64|android-arm|android-x86))?(\\.jar(-[a-z]*)?))");
-
 	public static String stripFilenameVersion(final String filename) {
-		final Matcher matcher = versionPattern.matcher(filename);
+		final Matcher matcher = VERSION_PATTERN.matcher(filename);
 		if (!matcher.matches()) return filename;
 		return matcher.group(1) + matcher.group(5);
 	}
@@ -191,7 +189,7 @@ public static String stripFilenameVersion(final String filename) {
 	public static File[] getAllVersions(final File directory,
 		final String filename)
 	{
-		final Matcher matcher = versionPattern.matcher(filename);
+		final Matcher matcher = VERSION_PATTERN.matcher(filename);
 		if (!matcher.matches()) {
 			final File file = new File(directory, filename);
 			return file.exists() ? new File[] { file } : null;
@@ -203,7 +201,7 @@ public static File[] getAllVersions(final File directory,
 			@Override
 			public boolean accept(final File dir, final String name) {
 				if (!name.startsWith(baseName)) return false;
-				final Matcher matcher2 = versionPattern.matcher(name);
+				final Matcher matcher2 = VERSION_PATTERN.matcher(name);
 				return matcher2.matches() && baseName.equals(matcher2.group(1)) &&
 						equals(classifier, matcher2.group(6));
 			}
@@ -609,6 +607,43 @@ else if (protocol.equals("jar")) {
 		return result;
 	}
 
+	// -- Helper methods --
+
+	/** Builds the {@link #VERSION_PATTERN} constant. */
+	private static Pattern buildVersionPattern() {
+		final String version =
+			"\\d+(\\.\\d+|\\d{7})+[a-z]?\\d?(-[A-Za-z0-9.]+?|\\.GA)*?";
+		final String suffix = "\\.jar(-[a-z]*)?";
+		return Pattern.compile("(.+?)(-" + version + ")?((-(" + classifiers() +
+			"))?(" + suffix + "))");
+	}
+
+	/** Helper method of {@link #buildVersionPattern()}. */
+	private static String classifiers() {
+		final String[] classifiers = {
+			"swing",
+			"swt",
+			"shaded",
+			"sources",
+			"javadoc",
+			"native",
+			"linux-x86",
+			"linux-x86_64",
+			"macosx-x86_64",
+			"windows-x86",
+			"windows-x86_64",
+			"android-arm",
+			"android-x86",
+		};
+		final StringBuilder sb = new StringBuilder("(");
+		for (final String classifier : classifiers) {
+			if (sb.length() > 1) sb.append("|");
+			sb.append(classifier);
+		}
+		sb.append(")");
+		return sb.toString();
+	}
+
 	// -- Deprecated methods --
 
 	/**
@@ -620,7 +655,7 @@ else if (protocol.equals("jar")) {
 	 */
 	@Deprecated
 	public static Matcher matchVersionedFilename(final String filename) {
-		return versionPattern.matcher(filename);
+		return VERSION_PATTERN.matcher(filename);
 	}
 
 }

From eebecfabe255b6f48222569a316589ecc54298ca Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Nov 2015 13:34:22 -0600
Subject: [PATCH 0024/1208] FileUtils: make native patterns more compact

This also supports more platform/architecture combinations.
---
 src/main/java/org/scijava/util/FileUtils.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 1c199118e..c79ec3b8a 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -627,13 +627,8 @@ private static String classifiers() {
 			"sources",
 			"javadoc",
 			"native",
-			"linux-x86",
-			"linux-x86_64",
-			"macosx-x86_64",
-			"windows-x86",
-			"windows-x86_64",
-			"android-arm",
-			"android-x86",
+			"(android|linux|macosx|windows)-" +
+				"(arm|x86|x86_64)",
 		};
 		final StringBuilder sb = new StringBuilder("(");
 		for (final String classifier : classifiers) {

From 9bf10d53ddf5711312eb37af714cf31a2b0bfb16 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Nov 2015 13:36:05 -0600
Subject: [PATCH 0025/1208] FileUtils: add more platforms and architectures

These will come in handy shortly, to support jogamp artifacts.
---
 src/main/java/org/scijava/util/FileUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index c79ec3b8a..5968df249 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -627,8 +627,8 @@ private static String classifiers() {
 			"sources",
 			"javadoc",
 			"native",
-			"(android|linux|macosx|windows)-" +
-				"(arm|x86|x86_64)",
+			"(android|linux|macosx|solaris|windows)-" +
+				"(aarch64|amd64|arm|armv6|armv6hf|i586|universal|x86|x86_64)",
 		};
 		final StringBuilder sb = new StringBuilder("(");
 		for (final String classifier : classifiers) {

From 8097e5282e3994f105896eb92792ed4678f55e4a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Nov 2015 13:37:11 -0600
Subject: [PATCH 0026/1208] FileUtils: allow optional "natives-" prefix

This is necessary to support jogamp artifacts, such as:

* gluegen-rt-2.3.0-natives-android-armv6.jar
* gluegen-rt-2.3.0-natives-linux-amd64.jar
* gluegen-rt-2.3.0-natives-macosx-universal.jar
* gluegen-rt-2.3.0-natives-windows-i586.jar
---
 src/main/java/org/scijava/util/FileUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 5968df249..8a7dbba07 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -627,7 +627,7 @@ private static String classifiers() {
 			"sources",
 			"javadoc",
 			"native",
-			"(android|linux|macosx|solaris|windows)-" +
+			"(natives-)?(android|linux|macosx|solaris|windows)-" +
 				"(aarch64|amd64|arm|armv6|armv6hf|i586|universal|x86|x86_64)",
 		};
 		final StringBuilder sb = new StringBuilder("(");

From 3914efc52adf25daba19361f5f6b174a4a92c1bb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Nov 2015 13:47:11 -0600
Subject: [PATCH 0027/1208] FileUtilsTest: test jogamp-style platform jars

---
 src/test/java/org/scijava/util/FileUtilsTest.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index cbec12492..88111372c 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -299,6 +299,18 @@ public void testStripVersionFromFilename() {
 		assertEquals("jars/ffmpeg-android-x86.jar", FileUtils.stripFilenameVersion("jars/ffmpeg-2.6.1-0.11-android-x86.jar"));
 		assertEquals("jars/ffmpeg-android-arm.jar", FileUtils.stripFilenameVersion("jars/ffmpeg-2.6.1-0.11-android-arm.jar"));
 
+		// Test the jogamp style of native binary .jars
+		assertEquals("jars/jogl-all-natives-android-aarch64.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-android-aarch64.jar"));
+		assertEquals("jars/jogl-all-natives-android-armv6.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-android-armv6.jar"));
+		assertEquals("jars/jogl-all-natives-linux-amd64.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-linux-amd64.jar"));
+		assertEquals("jars/jogl-all-natives-linux-armv6.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-linux-armv6.jar"));
+		assertEquals("jars/jogl-all-natives-linux-armv6hf.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-linux-armv6hf.jar"));
+		assertEquals("jars/jogl-all-natives-linux-i586.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-linux-i586.jar"));
+		assertEquals("jars/jogl-all-natives-macosx-universal.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-macosx-universal.jar"));
+		assertEquals("jars/jogl-all-natives-solaris-amd64.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-solaris-amd64.jar"));
+		assertEquals("jars/jogl-all-natives-solaris-i586.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-solaris-i586.jar"));
+		assertEquals("jars/jogl-all-natives-windows-amd64.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-windows-amd64.jar"));
+		assertEquals("jars/jogl-all-natives-windows-i586.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-windows-i586.jar"));
 	}
 
 	@Test

From 0c2608399d775d2f5ef7318cb85f18dbf9915158 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 Nov 2015 12:00:02 -0600
Subject: [PATCH 0028/1208] Tag EventHistory as a core SciJava service

---
 src/main/java/org/scijava/event/EventHistory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index be6e1b6fb..128a5b469 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -34,14 +34,14 @@
 
 import java.util.Set;
 
-import org.scijava.service.Service;
+import org.scijava.service.SciJavaService;
 
 /**
  * Interface for service that keeps a history of SciJava events.
  * 
  * @author Curtis Rueden
  */
-public interface EventHistory extends Service {
+public interface EventHistory extends SciJavaService {
 
 	/** Activates or deactivates event history tracking. */
 	void setActive(boolean active);

From e73ce62043374adc5107f9d7c767d196b050cd7d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 Nov 2015 14:52:03 -0600
Subject: [PATCH 0029/1208] Ensure all core services are SciJavaServices

This will prevent issues like b811a4d49683e8e5b0e344d7451365ed26fc447f
from going uncaught in the future.
---
 .../java/org/scijava/ContextCreationTest.java | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index e12f1daa1..d015c3853 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -47,6 +47,7 @@
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.service.AbstractService;
+import org.scijava.service.SciJavaService;
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
 
@@ -107,6 +108,26 @@ public void testFull() {
 		verifyServiceOrder(expected, context);
 	}
 
+	/**
+	 * Tests that a new fully populated {@link Context} has exactly the same
+	 * {@link Service}s available as one created with only {@link SciJavaService}
+	 * implementations.
+	 * <p>
+	 * In other words: tests that all {@link Service}s implemented in SciJava
+	 * Common are tagged with the {@link SciJavaService} interface.
+	 * </p>
+	 */
+	@Test
+	public void testSciJavaServices() {
+		final Context full = new Context();
+		final Context sciJava = new Context(SciJavaService.class);
+		for (final Service s : full.getServiceIndex()) {
+			final Class<? extends Service> c = s.getClass();
+			final Service sjs = sciJava.getService(c);
+			if (sjs == null) fail("Not a SciJavaService? " + s.getClass().getName());
+		}
+	}
+
 	/**
 	 * Tests that dependent {@link Service}s are automatically created and
 	 * populated in downstream {@link Service} classes.

From 835645cd05725e1a3029bb475632cad7cdb99d0d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 19 Nov 2015 08:31:36 -0600
Subject: [PATCH 0030/1208] POM: bump parent to pom-scijava 9.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7b7cfe7eb..d9583272c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>8.4.0</version>
+		<version>9.0.0</version>
 		<relativePath />
 	</parent>
 

From 62e4592da99b5944cff33b6f1ca44e36bc71b714 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 19 Nov 2015 08:33:07 -0600
Subject: [PATCH 0031/1208] POM: remove excess whitespace

This makes tidy-maven-plugin happy.
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9583272c..a08dc8a9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
 	<url>http://scijava.org/</url>
 	<inceptionYear>2009</inceptionYear>
-
 	<licenses>
 		<license>
 			<name>Simplified BSD License</name>
@@ -60,7 +59,6 @@
 			<timezone>-6</timezone>
 		</developer>
 	</developers>
-
 	<contributors>
 		<contributor>
 			<name>Johannes Schindelin</name>
@@ -106,12 +104,10 @@
 		<tag>HEAD</tag>
 		<url>https://github.com/scijava/scijava-common</url>
 	</scm>
-
 	<issueManagement>
 		<system>GitHub Issues</system>
 		<url>https://github.com/scijava/scijava-common/issues</url>
 	</issueManagement>
-
 	<ciManagement>
 		<system>Jenkins</system>
 		<url>http://jenkins.imagej.net/job/SciJava-common/</url>
@@ -230,5 +226,4 @@ Institute of Molecular Cell Biology and Genetics.</organizationName>
 			</build>
 		</profile>
 	</profiles>
-
 </project>

From 9732b113b16c81470439a5aead309bd14b7cfff7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 19 Nov 2015 11:31:24 -0600
Subject: [PATCH 0032/1208] POM: Flag myself as the founder

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index a08dc8a9b..f82e95c8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
 			<organization>UW-Madison LOCI</organization>
 			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
 			<roles>
+				<role>founder</role>
 				<role>lead</role>
 				<role>developer</role>
 				<role>debugger</role>

From 97d617246a797a2b555bf7c6d188c622e1aadb9c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 19 Nov 2015 11:58:08 -0600
Subject: [PATCH 0033/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f82e95c8e..dbb01116c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.49.1-SNAPSHOT</version>
+	<version>2.49.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 233c1b2979275d3f7f715577bb6ce7701672f735 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Nov 2015 10:26:52 -0600
Subject: [PATCH 0034/1208] ScriptInfoTest: clean up code style

---
 src/test/java/org/scijava/script/ScriptInfoTest.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index c36b4abb8..70619b2d9 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -135,13 +135,12 @@ public void testReaderSanity() throws Exception {
 			"% @LogService log\n" + //
 			"% @OUTPUT Integer output";
 
-		ScriptInfo info = new ScriptInfo(context, "hello.bsizes", new StringReader(
-			script));
-		BufferedReader reader1 = info.getReader();
-		BufferedReader reader2 = info.getReader();
+		final ScriptInfo info =
+			new ScriptInfo(context, "hello.bsizes", new StringReader(script));
+		final BufferedReader reader1 = info.getReader();
+		final BufferedReader reader2 = info.getReader();
 
-		assertEquals("Readers are not independent.", reader1.read(), reader2
-			.read());
+		assertEquals("Readers are not independent.", reader1.read(), reader2.read());
 
 	}
 

From a45b0576cc9a5122d80507ccce6fcf4ccef914fc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Nov 2015 11:09:39 -0600
Subject: [PATCH 0035/1208] ScriptInfoTest: add test for script param parsing

It is just a few down-the-middle tests right now.
But much better than before, which was practically nothing.
---
 .../org/scijava/script/ScriptInfoTest.java    | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 70619b2d9..23ffb5d53 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -32,6 +32,7 @@
 package org.scijava.script;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -53,6 +54,9 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.ItemIO;
+import org.scijava.log.LogService;
+import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Plugin;
 import org.scijava.test.TestUtils;
 import org.scijava.util.DigestUtils;
@@ -125,6 +129,75 @@ public void testVersion() throws IOException {
 		FileUtils.deleteRecursively(tmpDir);
 	}
 
+	/**
+	 * Tests {@link ScriptInfo} parameter declarations, including
+	 * {@link ScriptInfo#inputs()}, {@link ScriptInfo#outputs()},
+	 * {@link ScriptInfo#getInput(String)} and
+	 * {@link ScriptInfo#getOutput(String)}.
+	 */
+	@Test
+	public void testParameters() {
+		final String script = "" + //
+			"% @LogService(required = false) log\n" + //
+			"% @int(label=\"Slider Value\", softMin=5, softMax=15, " + //
+			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
+			"% @BOTH java.lang.StringBuilder buffer";
+
+		final ScriptInfo info =
+			new ScriptInfo(context, "params.bsizes", new StringReader(script));
+
+		final ModuleItem<?> log = info.getInput("log");
+		assertItem("log", LogService.class, null, ItemIO.INPUT, false, true, null,
+			null, null, null, null, null, null, null, log);
+
+		final ModuleItem<?> sliderValue = info.getInput("sliderValue");
+		assertItem("sliderValue", int.class, "Slider Value", ItemIO.INPUT, true,
+			true, null, "slider", 11, null, null, 5, 15, 3, sliderValue);
+
+		final ModuleItem<?> buffer = info.getOutput("buffer");
+		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,
+			null, null, null, null, null, null, null, null, buffer);
+
+		final ModuleItem<?> result = info.getOutput("result");
+		assertItem("result", Object.class, null, ItemIO.OUTPUT, true, true, null,
+			null, null, null, null, null, null, null, result);
+
+		int inputCount = 0;
+		final ModuleItem<?>[] inputs = { log, sliderValue, buffer };
+		for (final ModuleItem<?> inItem : info.inputs()) {
+			assertSame(inputs[inputCount++], inItem);
+		}
+
+		int outputCount = 0;
+		final ModuleItem<?>[] outputs = { buffer, result };
+		for (final ModuleItem<?> outItem : info.outputs()) {
+			assertSame(outputs[outputCount++], outItem);
+		}
+	}
+
+	private void assertItem(final String name, final Class<?> type,
+		final String label, final ItemIO ioType, final boolean required,
+		final boolean persist, final String persistKey, final String style,
+		final Object value, final Object min, final Object max,
+		final Object softMin, final Object softMax, final Number stepSize,
+		final ModuleItem<?> item)
+	{
+		assertEquals(name, item.getName());
+		assertSame(type, item.getType());
+		assertEquals(label, item.getLabel());
+		assertSame(ioType, item.getIOType());
+		assertEquals(required, item.isRequired());
+		assertEquals(persist, item.isPersisted());
+		assertEquals(persistKey, item.getPersistKey());
+		assertEquals(style, item.getWidgetStyle());
+		assertEquals(value, item.getDefaultValue());
+		assertEquals(min, item.getMinimumValue());
+		assertEquals(max, item.getMaximumValue());
+		assertEquals(softMin, item.getSoftMinimum());
+		assertEquals(softMax, item.getSoftMaximum());
+//		assertEquals(stepSize, item.getStepSize());
+	}
+
 	/**
 	 * Ensures the ScriptInfos Reader can be reused for multiple executions of the
 	 * script.

From c0ffe3956e8ccc08cc633ade9b00bb31a43f0de2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Nov 2015 11:14:09 -0600
Subject: [PATCH 0036/1208] ScriptInfo: add support for stepSize attribute

It's probably still a little hacky, since stepSize is typed as
Number rather than T. But it should work OK in normal circumstances.
---
 src/main/java/org/scijava/script/ScriptInfo.java     | 10 ++++++++--
 src/test/java/org/scijava/script/ScriptInfoTest.java |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 67f67ea62..ffc40391f 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -472,8 +472,14 @@ else if ("softMin".equalsIgnoreCase(key)) {
 			item.setSoftMinimum(convertService.convert(value, item.getType()));
 		}
 		else if ("stepSize".equalsIgnoreCase(key)) {
-			// FIXME
-			item.setStepSize(convertService.convert(value, Number.class));
+			try {
+				final double stepSize = Double.parseDouble(value);
+				item.setStepSize(stepSize);
+			}
+			catch (final NumberFormatException exc) {
+				log.warn("Script parameter " + item.getName() +
+					" has an invalid stepSize: " + value);
+			}
 		}
 		else if ("style".equalsIgnoreCase(key)) {
 			item.setWidgetStyle(value);
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 23ffb5d53..b87a4fb15 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -152,7 +152,7 @@ public void testParameters() {
 
 		final ModuleItem<?> sliderValue = info.getInput("sliderValue");
 		assertItem("sliderValue", int.class, "Slider Value", ItemIO.INPUT, true,
-			true, null, "slider", 11, null, null, 5, 15, 3, sliderValue);
+			true, null, "slider", 11, null, null, 5, 15, 3.0, sliderValue);
 
 		final ModuleItem<?> buffer = info.getOutput("buffer");
 		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,
@@ -195,7 +195,7 @@ private void assertItem(final String name, final Class<?> type,
 		assertEquals(max, item.getMaximumValue());
 		assertEquals(softMin, item.getSoftMinimum());
 		assertEquals(softMax, item.getSoftMaximum());
-//		assertEquals(stepSize, item.getStepSize());
+		assertEquals(stepSize, item.getStepSize());
 	}
 
 	/**

From 4a01d97621caf593be66d4d033041ab4528bd074 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Nov 2015 13:44:11 -0600
Subject: [PATCH 0037/1208] DefaultModuleService: do not persist default value

This makes iterative script development slightly more convenient.

Thanks to Leon Yang for the idea.
---
 .../java/org/scijava/module/DefaultModuleService.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index dcdebc5de..0c2d70925 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -60,6 +60,7 @@
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.ClassUtils;
+import org.scijava.util.MiscUtils;
 
 /**
  * Default service for keeping track of and executing available modules.
@@ -266,6 +267,13 @@ public <T> ModuleItem<T> getSingleOutput(final Module module,
 	public <T> void save(final ModuleItem<T> item, final T value) {
 		if (!item.isPersisted()) return;
 
+		if (MiscUtils.equal(item.getDefaultValue(), value)) {
+			// NB: Do not persist the value if it is the default.
+			// This is nice if the default value might change later,
+			// such as when iteratively developing a script.
+			return;
+		}
+
 		final String sValue = value == null ? "" : value.toString();
 
 		// do not persist if object cannot be converted back from a string

From 032cb8565ac8fbd3be53677d6a92902ee8cf5b4c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Nov 2015 10:18:34 -0600
Subject: [PATCH 0038/1208] Make OptionsPlugin abstract

It was never intended to be instantiated, but rather extended.

Closes #208.
---
 src/main/java/org/scijava/options/OptionsPlugin.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 2d03eb1b5..cd84b14d1 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -71,7 +71,9 @@
  * @author Barry DeZonia
  * @author Curtis Rueden
  */
-public class OptionsPlugin extends DynamicCommand implements SingletonPlugin {
+public abstract class OptionsPlugin extends DynamicCommand implements
+	SingletonPlugin
+{
 
 	// -- Parameters --
 

From eca2a95b3f6de1c22aaafecb324c39346334ce9f Mon Sep 17 00:00:00 2001
From: LeonYang5114 <leonyang1994@gmail.com>
Date: Wed, 25 Nov 2015 10:10:24 -0600
Subject: [PATCH 0039/1208] Fix bug of ignoring the step size of a parameter

The step size attribute of a parameter is always ignored because there
is no converter that converts String to Number. The bug is fixed by
parsing the String to double. Similar bug exists in the script editor
and has been fixed.

See also:
c0ffe39
#205
---
 src/main/java/org/scijava/command/CommandModuleItem.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index e0f45dfeb..de14eaa9a 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -145,7 +145,14 @@ public T getMaximumValue() {
 
 	@Override
 	public Number getStepSize() {
-		return tValue(getParameter().stepSize(), Number.class);
+		final String value = getParameter().stepSize();
+		try {
+			final double stepSize = Double.parseDouble(value);
+			return stepSize;
+		}
+		catch (final NumberFormatException exc) {
+			return tValue(value, Number.class);
+		}
 	}
 
 	@Override

From fdf7494d97c5f1062f5ae458bd4e1c34748a627c Mon Sep 17 00:00:00 2001
From: LeonYang5114 <leonyang1994@gmail.com>
Date: Wed, 25 Nov 2015 10:11:03 -0600
Subject: [PATCH 0040/1208] Add test for step size of a command's parameter

---
 src/test/java/org/scijava/command/InvalidCommandTest.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index da2fb86a4..73a68cbe2 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -71,6 +71,10 @@ public void testValid() {
 		final List<ValidityProblem> problems = info.getProblems();
 		assertNotNull(problems);
 		assertEquals(0, problems.size());
+		
+		final Number stepSize = info.getInput("x").getStepSize();
+		assertNotNull(stepSize);
+		assertEquals(10, stepSize.intValue());
 	}
 
 	@Test
@@ -101,7 +105,7 @@ public void testInvalid() {
 	@Plugin(type = Command.class)
 	public static class ValidCommand implements Command {
 
-		@Parameter
+		@Parameter(stepSize = "10")
 		private double x;
 
 		@Parameter(type = ItemIO.OUTPUT)

From 45ab6cf22dc3c33400bc40a17885e968f4eaa8ad Mon Sep 17 00:00:00 2001
From: LeonYang5114 <leonyang1994@gmail.com>
Date: Wed, 25 Nov 2015 10:16:20 -0600
Subject: [PATCH 0041/1208] Add empty option for not-required parameter in
 Widget

For command parameter that is not required but candidate options exist,
DefaultWidgetModel gave no empty option to be chosen from, which force
the user to use the potentially invalid values.
---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index bbd715b3d..328e4eb27 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -83,6 +83,8 @@ public DefaultWidgetModel(final Context context, final InputPanel<?, ?> inputPan
 		this.module = module;
 		this.item = item;
 		this.objectPool = objectPool;
+		if (!item.isRequired())
+			this.objectPool.add(0, null);
 		convertedObjects = new WeakHashMap<Object, Object>();
 	}
 
@@ -306,8 +308,10 @@ private Object ensureValidObject(final Object value) {
 
 	/** Ensures the value is on the given list. */
 	private Object ensureValid(final Object value, final List<?> list) {
+		if (value == null)
+			return list.contains(null);
 		for (final Object o : list) {
-			if (o.equals(value)) return value; // value is valid
+			if (value.equals(o)) return value; // value is valid
 			// check if value was converted and cached
 			final Object convertedValue = convertedObjects.get(o);
 			if (convertedValue != null && value.equals(convertedValue)) {

From 14aa08f3ddcc845ab6ad89ce6f197d5de90fff54 Mon Sep 17 00:00:00 2001
From: LeonYang5114 <leonyang1994@gmail.com>
Date: Wed, 25 Nov 2015 10:04:02 -0600
Subject: [PATCH 0042/1208] Fix bug of overwriting pre-assigned values

The DefaultValuePreprocessor overwrote the value of the module's
corresponding item even if the item is pre-assigned with some value. Now
it checks if the item is primitive or if it is non-null before setting
the default value.

See also:
---
 .../org/scijava/module/process/DefaultValuePreprocessor.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index a4ee85713..a795cee4a 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -37,6 +37,8 @@
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.util.ConversionUtils;
+import org.scijava.util.MiscUtils;
 
 /**
  * A preprocessor plugin that populates default parameter values.
@@ -70,6 +72,8 @@ private <T> void assignDefaultValue(final Module module,
 		final ModuleItem<T> item)
 	{
 		if (module.isResolved(item.getName())) return;
+		final T nullValue = ConversionUtils.getNullValue(item.getType());
+		if (MiscUtils.equal(item.getValue(module), nullValue)) return;
 		final T defaultValue = moduleService.getDefaultValue(item);
 		if (defaultValue == null) return;
 		item.setValue(module, defaultValue);

From 1933a52e9109648e17189a58753332b7118cc481 Mon Sep 17 00:00:00 2001
From: LeonYang5114 <leonyang1994@gmail.com>
Date: Wed, 25 Nov 2015 17:01:19 -0600
Subject: [PATCH 0043/1208] Remove unnecessary method call

---
 src/main/java/org/scijava/command/CommandModuleItem.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index e0f45dfeb..1af834e89 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -159,7 +159,7 @@ public List<T> getChoices() {
 		if (choices.length == 0) return super.getChoices();
 
 		final ArrayList<T> choiceList = new ArrayList<T>();
-		for (final String choice : getParameter().choices()) {
+		for (final String choice : choices) {
 			choiceList.add(tValue(choice));
 		}
 		return choiceList;

From c0ebfe30a0dd594c8a9adabfb13e17b643e512b8 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 2 Dec 2015 16:20:00 -0600
Subject: [PATCH 0044/1208] Add @Override annotation to method missing it.

---
 src/main/java/org/scijava/util/MersenneTwisterFast.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 9c89eaea9..f8eb8cf24 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -229,6 +229,7 @@ public strictfp class MersenneTwisterFast implements Serializable, Cloneable
     private boolean __haveNextNextGaussian;
     
     /* We're overriding all internal data, to my knowledge, so this should be okay */
+    @Override
     public Object clone()
         {
         try

From 9b96272bcff75c58aaa5414952a7fdf92bbc07fa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 3 Dec 2015 13:34:03 -0600
Subject: [PATCH 0045/1208] Add a FIXME

See also #213.
---
 src/main/java/org/scijava/command/CommandModuleItem.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 58fd4bb2a..31fe5842f 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -145,6 +145,7 @@ public T getMaximumValue() {
 
 	@Override
 	public Number getStepSize() {
+		// FIXME: stepSize should be typed on T, not Number!
 		final String value = getParameter().stepSize();
 		try {
 			final double stepSize = Double.parseDouble(value);

From 35875af94876137dec23053ddabb0fcb3770f06e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 3 Dec 2015 20:01:16 -0600
Subject: [PATCH 0046/1208] Add Maven Central shield to the README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5f8b5ca0c..68ac93496 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
 [![](http://jenkins.imagej.net/job/SciJava-common/lastBuild/badge/icon)](http://jenkins.imagej.net/job/SciJava-common/)
 [![Join the chat at https://gitter.im/scijava/scijava-common](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scijava/scijava-common?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

From cfd81502daf02c3dc22cd1ba84a45d7926abc2c4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 4 Dec 2015 15:35:17 -0600
Subject: [PATCH 0047/1208] Context: add ctor for _real_ emptiness

The Context(boolean) constructor creates contexts without services, but
which still have the full PluginIndex.

This change (thanks to @gab1one) provides a more aggressive sort of
emptiness, completely devoid of any plugins whatsoever.
---
 src/main/java/org/scijava/Context.java | 36 ++++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index a533f3858..c3e02d9dc 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -110,14 +110,25 @@ public Context() {
 	/**
 	 * Creates a new SciJava application context.
 	 * 
-	 * @param empty If true, the context will be empty; otherwise, it will be
-	 *          initialized with all available services.
-	 * @see #Context(Collection, PluginIndex, boolean)
+	 * @param empty If true, the context will be empty of services; otherwise, it
+	 *          will be initialized with all available services.
+	 * @see #Context(boolean, boolean)
 	 */
-	@SuppressWarnings("unchecked")
 	public Context(final boolean empty) {
-		this(empty ? Collections.<Class<? extends Service>> emptyList() : Arrays
-			.<Class<? extends Service>> asList(Service.class));
+		this(empty, false);
+	}
+
+	/**
+	 * Creates a new SciJava application context.
+	 * 
+	 * @param noServices If true, the context will contain no services; otherwise,
+	 *          it will be initialized with all available services.
+	 * @param noPlugins If true, the context will contain no plugins; otherwise,
+	 *          it will be initialized with all available plugins.
+	 * @see #Context(Collection, PluginIndex, boolean)
+	 */
+	public Context(final boolean noServices, final boolean noPlugins) {
+		this(services(noServices), plugins(noPlugins));
 	}
 
 	/**
@@ -195,9 +206,8 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 	 *          result in a default plugin index being constructed and used.
 	 * @see #Context(Collection, PluginIndex, boolean)
 	 */
-	@SuppressWarnings("unchecked")
 	public Context(final PluginIndex pluginIndex) {
-		this(Arrays.<Class<? extends Service>> asList(Service.class), pluginIndex);
+		this(services(false), pluginIndex);
 	}
 
 	/**
@@ -510,6 +520,16 @@ private String createMissingServiceMessage(
 		return msg.toString();
 	}
 
+	private static PluginIndex plugins(final boolean empty) {
+		return empty ? new PluginIndex(null) : null;
+	}
+
+	@SuppressWarnings("unchecked")
+	private static List<Class<? extends Service>> services(final boolean empty) {
+		if (empty) return Collections.<Class<? extends Service>> emptyList();
+		return Arrays.<Class<? extends Service>> asList(Service.class);
+	}
+
 	private static boolean strict() {
 		return !"false".equals(System.getProperty(STRICT_PROPERTY));
 	}

From dbc00b52689731f82615863a2bbb417322361806 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 4 Dec 2015 15:42:47 -0600
Subject: [PATCH 0048/1208] ContextCreationTest: add empty plugins test

---
 src/test/java/org/scijava/ContextCreationTest.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index d015c3853..d9ebd1979 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -32,6 +32,7 @@
 package org.scijava;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -63,6 +64,17 @@ public class ContextCreationTest {
 	public void testEmpty() {
 		final Context context = new Context(true);
 		assertTrue(context.getServiceIndex().isEmpty());
+		assertFalse(context.getPluginIndex().isEmpty());
+	}
+
+	/**
+	 * Tests {@link Context#Context(boolean, boolean)} with {@code (true, true)}.
+	 */
+	@Test
+	public void testNoPlugins() {
+		final Context context = new Context(true, true);
+		assertTrue(context.getServiceIndex().isEmpty());
+		assertTrue(context.getPluginIndex().isEmpty());
 	}
 
 	/**

From d2fecd2982e6757431dd3239a0a7c64ae6664dba Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Sat, 5 Dec 2015 20:45:14 -0600
Subject: [PATCH 0049/1208] Only try to load services if required.

If the serviceClasses Collection is empty, there is no reason to create a ServiceHelper.
---
 src/main/java/org/scijava/Context.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index c3e02d9dc..1fb063b23 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -272,9 +272,11 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 
 		setStrict(strict);
 
-		final ServiceHelper serviceHelper =
-			new ServiceHelper(this, serviceClasses, strict);
-		serviceHelper.loadServices();
+		if (!serviceClasses.isEmpty()){
+			final ServiceHelper serviceHelper =
+					new ServiceHelper(this, serviceClasses, strict);
+			serviceHelper.loadServices();
+		}
 	}
 
 	// -- Context methods --

From d342895593a82058be0577b6e7ea8380b9f3daf7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 7 Dec 2015 13:27:32 -0600
Subject: [PATCH 0050/1208] POM: bump parent to pom-scijava 9.1.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dbb01116c..b00b9ae3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.0.0</version>
+		<version>9.1.0</version>
 		<relativePath />
 	</parent>
 

From 9ad849d0f4bcbb99b6beb692627a3f7a0539c2b3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 7 Dec 2015 13:30:06 -0600
Subject: [PATCH 0051/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b00b9ae3b..0ca4e49e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.49.2-SNAPSHOT</version>
+	<version>2.50.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From b71dc5c1a1e5a6fda3013cdbad6c9313933f7946 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 8 Dec 2015 09:51:12 -0600
Subject: [PATCH 0052/1208] Support cancelation during module initialization

Thanks to Richard Domander for pointing out this limitation.

See: https://gitter.im/fiji/fiji/archives/2015/12/08
---
 .../scijava/module/process/InitPreprocessor.java   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 3a723d21a..8e9c03a7d 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -31,6 +31,7 @@
 
 package org.scijava.module.process;
 
+import org.scijava.Cancelable;
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.module.MethodCallException;
@@ -58,6 +59,7 @@ public class InitPreprocessor extends AbstractPreprocessorPlugin {
 	public void process(final Module module) {
 		try {
 			module.initialize();
+			if (isCanceled(module)) cancel(getCancelReason(module));
 		}
 		catch (final MethodCallException exc) {
 			if (log != null) log.error(exc);
@@ -66,4 +68,16 @@ public void process(final Module module) {
 		}
 	}
 
+	// -- Helper methods --
+
+	private boolean isCanceled(final Module module) {
+		return module instanceof Cancelable && ((Cancelable) module).isCanceled();
+	}
+
+	private String getCancelReason(final Module module) {
+		if (!(module instanceof Cancelable)) return null;
+		final String cancelReason = ((Cancelable) module).getCancelReason();
+		return cancelReason == null ? "" : cancelReason;
+	}
+
 }

From 7c20295facbd820139e04d0b521a42cdc8fcbd29 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 9 Dec 2015 13:41:45 -0600
Subject: [PATCH 0053/1208] ClassUtils: clean up CacheMap

Improves the javadoc, adding more information and fixing refactoring
artifacts (such as references to Field or Method in the general base
class)
---
 .../java/org/scijava/util/ClassUtils.java     | 67 +++++++++++--------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 2d189bf16..8c7b5ff66 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -758,33 +758,43 @@ public static Type getGenericType(final Field field, final Class<?> type) {
 	// -- Helper classes --
 
 	/**
-	 * Convenience class to further type narrow {@link CacheMap} to {@link Field}
-	 * s.
+	 * Convenience class for a {@link CacheMap} that stores annotated
+	 * {@link Field}s.
 	 */
 	private static class FieldCache extends CacheMap<Field> {}
 
 	/**
-	 * Convenience class to further type narrow {@link CacheMap} to {@link Method}
-	 * s.
+	 * Convenience class for a {@link CacheMap} that stores annotated
+	 * {@link Method}s.
 	 */
 	private static class MethodCache extends CacheMap<Method> {}
 
 	/**
 	 * Convenience class for {@code Map > Map > List} hierarchy. Cleans up
 	 * generics and contains helper methods for traversing the two map levels.
+	 * <p>
+	 * The intent for this class is to allow subclasses to specify the generic
+	 * parameter ultimately referenced by the at the end of these maps.
+	 * </p>
+	 * <p>
+	 * The first map key is a base class, presumably with various types of
+	 * annotations. The second map key is the annotation class, for example
+	 * {@link Method} or {@link Field}. The list then contains all instances of
+	 * the annotated type within the original base class.
+	 * </p>
 	 *
-	 * @param <T> - {@link AnnotatedElement} {@link List} ultimately referenced by
-	 *          this map
+	 * @param <T> - The type of {@link AnnotatedElement} contained by the
+	 *          {@link List} ultimately referenced by these {@link Map}s
 	 */
 	private static class CacheMap<T extends AnnotatedElement> extends
 		HashMap<Class<?>, Map<Class<? extends Annotation>, List<T>>>
 	{
 
 		/**
-		 * @param c Base class
-		 * @param annotationClass Annotation type
-		 * @return Cached list of Methods in the base class with the specified
-		 *         annotation, or null if a cached list does not exist.
+		 * @param c Base class of interest
+		 * @param annotationClass {@link Annotation type within the base class
+		 * @return A {@link List} of instances in the base class with the specified
+		 *         {@link Annotation}, or null if a cached list does not exist.
 		 */
 		public List<T> getList(final Class<?> c,
 			final Class<? extends Annotation> annotationClass)
@@ -798,16 +808,16 @@ public List<T> getList(final Class<?> c,
 		}
 
 		/**
-		 * Populates the provided list with {@link Method} entries of the given base
-		 * class which are annotated with the specified annotation type.
+		 * Creates a {@code base class > annotation > list of elements} mapping to
+		 * the provided list, creating the intermediate map if needed.
 		 *
-		 * @param c Base class
-		 * @param annotationClass Annotation type
-		 * @param annotatedMethods Method list to populate
+		 * @param c Base class of interest
+		 * @param annotationClass {@link Annotation} type of interest
+		 * @param annotatedElements List of {@link AnnotatedElement}s to map
 		 */
 		public void putList(final Class<?> c,
 			final Class<? extends Annotation> annotationClass,
-			final List<T> annotatedMethods)
+			final List<T> annotatedElements)
 		{
 			Map<Class<? extends Annotation>, List<T>> map = get(c);
 			if (map == null) {
@@ -815,27 +825,28 @@ public void putList(final Class<?> c,
 				put(c, map);
 			}
 
-			map.put(annotationClass, annotatedMethods);
+			map.put(annotationClass, annotatedElements);
 		}
 
 		/**
-		 * As {@link #getList(Class, Class)} but ensures an array is created and
-		 * mapped, if it doesn't already exist.
+		 * Generates mappings as in {@link #putList(Class, Class, List)}, but also
+		 * creates the {@link List} if it doesn't already exist. Returns the final
+		 * list at this mapping, for external population.
 		 *
-		 * @param c Base class
-		 * @param annotationClass Annotation type
-		 * @return Cached list of Fields in the base class with the specified
-		 *         annotation.
+		 * @param c Base class of interest
+		 * @param annotationClass {@link Annotation} type of interest
+		 * @return Cached list of {@link AnnotatedElement}s in the base class with
+		 *         the specified {@link Annotation}.
 		 */
 		public List<T> makeList(final Class<?> c,
 			final Class<? extends Annotation> annotationClass)
 		{
-			List<T> methods = getList(c, annotationClass);
-			if (methods == null) {
-				methods = new ArrayList<T>();
-				putList(c, annotationClass, methods);
+			List<T> elements = getList(c, annotationClass);
+			if (elements == null) {
+				elements = new ArrayList<T>();
+				putList(c, annotationClass, elements);
 			}
-			return methods;
+			return elements;
 		}
 
 	}

From f6f3d8466c9b7185052e572043645e1d15996e85 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 7 Dec 2015 21:08:42 -0600
Subject: [PATCH 0054/1208] ClassUtils: trap more class loading errors

No class loading error should crash the thread, ever.

Ops just switched to Java 8. Unfortunately, this change
crashed the context startup in the following way:

java.lang.UnsupportedClassVersionError: net/imagej/ops/DefaultNamespaceService : Unsupported major.minor version 52.0
	at java.lang.ClassLoader.defineClass1(Native Method)
	at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
	at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
	at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
	at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
	at org.scijava.util.ClassUtils.loadClass(ClassUtils.java:164)
	at org.scijava.plugin.PluginInfo.loadClass(PluginInfo.java:283)
	at org.scijava.plugin.PluginInfo.getIdentifier(PluginInfo.java:320)
	at org.scijava.AbstractUIDetails.getTitle(AbstractUIDetails.java:108)
	at org.scijava.AbstractUIDetails.compareTo(AbstractUIDetails.java:237)
	at org.scijava.AbstractUIDetails.compareTo(AbstractUIDetails.java:43)
	at java.util.ComparableTimSort.binarySort(ComparableTimSort.java:232)
	at java.util.ComparableTimSort.sort(ComparableTimSort.java:176)
	at java.util.ComparableTimSort.sort(ComparableTimSort.java:146)
	at java.util.Arrays.sort(Arrays.java:472)
	at java.util.Collections.sort(Collections.java:155)
	at org.scijava.object.SortedObjectIndex.mergeAfterSorting(SortedObjectIndex.java:97)
	at org.scijava.object.SortedObjectIndex.addAll(SortedObjectIndex.java:83)
	at org.scijava.plugin.PluginIndex.discover(PluginIndex.java:108)
	at org.scijava.Context.<init>(Context.java:261)
---
 src/main/java/org/scijava/util/ClassUtils.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 8c7b5ff66..61b9cbc29 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -163,7 +163,11 @@ public static Class<?> loadClass(final String name,
 					: classLoader;
 			return cl.loadClass(className);
 		}
-		catch (final ClassNotFoundException e) {
+		catch (final Throwable t) {
+			// NB: Do not allow any failure to load the class to crash us.
+			// Not ClassNotFoundException.
+			// Not NoClassDefFoundError.
+			// Not UnsupportedClassVersionError!
 			return null;
 		}
 	}

From 52acc853ed1dd77b9b487f0d3c9cfac45f7fbd6d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 7 Dec 2015 22:07:08 -0600
Subject: [PATCH 0055/1208] ClassUtils: be defensive when caching annotations

This avoids the following exception when injecting the
application context into the ImageJ gateway:

java.lang.UnsupportedClassVersionError: net/imagej/ops/OpService : Unsupported major.minor version 52.0
	at java.lang.ClassLoader.defineClass1(Native Method)
	at java.lang.ClassLoader.defineClass(ClassLoader.java:800)
	at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:142)
	at java.net.URLClassLoader.defineClass(URLClassLoader.java:449)
	at java.net.URLClassLoader.access$100(URLClassLoader.java:71)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:361)
	at java.net.URLClassLoader$1.run(URLClassLoader.java:355)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.net.URLClassLoader.findClass(URLClassLoader.java:354)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:425)
	at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308)
	at java.lang.ClassLoader.loadClass(ClassLoader.java:358)
	at java.lang.Class.getDeclaredMethods0(Native Method)
	at java.lang.Class.privateGetDeclaredMethods(Class.java:2625)
	at java.lang.Class.getDeclaredMethods(Class.java:1868)
	at org.scijava.util.ClassUtils.cacheAnnotatedObjects(ClassUtils.java:507)
	at org.scijava.Context.inject(Context.java:377)
	at org.scijava.AbstractContextual.setContext(AbstractContextual.java:68)
	at org.scijava.AbstractGateway.<init>(AbstractGateway.java:85)
	at net.imagej.ImageJ.<init>(ImageJ.java:90)
---
 .../java/org/scijava/util/ClassUtils.java     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 61b9cbc29..0b82ccaa8 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -358,7 +358,7 @@ public static <A extends Annotation> List<Method> getAnnotatedMethods(
 			cachedMethods = methodCache.getList(c, annotationClass);
 		}
 
-		methods.addAll(cachedMethods);
+		if (cachedMethods != null) methods.addAll(cachedMethods);
 	}
 
 	/**
@@ -501,15 +501,20 @@ else if (methodCache.getList(scannedClass, annotationClass) != null) {
 				final Class<? extends AnnotatedElement> objectClass =
 					query.get(annotationClass);
 
-				// Methods
-				if (Method.class.isAssignableFrom(objectClass)) {
-					populateCache(scannedClass, inherited, annotationClass, methodCache,
-						scannedClass.getDeclaredMethods());
+				try {
+					// Methods
+					if (Method.class.isAssignableFrom(objectClass)) {
+						populateCache(scannedClass, inherited, annotationClass, methodCache,
+							scannedClass.getDeclaredMethods());
+					}
+					// Fields
+					else if (Field.class.isAssignableFrom(objectClass)) {
+						populateCache(scannedClass, inherited, annotationClass, fieldCache,
+							scannedClass.getDeclaredFields());
+					}
 				}
-				// Fields
-				else if (Field.class.isAssignableFrom(objectClass)) {
-					populateCache(scannedClass, inherited, annotationClass, fieldCache,
-						scannedClass.getDeclaredFields());
+				catch (final Throwable t) {
+					// NB: No action needed?
 				}
 			}
 		}

From ccaaa6ad6a30e86a1068ac04af57d5c72c334cd1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 9 Dec 2015 14:37:11 -0600
Subject: [PATCH 0056/1208] DefaultConverter: fix bug converting to Collection

It is straightforward to convert from a Collection subclass
(e.g., ArrayList) to a Collection. It is just a simple cast.

This bug prevented such casts from taking place, due to
over-eager precedence of Collection-specific handling.

We really need to rewrite this stuff; see:
https://github.com/scijava/scijava-common/issues/109
---
 .../java/org/scijava/convert/DefaultConverter.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index c86a4f28e..561dd3c5f 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -294,13 +294,15 @@ private Collection<Object> createCollection(final Class<?> type) {
 	@Override
 	@Deprecated
 	public boolean canConvert(final Class<?> src, final Type dest) {
-		
+
 		// Handle array types, including generic array types.
 		if (isArray(dest)) return true;
-		
+
 		// Handle parameterized collection types.
-		if (dest instanceof ParameterizedType && isCollection(dest)) {
-			return createCollection(GenericUtils.getClass(dest)) != null;
+		if (dest instanceof ParameterizedType && isCollection(dest) &&
+			createCollection(GenericUtils.getClass(dest)) != null)
+		{
+			return true;
 		}
 		
 		return super.canConvert(src, dest);

From 867ab9c6378d9b293a7a9195c87e6eca5ffabaec Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 9 Dec 2015 14:42:08 -0600
Subject: [PATCH 0057/1208] ConverterTest: Add a test for generic Collections

This is a regression test for the bug-fix in
d40759d32010f86114ed099f8c425a246ad7bc3a.
---
 .../java/org/scijava/convert/ConverterTest.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index c982d7475..de75c9f3e 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -35,10 +35,14 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Collection;
 
 import org.junit.Test;
+import org.scijava.util.ClassUtils;
+import org.scijava.util.GenericUtils;
 
 /**
  * Tests individual {@link Converter}s.
@@ -49,6 +53,7 @@
  * </p>
  *
  * @author Mark Hiner
+ * @author Curtis Rueden
  */
 public class ConverterTest {
 
@@ -83,6 +88,18 @@ public void testCanConvert() {
 		assertTrue(nc.canConvert(Integer.class, Number.class));
 	}
 
+	@SuppressWarnings("unused")
+	private Collection<Number> collection;
+
+	@Test
+	public void testCanConvertToGenericCollection() {
+		final DefaultConverter dc = new DefaultConverter();
+
+		final Field destField = ClassUtils.getField(getClass(), "collection");
+		final Type destType = GenericUtils.getFieldType(destField, getClass());
+		assertTrue(dc.canConvert(ArrayList.class, destType));
+	}
+
 	private static class NumberConverter extends AbstractConverter<Number, Number> {
 
 		@SuppressWarnings("unchecked")

From c3c1a943aa894fa3ee0f5d8cd113e737ec711ece Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 11 Dec 2015 08:26:14 -0600
Subject: [PATCH 0058/1208] ClassUtils: fix AnnotatedObject refs

AnnotatedObject doesn't exist; they're AnnotatedElements.
---
 src/main/java/org/scijava/util/ClassUtils.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 0b82ccaa8..d73a82e26 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -415,16 +415,16 @@ public static <A extends Annotation> void getAnnotatedFields(
 
 	/**
 	 * This method scans the provided class, its superclasses and interfaces for
-	 * all supported {@link Annotation} : {@link AnnotatedObject} pairs.
+	 * all supported {@link Annotation} : {@link AnnotatedElement} pairs.
 	 * These are then cached to remove the need for future queries.
 	 * <p>
-	 * By combining multiple {@code Annotation : AnnotatedObject} pairs in one
+	 * By combining multiple {@code Annotation : AnnotatedElement} pairs in one
 	 * query, we can limit the number of times a class's superclass and interface
 	 * hierarchy are traversed.
 	 * </p>
 	 *
 	 * @param scannedClass Class to scan
-	 * @param query Pairs of {@link Annotation} and {@link AnnotatedObject}s to
+	 * @param query Pairs of {@link Annotation} and {@link AnnotatedElement}s to
 	 *          discover.
 	 */
 	public static void cacheAnnotatedObjects(final Class<?> scannedClass,

From d062d5b9c1bbf36b183269905d29de96e9512430 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 11 Dec 2015 09:14:34 -0600
Subject: [PATCH 0059/1208] ClassUtils: fix javadoc

Now up-to-date with ImageJ eclipse prefs.
---
 src/main/java/org/scijava/util/ClassUtils.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index d73a82e26..2a8d1a564 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -574,7 +574,9 @@ public static void setValue(final Field field, final Object instance,
 				// the given value needs to be converted to a compatible type
 				final Type fieldType =
 					GenericUtils.getFieldType(field, instance.getClass());
-				compatibleValue = ConversionUtils.convert(value, fieldType);
+				@SuppressWarnings("deprecation")
+				final Object convertedValue = ConversionUtils.convert(value, fieldType);
+				compatibleValue = convertedValue;
 			}
 			field.set(instance, compatibleValue);
 		}
@@ -770,13 +772,17 @@ public static Type getGenericType(final Field field, final Class<?> type) {
 	 * Convenience class for a {@link CacheMap} that stores annotated
 	 * {@link Field}s.
 	 */
-	private static class FieldCache extends CacheMap<Field> {}
+	private static class FieldCache extends CacheMap<Field> {
+		// Trivial subclass to narrow generic params
+	}
 
 	/**
 	 * Convenience class for a {@link CacheMap} that stores annotated
 	 * {@link Method}s.
 	 */
-	private static class MethodCache extends CacheMap<Method> {}
+	private static class MethodCache extends CacheMap<Method> {
+		// Trivial subclass to narrow generic params
+	}
 
 	/**
 	 * Convenience class for {@code Map > Map > List} hierarchy. Cleans up
@@ -801,7 +807,7 @@ private static class CacheMap<T extends AnnotatedElement> extends
 
 		/**
 		 * @param c Base class of interest
-		 * @param annotationClass {@link Annotation type within the base class
+		 * @param annotationClass {@link Annotation} type within the base class
 		 * @return A {@link List} of instances in the base class with the specified
 		 *         {@link Annotation}, or null if a cached list does not exist.
 		 */

From b5333a16b75795afe0e8fa906a65b868f92b0850 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 15 Dec 2015 11:46:15 -0600
Subject: [PATCH 0060/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0ca4e49e1..c7b74d33e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.50.1-SNAPSHOT</version>
+	<version>2.50.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 5f1b644f820b61358d2f6339f9c2ca6cf3f4552d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Jan 2016 13:17:10 +0100
Subject: [PATCH 0061/1208] DefaultPrefService: add other authors

Grant and I originally developed much of this
code as a static utility class called Prefs.
---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index b4f909b27..5c0ec2897 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -48,6 +48,8 @@
  * disk using the Java {@link Preferences} API.
  *
  * @author Mark Hiner
+ * @author Curtis Rueden
+ * @author Grant Harris
  */
 @Plugin(type = Service.class)
 public class DefaultPrefService extends AbstractPrefService {

From 1078b603b9386ce2563ca62639eadf69073389c1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Jan 2016 13:18:32 +0100
Subject: [PATCH 0062/1208] DefaultPrefService: remove obsolete TODO

---
 .../java/org/scijava/prefs/DefaultPrefService.java     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 5c0ec2897..9e666e444 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -54,16 +54,6 @@
 @Plugin(type = Service.class)
 public class DefaultPrefService extends AbstractPrefService {
 
-	// TODO - with the conversion from a static utility class to a service, we
-	// have unfortunately lost some power to adapt behavior to individual data
-	// types - either the whole service is superceded, or it's not. For example,
-	// see the saveValue/loadValue of the ModuleItem class, where each item could
-	// decide how it was saved and loaded.
-	// Thus it would be nice to refactor this service to use the Handler pattern,
-	// such that there would just be a few base put/get methods that delegated
-	// to appropriate handlers. Then the handlers of a single type could be
-	// provided and overridden.
-
 	// -- Global preferences --
 
 	@Override

From 5d4b849493b3220a41e32144d453c6156242061f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Jan 2016 13:28:28 +0100
Subject: [PATCH 0063/1208] DefaultPrefService: wrap all Preferences access

This encapsulates direct usage of the java.util.prefs API to:

1) a SmartPrefs class with many of the same methods (and a few new ones)
2) four remaining private helper methods of DefaultPrefService itself.

We no longer explicitly import java.util.prefs at the top of the class,
to make it easier to verify that the _only_ usages are as stated above.

The SmartPrefs class wraps a java.util.prefs.Preferences object,
providing much of the same API, as well as some new convenience API
matching that of the PrefService itself (notably: collections).

This change paves the way for more fine-grained control over our exact
usage of the Preferences API. In particular, see bug-fix in next commit.
---
 .../org/scijava/prefs/DefaultPrefService.java | 418 +++++++++++-------
 1 file changed, 247 insertions(+), 171 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 9e666e444..623e0cb4b 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -37,15 +37,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
 
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
 
 /**
  * Default {@link PrefService} implementation, which persists preferences to
- * disk using the Java {@link Preferences} API.
+ * disk using the {@link java.util.prefs.Preferences} API.
  *
  * @author Mark Hiner
  * @author Curtis Rueden
@@ -54,6 +54,9 @@
 @Plugin(type = Service.class)
 public class DefaultPrefService extends AbstractPrefService {
 
+	@Parameter(required = false)
+	private LogService log;
+
 	// -- Global preferences --
 
 	@Override
@@ -202,12 +205,7 @@ public void put(final Class<?> c, final String name, final long value) {
 
 	@Override
 	public void clear(final Class<?> c) {
-		try {
-			prefs(c).clear();
-		}
-		catch (final BackingStoreException e) {
-			// do nothing
-		}
+		prefs(c).clear();
 	}
 
 	// -- Other/unsorted --
@@ -217,13 +215,8 @@ public void clear(final Class<?> c) {
 
 	@Override
 	public void clearAll() {
-		try {
-			for (final String name : allPrefs())
-				prefs(name).removeNode();
-		}
-		catch (final BackingStoreException e) {
-			// do nothing
-		}
+		for (final String name : allPrefs())
+			prefs(name).removeNode();
 	}
 
 	@Override
@@ -233,26 +226,22 @@ public void clear(final String key) {
 
 	@Override
 	public void clear(final Class<?> prefClass, final String key) {
-		final Preferences preferences = prefs(prefClass);
-		clear(preferences, key);
+		prefs(prefClass).clear(key);
 	}
 
 	@Override
 	public void clear(final String absolutePath, final String key) {
-		final Preferences preferences = prefs(absolutePath);
-		clear(preferences, key);
+		prefs(absolutePath).clear(key);
 	}
 
 	@Override
 	public void remove(final Class<?> prefClass, final String key) {
-		final Preferences preferences = prefs(prefClass);
-		remove(preferences, key);
+		prefs(prefClass).remove(key);
 	}
 
 	@Override
 	public void remove(final String absolutePath, final String key) {
-		final Preferences preferences = prefs(absolutePath);
-		remove(preferences, key);
+		prefs(absolutePath).remove(key);
 	}
 
 	@Override
@@ -264,28 +253,24 @@ public void putMap(final Map<String, String> map, final String key) {
 	public void putMap(final Class<?> prefClass, final Map<String, String> map,
 		final String key)
 	{
-		final Preferences preferences = prefs(prefClass);
-		putMap(preferences.node(key), map);
+		prefs(prefClass).node(key).putMap(map);
 	}
 
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map,
 		final String key)
 	{
-		final Preferences preferences = prefs(absolutePath);
-		putMap(preferences.node(key), map);
+		prefs(absolutePath).node(key).putMap(map);
 	}
 
 	@Override
 	public void putMap(final Class<?> prefClass, final Map<String, String> map) {
-		final Preferences preferences = prefs(prefClass);
-		putMap(preferences, map);
+		prefs(prefClass).putMap(map);
 	}
 
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map) {
-		final Preferences preferences = prefs(absolutePath);
-		putMap(preferences, map);
+		prefs(absolutePath).putMap(map);
 	}
 
 	@Override
@@ -296,22 +281,19 @@ public Map<String, String> getMap(final String key) {
 	@Override
 	public Map<String, String> getMap(final Class<?> prefClass, final String key)
 	{
-		final Preferences preferences = prefs(prefClass);
-		return getMap(preferences.node(key));
+		return prefs(prefClass).node(key).getMap();
 	}
 
 	@Override
 	public Map<String, String>
 		getMap(final String absolutePath, final String key)
 	{
-		final Preferences preferences = prefs(absolutePath);
-		return getMap(preferences.node(key));
+		return prefs(absolutePath).node(key).getMap();
 	}
 
 	@Override
 	public Map<String, String> getMap(final Class<?> prefClass) {
-		final Preferences preferences = prefs(prefClass);
-		return getMap(preferences);
+		return prefs(prefClass).getMap();
 	}
 
 	@Override
@@ -323,28 +305,24 @@ public void putList(final List<String> list, final String key) {
 	public void putList(final Class<?> prefClass, final List<String> list,
 		final String key)
 	{
-		final Preferences preferences = prefs(prefClass);
-		putList(preferences.node(key), list);
+		prefs(prefClass).node(key).putList(list);
 	}
 
 	@Override
 	public void putList(final String absolutePath, final List<String> list,
 		final String key)
 	{
-		final Preferences preferences = prefs(absolutePath);
-		putList(preferences.node(key), list);
+		prefs(absolutePath).node(key).putList(list);
 	}
 
 	@Override
 	public void putList(final Class<?> prefClass, final List<String> list) {
-		final Preferences preferences = prefs(prefClass);
-		putList(preferences, list);
+		prefs(prefClass).putList(list);
 	}
 
 	@Override
 	public void putList(final String absolutePath, final List<String> list) {
-		final Preferences preferences = prefs(absolutePath);
-		putList(preferences, list);
+		prefs(absolutePath).putList(list);
 	}
 
 	@Override
@@ -354,20 +332,17 @@ public List<String> getList(final String key) {
 
 	@Override
 	public List<String> getList(final Class<?> prefClass, final String key) {
-		final Preferences preferences = prefs(prefClass);
-		return getList(preferences.node(key));
+		return prefs(prefClass).node(key).getList();
 	}
 
 	@Override
 	public List<String> getList(final String absolutePath, final String key) {
-		final Preferences preferences = prefs(absolutePath);
-		return getList(preferences.node(key));
+		return prefs(absolutePath).node(key).getList();
 	}
 
 	@Override
 	public List<String> getList(final Class<?> prefClass) {
-		final Preferences preferences = prefs(prefClass);
-		return getList(preferences);
+		return prefs(prefClass).getList();
 	}
 
 	@Override
@@ -377,8 +352,7 @@ public Iterable<String> getIterable(final String key) {
 
 	@Override
 	public Iterable<String> getIterable(final Class<?> prefClass, final String key) {
-		final Preferences preferences = prefs(prefClass);
-		return getIterable(preferences.node(key));
+		return prefs(prefClass).node(key).getIterable();
 	}
 
 	@Override
@@ -388,159 +362,261 @@ public void putIterable(final Iterable<String> iterable, final String key) {
 
 	@Override
 	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String key) {
-		final Preferences preferences = prefs(prefClass);
-		putIterable(preferences.node(key), iterable);
+		prefs(prefClass).node(key).node(key).putIterable(iterable);
 	}
 
 	// -- Helper methods --
 
-	private void clear(final Preferences preferences, final String key) {
-		try {
-			if (preferences.nodeExists(key)) {
-				preferences.node(key).clear();
-			}
-		}
-		catch (final BackingStoreException bse) {
-			bse.printStackTrace();
-		}
+	private static String key(final Class<?> c, final String name) {
+		return c == null ? name : c.getSimpleName() + "." + name;
+	}
+
+	private SmartPrefs prefs(final Class<?> c) {
+		return new SmartPrefs(java.util.prefs.Preferences.userNodeForPackage(
+			c == null ? PrefService.class : c), log);
+	}
+
+	private SmartPrefs prefs(final String absolutePath) {
+		return new SmartPrefs(java.util.prefs.Preferences.userRoot().node(
+			absolutePath), log);
 	}
 
-	private void remove(final Preferences preferences, final String key) {
+	private String[] allPrefs() {
 		try {
-			if (preferences.nodeExists(key)) {
-				preferences.node(key).removeNode();
-			}
+			return java.util.prefs.Preferences.userRoot().childrenNames();
 		}
-		catch (final BackingStoreException bse) {
-			bse.printStackTrace();
+		catch (java.util.prefs.BackingStoreException exc) {
+			log.error(exc);
+			return new String[0];
 		}
 	}
 
-	private void putMap(final Preferences preferences,
-		final Map<String, String> map)
-	{
-		if (preferences == null) {
-			throw new IllegalArgumentException("Preferences not set.");
+	// -- Helper classes --
+
+	/**
+	 * Smart wrapper around {@link java.util.prefs.Preferences} which
+	 * encapsulates, improves and enhances its behavior.
+	 */
+	private static class SmartPrefs {
+
+		private final java.util.prefs.Preferences p;
+		private final LogService log;
+
+		public SmartPrefs(final java.util.prefs.Preferences p,
+			final LogService log)
+		{
+			this.p = p;
+			this.log = log;
 		}
-		final Iterator<Entry<String, String>> iter = map.entrySet().iterator();
-		while (iter.hasNext()) {
-			final Entry<String, String> entry = iter.next();
-			final Object value = entry.getValue();
-			preferences.put(entry.getKey().toString(), value == null ? null : value
-				.toString());
+
+		// -- SmartPrefs methods --
+
+		public void clear(final String key) {
+			if (nodeExists(key)) node(key).clear();
 		}
 
-	}
+		public void remove(final String key) {
+			if (nodeExists(key)) node(key).removeNode();
+		}
+
+		public void putMap(final Map<String, String> map) {
+			final Iterator<Entry<String, String>> iter = map.entrySet().iterator();
+			while (iter.hasNext()) {
+				final Entry<String, String> entry = iter.next();
+				final String key = entry.getKey().toString();
+				final Object value = entry.getValue();
+				put(key, value);
+			}
 
-	private Map<String, String> getMap(final Preferences preferences) {
-		if (preferences == null) {
-			throw new IllegalArgumentException("Preferences not set.");
 		}
-		final Map<String, String> map = new HashMap<String, String>();
-		try {
-			final String[] keys = preferences.keys();
+
+		public Map<String, String> getMap() {
+			final Map<String, String> map = new HashMap<String, String>();
+			final String[] keys = keys();
 			for (int index = 0; index < keys.length; index++) {
-				map.put(keys[index], preferences.get(keys[index], null));
+				map.put(keys[index], get(keys[index]));
+			}
+			return map;
+		}
+
+		public void putList(final List<String> list) {
+			for (int index = 0; list != null && index < list.size(); index++) {
+				final Object value = list.get(index);
+				put("" + index, value);
 			}
 		}
-		catch (final BackingStoreException bse) {
-			bse.printStackTrace();
+
+		public List<String> getList() {
+			final List<String> list = new ArrayList<String>();
+			for (int index = 0; index < 1000; index++) {
+				final String value = get("" + index);
+				if (value == null) {
+					break;
+				}
+				list.add(value);
+			}
+			return list;
 		}
-		return map;
-	}
 
-	private void putList(final Preferences preferences, final List<String> list) {
-		if (preferences == null) {
-			throw new IllegalArgumentException("Preferences not set.");
+		public void putIterable(final Iterable<String> iterable) {
+			int index = 0;
+			for (final String value : iterable) {
+				put("" + index++, value);
+			}
 		}
-		for (int index = 0; list != null && index < list.size(); index++) {
-			final Object value = list.get(index);
-			preferences.put("" + index, value == null ? null : value.toString());
+
+		public Iterable<String> getIterable() {
+			return new Iterable<String>() {
+				@Override
+				public Iterator<String> iterator() {
+					return new Iterator<String>() {
+						private String value;
+						private int index;
+						{
+							findNext();
+						}
+
+						@Override
+						public String next() {
+							final String result = value;
+							findNext();
+							return result;
+						}
+
+						@Override
+						public boolean hasNext() {
+							return value != null;
+						}
+
+						@Override
+						public void remove() {
+							throw new UnsupportedOperationException();
+						}
+
+						private void findNext() {
+							if (index < 0) return;
+							value = get("" + index);
+							index = value == null ? -1 : index + 1;
+						}
+					};
+				}
+			};
+		}
+
+		// -- Adapted Preferences methods --
+
+		/** @see java.util.prefs.Preferences#put */
+		public void put(final String key, final Object value) {
+			p.put(key, value == null ? null : value.toString());
+		}
+
+		/** @see java.util.prefs.Preferences#get(String, String) */
+		public String get(final String key) {
+			return get(key, null);
 		}
-	}
 
-	private List<String> getList(final Preferences preferences) {
-		if (preferences == null) {
-			throw new IllegalArgumentException("Preferences not set.");
+		/** @see java.util.prefs.Preferences#get(String, String) */
+		public String get(final String key, final String def) {
+			return p.get(key, def);
 		}
-		final List<String> list = new ArrayList<String>();
-		for (int index = 0; index < 1000; index++) {
-			final String value = preferences.get("" + index, null);
-			if (value == null) {
-				break;
+
+		/** @see java.util.prefs.Preferences#clear() */
+		public void clear() {
+			try {
+				p.clear();
+			}
+			catch (java.util.prefs.BackingStoreException exc) {
+				log.error(exc);
 			}
-			list.add(value);
 		}
-		return list;
-	}
 
-	private void putIterable(final Preferences preferences,
-		final Iterable<String> iterable)
-	{
-		if (preferences == null) {
-			throw new IllegalArgumentException("Preferences not set.");
+		/** @see java.util.prefs.Preferences#putInt(String, int) */
+		public void putInt(final String key, final int value) {
+			p.putInt(key, value);
 		}
-		int index = 0;
-		for (final String value : iterable) {
-			preferences.put("" + index++, value == null ? null : value.toString());
+
+		/** @see java.util.prefs.Preferences#getInt(String, int) */
+		public int getInt(final String key, final int def) {
+			return p.getInt(key, def);
 		}
-	}
 
-	private Iterable<String> getIterable(final Preferences preferences)
-	{
-		if (preferences == null) {
-			throw new IllegalArgumentException("Preferences not set.");
+		/** @see java.util.prefs.Preferences#putLong(String, long) */
+		public void putLong(final String key, final long value) {
+			p.putLong(key, value);
+		}
+
+		/** @see java.util.prefs.Preferences#getLong(String, long) */
+		public long getLong(final String key, final long def) {
+			return p.getLong(key, def);
+		}
+
+		/** @see java.util.prefs.Preferences#putBoolean(String, boolean) */
+		public void putBoolean(final String key, final boolean value) {
+			p.putBoolean(key, value);
+		}
+
+		/** @see java.util.prefs.Preferences#getFloat(String, float) */
+		public boolean getBoolean(final String key, final boolean def) {
+			return p.getBoolean(key, def);
+		}
+
+		/** @see java.util.prefs.Preferences#putFloat(String, float) */
+		public void putFloat(final String key, final float value) {
+			p.putFloat(key, value);
+		}
+
+		/** @see java.util.prefs.Preferences#getFloat(String, float) */
+		public float getFloat(final String key, final float def) {
+			return p.getFloat(key, def);
 		}
-		return new Iterable<String>() {
-			@Override
-			public Iterator<String> iterator() {
-				return new Iterator<String>() {
-					private String value;
-					private int index;
-					{
-						findNext();
-					}
-
-					@Override
-					public String next() {
-						final String result = value;
-						findNext();
-						return result;
-					}
-
-					@Override
-					public boolean hasNext() {
-						return value != null;
-					}
-
-					@Override
-					public void remove() {
-						throw new UnsupportedOperationException();
-					}
-
-					private void findNext() {
-						if (index < 0) return;
-						value = preferences.get("" + index, null);
-						index = value == null ? -1 : index + 1;
-					}
-				};
+
+		/** @see java.util.prefs.Preferences#putDouble(String, double) */
+		public void putDouble(final String key, final double value) {
+			p.putDouble(key, value);
+		}
+
+		/** @see java.util.prefs.Preferences#getDouble(String, double) */
+		public double getDouble(final String key, final double def) {
+			return p.getDouble(key, def);
+		}
+
+		/** @see java.util.prefs.Preferences#keys() */
+		public String[] keys() {
+			try {
+				return p.keys();
 			}
-		};
-	}
+			catch (final java.util.prefs.BackingStoreException exc) {
+				log.error(exc);
+				return new String[0];
+			}
+		}
 
-	private Preferences prefs(final Class<?> c) {
-		return Preferences.userNodeForPackage(c == null ? PrefService.class : c);
-	}
+		/** @see java.util.prefs.Preferences#node(String) */
+		public SmartPrefs node(final String pathName) {
+			return new SmartPrefs(p.node(pathName), log);
+		}
 
-	private String[] allPrefs() throws BackingStoreException {
-		return Preferences.userRoot().childrenNames();
-	}
+		/** @see java.util.prefs.Preferences#nodeExists(String) */
+		public boolean nodeExists(final String pathName) {
+			try {
+				return p.nodeExists(pathName);
+			}
+			catch (final java.util.prefs.BackingStoreException exc) {
+				log.error(exc);
+				return false;
+			}
+		}
 
-	private Preferences prefs(final String absolutePath) {
-		return Preferences.userRoot().node(absolutePath);
-	}
+		/** @see java.util.prefs.Preferences#removeNode() */
+		public void removeNode() {
+			try {
+				p.removeNode();
+			}
+			catch (final java.util.prefs.BackingStoreException exc) {
+				log.error(exc);
+			}
+		}
 
-	private String key(final Class<?> c, final String name) {
-		return c == null ? name : c.getSimpleName() + "." + name;
 	}
+
 }

From 39e3b21b15575f2cf0ecf5eea17efdcb1068ee84 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Jan 2016 13:53:24 +0100
Subject: [PATCH 0064/1208] DefaultPrefService: fix bug with keys >80 chars

The Java Preferences API does not allow keys greater than 80 characters
long (the Preferences.MAX_KEY_LENGTH constant).

As a workaround, we limit the key length internally, using the last 77
characters of the string prepending with "..." to suggest this occurred.

This means, of course, that two keys with identical latter 77 characters
will now stomp each other. But there is little we can do aside from
using hashes or some such, which would mangle the keys too much IMHO
(configuration files on disk would be incomprehensible, for example).

The fix is also incomplete when it comes to persisting maps: if you
have a map with such long keys, they will be mangled when restored.
But I do not have enough time and energy to address that right now.

Tripped over by Kyle Harrington.
---
 .../org/scijava/prefs/DefaultPrefService.java | 57 ++++++++++++++-----
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 623e0cb4b..a5f2c05da 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -507,7 +507,7 @@ private void findNext() {
 
 		/** @see java.util.prefs.Preferences#put */
 		public void put(final String key, final Object value) {
-			p.put(key, value == null ? null : value.toString());
+			p.put(safeKey(key), value == null ? null : value.toString());
 		}
 
 		/** @see java.util.prefs.Preferences#get(String, String) */
@@ -517,7 +517,7 @@ public String get(final String key) {
 
 		/** @see java.util.prefs.Preferences#get(String, String) */
 		public String get(final String key, final String def) {
-			return p.get(key, def);
+			return p.get(safeKey(key), def);
 		}
 
 		/** @see java.util.prefs.Preferences#clear() */
@@ -532,58 +532,62 @@ public void clear() {
 
 		/** @see java.util.prefs.Preferences#putInt(String, int) */
 		public void putInt(final String key, final int value) {
-			p.putInt(key, value);
+			p.putInt(safeKey(key), value);
 		}
 
 		/** @see java.util.prefs.Preferences#getInt(String, int) */
 		public int getInt(final String key, final int def) {
-			return p.getInt(key, def);
+			return p.getInt(safeKey(key), def);
 		}
 
 		/** @see java.util.prefs.Preferences#putLong(String, long) */
 		public void putLong(final String key, final long value) {
-			p.putLong(key, value);
+			p.putLong(safeKey(key), value);
 		}
 
 		/** @see java.util.prefs.Preferences#getLong(String, long) */
 		public long getLong(final String key, final long def) {
-			return p.getLong(key, def);
+			return p.getLong(safeKey(key), def);
 		}
 
 		/** @see java.util.prefs.Preferences#putBoolean(String, boolean) */
 		public void putBoolean(final String key, final boolean value) {
-			p.putBoolean(key, value);
+			p.putBoolean(safeKey(key), value);
 		}
 
 		/** @see java.util.prefs.Preferences#getFloat(String, float) */
 		public boolean getBoolean(final String key, final boolean def) {
-			return p.getBoolean(key, def);
+			return p.getBoolean(safeKey(key), def);
 		}
 
 		/** @see java.util.prefs.Preferences#putFloat(String, float) */
 		public void putFloat(final String key, final float value) {
-			p.putFloat(key, value);
+			p.putFloat(safeKey(key), value);
 		}
 
 		/** @see java.util.prefs.Preferences#getFloat(String, float) */
 		public float getFloat(final String key, final float def) {
-			return p.getFloat(key, def);
+			return p.getFloat(safeKey(key), def);
 		}
 
 		/** @see java.util.prefs.Preferences#putDouble(String, double) */
 		public void putDouble(final String key, final double value) {
-			p.putDouble(key, value);
+			p.putDouble(safeKey(key), value);
 		}
 
 		/** @see java.util.prefs.Preferences#getDouble(String, double) */
 		public double getDouble(final String key, final double def) {
-			return p.getDouble(key, def);
+			return p.getDouble(safeKey(key), def);
 		}
 
 		/** @see java.util.prefs.Preferences#keys() */
 		public String[] keys() {
 			try {
-				return p.keys();
+				final String[] keys = p.keys();
+				for (int i = 0; i < keys.length; i++) {
+					keys[i] = safeKey(keys[i]);
+				}
+				return keys;
 			}
 			catch (final java.util.prefs.BackingStoreException exc) {
 				log.error(exc);
@@ -617,6 +621,33 @@ public void removeNode() {
 			}
 		}
 
+		// -- Helper methods --
+
+		private String safeKey(final String key) {
+			return makeSafe(key, java.util.prefs.Preferences.MAX_KEY_LENGTH);
+		}
+
+		/**
+		 * This method limits the given string to the specified maximum length using
+		 * its latter characters prepended with "..." as needed.
+		 * <p>
+		 * This is necessary because the Java Preferences API does not allow:
+		 * </p>
+		 * <ul>
+		 * <li>Keys longer than {@link java.util.prefs.Preferences#MAX_KEY_LENGTH}
+		 * </li>
+		 * <li>Values longer than
+		 * {@link java.util.prefs.Preferences#MAX_VALUE_LENGTH}</li>
+		 * <li>Node names longer than
+		 * {@link java.util.prefs.Preferences#MAX_NAME_LENGTH}</li>
+		 * </ul>
+		 */
+		private String makeSafe(final String s, final int max) {
+			final int len = s.length();
+			if (len < max) return s;
+			return "..." + s.substring(len - max + 3, len);
+		}
+
 	}
 
 }

From 7330e082079ce11cd3c13998f3086b4424329231 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Jan 2016 13:36:59 +0100
Subject: [PATCH 0065/1208] PrefServiceTest: add a test for keys >80 chars

The Java Preferences API does not support these;
let's make sure they (largely) work anyway.
---
 .../org/scijava/prefs/PrefServiceTest.java    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index a0b1f5270..c923ea4e9 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -175,4 +175,24 @@ public void testList() {
 		assertEquals(recentFiles, result);
 	}
 
+	/**
+	 * The Java Preferences API does not support keys longer than 80 characters.
+	 * Let's test that our service does not fall victim to this limitation.
+	 */
+	@Test
+	public void testLongKeys() {
+		final String longKey = "" + //
+			"abcdefghijklmnopqrstuvwxyz" + //
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZ" + //
+			"0123456789" + //
+			"9876543210" + //
+			"ZYXWVUTSRQPONMLKJIHGFEDCBA" + //
+			"zyxwvutsrqponmlkjihgfedcba";
+		final String lyrics =
+			"Now I know my ABC's. Next time won't you sing with me?";
+		prefService.put(longKey, lyrics);
+		final String recovered = prefService.get(longKey);
+		assertEquals(lyrics, recovered);
+	}
+
 }

From de4226db3e9a45e86ceab3d14ee57a1f9c2d4d95 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Jan 2016 14:01:31 +0100
Subject: [PATCH 0066/1208] DefaultPrefService: protect vs other long strings

This is analogous to the protection against overlong keys;
the Preferences API also has limits on values and node names.
---
 .../org/scijava/prefs/DefaultPrefService.java    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index a5f2c05da..94acd501c 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -507,7 +507,7 @@ private void findNext() {
 
 		/** @see java.util.prefs.Preferences#put */
 		public void put(final String key, final Object value) {
-			p.put(safeKey(key), value == null ? null : value.toString());
+			p.put(safeKey(key), safeValue(value));
 		}
 
 		/** @see java.util.prefs.Preferences#get(String, String) */
@@ -597,13 +597,13 @@ public String[] keys() {
 
 		/** @see java.util.prefs.Preferences#node(String) */
 		public SmartPrefs node(final String pathName) {
-			return new SmartPrefs(p.node(pathName), log);
+			return new SmartPrefs(p.node(safeName(pathName)), log);
 		}
 
 		/** @see java.util.prefs.Preferences#nodeExists(String) */
 		public boolean nodeExists(final String pathName) {
 			try {
-				return p.nodeExists(pathName);
+				return p.nodeExists(safeName(pathName));
 			}
 			catch (final java.util.prefs.BackingStoreException exc) {
 				log.error(exc);
@@ -627,6 +627,16 @@ private String safeKey(final String key) {
 			return makeSafe(key, java.util.prefs.Preferences.MAX_KEY_LENGTH);
 		}
 
+		private String safeValue(final Object value) {
+			if (value == null) return null;
+			return makeSafe(value.toString(),
+				java.util.prefs.Preferences.MAX_VALUE_LENGTH);
+		}
+
+		private String safeName(final String name) {
+			return makeSafe(name, java.util.prefs.Preferences.MAX_NAME_LENGTH);
+		}
+
 		/**
 		 * This method limits the given string to the specified maximum length using
 		 * its latter characters prepended with "..." as needed.

From 584b53898754cdcf7cf262e2a4e7cf5d38e50e15 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Jan 2016 14:13:35 +0100
Subject: [PATCH 0067/1208] DefaultPrefService: guard against null LogService

---
 .../java/org/scijava/prefs/DefaultPrefService.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 94acd501c..7b90821ea 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -386,7 +386,7 @@ private String[] allPrefs() {
 			return java.util.prefs.Preferences.userRoot().childrenNames();
 		}
 		catch (java.util.prefs.BackingStoreException exc) {
-			log.error(exc);
+			if (log != null) log.error(exc);
 			return new String[0];
 		}
 	}
@@ -526,7 +526,7 @@ public void clear() {
 				p.clear();
 			}
 			catch (java.util.prefs.BackingStoreException exc) {
-				log.error(exc);
+				if (log != null) log.error(exc);
 			}
 		}
 
@@ -590,7 +590,7 @@ public String[] keys() {
 				return keys;
 			}
 			catch (final java.util.prefs.BackingStoreException exc) {
-				log.error(exc);
+				if (log != null) log.error(exc);
 				return new String[0];
 			}
 		}
@@ -606,7 +606,7 @@ public boolean nodeExists(final String pathName) {
 				return p.nodeExists(safeName(pathName));
 			}
 			catch (final java.util.prefs.BackingStoreException exc) {
-				log.error(exc);
+				if (log != null) log.error(exc);
 				return false;
 			}
 		}
@@ -617,7 +617,7 @@ public void removeNode() {
 				p.removeNode();
 			}
 			catch (final java.util.prefs.BackingStoreException exc) {
-				log.error(exc);
+				if (log != null) log.error(exc);
 			}
 		}
 

From 6db9fe07f4432754e4a458c7748eb37b273310b7 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Sat, 16 Jan 2016 08:42:57 -0600
Subject: [PATCH 0068/1208] Create CastingConverter

Extract trivial casting logic from DefaultConverter to a new dedicated
(high priority) CastingConverter.

Fixes issues when trying to convert to, say, Object.
---
 .../org/scijava/convert/CastingConverter.java | 90 +++++++++++++++++++
 .../org/scijava/convert/DefaultConverter.java | 11 ---
 2 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/org/scijava/convert/CastingConverter.java

diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
new file mode 100644
index 000000000..d849d5cd4
--- /dev/null
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -0,0 +1,90 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.convert;
+
+import org.scijava.Priority;
+import org.scijava.plugin.Plugin;
+import org.scijava.util.ClassUtils;
+import org.scijava.util.ConversionUtils;
+import org.scijava.util.GenericUtils;
+
+/**
+ * Minimal {@link Converter} implementation to do direct casting.
+ *
+ * @author Mark Hiner hinerm at gmail.com
+ */
+@Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY - 1)
+public class CastingConverter extends AbstractConverter<Object, Object> {
+
+	@SuppressWarnings("deprecation")
+	@Override
+	public boolean canConvert(final Object src, final Class<?> dest) {
+		return ClassUtils.canCast(src, dest);
+	}
+
+	@Override
+	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		// OK if the existing object can be casted
+		if (ConversionUtils.canCast(src, dest))
+			return true;
+
+		return false;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T convert(final Object src, final Class<T> dest) {
+		// NB: Regardless of whether the destination type is an array or
+		// collection,
+		// we still want to cast directly if doing so is possible. But note that
+		// in
+		// general, this check does not detect cases of incompatible generic
+		// parameter types. If this limitation becomes a problem in the future
+		// we
+		// can extend the logic here to provide additional signatures of canCast
+		// which operate on Types in general rather than only Classes. However,
+		// the
+		// logic could become complex very quickly in various subclassing cases,
+		// generic parameters resolved vs. propagated, etc.
+		final Class<?> c = GenericUtils.getClass(dest);
+		return (T) ConversionUtils.cast(src, c);
+	}
+
+	@Override
+	public Class<Object> getOutputType() {
+		return Object.class;
+	}
+
+	@Override
+	public Class<Object> getInputType() {
+		return Object.class;
+	}
+}
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 561dd3c5f..4aa872960 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -61,17 +61,6 @@ public class DefaultConverter extends AbstractConverter<Object, Object> {
 
 	@Override
 	public Object convert(final Object src, final Type dest) {
-		// NB: Regardless of whether the destination type is an array or collection,
-		// we still want to cast directly if doing so is possible. But note that in
-		// general, this check does not detect cases of incompatible generic
-		// parameter types. If this limitation becomes a problem in the future we
-		// can extend the logic here to provide additional signatures of canCast
-		// which operate on Types in general rather than only Classes. However, the
-		// logic could become complex very quickly in various subclassing cases,
-		// generic parameters resolved vs. propagated, etc.
-		final Class<?> c = GenericUtils.getClass(dest);
-		if (c != null && ConversionUtils.canCast(src, c)) return ConversionUtils
-			.cast(src, c);
 
 		// Handle array types, including generic array types.
 		if (isArray(dest)) {

From ee8dd3adaec10ee7e0ce7ca66ddf1d64e49ccbf1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 17 Jan 2016 18:00:56 +0100
Subject: [PATCH 0069/1208] Context: allow multi-injection in non-strict mode

With scijava.context.strict set to false (i.e.: strict=false flag of the
Context), injecting an object multiple times is now allowed.

This avoids the dreaded "Context already injected" exception which is
thrown, for example, when reusing an op with a second module.

This commit is dedicated to Christian Dietz!
---
 src/main/java/org/scijava/Context.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index c3e02d9dc..a60ff4dd0 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -436,7 +436,7 @@ private void inject(final Field f, final Object o) {
 			final Class<?> type = f.getType();
 			if (Service.class.isAssignableFrom(type)) {
 				final Service existingService = (Service) ClassUtils.getValue(f, o);
-				if (existingService != null) {
+				if (strict && existingService != null) {
 					throw new IllegalStateException("Context already injected: " +
 							f.getDeclaringClass().getName() + "#" + f.getName());
 				}
@@ -450,14 +450,24 @@ private void inject(final Field f, final Object o) {
 					throw new IllegalArgumentException(
 						createMissingServiceMessage(serviceType));
 				}
+				if (existingService != null && existingService != service) {
+					// NB: Can only happen in non-strict mode.
+					throw new IllegalStateException("Mismatched context: " +
+							f.getDeclaringClass().getName() + "#" + f.getName());
+				}
 				ClassUtils.setValue(f, o, service);
 			}
 			else if (Context.class.isAssignableFrom(type) && type.isInstance(this)) {
 				final Context existingContext = (Context) ClassUtils.getValue(f, o);
-				if (existingContext != null) {
+				if (strict && existingContext != null) {
 					throw new IllegalStateException("Context already injected: " +
 							f.getDeclaringClass().getName() + "#" + f.getName());
 				}
+				if (existingContext != null && existingContext != this) {
+					// NB: Can only happen in non-strict mode.
+					throw new IllegalStateException("Mismatched context: " +
+							f.getDeclaringClass().getName() + "#" + f.getName());
+				}
 
 				// populate Context parameter
 				ClassUtils.setValue(f, o, this);

From 88d3cab189d1fd68b2065e0e109cbb18ef48e0b0 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 18 Jan 2016 13:04:13 -0600
Subject: [PATCH 0070/1208] Use List instead of Iterable as returntype of the
 ModuleInfo methods returning list of ModuleItems.

``inputs()`` and ``outputs()`` used to return Iterable<ModuleItem<?>> this made random access on a Module's in and outputs painful. This restriction is not needed as the implementations of ModuleInfo already return a List.
---
 src/main/java/org/scijava/command/CommandInfo.java       | 4 ++--
 src/main/java/org/scijava/module/AbstractModuleInfo.java | 4 ++--
 src/main/java/org/scijava/module/ModuleInfo.java         | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 3cc61e6ec..cb391eb47 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -279,13 +279,13 @@ public <T> CommandModuleItem<T> getOutput(final String name,
 	}
 
 	@Override
-	public Iterable<ModuleItem<?>> inputs() {
+	public List<ModuleItem<?>> inputs() {
 		parseParams();
 		return Collections.unmodifiableList(inputList);
 	}
 
 	@Override
-	public Iterable<ModuleItem<?>> outputs() {
+	public List<ModuleItem<?>> outputs() {
 		parseParams();
 		return Collections.unmodifiableList(outputList);
 	}
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 551664197..cd85e75cc 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -99,12 +99,12 @@ public <T> ModuleItem<T> getOutput(final String name, final Class<T> type) {
 	}
 
 	@Override
-	public Iterable<ModuleItem<?>> inputs() {
+	public List<ModuleItem<?>> inputs() {
 		return Collections.unmodifiableList(inputList());
 	}
 
 	@Override
-	public Iterable<ModuleItem<?>> outputs() {
+	public List<ModuleItem<?>> outputs() {
 		return Collections.unmodifiableList(outputList());
 	}
 
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index f55541d82..6e644fa27 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -31,6 +31,8 @@
 
 package org.scijava.module;
 
+import java.util.List;
+
 import org.scijava.UIDetails;
 import org.scijava.Validated;
 import org.scijava.event.EventService;
@@ -74,10 +76,10 @@ public interface ModuleInfo extends UIDetails, Validated {
 	<T> ModuleItem<T> getOutput(String name, Class<T> type);
 
 	/** Gets the list of input items. */
-	Iterable<ModuleItem<?>> inputs();
+	List<ModuleItem<?>> inputs();
 
 	/** Gets the list of output items. */
-	Iterable<ModuleItem<?>> outputs();
+	List<ModuleItem<?>> outputs();
 
 	/**
 	 * Gets the fully qualified name of the class containing the module's actual

From 4bef9fe97570f71d31e821ced38bb6da83faf0f3 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 19 Jan 2016 16:15:52 -0600
Subject: [PATCH 0071/1208] Bytecode analyser cleanup

- Add documentation link for constant pool
- order tags for readability
---
 src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 8c42da122..95d03a5cd 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -107,6 +107,8 @@ private double getDoubleConstant(final int index) {
 			getU4(offset + 5));
 	}
 
+	// See https://en.wikipedia.org/wiki/Java_class_file#The_constant_pool for the 
+	// meaning of the offsets behind these numbers 
 	private void getConstantPoolOffsets() {
 		final int poolCount = getU2(8) - 1;
 		poolOffsets = new int[poolCount];
@@ -115,8 +117,8 @@ private void getConstantPoolOffsets() {
 			poolOffsets[i] = offset;
 			final int tag = getU1(offset);
 			if (tag == 7 || tag == 8) offset += 3;
-			else if (tag == 9 || tag == 10 || tag == 11 || tag == 3 || tag == 4 ||
-				tag == 12) offset += 5;
+			else if (tag == 3 || tag == 4 || tag == 9 || tag == 10 
+					|| tag == 11 || tag == 12) offset += 5;
 			else if (tag == 5 || tag == 6) {
 				poolOffsets[++i] = offset;
 				offset += 9;

From 4a4b18551f3f3346ede0af6cfe72329462961ffc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 20 Jan 2016 13:20:54 +0100
Subject: [PATCH 0072/1208] Gateway: add a getShortName for use with scripting

When the gateway is a variable somewhere, it is convenient
for its name to be as short as possible. E.g.:

* "SciJava" can be "sj"
* "ImageJ" can be "ij"

It is handy for each gateway to self-suggest such a name.
---
 src/main/java/org/scijava/AbstractGateway.java | 5 +++++
 src/main/java/org/scijava/Gateway.java         | 6 ++++++
 src/main/java/org/scijava/SciJava.java         | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index a915e3953..8027649ce 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -87,6 +87,11 @@ public AbstractGateway(final String appName, final Context context) {
 
 	// -- Gateway methods --
 
+	@Override
+	public String getShortName() {
+		return getClass().getName().toLowerCase();
+	}
+
 	@Override
 	public <S extends Service> S get(final Class<S> serviceClass) {
 		return context().service(serviceClass);
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 9a191ec2c..7df6a81cc 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -118,6 +118,12 @@
  */
 public interface Gateway extends RichPlugin, Versioned {
 
+	/**
+	 * Gets a very succinct name for use referring to this gateway, e.g. as a
+	 * variable name for scripting.
+	 */
+	String getShortName();
+
 	/**
 	 * Returns an implementation of the requested {@link Service}, if it exists in
 	 * the underlying {@link Context}.
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index ee7a94eaf..e342ef380 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -112,4 +112,11 @@ public SciJava(final Context context) {
 		super(SciJavaApp.NAME, context);
 	}
 
+	// -- Gateway methods --
+
+	@Override
+	public String getShortName() {
+		return "sj";
+	}
+
 }

From d87844f9483266ae6d4102741aeca3837129d1d5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 26 Jan 2016 11:18:19 -0600
Subject: [PATCH 0073/1208] ClassUtils: add @return to loadClass javadoc

---
 src/main/java/org/scijava/util/ClassUtils.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 2a8d1a564..118aef1a7 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -93,6 +93,7 @@ private ClassUtils() {
 	 * Loads the class with the given name, using the current thread's context
 	 * class loader, or null if it cannot be loaded.
 	 *
+	 * @return The loaded class, or null if the class could not be loaded.
 	 * @see #loadClass(String, ClassLoader)
 	 */
 	public static Class<?> loadClass(final String className) {
@@ -118,6 +119,7 @@ public static Class<?> loadClass(final String className) {
 	 * @param name The name of the class to load.
 	 * @param classLoader The class loader with which to load the class; if null,
 	 *          the current thread's context class loader will be used.
+	 * @return The loaded class, or null if the class could not be loaded.
 	 */
 	public static Class<?> loadClass(final String name,
 		final ClassLoader classLoader)

From 77a91280cf07d05a74321f3b98771cbc43ae6dd0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jan 2016 12:34:45 -0600
Subject: [PATCH 0074/1208] POM: update to pom-scijava 9.3.0

This allows us to remove the Eclipse lifecycle configuration for
the exec-maven-plugin, since it is declared in pom-scijava now.
---
 pom.xml | 47 +----------------------------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index c7b74d33e..7d04f78fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.1.0</version>
+		<version>9.3.0</version>
 		<relativePath />
 	</parent>
 
@@ -182,49 +182,4 @@ Institute of Molecular Cell Biology and Genetics.</organizationName>
 			</plugin>
 		</plugins>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>only-eclipse</id>
-			<activation>
-				<property>
-					<name>m2e.version</name>
-				</property>
-			</activation>
-			<build>
-				<pluginManagement>
-					<plugins>
-						<!--
-						This plugin's configuration is used to store Eclipse m2e settings
-						only. It has no influence on the Maven build itself.
-						-->
-						<plugin>
-							<groupId>org.eclipse.m2e</groupId>
-							<artifactId>lifecycle-mapping</artifactId>
-							<version>1.0.0</version>
-							<configuration>
-								<lifecycleMappingMetadata>
-									<pluginExecutions>
-										<pluginExecution>
-											<pluginExecutionFilter>
-												<groupId>org.codehaus.mojo</groupId>
-												<artifactId>exec-maven-plugin</artifactId>
-												<versionRange>1.2.1</versionRange>
-												<goals>
-													<goal>java</goal>
-												</goals>
-											</pluginExecutionFilter>
-											<action>
-												<ignore />
-											</action>
-										</pluginExecution>
-									</pluginExecutions>
-								</lifecycleMappingMetadata>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-		</profile>
-	</profiles>
 </project>

From 97306515676492706b24835d5e2927ec2c60e480 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 19 Jan 2016 16:29:48 -0600
Subject: [PATCH 0075/1208] Add support for java bytecode tags added in java 7

- 15 Method handle
- 16 Method type
- 18 InvokeDynamic
---
 src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 95d03a5cd..a9276917a 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -116,9 +116,10 @@ private void getConstantPoolOffsets() {
 		for (int i = 0; i < poolCount; i++) {
 			poolOffsets[i] = offset;
 			final int tag = getU1(offset);
-			if (tag == 7 || tag == 8) offset += 3;
+			if (tag == 7 || tag == 8 || tag == 16) offset += 3;
+			else if (tag == 15) offset += 4;
 			else if (tag == 3 || tag == 4 || tag == 9 || tag == 10 
-					|| tag == 11 || tag == 12) offset += 5;
+					|| tag == 11 || tag == 12 || tag == 18) offset += 5;
 			else if (tag == 5 || tag == 6) {
 				poolOffsets[++i] = offset;
 				offset += 9;

From 3d6a2bf7c68f53a5886fc07cf9bf950e96c1a099 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 19 Jan 2016 16:59:38 -0600
Subject: [PATCH 0076/1208] Update tests for changes in ByteCodeAnalyzer

The tests now require java 8.
---
 pom.xml                                             |  6 +++++-
 .../java/org/scijava/annotations/AnnotatedD.java    | 13 +++++++++++++
 .../scijava/annotations/DirectoryIndexerTest.java   |  2 +-
 .../org/scijava/annotations/EclipseHelperTest.java  |  4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/org/scijava/annotations/AnnotatedD.java

diff --git a/pom.xml b/pom.xml
index c7b74d33e..2dade57d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.1.0</version>
+		<version>9.3.0</version>
 		<relativePath />
 	</parent>
 
@@ -114,6 +114,10 @@
 		<url>http://jenkins.imagej.net/job/SciJava-common/</url>
 	</ciManagement>
 
+	<properties>
+		<scijava.jvm.test.version>1.8</scijava.jvm.test.version>
+	</properties>
+
 	<dependencies>
 		<!-- Third-party dependencies -->
 		<dependency>
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
new file mode 100644
index 000000000..936bca914
--- /dev/null
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -0,0 +1,13 @@
+package org.scijava.annotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Simple(string1 = "adfd")
+public class AnnotatedD {
+
+	public AnnotatedD() {
+		List<String> list = new ArrayList<>();
+		list.stream().reduce(String::concat).get();
+	}
+}
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 1f8452062..9d09d1a55 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -122,7 +122,7 @@ public void testRepeatedClassPathElements() throws Exception {
 			assertFalse(seen.contains(name));
 			seen.add(name);
 		}
-		assertEquals(2, seen.size());
+		assertEquals(3, seen.size());
 	}
 
 	public static void
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index 2e8bd1f86..fc51b10f9 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -71,7 +71,7 @@ public void testSkipIndexGeneration() throws Exception {
 	public void testIndexing() throws Exception {
 		final File dir = createTemporaryDirectory("eclipse-test-");
 		copyClasses(dir, Complex.class, Simple.class, Fruit.class,
-			AnnotatedA.class, AnnotatedB.class, AnnotatedC.class);
+			AnnotatedA.class, AnnotatedB.class, AnnotatedC.class, AnnotatedD.class);
 		final File jsonDir = new File(dir, Index.INDEX_PREFIX);
 		for (final Class<?> clazz : new Class<?>[] { Complex.class, Simple.class })
 		{
@@ -104,7 +104,7 @@ public Class<?> loadClass(final String className)
 		// deleted
 		jsonDir.setLastModified(123456789);
 		for (final Class<?> clazz : new Class<?>[] { AnnotatedA.class,
-			AnnotatedB.class, AnnotatedC.class })
+			AnnotatedB.class, AnnotatedC.class, AnnotatedD.class })
 		{
 			assertTrue(new File(dir, DirectoryIndexerTest.getResourcePath(clazz))
 				.delete());

From b13f977f69e4ac54247b2293bd1d56703084298a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Feb 2016 09:47:52 -0600
Subject: [PATCH 0077/1208] ConsoleServiceTest: reduce FooArgument aggression

It claimed to support everything, which hosed any
other unit tests leaning on the ConsoleService.
---
 src/test/java/org/scijava/console/ConsoleServiceTest.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 601a6ea1a..3716c0ca2 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -220,6 +220,10 @@ public void handle(final LinkedList<String> args) {
 			argsHandled = true;
 		}
 
+		@Override
+		public boolean supports(final LinkedList<String> args) {
+			return !args.isEmpty() && args.getFirst().equals("--foo");
+		}
 	}
 
 	private static class OutputTracker implements OutputListener {

From 1e491a08c287800dc72fc1dd185cfd1d70bfd38f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 2 Feb 2016 22:54:51 -0600
Subject: [PATCH 0078/1208] Add a service for executing main methods

---
 pom.xml                                       |   2 +-
 .../org/scijava/main/DefaultMainService.java  | 122 ++++++++++++++++++
 .../java/org/scijava/main/MainService.java    |  69 ++++++++++
 3 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/main/DefaultMainService.java
 create mode 100644 src/main/java/org/scijava/main/MainService.java

diff --git a/pom.xml b/pom.xml
index 8df053aee..fedd6a8ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.50.2-SNAPSHOT</version>
+	<version>2.51.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
new file mode 100644
index 000000000..9b56e45b2
--- /dev/null
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -0,0 +1,122 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.main;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.AbstractService;
+import org.scijava.service.Service;
+import org.scijava.util.ClassUtils;
+
+/**
+ * Default implementation of {@link MainService}.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultMainService extends AbstractService implements MainService {
+
+	@Parameter(required = false)
+	private LogService log;
+
+	private final List<Main> mains = new ArrayList<Main>();
+
+	@Override
+	public int execMains() {
+		int mainCount = 0;
+		for (final Main main : mains) {
+			main.exec();
+			mainCount++;
+		}
+		return mainCount;
+	}
+
+	@Override
+	public void addMain(final String className, final String... args) {
+		mains.add(new DefaultMain(className, args));
+	}
+
+	@Override
+	public Main[] getMains() {
+		return mains.toArray(new Main[mains.size()]);
+	}
+
+	// -- Helper classes --
+
+	/** Default implementation of {@link MainService.Main}. */
+	private class DefaultMain implements Main {
+		private String className;
+		private String[] args;
+
+		public DefaultMain(final String className, final String... args) {
+			this.className = className;
+			this.args = args.clone();
+		}
+
+		@Override
+		public String className() {
+			return className;
+		}
+
+		@Override
+		public String[] args() {
+			return args;
+		}
+
+		@Override
+		public void exec() {
+			try {
+				final Class<?> mainClass = ClassUtils.loadClass(className);
+				final Method main = mainClass.getMethod("main", String[].class);
+				main.invoke(null, new Object[] { args });
+			}
+			catch (final NoSuchMethodException exc) {
+				if (log != null) {
+					log.error("No main method for class: " + className, exc);
+				}
+			}
+			catch (final IllegalAccessException exc) {
+				if (log != null) log.error(exc);
+			}
+			catch (final InvocationTargetException exc) {
+				if (log != null) log.error(exc);
+			}
+		}
+	}
+
+}
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
new file mode 100644
index 000000000..ee99373c3
--- /dev/null
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -0,0 +1,69 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.main;
+
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for services which manage dynamic execution of main methods.
+ * 
+ * @author Curtis Rueden
+ */
+public interface MainService extends SciJavaService {
+
+	/**
+	 * Executes registered main classes, in the order they were registered.
+	 * 
+	 * @return The number of main methods which were executed.
+	 */
+	int execMains();
+
+	/** Registers a main class to be executed by {@link #execMains()}. */
+	void addMain(final String className, final String... args);
+
+	/** Gets the registered main classes to execute. */
+	Main[] getMains();
+
+	/** Data structure containing main class and argument values. */
+	interface Main {
+
+		/** Gets the name of the class containing the {@code main} method to run. */
+		String className();
+
+		/** Gets the arguments to pass to the class's {@code main} method. */
+		String[] args();
+
+		/** Runs the {@code main} method with the associated arguments. */
+		void exec();
+	}
+
+}

From 09e8a7d9883425a6a481d08459ba1cefe4355033 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Feb 2016 07:57:53 -0600
Subject: [PATCH 0079/1208] Gateway: add MainService accessor

---
 src/main/java/org/scijava/AbstractGateway.java | 6 ++++++
 src/main/java/org/scijava/Gateway.java         | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 8027649ce..6e558530f 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -45,6 +45,7 @@
 import org.scijava.io.IOService;
 import org.scijava.io.RecentFileService;
 import org.scijava.log.LogService;
+import org.scijava.main.MainService;
 import org.scijava.menu.MenuService;
 import org.scijava.module.ModuleService;
 import org.scijava.object.ObjectService;
@@ -163,6 +164,11 @@ public LogService log() {
 		return get(LogService.class);
 	}
 
+	@Override
+	public MainService main() {
+		return get(MainService.class);
+	}
+
 	@Override
 	public MenuService menu() {
 		return get(MenuService.class);
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 7df6a81cc..9a71bf025 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -43,6 +43,7 @@
 import org.scijava.io.IOService;
 import org.scijava.io.RecentFileService;
 import org.scijava.log.LogService;
+import org.scijava.main.MainService;
 import org.scijava.menu.MenuService;
 import org.scijava.module.ModuleService;
 import org.scijava.object.ObjectService;
@@ -226,6 +227,13 @@ public interface Gateway extends RichPlugin, Versioned {
 	 */
 	LogService log();
 
+	/**
+	 * Gets this application context's {@link MainService}.
+	 *
+	 * @return The {@link MainService} of this application context.
+	 */
+	MainService main();
+
 	/**
 	 * Gets this application context's {@link MenuService}.
 	 *

From b372a8c2ce1949bca68914065f9c4d10a73d4237 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 2 Feb 2016 22:55:10 -0600
Subject: [PATCH 0080/1208] Add support for the --main argument

Using --main-class also works, for partial backwards compatibility.

This feature leans on the new MainService to do most of the work.
---
 .../scijava/main/console/MainArgument.java    | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 src/main/java/org/scijava/main/console/MainArgument.java

diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
new file mode 100644
index 000000000..2ed60c713
--- /dev/null
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.main.console;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.scijava.console.AbstractConsoleArgument;
+import org.scijava.console.ConsoleArgument;
+import org.scijava.log.LogService;
+import org.scijava.main.MainService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+
+/**
+ * Handles the {@code --main} command line argument, which launches an
+ * alternative main class.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = ConsoleArgument.class)
+public class MainArgument extends AbstractConsoleArgument {
+
+	@Parameter(required = false)
+	private MainService mainService;
+
+	@Parameter(required = false)
+	private LogService log;
+
+	// -- ConsoleArgument methods --
+
+	@Override
+	public void handle(final LinkedList<String> args) {
+		if (!supports(args)) return;
+
+		args.removeFirst(); // --main / --main-class
+		final String className = args.removeFirst();
+
+		final List<String> argList = new ArrayList<String>();
+		while (!args.isEmpty() && !isMainFlag(args) && !isSeparator(args)) {
+			argList.add(args.removeFirst());
+		}
+		if (isSeparator(args)) args.removeFirst(); // remove the -- separator
+		final String[] mainArgs = argList.toArray(new String[argList.size()]);
+
+		mainService.addMain(className, mainArgs);
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		return mainService != null && isMainFlag(args);
+	}
+
+	// -- Helper methods --
+
+	private boolean isMainFlag(final LinkedList<String> args) {
+		if (args == null || args.isEmpty()) return false;
+		final String arg = args.getFirst();
+		return arg.equals("--main") || arg.equals("--main-class");
+	}
+
+	private boolean isSeparator(final LinkedList<String> args) {
+		if (args == null || args.isEmpty()) return false;
+		return args.getFirst().equals("--");
+	}
+
+}

From c2c87f36bd7fa4e1006588257e28da7db72febc0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Feb 2016 09:40:18 -0600
Subject: [PATCH 0081/1208] Add tests for the MainService

---
 .../org/scijava/main/MainServiceTest.java     | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 src/test/java/org/scijava/main/MainServiceTest.java

diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
new file mode 100644
index 000000000..f62871f03
--- /dev/null
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -0,0 +1,143 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.main;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.console.ConsoleService;
+import org.scijava.main.console.MainArgument;
+
+/**
+ * Tests {@link MainService}.
+ *
+ * @author Curtis Rueden
+ */
+public class MainServiceTest {
+
+	private MainService mainService;
+
+	@Before
+	public void setUp() {
+		MathMain.resultCount = 0;
+		final Context context = new Context();
+		mainService = context.service(MainService.class);
+	}
+
+	@After
+	public void tearDown() {
+		mainService.context().dispose();
+	}
+
+	/**
+	 * Tests {@link MainService#execMains()},
+	 * {@link MainService#addMain(String, String...)} and
+	 * {@link MainService#getMains()}.
+	 */
+	@Test
+	public void testMainService() {
+		final int mainCount0 = mainService.execMains();
+		assertEquals(0, mainCount0);
+
+		mainService.addMain(MathMain.class.getName(), "12.3", "/", "4.56");
+
+		final int mainCount1 = mainService.execMains();
+		assertEquals(1, mainCount1);
+		assertEquals(System.getProperty(key(0)), "2.697368421052632");
+	}
+
+	/** Tests usage of {@link MainService} via {@code --main} CLI arguments. */
+	@Test
+	public void testConsoleArgs() {
+		assertEquals(0, mainService.getMains().length);
+
+		final ConsoleService consoleService = mainService.context().service(
+			ConsoleService.class);
+		consoleService.processArgs("-Dfoo=bar", //
+			"--main", "org.scijava.main.MainServiceTest$MathMain", "5", "+", "6", //
+			"--", "-Dwhiz=bang", //
+			"--main", "org.scijava.main.MainServiceTest$MathMain", "7", "-", "4");
+
+		final MainService.Main[] m = mainService.getMains();
+		assertEquals(2, m.length);
+		assertEquals("org.scijava.main.MainServiceTest$MathMain", m[0].className());
+		assertArrayEquals(new String[] {"5", "+", "6"}, m[0].args());
+		assertEquals("org.scijava.main.MainServiceTest$MathMain", m[1].className());
+		assertArrayEquals(new String[] {"7", "-", "4"}, m[1].args());
+
+		final int mainCount = mainService.execMains();
+		assertEquals(2, mainCount);
+		assertEquals(System.getProperty(key(0)), "11.0");
+		assertEquals(System.getProperty(key(1)), "3.0");
+
+		assertEquals(System.getProperty("foo"), "bar");
+		assertEquals(System.getProperty("whiz"), "bang");
+	}
+
+	// -- Helper methods --
+
+	private static String key(final int index) {
+		return MathMain.class.getName() + ":" + index;
+	}
+
+	// -- Helper classes --
+
+	private static class MathMain {
+		private static int resultCount = 0;
+		@SuppressWarnings("unused")
+		public static void main(final String[] args) {
+			if (args.length != 3) {
+				throw new IllegalArgumentException("Invalid args: " + args);
+			}
+
+			// compute a result from the arguments
+			final double operand1 = Double.parseDouble(args[0]);
+			final String operator = args[1];
+			final double operand2 = Double.parseDouble(args[2]);
+			final double result;
+			if (operator.equals("+")) result = operand1 + operand2;
+			else if (operator.equals("-")) result = operand1 - operand2;
+			else if (operator.equals("*")) result = operand1 * operand2;
+			else if (operator.equals("/")) result = operand1 / operand2;
+			else throw new IllegalArgumentException("Unknown operator: " + operator);
+
+			// save the result to a system property, for later checking
+			final String key = MathMain.class.getName() + ":" + resultCount++;
+			final String value = "" + result;
+			System.setProperty(key, value);
+		}
+	}
+}

From bd26730180425933b79d2d8881c0ee85dab53ed0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Feb 2016 10:11:08 -0600
Subject: [PATCH 0082/1208] ContextCreationTest: add MainService to the mix

---
 src/test/java/org/scijava/ContextCreationTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index d9ebd1979..ef41a7398 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -97,6 +97,7 @@ public void testFull() {
 				org.scijava.io.DefaultDataHandleService.class,
 				org.scijava.io.DefaultIOService.class,
 				org.scijava.io.DefaultRecentFileService.class,
+				org.scijava.main.DefaultMainService.class,
 				org.scijava.menu.DefaultMenuService.class,
 				org.scijava.module.DefaultModuleService.class,
 				org.scijava.object.DefaultObjectService.class,

From eb765278601a66b36410858054a14d942ef4d8d4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Feb 2016 10:18:34 -0600
Subject: [PATCH 0083/1208] MainServiceTest: use unique system properties

The "foo" system property clashed with the SystemPropertyArgumentTest.
---
 src/test/java/org/scijava/main/MainServiceTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index f62871f03..0b46943c0 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -86,9 +86,9 @@ public void testConsoleArgs() {
 
 		final ConsoleService consoleService = mainService.context().service(
 			ConsoleService.class);
-		consoleService.processArgs("-Dfoo=bar", //
+		consoleService.processArgs("-Dmain.test.foo=bar", //
 			"--main", "org.scijava.main.MainServiceTest$MathMain", "5", "+", "6", //
-			"--", "-Dwhiz=bang", //
+			"--", "-Dmain.test.whiz=bang", //
 			"--main", "org.scijava.main.MainServiceTest$MathMain", "7", "-", "4");
 
 		final MainService.Main[] m = mainService.getMains();
@@ -103,8 +103,8 @@ public void testConsoleArgs() {
 		assertEquals(System.getProperty(key(0)), "11.0");
 		assertEquals(System.getProperty(key(1)), "3.0");
 
-		assertEquals(System.getProperty("foo"), "bar");
-		assertEquals(System.getProperty("whiz"), "bang");
+		assertEquals(System.getProperty("main.test.foo"), "bar");
+		assertEquals(System.getProperty("main.test.whiz"), "bang");
 	}
 
 	// -- Helper methods --

From 69317b28d4a88faae88c5e24895949cf7d47470e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Jan 2016 16:00:56 -0600
Subject: [PATCH 0084/1208] DefaultScriptService: fix null context bug

For languages created simply by wrapping an existing ScriptEngineFactory
from the ScriptEngineManager, no context was ever being injected into
the wrapped ScriptLanguage. The ScriptLanguage plugin type extends
RichPlugin, which means every plugin instance is supposed to have a
non-null context. Hence, this behavior should be considered a bug.

Since the ScriptLanguageIndex is context-free, it does not know the
context to inject it. So to fix this problem in the least invasive way,
we simply have the ScriptService walk the whole list of available
ScriptLanguages after initially populating them, injecting the context
into any language for which it is still null.
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 646feb111..e1b548e1c 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -351,6 +351,12 @@ private synchronized void initScriptLanguageIndex() {
 			index.add(factory, true);
 		}
 
+		// Inject the context into languages which need it: the
+		// wrapped engine factories from the ScriptEngineManager.
+		for (final ScriptLanguage language : index) {
+			if (language.getContext() == null) language.setContext(getContext());
+		}
+
 		scriptLanguageIndex = index;
 	}
 

From d85efbdb602addbc53240aafa8c06c35482f295d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Jan 2016 14:58:59 -0600
Subject: [PATCH 0085/1208] ScriptInterpreter: return result of the evaluation

The ScriptEngine#eval method returns a result. Let's pass it along.
---
 .../java/org/scijava/script/DefaultScriptInterpreter.java     | 4 ++--
 src/main/java/org/scijava/script/ScriptInterpreter.java       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 13fe6ec77..1cfac55f8 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -83,10 +83,10 @@ public synchronized String walkHistory(final String currentCommand,
 	}
 
 	@Override
-	public void eval(final String command) throws ScriptException {
+	public Object eval(final String command) throws ScriptException {
 		if (history != null) history.add(command);
 		if (engine == null) throw new java.lang.IllegalArgumentException();
-		engine.eval(command);
+		return engine.eval(command);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index f2821b08b..332073ddf 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -65,9 +65,10 @@ public interface ScriptInterpreter {
 	 * Evaluates a command.
 	 * 
 	 * @param command the command to evaluate
+	 * @return result of the evaluation
 	 * @throws ScriptException
 	 */
-	void eval(String command) throws ScriptException;
+	Object eval(String command) throws ScriptException;
 
 	/**
 	 * Returns the associated {@link ScriptLanguage}.

From 9b77ad34e0d2c4b9abec3b0823e61c7d4e4626a3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Jan 2016 15:27:04 -0600
Subject: [PATCH 0086/1208] DefaultScriptInterpreter: improve constructors

The old constructor is deprecated.

There is now a simple constructor taking only the ScriptLanguage,
as well as one which allows to manually override the ScriptEngine.

The SciJava application context is derived from the ScriptLanguage,
and services (notably: the PrefService) are injected from there.

The PrefService is now optional, and when it is null, there is no
history available. (The code for null History was already in place
everywhere -- it just couldn't happen previously due to the explicit
"new History" call in the constructor. So now we make use of it.)
---
 .../script/DefaultScriptInterpreter.java      | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 1cfac55f8..c0da50a92 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -46,21 +46,50 @@ public class DefaultScriptInterpreter implements ScriptInterpreter {
 	private final ScriptEngine engine;
 	private final History history;
 
+	@Parameter(required = false)
+	private PrefService prefs;
+
 	/**
-	 * Constructs a new {@link DefaultScriptInterpreter}.
-	 * 
-	 * @param scriptService the script service
-	 * @param language the script language
+	 * @deprecated Use {@link #DefaultScriptInterpreter(ScriptLanguage)} instead.
 	 */
+	@Deprecated
+	@SuppressWarnings("unused")
 	public DefaultScriptInterpreter(final PrefService prefs,
 		final ScriptService scriptService, final ScriptLanguage language)
 	{
+		this(language);
+	}
+
+	/**
+	 * Creates a new script interpreter for the given script language.
+	 * 
+	 * @param language {@link ScriptLanguage} of the interpreter
+	 */
+	public DefaultScriptInterpreter(final ScriptLanguage language) {
+		this(language, null);
+	}
+
+	/**
+	 * Creates a new script interpreter for the given script language, using the
+	 * specified script engine.
+	 * 
+	 * @param language {@link ScriptLanguage} of the interpreter
+	 * @param engine {@link ScriptEngine} to use, or null for the specified
+	 *          language's default engine
+	 */
+	public DefaultScriptInterpreter(final ScriptLanguage language,
+		final ScriptEngine engine)
+	{
+		language.getContext().inject(this);
 		this.language = language;
-		engine = language.getScriptEngine();
-		history = new History(prefs, engine.getClass().getName());
+		this.engine = engine == null ? language.getScriptEngine() : engine;
+		history = prefs == null ? null :
+			new History(prefs, this.engine.getClass().getName());
 		readHistory();
 	}
 
+	// -- ScriptInterpreter methods --
+
 	@Override
 	public synchronized void readHistory() {
 		if (history == null) return;

From edd3c340deb15ae054a34a0f43469bcebda3abda Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Jan 2016 15:31:57 -0600
Subject: [PATCH 0087/1208] ScriptInterpreter: add getBindings() method

This is a convenience method to easily access
the engine scope bindings of the script engine.
---
 .../org/scijava/script/DefaultScriptInterpreter.java     | 7 +++++++
 src/main/java/org/scijava/script/ScriptInterpreter.java  | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index c0da50a92..45707f728 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -30,6 +30,8 @@
  */
 package org.scijava.script;
 
+import javax.script.Bindings;
+import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
@@ -128,4 +130,9 @@ public ScriptEngine getEngine() {
 		return engine;
 	}
 
+	@Override
+	public Bindings getBindings() {
+		return engine.getBindings(ScriptContext.ENGINE_SCOPE);
+	}
+
 }
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index 332073ddf..3eeece7c9 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -31,6 +31,8 @@
 
 package org.scijava.script;
 
+import javax.script.Bindings;
+import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
@@ -81,4 +83,11 @@ public interface ScriptInterpreter {
 	 * @return the script engine
 	 */
 	ScriptEngine getEngine();
+
+	/**
+	 * Returns the {@link Bindings} of the associated {@link ScriptEngine} at
+	 * {@link ScriptContext#ENGINE_SCOPE} scope.
+	 */
+	Bindings getBindings();
+
 }

From 7607c0f5daa23347a143d5b194e01d0219c8b146 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Jan 2016 15:33:50 -0600
Subject: [PATCH 0088/1208] ScriptInterpreter: allow multi-line evaluation

This adds new methods designed to support evaluation of multi-line
statements which are fed to the interpreter one line at a time. The
approach works according to a strategy implemented by Jason Sachs on
StackOverflow at:

    http://stackoverflow.com/a/5598207

This functionality will be useful for improving the behavior of
REPL (Read-Eval-Print-Loop) shells backed by this interpreter.
---
 .../script/DefaultScriptInterpreter.java      | 232 +++++++++++++++++-
 .../org/scijava/script/ScriptInterpreter.java |  43 ++++
 2 files changed, 273 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 45707f728..3eda51bdf 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -30,17 +30,28 @@
  */
 package org.scijava.script;
 
+import java.lang.reflect.Method;
+
 import javax.script.Bindings;
+import javax.script.Compilable;
+import javax.script.CompiledScript;
 import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
 import org.scijava.prefs.PrefService;
 
 /**
  * The default implementation of a {@link ScriptInterpreter}.
+ * <p>
+ * Credit to Jason Sachs for the multi-line evaluation (see
+ * <a href="http://stackoverflow.com/a/5598207">his post on StackOverflow</a>).
+ * </p>
  *  
  * @author Johannes Schindelin
+ * @author Curtis Rueden
  */
 public class DefaultScriptInterpreter implements ScriptInterpreter {
 
@@ -51,6 +62,13 @@ public class DefaultScriptInterpreter implements ScriptInterpreter {
 	@Parameter(required = false)
 	private PrefService prefs;
 
+	@Parameter(required = false)
+	private LogService log;
+
+	private final StringBuilder buffer;
+	private int pendingLineCount;
+	private boolean expectingMoreInput;
+
 	/**
 	 * @deprecated Use {@link #DefaultScriptInterpreter(ScriptLanguage)} instead.
 	 */
@@ -88,6 +106,8 @@ public DefaultScriptInterpreter(final ScriptLanguage language,
 		history = prefs == null ? null :
 			new History(prefs, this.engine.getClass().getName());
 		readHistory();
+		buffer = new StringBuilder();
+		reset();
 	}
 
 	// -- ScriptInterpreter methods --
@@ -115,11 +135,101 @@ public synchronized String walkHistory(final String currentCommand,
 
 	@Override
 	public Object eval(final String command) throws ScriptException {
-		if (history != null) history.add(command);
-		if (engine == null) throw new java.lang.IllegalArgumentException();
+		addToHistory(command);
 		return engine.eval(command);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * This implementation from Jason Sachs uses the following strategy:
+	 * </p>
+	 * <ul>
+	 * <li>Keep a pending list of input lines not yet evaluated.</li>
+	 * <li>Try compiling (but not evaluating) the pending input lines.
+	 * <ul>
+	 * <li>If the compilation is OK, we may be able to execute pending input
+	 * lines.</li>
+	 * <li>If the compilation throws an exception, and there is an indication of
+	 * the position (line + column number) of the error, and this matches the end
+	 * of the pending input, then that's a clue that we're expecting more input,
+	 * so swallow the exception and wait for the next line.</li>
+	 * <li>Otherwise, we either don't know where the error is, or it happened
+	 * prior to the end of the pending input, so rethrow the exception.</li>
+	 * </ul>
+	 * </li>
+	 * <li>If we are not expecting any more input lines, and we only have one line
+	 * of pending input, then evaluate it and restart.</li>
+	 * <li>If we are not expecting any more input lines, and the last one is a
+	 * blank one, and we have more than one line of pending input, then evaluate
+	 * it and restart. Python's interactive shell seems to do this.</li>
+	 * <li>Otherwise, keep reading input lines.</li>
+	 * </ul>
+	 * <p>
+	 * This helps avoid certain problems:
+	 * </p>
+	 * <ul>
+	 * <li>users getting annoyed having to enter extra blank lines after
+	 * single-line inputs</li>
+	 * <li>users entering a long multi-line statement and only find out after the
+	 * fact that there was a syntax error in the 2nd line.</li>
+	 * </ul>
+	 * <p>
+	 * For further details, see <a href="http://stackoverflow.com/a/5598207">SO
+	 * #5584674</a>.
+	 * </p>
+	 * </p>
+	 */
+	@Override
+	public Object interpret(final String line) throws ScriptException {
+		if (line.isEmpty()) {
+			if (!shouldEvaluatePendingInput(true)) return MORE_INPUT_PENDING;
+		}
+
+		pendingLineCount++;
+		buffer.append(line);
+		buffer.append("\n");
+
+		if (!(engine instanceof Compilable)) {
+			// Not a compilable language.
+			// Evaluate directly, with no multi-line statements possible.
+			try {
+				return eval(buffer.toString());
+			}
+			finally {
+				reset();
+			}
+		}
+
+		final CompiledScript cs = tryCompiling(buffer.toString(),
+			getPendingLineCount(), line.length());
+
+		if (cs == null) {
+			// Command did not compile.
+			// Assume it is incomplete and wait for more input on the next line.
+			return MORE_INPUT_PENDING;
+		}
+		if (!shouldEvaluatePendingInput(line.isEmpty())) {
+			// We are still expecting more input.
+			return MORE_INPUT_PENDING;
+		}
+		// Command is complete; evaluate the compiled script.
+		try {
+			addToHistory(buffer.toString());
+			return cs.eval();
+		}
+		finally {
+			reset();
+		}
+	}
+
+	@Override
+	public void reset() {
+		buffer.setLength(0);
+		pendingLineCount = 0;
+		expectingMoreInput = false;
+	}
+
 	@Override
 	public ScriptLanguage getLanguage() {
 		return language;
@@ -135,4 +245,122 @@ public Bindings getBindings() {
 		return engine.getBindings(ScriptContext.ENGINE_SCOPE);
 	}
 
+	@Override
+	public boolean isReady() {
+		return buffer.length() == 0;
+	}
+
+	@Override
+	public boolean isExpectingMoreInput() {
+		return expectingMoreInput;
+	}
+
+	// -- Helper methods --
+
+	private void addToHistory(final String command) {
+		if (history != null) history.add(command);
+	}
+
+	/**
+	 * @return number of lines pending execution
+	 */
+	private int getPendingLineCount() {
+		return pendingLineCount;
+	}
+
+	/**
+	 * @param lineIsEmpty whether the last line is empty
+	 * @return whether we should evaluate the pending input. The default behavior
+	 *         is to evaluate if we only have one line of input, or if the user
+	 *         enters a blank line. This behavior should be overridden where
+	 *         appropriate.
+	 */
+	private boolean shouldEvaluatePendingInput(final boolean lineIsEmpty) {
+		if (isExpectingMoreInput()) return false;
+		return getPendingLineCount() == 1 || lineIsEmpty;
+	}
+
+	private CompiledScript tryCompiling(final String string, final int lineCount,
+		final int lastLineLength) throws ScriptException
+	{
+		CompiledScript result = null;
+		try {
+			final Compilable c = (Compilable) engine;
+			result = c.compile(string);
+		}
+		catch (final ScriptException se) {
+			boolean rethrow = true;
+			if (se.getCause() != null) {
+				final Integer col = columnNumber(se);
+				final Integer line = lineNumber(se);
+				// swallow the exception if it occurs at the last character
+				// of the input (we may need to wait for more lines)
+				if (isLastCharacter(col, line, lineCount, lastLineLength)) {
+					rethrow = false;
+				}
+				else if (log != null && log.isDebug()) {
+					final String msg = se.getCause().getMessage();
+					log.debug("L" + line + " C" + col + "(" + lineCount + "," +
+						lastLineLength + "): " + msg);
+					log.debug("in '" + string + "'");
+				}
+			}
+
+			if (rethrow) {
+				reset();
+				throw se;
+			}
+		}
+
+		expectingMoreInput = result == null;
+		return result;
+	}
+
+	private boolean isLastCharacter(final Integer col, final Integer line,
+		final int lineCount, final int lastLineLength)
+	{
+		if (col == null || line == null) return false;
+		final int colNo = col.intValue(), lineNo = line.intValue();
+		return lineNo == lineCount && colNo == lastLineLength ||
+			lineNo == lineCount + 1 && colNo == 0;
+	}
+
+	private Integer columnNumber(final ScriptException se) {
+		if (se.getColumnNumber() >= 0) return se.getColumnNumber();
+		return callMethod(se.getCause(), "columnNumber", Integer.class);
+	}
+
+	private Integer lineNumber(final ScriptException se) {
+		if (se.getLineNumber() >= 0) return se.getLineNumber();
+		return callMethod(se.getCause(), "lineNumber", Integer.class);
+	}
+
+	private static Method getMethod(final Object object,
+		final String methodName)
+	{
+		try {
+			return object.getClass().getMethod(methodName);
+		}
+		catch (final NoSuchMethodException e) {
+			// gulp
+			return null;
+		}
+	}
+
+	private static <T> T callMethod(final Object object, final String methodName,
+		final Class<T> cl)
+	{
+		try {
+			final Method m = getMethod(object, methodName);
+			if (m != null) {
+				final Object result = m.invoke(object);
+				return cl.cast(result);
+			}
+		}
+		catch (final Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
 }
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index 3eeece7c9..7c7e12da7 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -40,9 +40,16 @@
  * The contract for script interpreters.
  * 
  * @author Johannes Schindelin
+ * @author Curtis Rueden
  */
 public interface ScriptInterpreter {
 
+	/**
+	 * A special object returned by {@link #interpret(String)} when the
+	 * interpreter is expecting additional input before finishing the evaluation.
+	 */
+	Object MORE_INPUT_PENDING = new Object();
+
 	/**
 	 * Reads the persisted history of the current script interpreter.
 	 */
@@ -72,6 +79,26 @@ public interface ScriptInterpreter {
 	 */
 	Object eval(String command) throws ScriptException;
 
+	/**
+	 * Interprets the given line of code, which might be part of a multi-line
+	 * statement.
+	 * 
+	 * @param line line of code to interpret
+	 * @return value of the line, or {@link #MORE_INPUT_PENDING} if there is still
+	 *         pending input
+	 * @throws ScriptException in case of an exception
+	 */
+	Object interpret(String line) throws ScriptException;
+
+	/**
+	 * Clears the buffer of not-yet-evaluated lines of code, accumulated from
+	 * previous calls to {@link #interpret}. In other words: start over with a new
+	 * (potentially multi-line) statement, discarding the current partial one.
+	 * 
+	 * @see #interpret
+	 */
+	void reset();
+
 	/**
 	 * Returns the associated {@link ScriptLanguage}.
 	 */
@@ -90,4 +117,20 @@ public interface ScriptInterpreter {
 	 */
 	Bindings getBindings();
 
+	/**
+	 * @return whether the interpreter is ready for a brand new statement.
+	 * @see #interpret(String)
+	 */
+	boolean isReady();
+
+	/**
+	 * @return whether the interpreter expects more input. A true value means
+	 *         there is definitely more input needed. A false value means no more
+	 *         input is needed, but it may not yet be appropriate to evaluate all
+	 *         the pending lines. (there's some ambiguity depending on the
+	 *         language)
+	 * @see #interpret(String)
+	 */
+	boolean isExpectingMoreInput();
+
 }

From cb7067e29930a09d0ce4cee1e391e91d618b7f57 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 21 Jan 2016 15:12:47 +0100
Subject: [PATCH 0089/1208] Add a REPL backed by the script interpreter

It's basic, but the language switching feature is pretty
snazzy. And it's convenient to have for CLI usage.

The main method provides a CLI-based REPL. But the API should
enable more sophisticated UIs built around it, as well.
---
 .../java/org/scijava/script/ScriptREPL.java   | 351 ++++++++++++++++++
 1 file changed, 351 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/ScriptREPL.java

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
new file mode 100644
index 000000000..e3536bd97
--- /dev/null
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -0,0 +1,351 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.script.Bindings;
+
+import org.scijava.Context;
+import org.scijava.Gateway;
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.PluginService;
+import org.scijava.service.Service;
+
+/**
+ * A REPL for SciJava script engines, which allows dynamic language switching.
+ *
+ * @author Curtis Rueden
+ */
+public class ScriptREPL {
+
+	private static final String NULL = "<null>";
+
+	@Parameter
+	private Context context;
+
+	@Parameter
+	private ScriptService scriptService;
+
+	@Parameter(required = false)
+	private PluginService pluginService;
+
+	@Parameter(required = false)
+	private LogService log;
+
+	private final PrintStream out;
+
+	private ScriptInterpreter interpreter;
+
+	public ScriptREPL(final Context context) {
+		this(context, System.out);
+	}
+
+	public ScriptREPL(final Context context, final OutputStream out) {
+		context.inject(this);
+		this.out = out instanceof PrintStream ?
+			(PrintStream) out : new PrintStream(out);
+	}
+
+	/** Gets the script interpreter for the currently active language. */
+	public ScriptInterpreter getInterpreter() {
+		return interpreter;
+	}
+
+	/**
+	 * Starts a Read-Eval-Print-Loop from the standard input stream, returning
+	 * when the loop terminates.
+	 */
+	public void loop() throws IOException {
+		loop(System.in);
+	}
+
+	/**
+	 * Starts a Read-Eval-Print-Loop from the given input stream, returning when
+	 * the loop terminates.
+	 * 
+	 * @param in Input stream from which commands are read.
+	 */
+	public void loop(final InputStream in) throws IOException {
+		initialize();
+		final BufferedReader bin = new BufferedReader(new InputStreamReader(in));
+		while (true) {
+			prompt();
+			final String line = bin.readLine();
+			if (line == null) break;
+			if (!evaluate(line)) return;
+		}
+	}
+
+	/** Outputs a greeting, and sets up the initial language of the REPL. */
+	public void initialize() {
+		out.println("Welcome to the SciJava REPL!");
+		out.println();
+		help();
+		out.println("Have fun!");
+		out.println();
+		lang(scriptService.getLanguages().get(0).getLanguageName());
+		populateBindings(interpreter.getBindings());
+	}
+
+	/** Outputs the prompt. */
+	public void prompt() {
+		out.print(interpreter.isReady() ? "> " : "\\ ");
+	}
+
+	/**
+	 * Evaluates the line, including handling of special colon-prefixed REPL
+	 * commands.
+	 * 
+	 * @param line The line to evaluate.
+	 * @return False iff the REPL should exit.
+	 */
+	public boolean evaluate(final String line) {
+		final String tLine = line.trim();
+		if (tLine.equals(":help")) help();
+		else if (tLine.equals(":vars")) vars();
+		else if (tLine.equals(":langs")) langs();
+		else if (tLine.startsWith(":lang ")) lang(line.substring(6).trim());
+		else if (line.trim().equals(":quit")) return false;
+		else {
+			// pass the input to the current interpreter for evaluation
+			try {
+				final Object result = interpreter.interpret(line);
+				if (result != ScriptInterpreter.MORE_INPUT_PENDING) {
+					out.println(s(result));
+				}
+			}
+			catch (final Throwable exc) {
+				exc.printStackTrace(out);
+			}
+		}
+		return true;
+	}
+
+	// -- Commands --
+
+	/** Prints a usage guide. */
+	public void help() {
+		out.println("Available built-in commands:");
+		out.println();
+		out.println("  :help           | this handy list of commands");
+		out.println("  :vars           | dump a list of variables");
+		out.println("  :lang <name>    | switch the active language");
+		out.println("  :langs          | list available languages");
+		out.println("  :quit           | exit the REPL");
+		out.println();
+		out.println("Or type a statement to evaluate it with the active language.");
+		out.println();
+	}
+
+	/** Lists variables in the script context. */
+	public void vars() {
+		final List<String> keys = new ArrayList<String>();
+		final List<Object> types = new ArrayList<Object>();
+		final Bindings bindings = interpreter.getBindings();
+		for (final String key : bindings.keySet()) {
+			final Object value = bindings.get(key);
+			keys.add(key);
+			types.add(type(value));
+		}
+		printColumns(keys, types);
+	}
+
+	/**
+	 * Creates a new {@link ScriptInterpreter} to interpret statements, preserving
+	 * existing variables from the previous interpreter.
+	 * 
+	 * @param langName The script language of the new interpreter.
+	 * @throws IllegalArgumentException if the requested language is not
+	 *           available.
+	 */
+	public void lang(final String langName) {
+		// create the new interpreter
+		final ScriptLanguage language = scriptService.getLanguageByName(langName);
+		if (language == null) {
+			throw new IllegalArgumentException("No such language: " + langName);
+		}
+		final ScriptInterpreter newInterpreter =
+			new DefaultScriptInterpreter(language);
+
+		// preserve state of the previous interpreter
+		copyBindings(interpreter, newInterpreter);
+		out.println("language -> " +
+			newInterpreter.getLanguage().getLanguageName());
+		interpreter = newInterpreter;
+	}
+
+	public void langs() {
+		final List<String> names = new ArrayList<String>();
+		final List<String> versions = new ArrayList<String>();
+		final List<Object> aliases = new ArrayList<Object>();
+		for (final ScriptLanguage lang : scriptService.getLanguages()) {
+			names.add(lang.getLanguageName());
+			versions.add(lang.getLanguageVersion());
+			aliases.add(lang.getNames());
+		}
+		printColumns(names, versions, aliases);
+	}
+
+	// -- Main method --
+
+	public static void main(final String... args) throws Exception {
+		// make a SciJava application context
+		final Context context = new Context();
+
+		// create the script interpreter
+		final ScriptREPL scriptCLI = new ScriptREPL(context);
+
+		// start the REPL
+		scriptCLI.loop();
+
+		// clean up
+		context.dispose();
+		System.exit(0);
+	}
+
+	// -- Helper methods --
+
+	/** Populates the bindings with the context + services + gateways. */
+	private void populateBindings(final Bindings bindings) {
+		bindings.put("ctx", context);
+		for (final Service service : context.getServiceIndex().getAll()) {
+			final String name = serviceName(service);
+			bindings.put(name, service);
+		}
+		for (final Gateway gateway : gateways()) {
+			bindings.put(gateway.getShortName(), gateway);
+		}
+	}
+
+	/** Transfers variables from one interpreter's bindings to another. */
+	private void copyBindings(final ScriptInterpreter src,
+		final ScriptInterpreter dest)
+	{
+		if (src == null) return; // nothing to copy
+		final Bindings srcBindings = src.getBindings();
+		final Bindings destBindings = dest.getBindings();
+		for (final String key : src.getBindings().keySet()) {
+			final Object value = src.getLanguage().decode(srcBindings.get(key));
+			destBindings.put(key, value);
+		}
+	}
+
+	private List<Gateway> gateways() {
+		final ArrayList<Gateway> gateways = new ArrayList<Gateway>();
+		if (pluginService == null) return gateways;
+		// HACK: Instantiating a Gateway with the noargs constructor spins
+		// up a second Context, which is not what we want. Perhaps SJC should
+		// be changed to prefer a single-argument constructor that accepts a
+		// Context, before trying the noargs constructor?
+		// In the meantime, we do it manually here.
+		final List<PluginInfo<Gateway>> infos =
+			pluginService.getPluginsOfType(Gateway.class);
+		for (final PluginInfo<Gateway> info : infos) {
+			try {
+				final Constructor<? extends Gateway> ctor =
+					info.loadClass().getConstructor(Context.class);
+				final Gateway gateway = ctor.newInstance(context);
+				gateways.add(gateway);
+			}
+			catch (final Throwable t) {
+				if (log != null) log.error(t);
+			}
+		}
+		return gateways;
+	}
+
+	private String serviceName(final Service service) {
+		final String serviceName = service.getClass().getSimpleName();
+		final String shortName = lowerCamelCase(
+			serviceName.replaceAll("^(Default)?(.*)Service$", "$2"));
+		return shortName;
+	}
+
+	private String type(final Object value) {
+		if (value == null) return NULL;
+		final Object decoded = interpreter.getLanguage().decode(value);
+		if (decoded == null) return NULL;
+		return "[" + decoded.getClass().getName() + "]";
+	}
+
+	private void printColumns(final List<?>... columns) {
+		final int pad = 2;
+
+		// compute width of each column
+		final int[] widths = new int[columns.length];
+		for (int c = 0; c < columns.length; c++) {
+			final List<?> list = columns[c];
+			for (final Object o : list) {
+				final String s = s(o);
+				if (s.length() > widths[c]) widths[c] = s.length();
+			}
+		}
+
+		// output the columns
+		for (int i = 0; i < columns[0].size(); i++) {
+			for (int c = 0; c < columns.length; c++) {
+				final String s = s(columns[c].get(i));
+				out.print(s);
+				for (int p = s.length(); p < widths[c] + pad; p++) {
+					out.print(' ');
+				}
+			}
+			out.println();
+		}
+	}
+
+	private static String lowerCamelCase(final String s) {
+		final StringBuilder sb = new StringBuilder(s);
+		for (int i=0; i<sb.length(); i++) {
+			final char c = sb.charAt(i);
+			if (c >= 'A' && c <= 'Z') sb.setCharAt(i, (char) (c - 'A' + 'a'));
+			else break;
+		}
+		return sb.toString();
+	}
+
+	private static String s(final Object o) {
+		return o == null ? NULL : o.toString();
+	}
+
+}

From edfc7c53815918672ba708daa5fb45b3d80ea404 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 Feb 2016 15:17:43 -0600
Subject: [PATCH 0090/1208] Revert commit "Use List instead of Iterable as
 returntype of the ModuleInfo methods returning list of ModuleItems."

This reverts commit 88d3cab189d1fd68b2065e0e109cbb18ef48e0b0.

Unfortunately, this change results in incompatible bytecode, such that
downstream callers encounter exceptions like:

    java.lang.NoSuchMethodError: org.scijava.module.ModuleInfo.inputs()Ljava/lang/Iterable;
            at net.imagej.ops.NamespacePreprocessor.process(NamespacePreprocessor.java:56)
            at org.scijava.module.ModuleRunner.preProcess(ModuleRunner.java:104)

So this change will need to wait till SciJava Common 3.0.0, sadly.
---
 src/main/java/org/scijava/command/CommandInfo.java       | 4 ++--
 src/main/java/org/scijava/module/AbstractModuleInfo.java | 4 ++--
 src/main/java/org/scijava/module/ModuleInfo.java         | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index cb391eb47..3cc61e6ec 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -279,13 +279,13 @@ public <T> CommandModuleItem<T> getOutput(final String name,
 	}
 
 	@Override
-	public List<ModuleItem<?>> inputs() {
+	public Iterable<ModuleItem<?>> inputs() {
 		parseParams();
 		return Collections.unmodifiableList(inputList);
 	}
 
 	@Override
-	public List<ModuleItem<?>> outputs() {
+	public Iterable<ModuleItem<?>> outputs() {
 		parseParams();
 		return Collections.unmodifiableList(outputList);
 	}
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index cd85e75cc..551664197 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -99,12 +99,12 @@ public <T> ModuleItem<T> getOutput(final String name, final Class<T> type) {
 	}
 
 	@Override
-	public List<ModuleItem<?>> inputs() {
+	public Iterable<ModuleItem<?>> inputs() {
 		return Collections.unmodifiableList(inputList());
 	}
 
 	@Override
-	public List<ModuleItem<?>> outputs() {
+	public Iterable<ModuleItem<?>> outputs() {
 		return Collections.unmodifiableList(outputList());
 	}
 
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index 6e644fa27..f55541d82 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -31,8 +31,6 @@
 
 package org.scijava.module;
 
-import java.util.List;
-
 import org.scijava.UIDetails;
 import org.scijava.Validated;
 import org.scijava.event.EventService;
@@ -76,10 +74,10 @@ public interface ModuleInfo extends UIDetails, Validated {
 	<T> ModuleItem<T> getOutput(String name, Class<T> type);
 
 	/** Gets the list of input items. */
-	List<ModuleItem<?>> inputs();
+	Iterable<ModuleItem<?>> inputs();
 
 	/** Gets the list of output items. */
-	List<ModuleItem<?>> outputs();
+	Iterable<ModuleItem<?>> outputs();
 
 	/**
 	 * Gets the fully qualified name of the class containing the module's actual

From 46d898942709e024d934f5b80011cf13e6534ce1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 Feb 2016 15:12:55 -0600
Subject: [PATCH 0091/1208] DefaultWidgetModel: tweak javadoc

---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index bbd715b3d..93c287126 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -285,7 +285,7 @@ public boolean isInitialized() {
 	// -- Helper methods --
 
 	/**
-	 * For multiple choice widgets, ensure the value is a valid choice.
+	 * For multiple choice widgets, ensures the value is a valid choice.
 	 * 
 	 * @see #getChoices()
 	 * @see ChoiceWidget
@@ -295,7 +295,7 @@ private Object ensureValidChoice(final Object value) {
 	}
 
 	/**
-	 * For object widgets, ensure the value is a valid object.
+	 * For object widgets, ensures the value is a valid object.
 	 * 
 	 * @see #getObjectPool()
 	 * @see ObjectWidget

From 4679622b50e31cbc8c2920490dae983ab00aeea8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 Feb 2016 15:13:16 -0600
Subject: [PATCH 0092/1208] DefaultWidgetModel: use default when value is null

Before this change, it was up to individual widget implementations to
actually respect the default value... and most of them didn't.
This change makes respecting the default value automatic!
---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 93c287126..278bf71a9 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -44,6 +44,7 @@
 import org.scijava.module.MethodCallException;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
+import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.ClassUtils;
@@ -70,6 +71,9 @@ public class DefaultWidgetModel extends AbstractContextual implements WidgetMode
 	@Parameter
 	private ConvertService convertService;
 
+	@Parameter
+	private ModuleService moduleService;
+
 	@Parameter(required = false)
 	private LogService log;
 
@@ -84,6 +88,11 @@ public DefaultWidgetModel(final Context context, final InputPanel<?, ?> inputPan
 		this.item = item;
 		this.objectPool = objectPool;
 		convertedObjects = new WeakHashMap<Object, Object>();
+
+		if (item.getValue(module) == null) {
+			// assign the item's default value as the current value
+			setValue(moduleService.getDefaultValue(item));
+		}
 	}
 
 	@Override

From e759dd8af838b308a069d0a8d3436557fdff8892 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 12 Feb 2016 10:28:34 -0600
Subject: [PATCH 0093/1208] RunArgument: support scripts

When parsing arguments to the --run command line option, check if we
were given a valid script name. If so, run the script with the given
arguments.
---
 .../scijava/command/console/RunArgument.java  | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 6c09e8cc8..469608b59 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -31,20 +31,26 @@
 
 package org.scijava.command.console;
 
+import java.io.File;
+import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.Map;
 
 import org.scijava.command.CommandInfo;
 import org.scijava.command.CommandService;
 import org.scijava.console.AbstractConsoleArgument;
 import org.scijava.console.ConsoleArgument;
+import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.script.ScriptService;
 
 /**
  * Handles the {@code --run} command line argument.
  * 
  * @author Curtis Rueden
  * @author Johannes Schindelin
+ * @author Mark Hiner hinerm at gmail.com
  */
 @Plugin(type = ConsoleArgument.class)
 public class RunArgument extends AbstractConsoleArgument {
@@ -52,6 +58,12 @@ public class RunArgument extends AbstractConsoleArgument {
 	@Parameter
 	private CommandService commandService;
 
+	@Parameter
+	private ScriptService scriptService;
+
+	@Parameter
+	private LogService logService;
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -76,6 +88,32 @@ public boolean supports(final LinkedList<String> args) {
 
 	/** Implements the {@code --run} command line argument. */
 	private void run(final String commandToRun, final String optionString) {
+		final Map<String, Object> inputMap = new HashMap<String, Object>();
+
+		if (!optionString.isEmpty()) {
+			final String[] pairs = optionString.split(",");
+			for (final String pair : pairs) {
+				final String[] split = pair.split("=");
+				if (split.length != 2) {
+					logService.error("Parameters must be formatted as a comma-separated list of key=value pairs");
+					return;
+				}
+				inputMap.put(split[0], split[1]);
+			}
+		}
+
+		// first check if this is a script
+		final File scriptFile = new File(commandToRun);
+		if (scriptFile.exists() && scriptService.canHandleFile(commandToRun)) {
+			try {
+				scriptService.run(scriptFile, true, inputMap);
+			} catch (final Exception exc) {
+				logService.error(exc);
+			}
+			return;
+		}
+
+		// Not a script, check if it's a command class
 		CommandInfo info = commandService.getCommand(commandToRun);
 		if (info == null) {
 			// command was not a class name; search for command by title instead
@@ -87,9 +125,11 @@ private void run(final String commandToRun, final String optionString) {
 				}
 			}
 		}
+
+		// couldn't find anything to run
 		if (info == null) return;
 		// TODO: parse the optionString a la ImageJ1
-		commandService.run(info, true);
+		commandService.run(info, true, inputMap);
 	}
 
 }

From 696913021a021d21d6617e82a90799ad31e76a06 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 16 Feb 2016 07:49:20 -0600
Subject: [PATCH 0094/1208] Happy 2016!

---
 src/it/apt-test/pom.xml                       |  2 +-
 src/it/apt-test/setup.bsh                     |  2 +-
 .../org/scijava/annotation/its/Annotated.java |  2 +-
 .../annotation/its/CustomAnnotation.java      |  2 +-
 src/it/apt-test/verify.bsh                    |  2 +-
 src/it/settings.xml                           |  2 +-
 .../org/scijava/AbstractBasicDetails.java     |  2 +-
 .../java/org/scijava/AbstractContextual.java  |  2 +-
 .../java/org/scijava/AbstractGateway.java     |  2 +-
 .../java/org/scijava/AbstractUIDetails.java   |  2 +-
 src/main/java/org/scijava/BasicDetails.java   |  2 +-
 src/main/java/org/scijava/Cancelable.java     |  2 +-
 src/main/java/org/scijava/Context.java        |  2 +-
 src/main/java/org/scijava/Contextual.java     |  2 +-
 src/main/java/org/scijava/Disposable.java     |  2 +-
 src/main/java/org/scijava/Gateway.java        |  2 +-
 src/main/java/org/scijava/Identifiable.java   |  2 +-
 src/main/java/org/scijava/Instantiable.java   |  2 +-
 .../org/scijava/InstantiableException.java    |  2 +-
 src/main/java/org/scijava/ItemIO.java         |  2 +-
 src/main/java/org/scijava/ItemVisibility.java |  2 +-
 src/main/java/org/scijava/Locatable.java      |  2 +-
 src/main/java/org/scijava/MenuEntry.java      |  2 +-
 src/main/java/org/scijava/MenuPath.java       |  2 +-
 src/main/java/org/scijava/Named.java          |  2 +-
 .../org/scijava/NoSuchServiceException.java   |  2 +-
 .../org/scijava/NullContextException.java     |  2 +-
 src/main/java/org/scijava/Optional.java       |  2 +-
 src/main/java/org/scijava/Prioritized.java    |  2 +-
 src/main/java/org/scijava/Priority.java       |  2 +-
 src/main/java/org/scijava/SciJava.java        |  2 +-
 src/main/java/org/scijava/Typed.java          |  2 +-
 src/main/java/org/scijava/UIDetails.java      |  2 +-
 src/main/java/org/scijava/Validated.java      |  2 +-
 .../java/org/scijava/ValidityProblem.java     |  2 +-
 src/main/java/org/scijava/Versioned.java      |  2 +-
 .../annotations/AbstractIndexWriter.java      |  2 +-
 .../annotations/AnnotationCombiner.java       |  2 +-
 .../annotations/AnnotationProcessor.java      |  2 +-
 .../scijava/annotations/ByteCodeAnalyzer.java |  2 +-
 .../scijava/annotations/DirectoryIndexer.java |  2 +-
 .../scijava/annotations/EclipseHelper.java    |  2 +-
 .../java/org/scijava/annotations/Index.java   |  2 +-
 .../org/scijava/annotations/IndexItem.java    |  2 +-
 .../org/scijava/annotations/IndexReader.java  |  2 +-
 .../org/scijava/annotations/Indexable.java    |  2 +-
 .../annotations/legacy/LegacyReader.java      |  2 +-
 .../java/org/scijava/app/AbstractApp.java     |  2 +-
 src/main/java/org/scijava/app/App.java        |  2 +-
 src/main/java/org/scijava/app/AppService.java |  2 +-
 .../org/scijava/app/DefaultAppService.java    |  2 +-
 .../org/scijava/app/DefaultStatusService.java |  2 +-
 src/main/java/org/scijava/app/SciJavaApp.java |  2 +-
 .../java/org/scijava/app/StatusService.java   |  2 +-
 .../org/scijava/app/event/StatusEvent.java    |  2 +-
 .../java/org/scijava/cache/CacheService.java  |  2 +-
 .../scijava/cache/DefaultCacheService.java    |  2 +-
 .../java/org/scijava/command/Command.java     |  2 +-
 .../java/org/scijava/command/CommandInfo.java |  2 +-
 .../org/scijava/command/CommandModule.java    |  2 +-
 .../scijava/command/CommandModuleItem.java    |  2 +-
 .../org/scijava/command/CommandService.java   |  2 +-
 .../org/scijava/command/ContextCommand.java   |  2 +-
 .../command/DefaultCommandService.java        |  2 +-
 .../org/scijava/command/DynamicCommand.java   |  2 +-
 .../scijava/command/DynamicCommandInfo.java   |  2 +-
 .../java/org/scijava/command/Interactive.java |  2 +-
 .../scijava/command/InteractiveCommand.java   |  2 +-
 .../org/scijava/command/ModuleCommand.java    |  2 +-
 .../java/org/scijava/command/Previewable.java |  2 +-
 .../scijava/command/UnimplementedCommand.java |  2 +-
 .../scijava/command/console/RunArgument.java  |  2 +-
 .../console/AbstractConsoleArgument.java      |  2 +-
 .../org/scijava/console/ConsoleArgument.java  |  2 +-
 .../org/scijava/console/ConsoleService.java   |  2 +-
 .../console/DefaultConsoleService.java        |  2 +-
 .../scijava/console/MultiOutputStream.java    |  2 +-
 .../org/scijava/console/MultiPrintStream.java |  2 +-
 .../java/org/scijava/console/OutputEvent.java |  2 +-
 .../org/scijava/console/OutputListener.java   |  2 +-
 .../console/SystemPropertyArgument.java       |  2 +-
 .../convert/AbstractConvertService.java       |  2 +-
 .../scijava/convert/AbstractConverter.java    |  2 +-
 .../org/scijava/convert/ArrayConverters.java  |  2 +-
 .../org/scijava/convert/CastingConverter.java |  4 +--
 .../scijava/convert/ConversionRequest.java    |  2 +-
 .../org/scijava/convert/ConvertService.java   |  2 +-
 .../java/org/scijava/convert/Converter.java   |  2 +-
 .../convert/DefaultConvertService.java        |  2 +-
 .../org/scijava/convert/DefaultConverter.java |  2 +-
 .../org/scijava/convert/NullConverter.java    |  2 +-
 .../convert/PrimitiveArrayUnwrapper.java      |  2 +-
 .../convert/PrimitiveArrayWrapper.java        |  2 +-
 .../org/scijava/display/AbstractDisplay.java  |  2 +-
 .../display/ActiveDisplayPreprocessor.java    |  2 +-
 .../org/scijava/display/DefaultDisplay.java   |  2 +-
 .../display/DefaultDisplayService.java        |  2 +-
 .../scijava/display/DefaultTextDisplay.java   |  2 +-
 .../java/org/scijava/display/Display.java     |  2 +-
 .../scijava/display/DisplayPostprocessor.java |  2 +-
 .../org/scijava/display/DisplayService.java   |  2 +-
 .../java/org/scijava/display/Displayable.java |  2 +-
 .../java/org/scijava/display/TextDisplay.java |  2 +-
 .../display/event/DisplayActivatedEvent.java  |  2 +-
 .../display/event/DisplayCreatedEvent.java    |  2 +-
 .../display/event/DisplayDeletedEvent.java    |  2 +-
 .../scijava/display/event/DisplayEvent.java   |  2 +-
 .../display/event/DisplayUpdatedEvent.java    |  2 +-
 .../display/event/input/InputEvent.java       |  2 +-
 .../scijava/display/event/input/KyEvent.java  |  2 +-
 .../display/event/input/KyPressedEvent.java   |  2 +-
 .../display/event/input/KyReleasedEvent.java  |  2 +-
 .../display/event/input/KyTypedEvent.java     |  2 +-
 .../display/event/input/MsButtonEvent.java    |  2 +-
 .../display/event/input/MsClickedEvent.java   |  2 +-
 .../display/event/input/MsDraggedEvent.java   |  2 +-
 .../display/event/input/MsEnteredEvent.java   |  2 +-
 .../scijava/display/event/input/MsEvent.java  |  2 +-
 .../display/event/input/MsExitedEvent.java    |  2 +-
 .../display/event/input/MsMovedEvent.java     |  2 +-
 .../display/event/input/MsPressedEvent.java   |  2 +-
 .../display/event/input/MsReleasedEvent.java  |  2 +-
 .../display/event/input/MsWheelEvent.java     |  2 +-
 .../event/window/WinActivatedEvent.java       |  2 +-
 .../display/event/window/WinClosedEvent.java  |  2 +-
 .../display/event/window/WinClosingEvent.java |  2 +-
 .../event/window/WinDeactivatedEvent.java     |  2 +-
 .../event/window/WinDeiconifiedEvent.java     |  2 +-
 .../display/event/window/WinEvent.java        |  2 +-
 .../event/window/WinIconifiedEvent.java       |  2 +-
 .../display/event/window/WinOpenedEvent.java  |  2 +-
 .../scijava/event/ContextDisposingEvent.java  |  2 +-
 .../org/scijava/event/DefaultEventBus.java    |  2 +-
 .../scijava/event/DefaultEventHistory.java    |  2 +-
 .../scijava/event/DefaultEventService.java    |  2 +-
 .../java/org/scijava/event/EventDetails.java  |  2 +-
 .../java/org/scijava/event/EventHandler.java  |  2 +-
 .../java/org/scijava/event/EventHistory.java  |  2 +-
 .../scijava/event/EventHistoryListener.java   |  2 +-
 .../java/org/scijava/event/EventService.java  |  2 +-
 .../org/scijava/event/EventSubscriber.java    |  2 +-
 .../java/org/scijava/event/SciJavaEvent.java  |  2 +-
 .../java/org/scijava/input/Accelerator.java   |  2 +-
 .../scijava/input/DefaultInputService.java    |  2 +-
 .../org/scijava/input/InputModifiers.java     |  2 +-
 .../java/org/scijava/input/InputService.java  |  2 +-
 src/main/java/org/scijava/input/KeyCode.java  |  2 +-
 .../java/org/scijava/input/MouseCursor.java   |  2 +-
 .../org/scijava/io/AbstractDataHandle.java    |  2 +-
 .../java/org/scijava/io/AbstractIOPlugin.java |  2 +-
 .../java/org/scijava/io/AbstractLocation.java |  2 +-
 .../java/org/scijava/io/BytesLocation.java    |  2 +-
 src/main/java/org/scijava/io/DataHandle.java  |  2 +-
 .../org/scijava/io/DataHandleInputStream.java |  2 +-
 .../scijava/io/DataHandleOutputStream.java    |  2 +-
 .../org/scijava/io/DataHandleService.java     |  2 +-
 .../scijava/io/DefaultDataHandleService.java  |  2 +-
 .../java/org/scijava/io/DefaultIOService.java |  2 +-
 .../scijava/io/DefaultRecentFileService.java  |  2 +-
 src/main/java/org/scijava/io/FileHandle.java  |  2 +-
 .../java/org/scijava/io/FileLocation.java     |  2 +-
 src/main/java/org/scijava/io/IOPlugin.java    |  2 +-
 src/main/java/org/scijava/io/IOService.java   |  2 +-
 src/main/java/org/scijava/io/Location.java    |  2 +-
 .../org/scijava/io/RecentFileService.java     |  2 +-
 src/main/java/org/scijava/io/URILocation.java |  2 +-
 src/main/java/org/scijava/io/URLLocation.java |  2 +-
 .../org/scijava/io/console/OpenArgument.java  |  2 +-
 .../org/scijava/io/event/DataOpenedEvent.java |  2 +-
 .../org/scijava/io/event/DataSavedEvent.java  |  2 +-
 .../java/org/scijava/io/event/IOEvent.java    |  2 +-
 .../org/scijava/log/AbstractLogService.java   |  2 +-
 .../log/DefaultUncaughtExceptionHandler.java  |  2 +-
 src/main/java/org/scijava/log/LogService.java |  2 +-
 .../org/scijava/log/StderrLogService.java     |  2 +-
 .../org/scijava/main/DefaultMainService.java  |  2 +-
 .../java/org/scijava/main/MainService.java    |  2 +-
 .../scijava/main/console/MainArgument.java    |  2 +-
 .../org/scijava/menu/AbstractMenuCreator.java |  2 +-
 .../org/scijava/menu/DefaultMenuService.java  |  2 +-
 .../java/org/scijava/menu/MenuConstants.java  |  2 +-
 .../java/org/scijava/menu/MenuCreator.java    |  2 +-
 .../java/org/scijava/menu/MenuService.java    |  2 +-
 .../java/org/scijava/menu/ShadowMenu.java     |  2 +-
 .../org/scijava/menu/ShadowMenuIterator.java  |  2 +-
 .../org/scijava/menu/event/MenuEvent.java     |  2 +-
 .../scijava/menu/event/MenusAddedEvent.java   |  2 +-
 .../scijava/menu/event/MenusRemovedEvent.java |  2 +-
 .../scijava/menu/event/MenusUpdatedEvent.java |  2 +-
 .../org/scijava/module/AbstractModule.java    |  2 +-
 .../scijava/module/AbstractModuleInfo.java    |  2 +-
 .../scijava/module/AbstractModuleItem.java    |  2 +-
 .../scijava/module/DefaultModuleService.java  |  2 +-
 .../scijava/module/DefaultMutableModule.java  |  2 +-
 .../module/DefaultMutableModuleInfo.java      |  2 +-
 .../module/DefaultMutableModuleItem.java      |  2 +-
 .../scijava/module/MethodCallException.java   |  2 +-
 .../java/org/scijava/module/MethodRef.java    |  2 +-
 src/main/java/org/scijava/module/Module.java  |  2 +-
 .../module/ModuleCanceledException.java       |  2 +-
 .../org/scijava/module/ModuleException.java   |  2 +-
 .../java/org/scijava/module/ModuleIndex.java  |  2 +-
 .../java/org/scijava/module/ModuleInfo.java   |  2 +-
 .../java/org/scijava/module/ModuleItem.java   |  2 +-
 .../java/org/scijava/module/ModuleRunner.java |  2 +-
 .../org/scijava/module/ModuleService.java     |  2 +-
 .../org/scijava/module/MutableModule.java     |  2 +-
 .../org/scijava/module/MutableModuleInfo.java |  2 +-
 .../org/scijava/module/MutableModuleItem.java |  2 +-
 .../module/event/ModuleCanceledEvent.java     |  2 +-
 .../org/scijava/module/event/ModuleEvent.java |  2 +-
 .../module/event/ModuleExecutedEvent.java     |  2 +-
 .../module/event/ModuleExecutingEvent.java    |  2 +-
 .../module/event/ModuleExecutionEvent.java    |  2 +-
 .../module/event/ModuleFinishedEvent.java     |  2 +-
 .../module/event/ModulePostprocessEvent.java  |  2 +-
 .../module/event/ModulePreprocessEvent.java   |  2 +-
 .../module/event/ModuleProcessEvent.java      |  2 +-
 .../module/event/ModuleStartedEvent.java      |  2 +-
 .../module/event/ModulesAddedEvent.java       |  2 +-
 .../module/event/ModulesListEvent.java        |  2 +-
 .../module/event/ModulesRemovedEvent.java     |  2 +-
 .../module/event/ModulesUpdatedEvent.java     |  2 +-
 .../process/AbstractPostprocessorPlugin.java  |  2 +-
 .../process/AbstractPreprocessorPlugin.java   |  2 +-
 .../AbstractSingleInputPreprocessor.java      |  2 +-
 .../process/CheckInputsPreprocessor.java      |  2 +-
 .../module/process/DebugPostprocessor.java    |  2 +-
 .../module/process/DebugPreprocessor.java     |  2 +-
 .../process/DefaultValuePreprocessor.java     |  6 ++--
 .../module/process/GatewayPreprocessor.java   |  2 +-
 .../module/process/InitPreprocessor.java      |  2 +-
 .../process/LoadInputsPreprocessor.java       |  2 +-
 .../module/process/ModulePostprocessor.java   |  2 +-
 .../module/process/ModulePreprocessor.java    |  2 +-
 .../module/process/ModuleProcessor.java       |  2 +-
 .../module/process/PostprocessorPlugin.java   |  2 +-
 .../module/process/PreprocessorPlugin.java    |  2 +-
 .../process/SaveInputsPreprocessor.java       |  2 +-
 .../module/process/ServicePreprocessor.java   |  2 +-
 .../module/process/ValidityPreprocessor.java  |  2 +-
 .../scijava/object/DefaultObjectService.java  |  2 +-
 .../java/org/scijava/object/LazyObjects.java  |  2 +-
 .../java/org/scijava/object/ObjectIndex.java  |  2 +-
 .../org/scijava/object/ObjectService.java     |  2 +-
 .../org/scijava/object/SortedObjectIndex.java |  2 +-
 .../org/scijava/object/event/ListEvent.java   |  2 +-
 .../object/event/ObjectCreatedEvent.java      |  2 +-
 .../object/event/ObjectDeletedEvent.java      |  2 +-
 .../org/scijava/object/event/ObjectEvent.java |  2 +-
 .../object/event/ObjectModifiedEvent.java     |  2 +-
 .../object/event/ObjectsAddedEvent.java       |  2 +-
 .../object/event/ObjectsListEvent.java        |  2 +-
 .../object/event/ObjectsRemovedEvent.java     |  2 +-
 .../options/DefaultOptionsService.java        |  2 +-
 .../org/scijava/options/OptionsPlugin.java    |  2 +-
 .../org/scijava/options/OptionsService.java   |  2 +-
 .../scijava/options/event/OptionsEvent.java   |  2 +-
 .../scijava/platform/AbstractPlatform.java    |  2 +-
 .../org/scijava/platform/AppEventService.java |  2 +-
 .../platform/DefaultAppEventService.java      |  2 +-
 .../org/scijava/platform/DefaultPlatform.java |  2 +-
 .../platform/DefaultPlatformService.java      |  2 +-
 .../java/org/scijava/platform/Platform.java   |  2 +-
 .../org/scijava/platform/PlatformService.java |  2 +-
 .../scijava/platform/event/AppAboutEvent.java |  2 +-
 .../scijava/platform/event/AppFocusEvent.java |  2 +-
 .../platform/event/AppMenusCreatedEvent.java  |  2 +-
 .../platform/event/AppOpenFilesEvent.java     |  2 +-
 .../platform/event/AppPreferencesEvent.java   |  2 +-
 .../scijava/platform/event/AppPrintEvent.java |  2 +-
 .../scijava/platform/event/AppQuitEvent.java  |  2 +-
 .../platform/event/AppReOpenEvent.java        |  2 +-
 .../platform/event/AppScreenSleepEvent.java   |  2 +-
 .../scijava/platform/event/AppSleepEvent.java |  2 +-
 .../platform/event/AppSystemSleepEvent.java   |  2 +-
 .../platform/event/AppUserSessionEvent.java   |  2 +-
 .../platform/event/AppVisibleEvent.java       |  2 +-
 .../platform/event/ApplicationEvent.java      |  2 +-
 .../scijava/plugin/AbstractHandlerPlugin.java |  2 +-
 .../plugin/AbstractHandlerService.java        |  2 +-
 .../org/scijava/plugin/AbstractPTService.java |  2 +-
 .../scijava/plugin/AbstractRichPlugin.java    |  2 +-
 .../plugin/AbstractSingletonService.java      |  2 +-
 .../scijava/plugin/AbstractTypedPlugin.java   |  2 +-
 .../scijava/plugin/AbstractTypedService.java  |  2 +-
 .../scijava/plugin/AbstractWrapperPlugin.java |  2 +-
 .../plugin/AbstractWrapperService.java        |  2 +-
 src/main/java/org/scijava/plugin/Attr.java    |  2 +-
 .../scijava/plugin/DefaultPluginFinder.java   |  2 +-
 .../scijava/plugin/DefaultPluginService.java  |  2 +-
 .../org/scijava/plugin/HandlerPlugin.java     |  2 +-
 .../org/scijava/plugin/HandlerService.java    |  2 +-
 .../org/scijava/plugin/HasPluginInfo.java     |  2 +-
 src/main/java/org/scijava/plugin/Menu.java    |  2 +-
 .../java/org/scijava/plugin/PTService.java    |  2 +-
 .../java/org/scijava/plugin/Parameter.java    |  2 +-
 src/main/java/org/scijava/plugin/Plugin.java  |  2 +-
 .../java/org/scijava/plugin/PluginFinder.java |  2 +-
 .../java/org/scijava/plugin/PluginIndex.java  |  2 +-
 .../java/org/scijava/plugin/PluginInfo.java   |  2 +-
 .../org/scijava/plugin/PluginService.java     |  2 +-
 .../java/org/scijava/plugin/RichPlugin.java   |  2 +-
 .../org/scijava/plugin/SciJavaPlugin.java     |  2 +-
 .../org/scijava/plugin/SingletonPlugin.java   |  2 +-
 .../org/scijava/plugin/SingletonService.java  |  2 +-
 .../org/scijava/plugin/SortablePlugin.java    |  2 +-
 .../java/org/scijava/plugin/TypedPlugin.java  |  2 +-
 .../java/org/scijava/plugin/TypedService.java |  2 +-
 .../org/scijava/plugin/WrapperPlugin.java     |  2 +-
 .../org/scijava/plugin/WrapperService.java    |  2 +-
 .../plugin/event/PluginsAddedEvent.java       |  2 +-
 .../plugin/event/PluginsListEvent.java        |  2 +-
 .../plugin/event/PluginsRemovedEvent.java     |  2 +-
 .../scijava/prefs/AbstractPrefService.java    |  2 +-
 .../org/scijava/prefs/DefaultPrefService.java |  2 +-
 .../java/org/scijava/prefs/PrefService.java   |  2 +-
 .../scijava/script/AbstractScriptContext.java |  2 +-
 .../scijava/script/AbstractScriptEngine.java  |  2 +-
 .../scijava/script/AbstractScriptHeader.java  |  2 +-
 .../script/AbstractScriptLanguage.java        |  2 +-
 .../scijava/script/AdaptedScriptLanguage.java |  2 +-
 .../org/scijava/script/CodeGenerator.java     |  2 +-
 .../org/scijava/script/CodeGeneratorJava.java |  2 +-
 .../script/DefaultScriptHeaderService.java    |  2 +-
 .../script/DefaultScriptInterpreter.java      |  2 +-
 .../scijava/script/DefaultScriptService.java  |  2 +-
 src/main/java/org/scijava/script/History.java |  2 +-
 .../org/scijava/script/InvocationObject.java  |  2 +-
 .../org/scijava/script/ParameterObject.java   |  2 +-
 .../java/org/scijava/script/ScriptFinder.java |  2 +-
 .../java/org/scijava/script/ScriptHeader.java |  2 +-
 .../scijava/script/ScriptHeaderService.java   |  2 +-
 .../java/org/scijava/script/ScriptInfo.java   |  2 +-
 .../org/scijava/script/ScriptInterpreter.java |  2 +-
 .../org/scijava/script/ScriptLanguage.java    |  2 +-
 .../scijava/script/ScriptLanguageIndex.java   |  2 +-
 .../java/org/scijava/script/ScriptModule.java |  2 +-
 .../org/scijava/script/ScriptService.java     |  2 +-
 .../org/scijava/script/io/ScriptIOPlugin.java |  2 +-
 .../org/scijava/service/AbstractService.java  |  2 +-
 .../org/scijava/service/SciJavaService.java   |  2 +-
 .../java/org/scijava/service/Service.java     |  2 +-
 .../org/scijava/service/ServiceHelper.java    |  2 +-
 .../org/scijava/service/ServiceIndex.java     |  2 +-
 .../service/event/ServicesLoadedEvent.java    |  2 +-
 src/main/java/org/scijava/test/TestUtils.java |  2 +-
 .../org/scijava/text/AbstractTextFormat.java  |  2 +-
 .../org/scijava/text/DefaultTextService.java  |  2 +-
 .../java/org/scijava/text/TextFormat.java     |  2 +-
 .../java/org/scijava/text/TextService.java    |  2 +-
 .../org/scijava/text/io/TextIOPlugin.java     |  2 +-
 .../scijava/thread/DefaultThreadService.java  |  2 +-
 .../org/scijava/thread/ThreadService.java     |  2 +-
 .../java/org/scijava/tool/AbstractTool.java   |  2 +-
 .../org/scijava/tool/CustomDrawnTool.java     |  2 +-
 .../org/scijava/tool/DefaultToolService.java  |  2 +-
 src/main/java/org/scijava/tool/DummyTool.java |  2 +-
 .../java/org/scijava/tool/IconDrawer.java     |  2 +-
 .../java/org/scijava/tool/IconService.java    |  2 +-
 src/main/java/org/scijava/tool/Tool.java      |  2 +-
 .../java/org/scijava/tool/ToolService.java    |  2 +-
 .../tool/event/ToolActivatedEvent.java        |  2 +-
 .../tool/event/ToolDeactivatedEvent.java      |  2 +-
 .../org/scijava/tool/event/ToolEvent.java     |  2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java   |  2 +-
 .../ui/AbstractInputHarvesterPlugin.java      |  2 +-
 .../org/scijava/ui/AbstractUIInputWidget.java |  2 +-
 .../org/scijava/ui/AbstractUserInterface.java |  2 +-
 .../java/org/scijava/ui/ApplicationFrame.java |  2 +-
 src/main/java/org/scijava/ui/Arrangeable.java |  2 +-
 .../java/org/scijava/ui/CloseConfirmable.java |  2 +-
 .../java/org/scijava/ui/DefaultUIService.java |  2 +-
 src/main/java/org/scijava/ui/Desktop.java     |  2 +-
 .../java/org/scijava/ui/DialogPrompt.java     |  2 +-
 .../java/org/scijava/ui/FilePreprocessor.java |  2 +-
 src/main/java/org/scijava/ui/StatusBar.java   |  2 +-
 .../java/org/scijava/ui/SystemClipboard.java  |  2 +-
 src/main/java/org/scijava/ui/ToolBar.java     |  2 +-
 .../java/org/scijava/ui/UIPreprocessor.java   |  2 +-
 src/main/java/org/scijava/ui/UIService.java   |  2 +-
 .../java/org/scijava/ui/UserInterface.java    |  2 +-
 .../ui/console/AbstractConsolePane.java       |  2 +-
 .../org/scijava/ui/console/ConsolePane.java   |  2 +-
 .../org/scijava/ui/console/UIArgument.java    |  2 +-
 .../ui/dnd/AbstractDragAndDropData.java       |  2 +-
 .../ui/dnd/AbstractDragAndDropHandler.java    |  2 +-
 .../ui/dnd/DefaultDragAndDropData.java        |  2 +-
 .../ui/dnd/DefaultDragAndDropService.java     |  2 +-
 .../org/scijava/ui/dnd/DragAndDropData.java   |  2 +-
 .../scijava/ui/dnd/DragAndDropHandler.java    |  2 +-
 .../scijava/ui/dnd/DragAndDropService.java    |  2 +-
 .../ui/dnd/FileDragAndDropHandler.java        |  2 +-
 .../ui/dnd/ListDragAndDropHandler.java        |  2 +-
 .../java/org/scijava/ui/dnd/MIMEType.java     |  2 +-
 .../ui/dnd/ScriptFileDragAndDropHandler.java  |  2 +-
 .../ui/dnd/event/DragAndDropEvent.java        |  2 +-
 .../scijava/ui/dnd/event/DragEnterEvent.java  |  2 +-
 .../scijava/ui/dnd/event/DragExitEvent.java   |  2 +-
 .../scijava/ui/dnd/event/DragOverEvent.java   |  2 +-
 .../org/scijava/ui/dnd/event/DropEvent.java   |  2 +-
 .../java/org/scijava/ui/event/UIEvent.java    |  2 +-
 .../org/scijava/ui/event/UIShownEvent.java    |  2 +-
 .../ui/viewer/AbstractDisplayViewer.java      |  2 +-
 .../org/scijava/ui/viewer/DisplayPanel.java   |  2 +-
 .../org/scijava/ui/viewer/DisplayViewer.java  |  2 +-
 .../org/scijava/ui/viewer/DisplayWindow.java  |  2 +-
 .../text/AbstractTextDisplayViewer.java       |  2 +-
 .../ui/viewer/text/TextDisplayPanel.java      |  2 +-
 .../ui/viewer/text/TextDisplayViewer.java     |  2 +-
 .../scijava/util/AbstractPrimitiveArray.java  |  2 +-
 src/main/java/org/scijava/util/AppUtils.java  |  2 +-
 .../java/org/scijava/util/ArrayUtils.java     |  2 +-
 src/main/java/org/scijava/util/BoolArray.java |  2 +-
 src/main/java/org/scijava/util/ByteArray.java |  2 +-
 src/main/java/org/scijava/util/Bytes.java     |  6 ++--
 src/main/java/org/scijava/util/CharArray.java |  2 +-
 .../java/org/scijava/util/CheckSezpoz.java    |  2 +-
 .../java/org/scijava/util/ClassUtils.java     |  2 +-
 src/main/java/org/scijava/util/ColorRGB.java  |  2 +-
 src/main/java/org/scijava/util/ColorRGBA.java |  2 +-
 src/main/java/org/scijava/util/Colors.java    |  2 +-
 .../org/scijava/util/CombineAnnotations.java  |  2 +-
 src/main/java/org/scijava/util/Combiner.java  |  2 +-
 .../org/scijava/util/ConversionUtils.java     |  2 +-
 .../java/org/scijava/util/DebugUtils.java     |  2 +-
 .../java/org/scijava/util/DigestUtils.java    |  2 +-
 .../java/org/scijava/util/DoubleArray.java    |  2 +-
 src/main/java/org/scijava/util/FileUtils.java |  2 +-
 .../java/org/scijava/util/FloatArray.java     |  2 +-
 .../java/org/scijava/util/GenericUtils.java   |  2 +-
 src/main/java/org/scijava/util/IntArray.java  |  2 +-
 src/main/java/org/scijava/util/IntCoords.java |  2 +-
 src/main/java/org/scijava/util/IntRect.java   |  2 +-
 .../java/org/scijava/util/IteratorPlus.java   |  2 +-
 .../org/scijava/util/LastRecentlyUsed.java    |  2 +-
 .../org/scijava/util/LineOutputStream.java    |  2 +-
 src/main/java/org/scijava/util/ListUtils.java |  2 +-
 src/main/java/org/scijava/util/LongArray.java |  2 +-
 src/main/java/org/scijava/util/Manifest.java  |  2 +-
 .../org/scijava/util/MersenneTwisterFast.java |  2 +-
 .../org/scijava/util/MetaInfCombiner.java     |  2 +-
 .../java/org/scijava/util/MirrorWebsite.java  |  2 +-
 src/main/java/org/scijava/util/MiscUtils.java |  2 +-
 .../java/org/scijava/util/NumberUtils.java    |  2 +-
 .../java/org/scijava/util/ObjectArray.java    |  2 +-
 src/main/java/org/scijava/util/POM.java       |  2 +-
 .../java/org/scijava/util/PlatformUtils.java  |  2 +-
 src/main/java/org/scijava/util/Prefs.java     |  2 +-
 .../java/org/scijava/util/PrimitiveArray.java |  2 +-
 .../java/org/scijava/util/ProcessUtils.java   |  2 +-
 src/main/java/org/scijava/util/Query.java     |  2 +-
 src/main/java/org/scijava/util/ReadInto.java  |  2 +-
 .../java/org/scijava/util/RealCoords.java     |  2 +-
 src/main/java/org/scijava/util/RealRect.java  |  2 +-
 .../org/scijava/util/ReflectException.java    |  2 +-
 .../org/scijava/util/ReflectedUniverse.java   |  2 +-
 .../org/scijava/util/ServiceCombiner.java     |  2 +-
 .../java/org/scijava/util/ShortArray.java     |  2 +-
 src/main/java/org/scijava/util/Sizable.java   |  2 +-
 .../org/scijava/util/SizableArrayList.java    |  2 +-
 .../java/org/scijava/util/StringMaker.java    |  2 +-
 .../java/org/scijava/util/StringUtils.java    |  6 ++--
 src/main/java/org/scijava/util/Timing.java    |  2 +-
 .../java/org/scijava/util/TunePlayer.java     |  2 +-
 src/main/java/org/scijava/util/UnitUtils.java |  2 +-
 .../java/org/scijava/util/VersionUtils.java   |  2 +-
 src/main/java/org/scijava/util/XML.java       |  2 +-
 .../welcome/DefaultWelcomeService.java        |  2 +-
 .../org/scijava/welcome/WelcomeService.java   |  2 +-
 .../scijava/welcome/event/WelcomeEvent.java   |  2 +-
 .../widget/AbstractInputHarvester.java        |  2 +-
 .../scijava/widget/AbstractInputPanel.java    |  2 +-
 .../scijava/widget/AbstractInputWidget.java   |  2 +-
 src/main/java/org/scijava/widget/Button.java  |  2 +-
 .../java/org/scijava/widget/ButtonWidget.java |  2 +-
 .../java/org/scijava/widget/ChoiceWidget.java |  2 +-
 .../java/org/scijava/widget/ColorWidget.java  |  2 +-
 .../java/org/scijava/widget/DateWidget.java   |  2 +-
 .../scijava/widget/DefaultWidgetModel.java    |  2 +-
 .../scijava/widget/DefaultWidgetService.java  |  2 +-
 .../java/org/scijava/widget/FileWidget.java   |  2 +-
 .../org/scijava/widget/InputHarvester.java    |  2 +-
 .../java/org/scijava/widget/InputPanel.java   |  2 +-
 .../java/org/scijava/widget/InputWidget.java  |  2 +-
 .../org/scijava/widget/MessageWidget.java     |  2 +-
 .../java/org/scijava/widget/NumberWidget.java |  2 +-
 .../java/org/scijava/widget/ObjectWidget.java |  2 +-
 .../java/org/scijava/widget/TextWidget.java   |  2 +-
 .../java/org/scijava/widget/ToggleWidget.java |  2 +-
 .../java/org/scijava/widget/UIComponent.java  |  2 +-
 .../java/org/scijava/widget/WidgetModel.java  |  2 +-
 .../org/scijava/widget/WidgetService.java     |  2 +-
 .../java/org/scijava/ContextCreationTest.java |  2 +-
 .../org/scijava/ContextInjectionTest.java     |  2 +-
 .../org/scijava/annotations/AnnotatedA.java   |  2 +-
 .../org/scijava/annotations/AnnotatedB.java   |  2 +-
 .../org/scijava/annotations/AnnotatedC.java   |  2 +-
 .../org/scijava/annotations/AnnotatedD.java   | 30 +++++++++++++++++++
 .../annotations/AnnotatedInnerClass.java      |  2 +-
 .../java/org/scijava/annotations/Complex.java |  2 +-
 .../annotations/DirectoryIndexerTest.java     |  2 +-
 .../annotations/EclipseHelperTest.java        |  2 +-
 .../java/org/scijava/annotations/Fruit.java   |  2 +-
 .../org/scijava/annotations/LegacyTest.java   |  2 +-
 .../java/org/scijava/annotations/Simple.java  |  2 +-
 .../scijava/app/DefaultStatusServiceTest.java |  2 +-
 .../scijava/command/CommandServiceTest.java   |  2 +-
 .../scijava/command/InvalidCommandTest.java   |  2 +-
 .../scijava/console/ConsoleServiceTest.java   |  2 +-
 .../console/SystemPropertyArgumentTest.java   |  2 +-
 .../scijava/convert/ConvertServiceTest.java   |  2 +-
 .../org/scijava/convert/ConverterTest.java    |  2 +-
 .../java/org/scijava/display/DisplayTest.java |  2 +-
 .../org/scijava/event/EventServiceTest.java   |  2 +-
 .../org/scijava/io/BytesLocationTest.java     |  2 +-
 .../java/org/scijava/io/DataHandleTest.java   |  6 ++--
 .../java/org/scijava/io/FileHandleTest.java   |  6 ++--
 .../java/org/scijava/io/FileLocationTest.java |  2 +-
 .../java/org/scijava/io/URILocationTest.java  |  2 +-
 .../java/org/scijava/io/URLLocationTest.java  |  2 +-
 .../java/org/scijava/log/LogServiceTest.java  |  2 +-
 .../org/scijava/main/MainServiceTest.java     |  6 ++--
 .../org/scijava/menu/MenuServiceTest.java     |  2 +-
 .../java/org/scijava/menu/ShadowMenuTest.java |  2 +-
 .../org/scijava/module/ModuleServiceTest.java |  2 +-
 .../org/scijava/object/ObjectIndexTest.java   |  2 +-
 .../scijava/object/SortedObjectIndexTest.java |  2 +-
 .../java/org/scijava/options/OptionsTest.java |  2 +-
 .../org/scijava/plugin/PluginIndexTest.java   |  2 +-
 .../org/scijava/plugin/PluginInfoTest.java    |  2 +-
 .../org/scijava/prefs/PrefServiceTest.java    |  2 +-
 .../script/AbstractScriptLanguageTest.java    |  6 ++--
 .../org/scijava/script/ScriptEngineTest.java  |  2 +-
 .../org/scijava/script/ScriptFinderTest.java  |  2 +-
 .../org/scijava/script/ScriptInfoTest.java    |  2 +-
 .../org/scijava/script/ScriptServiceTest.java |  2 +-
 .../org/scijava/service/ServiceIndexTest.java |  2 +-
 .../java/org/scijava/test/TestUtilsTest.java  |  2 +-
 .../org/scijava/thread/ThreadServiceTest.java |  2 +-
 .../java/org/scijava/util/AppUtilsTest.java   |  2 +-
 .../java/org/scijava/util/ArrayUtilsTest.java |  7 +++--
 .../java/org/scijava/util/BoolArrayTest.java  |  2 +-
 .../java/org/scijava/util/ByteArrayTest.java  |  2 +-
 .../java/org/scijava/util/CharArrayTest.java  |  2 +-
 .../java/org/scijava/util/ClassUtilsTest.java |  2 +-
 .../java/org/scijava/util/ColorRGBTest.java   |  2 +-
 .../org/scijava/util/ConversionUtilsTest.java |  2 +-
 .../org/scijava/util/DigestUtilsTest.java     |  2 +-
 .../org/scijava/util/DoubleArrayTest.java     |  2 +-
 .../java/org/scijava/util/FileUtilsTest.java  |  2 +-
 .../java/org/scijava/util/FloatArrayTest.java |  2 +-
 .../org/scijava/util/GenericUtilsTest.java    |  2 +-
 .../java/org/scijava/util/IntArrayTest.java   |  2 +-
 .../scijava/util/LastRecentlyUsedTest.java    |  2 +-
 .../java/org/scijava/util/LongArrayTest.java  |  2 +-
 .../org/scijava/util/ObjectArrayTest.java     |  2 +-
 src/test/java/org/scijava/util/POMTest.java   |  2 +-
 .../org/scijava/util/PrimitiveArrayTest.java  |  2 +-
 .../org/scijava/util/ProcessUtilsTest.java    |  2 +-
 .../java/org/scijava/util/ShortArrayTest.java |  2 +-
 .../java/org/scijava/util/UnitUtilsTest.java  |  2 +-
 562 files changed, 609 insertions(+), 578 deletions(-)

diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 570cbb5ec..973fa0c14 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2015 Board of Regents of the University of
+  Copyright (C) 2009 - 2016 Board of Regents of the University of
   Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
   Institute of Molecular Cell Biology and Genetics.
   %%
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 82580215d..2b08f010f 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index 8b4abd6a7..ff5cdf3e8 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index 502f5596e..80c1db3ba 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index 2df5895fc..71a9c5efa 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 7e66aef87..c7205a7b0 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2015 Board of Regents of the University of
+  Copyright (C) 2009 - 2016 Board of Regents of the University of
   Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
   Institute of Molecular Cell Biology and Genetics.
   %%
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index 6688600b2..cfeae9f66 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index 74d95ab5d..71afa3108 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 6e558530f..603e6a7a4 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 409dcefd6..eccfbafe3 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index 4294428fc..3f061494a 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 9ce0ed337..2f738e626 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index c3e02d9dc..6f3196c21 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index dfd218345..30729043e 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index 0d7c4ec38..41b397cb5 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 9a71bf025..a034682dd 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index f1afd148c..e057780bb 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index 867f29ea2..f3f174aa5 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index 43d976e1c..596e59ee9 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index 6f79e2791..b45f5062e 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index a5ebdfc9c..4055bc8f6 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index 6cf85f384..3073a9266 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index 8d37b10a8..fa8fb4821 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index e44b86899..09b1677c7 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index 2f7cac60d..5ddd9cb16 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 225f6242e..09d23663c 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index 71a3d344d..acae73049 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 16ef8e8b3..dcfc568e3 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 57dd7a943..4aafbeb13 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index af2774e97..2f0c06e29 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index e342ef380..8ae9c8e0c 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index 9100a8400..be50d652d 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 47428d198..94e6e5d12 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index 9512db816..ea17c28ab 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index a716e3679..a7f7134e4 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index ab3c9069a..793c0fc9d 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 27a4f6592..fe58d191f 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index c224590df..5a5b7c127 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index cf473c161..70a54e3e1 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index a9276917a..4f752d324 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 133909d4a..5943d9abb 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index d460d49e5..b2f78d7e3 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index 9109f67a9..a6231532f 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index 0193c4cc5..a413ad57a 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index 0ba5ee233..5c613748e 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 5486809f4..8204de4d1 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 51307062d..5bf17928d 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 0fe3142f0..ff26c35dc 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index e4edcca0f..2bfee1844 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index fedb50e38..8853b0d56 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index a68223bef..903e9d283 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 22d481b06..3d15f6252 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 01499f353..97b1f54a5 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index fde11880a..8ae39845a 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index 6edabc536..e6bfbcdb1 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index a39a43eea..11981d906 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 2cf81d4ad..b1b305273 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index d20e232e2..85f191060 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 3cc61e6ec..49bfdb488 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 7ae33aa2e..d392b6c58 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 31fe5842f..4844db92d 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 4f76f8e93..1659b088e 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index e13198833..5d74e3863 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index 3246e9afc..71a4054fd 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index ff622847b..dac4df9ee 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index 39ac54354..a6b9cc507 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index 0ea3369ef..9f8b389b3 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index b1f14d62a..a1b465ab7 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index 211f3b5ca..fe3f47561 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index fcea8a72e..a853bb355 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 2565239f0..43c967bb3 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 469608b59..da6f38bfc 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 4112bfc9b..f6806ab3d 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index 4a9232da2..18f3762f3 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 51d1d7f0b..77cef9477 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 75821a5db..22483a459 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 655575082..0b596af93 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 13c2ff1f5..2261c533a 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index cddafcb19..6d81ebdef 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index 9c9111374..6636c1ad6 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index f8b968458..8202f8ce9 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 200460a60..3f9a37ef9 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 26602d0e3..058624d94 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 7971c0872..f2d129cd1 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index d849d5cd4..00ebb1f0b 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.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
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 4ca2b0fdd..1b0a211f0 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 3feec3e81..555a270bd 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 2ad015dfe..157a7a744 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index b28ce6383..1f2318a95 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 4aa872960..803483dc3 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 6eb29874b..f3686ea2f 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index 7b63df197..9a821393b 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index 0c3a7992b..a6d421608 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index 9c4d43669..1b84f07b9 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 09ba6c725..916bc2d0a 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index 2041330a6..cad0c02f3 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index f193decfb..ec11b5c20 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index de8b1cfba..2b5940087 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index 6405499c1..019a53443 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index eea4a5c42..092122db3 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index cb2abddbb..98dd2b6da 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index 292e0b53d..ffc22461e 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 3c06c5ef0..5da87694c 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 315f0215f..9a81b32f1 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index 6e45ab5ec..c1ef3e70d 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index 24a74e2a7..37889a187 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 4637037b9..12ae2b5de 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index f0e40254d..9fa301481 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index ca46e80e7..7855ae923 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index d31534b81..8892b20a1 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 28f326837..1d936b33d 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 593e557f7..3604fe6b6 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index 568aec3ba..553a791b6 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index bf0a38d98..6a4a41ed6 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 6d180c2fe..71fefc267 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index bed510b88..9a2157b06 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index ab1e8843c..e9813d94e 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index 61f4614c0..e000e0a09 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index f08d93bb6..eb6ad2716 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index 0afc917a7..e5d367ec0 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index 841f5c5de..44271958d 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 4328779c0..4a7cf0a49 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 4908ff5d9..d33d2d6d4 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index 8ee0f7938..8ec498c73 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 684c9abf4..450883dd4 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index 51d93a605..b3eedf74e 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index 8fb256d7f..3d9f08236 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index d1a58d19c..1f66c2861 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index 8b9bd41c5..af3a4fb21 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 2333ccd22..740de597b 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index 1a3904883..2cc54a73f 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index dfee4e284..7df001f65 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index cfd847797..f9a7fbe14 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 72eb38add..541528fcd 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 855cd8fec..3e41c1023 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index de79229e0..4f210c0ee 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 93f94c4b5..6fdfb967f 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index 128a5b469..8cd782253 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index 8d813b798..acf0c07c8 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 4f269c36d..fcacb1b46 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index 7b7ddf9a6..69796fe43 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index f30b9c7fb..13920ce43 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index ea745910f..3c83dd0d5 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 3e2c47495..d806b9042 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index 0464c301f..f7da0c4b7 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index b0cf29958..467788e0e 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index fe8b8d4a7..a01ff8663 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index 39e7f3061..f55d0c768 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/AbstractDataHandle.java b/src/main/java/org/scijava/io/AbstractDataHandle.java
index cfb917810..64ac47c77 100644
--- a/src/main/java/org/scijava/io/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 9091ae38f..d7c526ad7 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/AbstractLocation.java b/src/main/java/org/scijava/io/AbstractLocation.java
index ce0e12ad6..fe40a36d8 100644
--- a/src/main/java/org/scijava/io/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/BytesLocation.java b/src/main/java/org/scijava/io/BytesLocation.java
index c58ddb0c6..f0cf50b4b 100644
--- a/src/main/java/org/scijava/io/BytesLocation.java
+++ b/src/main/java/org/scijava/io/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandle.java b/src/main/java/org/scijava/io/DataHandle.java
index 24162ef77..d70be75dd 100644
--- a/src/main/java/org/scijava/io/DataHandle.java
+++ b/src/main/java/org/scijava/io/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandleInputStream.java b/src/main/java/org/scijava/io/DataHandleInputStream.java
index 1d341f449..01c013a6b 100644
--- a/src/main/java/org/scijava/io/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandleOutputStream.java b/src/main/java/org/scijava/io/DataHandleOutputStream.java
index 42ec2d104..4e03766ef 100644
--- a/src/main/java/org/scijava/io/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandleService.java b/src/main/java/org/scijava/io/DataHandleService.java
index eaf93e28c..caec74a59 100644
--- a/src/main/java/org/scijava/io/DataHandleService.java
+++ b/src/main/java/org/scijava/io/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DefaultDataHandleService.java b/src/main/java/org/scijava/io/DefaultDataHandleService.java
index 2be00711f..92882cbd1 100644
--- a/src/main/java/org/scijava/io/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 2ad822f72..173ebc664 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index ce0ddd9e6..90a5b0198 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/FileHandle.java b/src/main/java/org/scijava/io/FileHandle.java
index 045c254fd..53a604f21 100644
--- a/src/main/java/org/scijava/io/FileHandle.java
+++ b/src/main/java/org/scijava/io/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/FileLocation.java b/src/main/java/org/scijava/io/FileLocation.java
index 757c4b738..7ebb80119 100644
--- a/src/main/java/org/scijava/io/FileLocation.java
+++ b/src/main/java/org/scijava/io/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index aacaade90..e000c72ab 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index b82fd0f1e..5f64ba7ad 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/Location.java b/src/main/java/org/scijava/io/Location.java
index 4f08be1b9..a02abbf25 100644
--- a/src/main/java/org/scijava/io/Location.java
+++ b/src/main/java/org/scijava/io/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index 6f1d606bf..ea6220426 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/URILocation.java b/src/main/java/org/scijava/io/URILocation.java
index 87f9e7d4d..cb2d2022c 100644
--- a/src/main/java/org/scijava/io/URILocation.java
+++ b/src/main/java/org/scijava/io/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/URLLocation.java b/src/main/java/org/scijava/io/URLLocation.java
index 4148d668a..54d8fbb06 100644
--- a/src/main/java/org/scijava/io/URLLocation.java
+++ b/src/main/java/org/scijava/io/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 1f5457e6b..9b271ed4c 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 03028ecb2..893ad63b6 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index 8f5f2955a..fe911efa9 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index d678ae19c..9140893c2 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 96dc08240..135c90dd3 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index 9270e1f9f..6b1dbd7cd 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 190077f0f..e1fae2013 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 9524a5427..5d7fc4688 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 9b56e45b2..31de081fd 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index ee99373c3..fcd15831c 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 2ed60c713..45551f2a9 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index 0b5951096..ab476c375 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 8072c50f6..d128cca83 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index 101e1d125..336a1832f 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index 872efd0a0..45d7c7402 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index 5970c3db8..000ac5bcd 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 4ba28d799..a2c87b573 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index cb9e48353..884cd5ab5 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index 2d5ac867b..16c1b5de2 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index a9a7163ad..03d00ae91 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index b097317e1..3214051df 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index 9980be59d..cc6da3099 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index b4c0c1922..0406bdb71 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 551664197..1b6461b6b 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index 0ae2f9206..c6d84537d 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index dcdebc5de..2bd74928f 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 1fa266b0f..e40f54498 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index 630fd311e..7585c16ff 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 1ff2d6bbe..b833cb34f 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index 09363f3ca..43a2cccad 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index ba7194645..aaca5bbd2 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 2816a2ddf..275f0d904 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index 15a76ab30..8442e20aa 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 6576e5814..e75d47128 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index eb3fac56a..4131a5ec7 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index f55541d82..b17a0548d 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 1016ce653..087a03c8a 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index e03e8dd73..27fb61347 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 3573e2b3e..e49850715 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 189c6cf87..3838b12a3 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index 5e57665bd..4de34d722 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index efd681ed5..3fd6df99d 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index 0451da0b1..53d4240e5 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index 6cdc33195..ec8cbc044 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index e84b6a3fa..97d51205d 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index a1ede59c8..a7927f3b2 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 357732926..ab3e4cdd7 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index 847747ac7..b07316001 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 501feae67..5cdd679f5 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index 8aed828df..ff41de328 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index bb969177d..3aa87b220 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index 069915064..bd532fb72 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index 9f8714aae..adc9b2a78 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 9e754000b..212903786 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index a52cd32b9..dede673ac 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index e75d25ee0..062850923 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index 1af137a8b..c03d757a5 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index 39f957be5..d87bb47d8 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index 3fc602696..f4eb2e044 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index 7e031019e..db69245aa 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 6115bb080..6a5274f29 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index ed5218174..7ac9db72a 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index a795cee4a..1422b9422 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 7f805e9c3..6f0ed52c8 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 8e9c03a7d..2df7a6682 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index f61f484d5..17d1b736f 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index c25986a4c..4aecdd0c5 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index 555473f3b..6f547bf00 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index e27c6b891..5deb1f398 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index de83e0b01..37bfbcd34 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index ae66f51d4..1fa632790 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 220027507..6c81a9c4a 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 127bf992b..69e8f4500 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index 918f922d7..a18ef8a9c 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index aee218631..a9d560980 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 975efa89b..83e9a1efc 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index 1baee99ff..a953dbe22 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index d305dbd3f..fd4bf23f5 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 08639a1fd..2a1bd99db 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index 1ea8c046c..753a9a5fa 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index 41292faeb..eb3804baf 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index c3c0d98f7..09cdf01a6 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index 0c8d7de4e..dfcc549f1 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 1e9eddb86..83a268634 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index 3082f50fc..b505e49d3 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index 549a5e921..598c83866 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 9b9f78c27..c88a8314a 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index d6de6e0c4..a75b24045 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index cd84b14d1..783cf3161 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index 8e3c0b60e..cec85eda4 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index 30ea0e09d..e57296aa5 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index 6970acc50..922cf39fe 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index 6b4d31a8f..6a55084e4 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index 43bbcf1cd..d5216ae82 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index f7bb7b18c..3cda5fabf 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index d399caad3..aabd65a1c 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 8b8f1bf47..329774e9e 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 6a42f6bf3..3cb305b25 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index f8bb85e38..22b9c5e40 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 0dd25f222..b595cc98f 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 4adec3e76..d0762cb66 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index b74c97c66..6d0d19c8a 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index f3e95ebda..b11e0eb87 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index 21a377973..a6f3dfa6b 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index 69293d35f..be29a6a0e 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index c0f168c91..71eed3f60 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index 1a5cdeb61..60b1bc7b5 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index 8896089b7..c105f7f5d 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index e0b89a317..07cc9fbf8 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index 9575d763c..0ee88d175 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index d9826680d..9292e9d2c 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 0e56d48e0..1076d9a7b 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 8a00c1878..6773ccbbf 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index 2e13897a2..1768f9731 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 9c31eb2fc..4c77c451e 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index bc720e848..11f88620b 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index cc19bacab..f60c76c77 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 1498f6491..cda3c8e3b 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index cbdb3c4b5..04a444637 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index e50995bbd..80acfa436 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 4e6910e59..5254a5a12 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index 73e9156cd..9d7a8a47f 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index cb595ec76..5c5796e75 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index cc7429149..796870681 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index 37bffe6ce..9331331e6 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 53cd7d3d1..ed551a499 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 4915ca8d1..69a2bb81a 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index abc746d36..962df19f9 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 8abc4be7d..1f3caf9df 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index 05ccd809c..84e8eddbf 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index f4bca8fd8..7f70f564b 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 7267db536..84f3325db 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 832cdbc8b..629aa52b5 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 2e67873d7..b60843f9b 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index 6cbb5257e..03db44d30 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index b64b91ed5..bbe7a304f 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 72bcb4133..d1f8c22c2 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 8b43c3d26..48de6c945 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 86fce11b6..5f22897a2 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index c07a2a098..ef2e60411 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index d13fc18cb..ecf27077b 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 1db9fa969..86983ddbf 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index 0a1485e8e..062e2c639 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index e46882387..0664c95a8 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index 4c40ef7dd..836074a67 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index b59f798bb..0726c81d6 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index bd3c13feb..b6feeaac1 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index d9f21139a..42c71fbe5 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 7b90821ea..327706198 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index ee711aaaa..8b4349bb6 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index 04099dec0..d5cf7ee06 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index 1c40684cd..46382835d 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index b48b0f221..a2afb48cc 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index 1644cec5f..f50965015 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index a06ec4147..403bc7693 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index 010846b43..e7f9b6e56 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 4fd1fc21c..de2fc84c2 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index 9230f69ca..5b51ca2f6 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 13fe6ec77..a0db10893 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 646feb111..1883a960a 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/History.java b/src/main/java/org/scijava/script/History.java
index 445bffd96..c2fe584bb 100644
--- a/src/main/java/org/scijava/script/History.java
+++ b/src/main/java/org/scijava/script/History.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 6dad3306a..44591f9ec 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 790ee172c..80e1e615e 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 9c7bfc120..f0deabdd9 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index db7403d54..b38ead72f 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index 3e6a0b9f0..b87ce51b9 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index ffc40391f..d8af44045 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index f2821b08b..a2c832874 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 6e17b895d..0605e4615 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 5c853688b..dfae11751 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index fc203366f..602545ebe 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index cea200a27..629d28fb3 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index 4338b2f0d..18cba6c8c 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index ec37801c5..88f036f21 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index 9d395c80b..a1ea5ee51 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index ce2330db9..140d1377f 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 025deaac7..f239f811b 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index ccff39f89..2c39bd946 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index 44edda8ae..01f23192a 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 31b3ccb29..36b29c72d 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 5a25f2045..899f1be9c 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index ce804b51a..c4f36d680 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 0b7347db6..20ce9d4ee 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 26bbc820d..1703fb0b3 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 2dfbee160..e499c943a 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 713769fc5..ae136e921 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index a8913bb2e..2287c87f2 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index 0defc847a..b042f4749 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 30651696e..3850e5ebf 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index 03efd7521..15cc3fdee 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index 6bb43f6e5..5b729c595 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index a824be58b..d4bacb3ba 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index f58079758..88e8600dc 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index 7a5aa7af7..f0fa67ef7 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 7d0307e69..c9145bf5e 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 82c8493f5..7c560a73a 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 156fe1071..09857e75e 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 421c6da6c..18427dc01 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index c21854559..1559bbda9 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index 8d09ab940..a92458a61 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index 07ab6238a..deff1ce46 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 8b9f67998..8234027ea 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index 0815330b4..4150ee826 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index 8c2ec013f..9d21573cb 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index 93ea92a45..8df904b3d 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index fe1609a3c..fd381c41c 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index d29105dc0..f5d008322 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index e67725b63..d09553606 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index 78e5fdc1b..68ce98c6c 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 924f170fe..731f03b18 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index 9c562722d..c9303005b 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index 1edf1bbd2..a6e0f3dbe 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index c56973205..44da9289c 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index ed2445790..b5c6a03e7 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index cf4493a88..32a97c6d6 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index 9a15d05c5..f704ad027 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index 43109e4ac..ec03b3663 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index f0e4efd8b..018b8059c 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 62231d310..89e9ff137 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index 7f56f2db7..9f4e63434 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index ec1a3823d..124229a17 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index 61ce6fa5c..21399db2a 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index 748bbeda7..7c707ca09 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index c235d4b80..3fbf71803 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index fc8800256..38c782304 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index e1e2d4603..cbc282026 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index dfc28cc3e..de627cd6d 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 825f4010a..7cef9096f 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index 6e8243dc7..5ac984613 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index d6dd5babe..429237d30 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index 67460dfdd..b092a1a75 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 330f40b17..198f5265d 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index e6ad40d23..5bb837d35 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index 7c399b2b2..cf9ac5de6 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index fdf07365b..a430604f2 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index 9edfe0688..a397df034 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index af9c1c843..6e8d1ef1b 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index 7f0865e30..cbcf53aeb 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index a53e488c8..557b035a3 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index 626c3bb87..2f0f195db 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index 28dbb8385..d36b752c1 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 28eda77cb..4438f34c2 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 8bde41996..55953b5fb 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index 96002ca68..a5118d874 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 371552ea4..bd3d79f78 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index aa2d6d47d..5e415caae 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 6d6a096e5..916b0e67b 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index c900d32b6..f0499e138 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index f82784d57..293e53d7a 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index b98b9ab56..4d857ead5 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index 065291251..f76785999 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 118aef1a7..bf7f4141d 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 12a63b156..714946065 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index 3c9e697ea..504e3aa07 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index 2f95e58cb..64eafd8e3 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index 32c6ff529..7b7260826 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index d850acc38..e38565a0d 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index c9b3738d4..0f343d157 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 6fe13882d..869dd34a8 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 79fbdd0f9..27b0d1dec 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index 773dd69d8..bf2337ecf 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 8a7dbba07..06bf48e56 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index c4ab9f2cb..b427d3055 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index 9e3898feb..72fc323f2 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index bbc4562c1..b88fe3f6c 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index a5c411ea8..8480882f7 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index 61a4cdc97..90362a37d 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index 2f382f69a..dc587ecd9 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 93a2dc7ab..88057c527 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index cd45e36a4..5afd7f78f 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index ad7241649..33e8c7985 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index 2e0028554..f71460601 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 88f45b3b8..3fffeb861 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index f8eb8cf24..78df195bd 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 084f36e51..5a73573a9 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index 0f0315347..1c1138a4f 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index f1f37d85f..47f3e2794 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index cedce4b60..8189764a0 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index 3e70244c0..a20352b7a 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 3fd2d25d5..7dc50d507 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index db8168d0b..ff7fbfa8c 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index 0c0ccf850..a526d49ec 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 7344fe110..6b1af3128 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index e3d8c92c3..da30b7c06 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index 171ac7c6d..e3942d124 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 402de1296..13b4a9186 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index fb245f22e..5c4e569ea 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index 2a054b8de..006c233ae 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index a2bfbe7d9..0d5d6240f 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 2ac045161..968212bfd 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index 8f76ed95f..f91e182d9 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 4023b2110..1db496b8c 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index 470d6457a..9b55aaeea 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index b37a0697a..09f468286 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 552e2e80e..6d7fafd1e 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 817e9d116..1145a409f 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 87e1fd5ca..98f350688 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index 1730d0383..48f1f511a 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 1ea53e2a3..3b400f57a 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index fe1edb016..b78201336 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 9a82a2a6e..79f0cd741 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index de71efcb7..90d8e1a00 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index 6831ec5f3..4b822c406 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index d92a66d7e..3098adb93 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index bf3acafb0..e3968a1f2 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index c4612649b..e9155aa85 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 9b3ef6a0f..7ae6e7eef 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index d34a22a47..323793c3a 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index 4ae0b651e..1bbd8ada6 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index a574b4bae..e578a3011 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 022f8ac99..7b87694c0 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index ae2212e2a..0fc3a0ed0 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 278bf71a9..4f5052fb1 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 518f869d6..fdc6c94a9 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index bb7de0947..faa979214 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index ee5ee8356..d2f57d154 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 07dd0d67f..2ce25cfa9 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index c8c04030a..0b793f47e 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 49d54d928..89096ac6e 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index bc06fe0ac..a0b1c5a92 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index f399e4178..49d4f47c3 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index 47c7d419f..c5ffdbcbb 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index e9d976c91..61682d22f 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 0ea3f2a60..3f07a535e 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 16e19373a..ee7968266 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index 5147a14aa..e0311419d 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index ef41a7398..be2871145 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index a3e29eeb1..0e09c8dc4 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index c4d02ed7d..48829628e 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index 1dd8ae2b5..424fcc21b 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index 624941e1a..e2c6c7e7c 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index 936bca914..1e7380474 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -1,3 +1,33 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.annotations;
 
 import java.util.ArrayList;
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 9f84217a6..8ca3a1ff8 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index 7282def79..d1a6ce84d 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 9d09d1a55..848eec71a 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index fc51b10f9..373558b38 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index fbeafade7..4f2b9bfdb 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index 597e5b378..cbcef610b 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index d56bc2cee..a6af80190 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/app/DefaultStatusServiceTest.java b/src/test/java/org/scijava/app/DefaultStatusServiceTest.java
index cfcbc81db..eca692637 100644
--- a/src/test/java/org/scijava/app/DefaultStatusServiceTest.java
+++ b/src/test/java/org/scijava/app/DefaultStatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index dd53d29d2..df8f1f565 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 73a68cbe2..30eb59989 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 3716c0ca2..07440ef33 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index 64bbf8d96..03e05e503 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 620e5ca04..18a3deed9 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index de75c9f3e..798796def 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index 17e02d96a..ed6ad0d81 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index 5897cf188..ceff9f097 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/BytesLocationTest.java b/src/test/java/org/scijava/io/BytesLocationTest.java
index c36de091e..67a0e9716 100644
--- a/src/test/java/org/scijava/io/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/DataHandleTest.java b/src/test/java/org/scijava/io/DataHandleTest.java
index decc7d29c..a9d0db06b 100644
--- a/src/test/java/org/scijava/io/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/DataHandleTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/FileHandleTest.java b/src/test/java/org/scijava/io/FileHandleTest.java
index d4ad153a2..89d8914f9 100644
--- a/src/test/java/org/scijava/io/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/FileHandleTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/FileLocationTest.java b/src/test/java/org/scijava/io/FileLocationTest.java
index 25b96d2bf..098cdaa54 100644
--- a/src/test/java/org/scijava/io/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/URILocationTest.java b/src/test/java/org/scijava/io/URILocationTest.java
index 7a30f154f..ccd9155ac 100644
--- a/src/test/java/org/scijava/io/URILocationTest.java
+++ b/src/test/java/org/scijava/io/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/URLLocationTest.java b/src/test/java/org/scijava/io/URLLocationTest.java
index 2e33b142b..69e85135e 100644
--- a/src/test/java/org/scijava/io/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 8373b065c..416069776 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index 0b46943c0..fd1382213 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index 92a149283..5e464c741 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 1d07c4b2c..0e8bf5a58 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index 5e65c34d6..a1276f915 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 06d44487f..6d6d33b62 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 62bfe212f..906915352 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 09519b591..9e59fc7e8 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 1ff650a78..04ffbd149 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 602be97c9..33510e5ec 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index c923ea4e9..c217544d8 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index 77717de58..00c0aa2d2 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index 167910ab7..4b3a8685f 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index d5626e993..122da260f 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index b87a4fb15..df64ad513 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index 2c49a15e1..60a249232 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 9ba7ae354..7629ddcd3 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 3bdcf2f45..1fe7f508d 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 23357838c..878ccfc1a 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index 76c4b986d..8634a5ca5 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index 235f1898d..bd21d71d3 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -1,9 +1,10 @@
 /*
  * #%L
- * SCIFIO library for reading and converting scientific file formats.
+ * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2011 - 2014 Board of Regents of the University of
- * Wisconsin-Madison
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index a52ff6d1e..713fe4f42 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index 763467633..2540fe5dd 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index f204cb080..f8ba039ea 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 72d036636..561e5d6c5 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 467663eec..89d73f52a 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 547f57c12..68d7ced59 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 20c74334f..f066f24ed 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index f68424b63..717f997a1 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index 88111372c..ad8d51c1a 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index e9eb4dd96..b5d62c5ce 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/GenericUtilsTest.java b/src/test/java/org/scijava/util/GenericUtilsTest.java
index 4fc3fceda..6b0a10939 100644
--- a/src/test/java/org/scijava/util/GenericUtilsTest.java
+++ b/src/test/java/org/scijava/util/GenericUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index 3b23dca8e..badb7112e 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 5d1001da9..c93cd1875 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index fc8b72671..c6f6e9237 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index 845834c7c..b7d651dc6 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index d44c18a02..e8ad4071c 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index cf64e82f7..fb985d03f 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index e5041ce85..1ee21a581 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index e0b595793..a24e9e90b 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index 830a531c1..f584fe72f 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%

From 2252e33a23f02ae145d1a19572b32c169928a37b Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 12 Feb 2016 12:11:11 -0600
Subject: [PATCH 0095/1208] RunArgument: don't run multithreaded

We do not want to run arguments in parallel. When a RunArgument returns
we want all work to be done so that cleanup can be performed.
---
 .../org/scijava/command/console/RunArgument.java     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index da6f38bfc..9a5e73c35 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -35,8 +35,11 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import org.scijava.command.CommandInfo;
+import org.scijava.command.CommandModule;
 import org.scijava.command.CommandService;
 import org.scijava.console.AbstractConsoleArgument;
 import org.scijava.console.ConsoleArgument;
@@ -106,7 +109,7 @@ private void run(final String commandToRun, final String optionString) {
 		final File scriptFile = new File(commandToRun);
 		if (scriptFile.exists() && scriptService.canHandleFile(commandToRun)) {
 			try {
-				scriptService.run(scriptFile, true, inputMap);
+				scriptService.run(scriptFile, true, inputMap).get();
 			} catch (final Exception exc) {
 				logService.error(exc);
 			}
@@ -129,7 +132,10 @@ private void run(final String commandToRun, final String optionString) {
 		// couldn't find anything to run
 		if (info == null) return;
 		// TODO: parse the optionString a la ImageJ1
-		commandService.run(info, true, inputMap);
+		try {
+			commandService.run(info, true, inputMap).get();
+		} catch (final Exception exc) {
+			logService.error(exc);
+		}
 	}
-
 }

From 7ea047d1d3926f1d8f5856f4a282d9a47295694f Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 12 Feb 2016 14:21:04 -0600
Subject: [PATCH 0096/1208] UIService: add headless methods

Add isHeadless and setHeadless methods to the UIService. These methods
delegate directly to the "java.awt.headless" system property.
---
 src/main/java/org/scijava/ui/DefaultUIService.java | 12 +++++++++++-
 src/main/java/org/scijava/ui/UIService.java        |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index fd381c41c..ebaaf00cd 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -203,6 +203,17 @@ public boolean isVisible(final String name) {
 		return ui.isVisible();
 	}
 
+
+	@Override
+	public void setHeadless(final boolean headless) {
+		System.setProperty("java.awt.headless", String.valueOf(headless));
+	}
+
+	@Override
+	public boolean isHeadless() {
+		return Boolean.getBoolean("java.awt.headless");
+	}
+
 	@Override
 	public UserInterface getDefaultUI() {
 		if (defaultUI != null) return defaultUI;
@@ -527,5 +538,4 @@ private void addUserInterface(final String name, final UserInterface ui) {
 	private String getTitle() {
 		return appService.getApp().getTitle();
 	}
-
 }
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index b5c6a03e7..1fe2bbd79 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -102,6 +102,12 @@ public interface UIService extends SciJavaService {
 	/** Gets whether the UI with the given name or class name is visible. */
 	boolean isVisible(String name);
 
+	/** Sets whether the application is running in headless mode (no UI). */
+	void setHeadless(boolean isHeadless);
+
+	/** Gets whether the UI is running in headless mode (no UI). */
+	boolean isHeadless();
+
 	/**
 	 * Gets the default user interface.
 	 * 

From 51b6e83463bd4e0186d404334b024ed356ba4040 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 12 Feb 2016 14:59:37 -0600
Subject: [PATCH 0097/1208] Extract handles logic to AbstractConsoleArgument

Argument implementations can now declare their minimum size and aliases
and let the abstract layer handle the bulk of the matching.
---
 .../scijava/command/console/RunArgument.java  | 16 ++++------
 .../console/AbstractConsoleArgument.java      | 32 +++++++++++++++++++
 .../console/SystemPropertyArgument.java       |  8 ++++-
 .../org/scijava/io/console/OpenArgument.java  | 14 ++++----
 .../scijava/main/console/MainArgument.java    | 16 +++++-----
 .../org/scijava/ui/console/UIArgument.java    | 13 ++++----
 .../scijava/console/ConsoleServiceTest.java   |  9 +++---
 7 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 9a5e73c35..e340d09fe 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -35,11 +35,8 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 import org.scijava.command.CommandInfo;
-import org.scijava.command.CommandModule;
 import org.scijava.command.CommandService;
 import org.scijava.console.AbstractConsoleArgument;
 import org.scijava.console.ConsoleArgument;
@@ -67,6 +64,12 @@ public class RunArgument extends AbstractConsoleArgument {
 	@Parameter
 	private LogService logService;
 
+	// -- Constructor --
+
+	public RunArgument() {
+		super(2, "--run");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -80,13 +83,6 @@ public void handle(final LinkedList<String> args) {
 		run(commandToRun, optionString);
 	}
 
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final LinkedList<String> args) {
-		return args != null && args.size() >= 2 && args.getFirst().equals("--run");
-	}
-
 	// -- Helper methods --
 
 	/** Implements the {@code --run} command line argument. */
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index f6806ab3d..0aa170e03 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -31,7 +31,9 @@
 
 package org.scijava.console;
 
+import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.Set;
 
 import org.scijava.plugin.AbstractHandlerPlugin;
 
@@ -43,13 +45,43 @@
 public abstract class AbstractConsoleArgument extends
 	AbstractHandlerPlugin<LinkedList<String>> implements ConsoleArgument
 {
+	private int numArgs;
+	private Set<String> aliasFlags;
+
+	public AbstractConsoleArgument() {
+		this(1, new String[0]);
+	}
+
+	public AbstractConsoleArgument(final String... aliases) {
+		this(1, aliases);
+	}
+	
+	public AbstractConsoleArgument(final int requiredArgs, final String... aliases) {
+		numArgs = requiredArgs;
+		aliasFlags = new HashSet<String>();
+		for (final String s : aliases) aliasFlags.add(s);
+	}
 
 	// -- Typed methods --
 
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		if (args == null || args.size() < numArgs) return false;
+		return isAlias(args);
+	}
+
 	@Override
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Class<LinkedList<String>> getType() {
 		return (Class) String.class;
 	}
 
+	/**
+	 * @return true if there are no aliases for this {@code ConsoleArgument}, or
+	 *         at least one alias matches the first argument in the provided
+	 *         list
+	 */
+	protected boolean isAlias(final LinkedList<String> args) {
+		return aliasFlags.isEmpty() || aliasFlags.contains(args.getFirst());
+	}
 }
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index 8202f8ce9..ad3b94bff 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -49,6 +49,12 @@ public class SystemPropertyArgument extends AbstractConsoleArgument {
 	private static final String SYS_PROP_REGEX = "-D([\\w\\._-]+)(=(.*))?";
 	private static final Pattern SYS_PROP_PAT = Pattern.compile(SYS_PROP_REGEX);
 
+	// -- Constructor --
+
+	public SystemPropertyArgument() {
+		super(1);
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -69,7 +75,7 @@ public void handle(final LinkedList<String> args) {
 
 	@Override
 	public boolean supports(final LinkedList<String> args) {
-		if (args == null || args.isEmpty()) return false;
+		if (!super.supports(args)) return false;
 		final String arg = args.getFirst();
 		if (!arg.startsWith("-D")) return false;
 		return SYS_PROP_PAT.matcher(arg).matches();
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 9b271ed4c..36a4668f1 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -59,6 +59,12 @@ public class OpenArgument extends AbstractConsoleArgument {
 	@Parameter
 	private LogService log;
 
+	// -- Constructor --
+
+	public OpenArgument() {
+		super(2, "--open");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -76,12 +82,4 @@ public void handle(final LinkedList<String> args) {
 			log.error(exc);
 		}
 	}
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final LinkedList<String> args) {
-		return args != null && args.size() >= 2 && args.getFirst().equals("--open");
-	}
-
 }
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 45551f2a9..152182ae9 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -57,6 +57,12 @@ public class MainArgument extends AbstractConsoleArgument {
 	@Parameter(required = false)
 	private LogService log;
 
+	// -- Constructor --
+
+	public MainArgument() {
+		super(2, "--main", "--main-class");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -67,7 +73,7 @@ public void handle(final LinkedList<String> args) {
 		final String className = args.removeFirst();
 
 		final List<String> argList = new ArrayList<String>();
-		while (!args.isEmpty() && !isMainFlag(args) && !isSeparator(args)) {
+		while (!args.isEmpty() && !isAlias(args) && !isSeparator(args)) {
 			argList.add(args.removeFirst());
 		}
 		if (isSeparator(args)) args.removeFirst(); // remove the -- separator
@@ -80,17 +86,11 @@ public void handle(final LinkedList<String> args) {
 
 	@Override
 	public boolean supports(final LinkedList<String> args) {
-		return mainService != null && isMainFlag(args);
+		return mainService != null && super.supports(args);
 	}
 
 	// -- Helper methods --
 
-	private boolean isMainFlag(final LinkedList<String> args) {
-		if (args == null || args.isEmpty()) return false;
-		final String arg = args.getFirst();
-		return arg.equals("--main") || arg.equals("--main-class");
-	}
-
 	private boolean isSeparator(final LinkedList<String> args) {
 		if (args == null || args.isEmpty()) return false;
 		return args.getFirst().equals("--");
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index 018b8059c..ca4611406 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -55,6 +55,12 @@ public class UIArgument extends AbstractConsoleArgument {
 	@Parameter
 	private LogService log;
 
+	// -- Constructor --
+
+	public UIArgument() {
+		super(2, "--ui");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -73,11 +79,4 @@ public void handle(final LinkedList<String> args) {
 			}
 	}
 
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final LinkedList<String> args) {
-		return args != null && args.size() >= 2 && args.getFirst().equals("--ui");
-	}
-
 }
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 07440ef33..992723f8d 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -208,6 +208,10 @@ private void assertOutputEvent(final Source source, final String output,
 	@Plugin(type = ConsoleArgument.class, priority = Priority.HIGH_PRIORITY)
 	public static class FooArgument extends AbstractConsoleArgument {
 
+		public FooArgument() {
+			super(1, "--foo");
+		}
+
 		private boolean argsHandled;
 
 		@Override
@@ -219,11 +223,6 @@ public void handle(final LinkedList<String> args) {
 			args.clear();
 			argsHandled = true;
 		}
-
-		@Override
-		public boolean supports(final LinkedList<String> args) {
-			return !args.isEmpty() && args.getFirst().equals("--foo");
-		}
 	}
 
 	private static class OutputTracker implements OutputListener {

From 17ccc397606a42a1279ccfc6896401d4b51513da Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 12 Feb 2016 12:12:24 -0600
Subject: [PATCH 0098/1208] Add HeadlessArgument

For dealing with the --headless flag
---
 .../org/scijava/console/HeadlessArgument.java | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 src/main/java/org/scijava/console/HeadlessArgument.java

diff --git a/src/main/java/org/scijava/console/HeadlessArgument.java b/src/main/java/org/scijava/console/HeadlessArgument.java
new file mode 100644
index 000000000..e075c9250
--- /dev/null
+++ b/src/main/java/org/scijava/console/HeadlessArgument.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.console;
+
+import java.util.LinkedList;
+
+import org.scijava.Context;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.ui.UIService;
+
+/**
+ * Handles the {@code --headless} argument to signal that no UI will be opened
+ * and the enclosing {@link Context} will not be used after the
+ * {@link ConsoleService} argument processing is complete.
+ *
+ * @author Mark Hiner hinerm at gmail.com
+ */
+@Plugin(type = ConsoleArgument.class)
+public class HeadlessArgument extends AbstractConsoleArgument {
+
+	@Parameter(required = false)
+	private UIService uiService;
+
+	// -- Constructor --
+
+	public HeadlessArgument() {
+		super(1, "--headless");
+	}
+
+	// -- ConsoleArgument methods --
+
+	@Override
+	public void handle(final LinkedList<String> args) {
+		if (!supports(args)) return;
+
+		args.removeFirst(); // --headless
+
+		uiService.setHeadless(true);
+	}
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		return uiService != null && super.supports(args);
+	}
+
+}

From ca551badaccd55aef8b7b13db425f49901c9c162 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 16 Feb 2016 07:55:34 -0600
Subject: [PATCH 0099/1208] Split RunArgument script logic to new class

RunArgument now handles commands exclusively, while RunScriptArgument
handles scripts.

Shared logic between these classes (input mapping) is moved to a
ConsoleUtils utility class.
---
 .../scijava/command/console/RunArgument.java  |  76 +++++------
 .../org/scijava/console/ConsoleUtils.java     |  66 ++++++++++
 .../script/console/RunScriptArgument.java     | 118 ++++++++++++++++++
 3 files changed, 218 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/org/scijava/console/ConsoleUtils.java
 create mode 100644 src/main/java/org/scijava/script/console/RunScriptArgument.java

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index e340d09fe..4d99e817a 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -31,8 +31,6 @@
 
 package org.scijava.command.console;
 
-import java.io.File;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
@@ -40,14 +38,14 @@
 import org.scijava.command.CommandService;
 import org.scijava.console.AbstractConsoleArgument;
 import org.scijava.console.ConsoleArgument;
+import org.scijava.console.ConsoleUtils;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.script.ScriptService;
 
 /**
  * Handles the {@code --run} command line argument.
- * 
+ *
  * @author Curtis Rueden
  * @author Johannes Schindelin
  * @author Mark Hiner hinerm at gmail.com
@@ -58,61 +56,63 @@ public class RunArgument extends AbstractConsoleArgument {
 	@Parameter
 	private CommandService commandService;
 
-	@Parameter
-	private ScriptService scriptService;
-
 	@Parameter
 	private LogService logService;
 
 	// -- Constructor --
 
 	public RunArgument() {
-		super(2, "--run");
+		super(2, "--run", "--class");
 	}
 
 	// -- ConsoleArgument methods --
 
 	@Override
 	public void handle(final LinkedList<String> args) {
-		if (!supports(args)) return;
+		if (!supports(args))
+			return;
 
 		args.removeFirst(); // --run
 		final String commandToRun = args.removeFirst();
-		final String optionString = args.isEmpty() ? "" : args.removeFirst();
+		final String paramString = args.isEmpty() ? "" : args.removeFirst();
 
-		run(commandToRun, optionString);
+		run(commandToRun, paramString);
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		if (!super.supports(args))
+			return false;
+		return getInfo(args.get(1)) != null;
 	}
 
 	// -- Helper methods --
 
 	/** Implements the {@code --run} command line argument. */
 	private void run(final String commandToRun, final String optionString) {
-		final Map<String, Object> inputMap = new HashMap<String, Object>();
-
-		if (!optionString.isEmpty()) {
-			final String[] pairs = optionString.split(",");
-			for (final String pair : pairs) {
-				final String[] split = pair.split("=");
-				if (split.length != 2) {
-					logService.error("Parameters must be formatted as a comma-separated list of key=value pairs");
-					return;
-				}
-				inputMap.put(split[0], split[1]);
-			}
-		}
+		// get the command info
+		final CommandInfo info = getInfo(commandToRun);
 
-		// first check if this is a script
-		final File scriptFile = new File(commandToRun);
-		if (scriptFile.exists() && scriptService.canHandleFile(commandToRun)) {
-			try {
-				scriptService.run(scriptFile, true, inputMap).get();
-			} catch (final Exception exc) {
-				logService.error(exc);
-			}
+		// couldn't find anything to run
+		if (info == null)
 			return;
+
+		// TODO: parse the optionString a la ImageJ1
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(optionString, logService);
+
+		try {
+			commandService.run(info, true, inputMap).get();
+		} catch (final Exception exc) {
+			logService.error(exc);
 		}
+	}
 
-		// Not a script, check if it's a command class
+	/**
+	 * Try to convert the given string to a {@link CommandInfo}
+	 */
+	private CommandInfo getInfo(final String commandToRun) {
 		CommandInfo info = commandService.getCommand(commandToRun);
 		if (info == null) {
 			// command was not a class name; search for command by title instead
@@ -124,14 +124,6 @@ private void run(final String commandToRun, final String optionString) {
 				}
 			}
 		}
-
-		// couldn't find anything to run
-		if (info == null) return;
-		// TODO: parse the optionString a la ImageJ1
-		try {
-			commandService.run(info, true, inputMap).get();
-		} catch (final Exception exc) {
-			logService.error(exc);
-		}
+		return info;
 	}
 }
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
new file mode 100644
index 000000000..74a75c6f1
--- /dev/null
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.console;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.scijava.log.LogService;
+
+/**
+ * Helper class for {@link ConsoleArgument}s.
+ *
+ * @author Mark Hiner hinerm at gmail.com
+ */
+public final class ConsoleUtils {
+
+	public static Map<String, Object> parseParameterString(final String parameterString) {
+		return parseParameterString(parameterString, null);
+	}
+
+	public static Map<String, Object> parseParameterString(final String parameterString, final LogService logService) {
+		final Map<String, Object> inputMap = new HashMap<String, Object>();
+
+		if (!parameterString.isEmpty()) {
+			final String[] pairs = parameterString.split(",");
+			for (final String pair : pairs) {
+				final String[] split = pair.split("=");
+				if (split.length == 2)
+					inputMap.put(split[0], split[1]);
+				else if (logService != null)
+					logService.error("Parameters must be formatted as a comma-separated list of key=value pairs");
+
+			}
+		}
+
+		return inputMap;
+	}
+}
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
new file mode 100644
index 000000000..e8427a67a
--- /dev/null
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -0,0 +1,118 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.script.console;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.Map;
+
+import org.scijava.console.AbstractConsoleArgument;
+import org.scijava.console.ConsoleArgument;
+import org.scijava.console.ConsoleUtils;
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.script.ScriptService;
+
+/**
+ * {@link ConsoleArgument} for executing scripts directly.
+ *
+ * @author Mark Hiner hinerm at gmail.com
+ */
+@Plugin(type = ConsoleArgument.class)
+public class RunScriptArgument extends AbstractConsoleArgument {
+
+	@Parameter
+	private ScriptService scriptService;
+
+	@Parameter
+	private LogService logService;
+
+	// -- Constructor --
+
+	public RunScriptArgument() {
+		super(2, "--run", "--script");
+	}
+
+	// -- ConsoleArgument methods --
+
+	@Override
+	public void handle(final LinkedList<String> args) {
+		if (!supports(args))
+			return;
+
+		args.removeFirst(); // --run
+		final String scriptToRun = args.removeFirst();
+		final String paramString = args.isEmpty() ? "" : args.removeFirst();
+
+		run(scriptToRun, paramString);
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		if (!super.supports(args))
+			return false;
+		return getScript(args.get(1)) != null;
+	}
+
+	// -- Helper methods --
+
+	/**
+	 * Run the script
+	 */
+	private void run(final String scriptToRun, final String paramString) {
+		final File script = getScript(scriptToRun);
+
+		// couldn't find anything to run
+		if (script == null)
+			return;
+
+		// TODO: parse the optionString a la ImageJ1
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(paramString, logService);
+
+		try {
+			scriptService.run(script, true, inputMap).get();
+		} catch (final Exception exc) {
+			logService.error(exc);
+		}
+	}
+
+	/**
+	 * Try to convert the given string to a {@link File} representing a
+	 * supported script type.
+	 */
+	private File getScript(final String string) {
+		final File scriptFile = new File(string);
+		return scriptFile.exists() && scriptService.canHandleFile(scriptFile) ? scriptFile : null;
+	}
+}

From 88775ec6af71a0c6e7dd9a9027b5f5c971e0f917 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 16 Feb 2016 08:45:33 -0600
Subject: [PATCH 0100/1208] ScriptService: getScript now creates the script

To avoid a proliferation of case logic and repeated creation code,
ScriptService needs public API that retrieves a cached script and
creates it if it doesn't exist.

It is not necessary to have both a lookup-only and a lookup-and-create
method: if an API consumer wants to check the existence of a ScriptInfo,
the containing Collection is accessible.

Thus getScript now simply creates the ScriptInfo if it does not already
exist.
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 4 ++--
 src/main/java/org/scijava/script/ScriptService.java        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 1883a960a..376ff22ae 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -169,7 +169,7 @@ public Collection<ScriptInfo> getScripts() {
 
 	@Override
 	public ScriptInfo getScript(final File scriptFile) {
-		return scripts().get(scriptFile);
+		return getOrCreate(scriptFile);
 	}
 
 	@Override
@@ -455,7 +455,7 @@ private void addAliases(final HashMap<String, Class<?>> map,
 	 * are registered with the service.
 	 */
 	private ScriptInfo getOrCreate(final File file) {
-		final ScriptInfo info = getScript(file);
+		final ScriptInfo info = scripts().get(file);
 		if (info != null) return info;
 		return new ScriptInfo(getContext(), file);
 	}
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 629d28fb3..a9f1f470e 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -117,8 +117,8 @@ public interface ScriptService extends SingletonService<ScriptLanguage>,
 	Collection<ScriptInfo> getScripts();
 
 	/**
-	 * Gets the {@link ScriptInfo} metadata for the script at the given file, or
-	 * null if none.
+	 * Gets the cached {@link ScriptInfo} metadata for the script at the given
+	 * file, creating it if it does not already exist.
 	 */
 	ScriptInfo getScript(File scriptFile);
 

From 1cf0e296b08495d8634e6148fa91ba6f3c30ca0e Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 16 Feb 2016 08:50:11 -0600
Subject: [PATCH 0101/1208] ConsoleUtils: attempt to match singleton params

It is not practical to require users to know the names of script
parameters to call the script.

If script params are mapped with =, great. If not, we can try to match
them with the parameters of the script.

NB: this requires that script parameters be written in a reasonable
ordering, such that user-supplied params come before system-supplied
params.
---
 .../scijava/command/console/RunArgument.java  |  2 +-
 .../org/scijava/console/ConsoleUtils.java     | 22 ++++++++++++++++++-
 .../script/console/RunScriptArgument.java     |  8 ++++---
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 4d99e817a..6d44e8b88 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -100,7 +100,7 @@ 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, logService);
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(optionString, info, logService);
 
 		try {
 			commandService.run(info, true, inputMap).get();
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 74a75c6f1..3e1557fef 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -31,9 +31,13 @@
 package org.scijava.console;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
+import org.scijava.command.CommandInfo;
 import org.scijava.log.LogService;
+import org.scijava.module.ModuleInfo;
+import org.scijava.module.ModuleItem;
 
 /**
  * Helper class for {@link ConsoleArgument}s.
@@ -43,18 +47,33 @@
 public final class ConsoleUtils {
 
 	public static Map<String, Object> parseParameterString(final String parameterString) {
-		return parseParameterString(parameterString, null);
+		return parseParameterString(parameterString, (CommandInfo)null);
+	}
+
+	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info) {
+		return parseParameterString(parameterString, info, null);
 	}
 
 	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 ModuleInfo info, final LogService logService) {
 		final Map<String, Object> inputMap = new HashMap<String, Object>();
 
 		if (!parameterString.isEmpty()) {
+			Iterator<ModuleItem<?>> inputs = null;
+			if (info != null) {
+				inputs = info.inputs().iterator();
+			}
 			final String[] pairs = parameterString.split(",");
 			for (final String pair : pairs) {
 				final String[] split = pair.split("=");
 				if (split.length == 2)
 					inputMap.put(split[0], split[1]);
+				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");
 
@@ -62,5 +81,6 @@ else if (logService != null)
 		}
 
 		return inputMap;
+
 	}
 }
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index e8427a67a..5b12156d3 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -40,6 +40,7 @@
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.script.ScriptInfo;
 import org.scijava.script.ScriptService;
 
 /**
@@ -97,11 +98,12 @@ private void run(final String scriptToRun, final String paramString) {
 		if (script == null)
 			return;
 
-		// TODO: parse the optionString a la ImageJ1
-		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(paramString, logService);
+		final ScriptInfo info = scriptService.getScript(script);
+
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(paramString, info, logService);
 
 		try {
-			scriptService.run(script, true, inputMap).get();
+			scriptService.run(info, true, inputMap).get();
 		} catch (final Exception exc) {
 			logService.error(exc);
 		}

From 6913c42c138f7d9556215ba5f1c4f9a29f95b885 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 16 Feb 2016 09:40:02 -0600
Subject: [PATCH 0102/1208] DisplayPostprocessor: set name if creating display

The Display name is not guaranteed to be null by default: it is up to
the implementation of each DisplayPlugin. A common case is that the
default name will come back as "Untitled-#" if not specified, which will
then supercede the requested output name.

To avoid this, the DisplayPostprocessor should always pass the default
name when creating a display.
---
 src/main/java/org/scijava/display/DisplayPostprocessor.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 092122db3..986a3a458 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -113,13 +113,9 @@ private void handleOutput(final String defaultName, final Object output) {
 			}
 			else {
 				// create a new display for the output
-				final Display<?> display = displayService.createDisplay(output);
+				final Display<?> display = displayService.createDisplay(defaultName, output);
 				if (display != null) {
 					displays.add(display);
-					if (display.getName() == null) {
-						// set a default name based on the parameter
-						display.setName(defaultName);
-					}
 				}
 			}
 		}

From 92a9a94391e82b229e0b661d5fd13a80dc56a4db Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 16 Feb 2016 14:58:24 -0600
Subject: [PATCH 0103/1208] SciJavaPlugin: list more plugin types in the doc

---
 src/main/java/org/scijava/plugin/SciJavaPlugin.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index d1f8c22c2..001094ba6 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -45,8 +45,11 @@
  * <li>{@link org.scijava.command.Command} - plugins that are executable. These
  * plugins typically perform a discrete operation, and are accessible via the
  * application menus.</li>
+ * <li>{@link org.scijava.console.ConsoleArgument} - plugins that handle
+ * arguments passed to the application as command line parameters.</li>
  * <li>{@link org.scijava.display.Display} - plugins that visualize objects,
  * often used to display module outputs.</li>
+ * <li>{@link org.scijava.io.IOPlugin} - plugins that read or write data.</li>
  * <li>{@link org.scijava.module.process.PreprocessorPlugin} - plugins that
  * perform preprocessing on modules. A preprocessor plugin is a discoverable
  * {@link org.scijava.module.process.ModulePreprocessor}.</li>
@@ -56,6 +59,8 @@
  * {@link org.scijava.module.process.ModulePostprocessor}.</li>
  * <li>{@link org.scijava.platform.Platform} - plugins for defining
  * platform-specific behavior.</li>
+ * <li>{@link org.scijava.script.ScriptLanguage} - plugins that enable executing
+ * scripts in particular languages as SciJava modules.</li>
  * <li>{@link org.scijava.service.Service} - plugins that define new API in a
  * particular area.</li>
  * <li>{@link org.scijava.tool.Tool} - plugins that map user input (e.g.,

From 240903732374730f5258bdc5ca882a44dc1ca131 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 16 Feb 2016 11:11:19 -0600
Subject: [PATCH 0104/1208] Revert "DisplayPostprocessor: set name if creating
 display"

This reverts commit 6913c42c138f7d9556215ba5f1c4f9a29f95b885, which was
attempting to a fix a bug actually determined to be in imagej-common.

See
https://github.com/imagej/imagej-common/commit/c3cf15ad8449e07ae42516f7c35025b0f6e595a0
---
 src/main/java/org/scijava/display/DisplayPostprocessor.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 986a3a458..092122db3 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -113,9 +113,13 @@ private void handleOutput(final String defaultName, final Object output) {
 			}
 			else {
 				// create a new display for the output
-				final Display<?> display = displayService.createDisplay(defaultName, output);
+				final Display<?> display = displayService.createDisplay(output);
 				if (display != null) {
 					displays.add(display);
+					if (display.getName() == null) {
+						// set a default name based on the parameter
+						display.setName(defaultName);
+					}
 				}
 			}
 		}

From 4e876d6b99529a51c2c8199ac72c168a10010d1d Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 17 Feb 2016 12:04:30 -0600
Subject: [PATCH 0105/1208] ConvertService: update getCompatibleInputs docs

Add javadoc and move out of deprecated section
---
 src/main/java/org/scijava/convert/ConvertService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 555a270bd..b678007ff 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -83,6 +83,12 @@ public interface ConvertService extends
 	 */
 	boolean supports(Object src, Type dest);
 
+	/**
+	 * @return A collection of instances that could be converted to the
+	 *         specified class.
+	 */
+	Collection<Object> getCompatibleInputs(Class<?> dest);
+
 	// -- Deprecated API --
 
 	/**
@@ -112,6 +118,4 @@ public interface ConvertService extends
 	 */
 	@Deprecated
 	boolean supports(Class<?> src, Type dest);
-
-	Collection<Object> getCompatibleInputs(Class<?> dest);
 }

From 60a94572e8b08dbc1ec7833bdb38497013d88220 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 17 Feb 2016 12:22:49 -0600
Subject: [PATCH 0106/1208] ConvertService: add getCompatibleClasses methods

For obtaining collections of compatible input and output classes.
---
 .../convert/AbstractConvertService.java       | 34 +++++++++++++++++++
 .../org/scijava/convert/ConvertService.java   | 12 +++++++
 2 files changed, 46 insertions(+)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 3f9a37ef9..e626097b7 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -32,6 +32,9 @@
 package org.scijava.convert;
 
 import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.scijava.plugin.AbstractHandlerService;
 import org.scijava.util.ConversionUtils;
@@ -68,10 +71,41 @@ public Object convert(ConversionRequest request) {
 		return handler == null ? null : handler.convert(request);
 	}
 
+	@Override
+	public Collection<Class<?>> getCompatibleInputClasses(Class<?> dest) {
+		Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
+
+		for (Converter<?, ?> converter : getInstances()) {
+			addIfMatches(dest, converter.getOutputType(), converter.getInputType(), compatibleClasses);
+		}
+
+		return compatibleClasses;
+	}
+
+	@Override
+	public Collection<Class<?>> getCompatibleOutputClasses(Class<?> source) {
+		Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
+
+		for (Converter<?, ?> converter : getInstances()) {
+			addIfMatches(source, converter.getInputType(), converter.getOutputType(), compatibleClasses);
+		}
+
+		return compatibleClasses;
+	}
+
 	// -- Service methods --
 
 	@Override
 	public void initialize() {
 		ConversionUtils.setDelegateService(this, getPriority());
 	}
+
+	// -- Helper methods --
+
+	/**
+	 * Test two classes; if they match, a third class is added to the provided set of classes.
+	 */
+	private void addIfMatches(Class<?> c1, Class<?> c2, Class<?> toAdd, Set<Class<?>> classes) {
+		if (c1 == c2) classes.add(toAdd);
+	}
 }
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index b678007ff..adb219061 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -89,6 +89,18 @@ public interface ConvertService extends
 	 */
 	Collection<Object> getCompatibleInputs(Class<?> dest);
 
+	/**
+	 * @return A collection of all classes that could potentially be converted
+	 *         <b>to</b> the specified class.
+	 */
+	Collection<Class<?>> getCompatibleInputClasses(Class<?> dest);
+
+	/**
+	 * @return A collection of all classes that could potentially be converted
+	 *         <b>from</b> the specified class.
+	 */
+	Collection<Class<?>> getCompatibleOutputClasses(Class<?> dest);
+
 	// -- Deprecated API --
 
 	/**

From 4ecbb8d147785fb050298841fa0fd42332cd792d Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 17 Feb 2016 12:24:21 -0600
Subject: [PATCH 0107/1208] Move implementations to AbstractConvertService

There was no logic that needed to be specified outside an Abstract
layer.
---
 .../convert/AbstractConvertService.java       | 65 +++++++++++++++++
 .../convert/DefaultConvertService.java        | 73 +------------------
 2 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index e626097b7..01fef9974 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -32,8 +32,10 @@
 package org.scijava.convert;
 
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.scijava.plugin.AbstractHandlerService;
@@ -51,6 +53,69 @@ public abstract class AbstractConvertService extends
 {
 
 	// -- ConversionService methods --
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public Class<Converter<?, ?>> getPluginType() {
+		return (Class)Converter.class;
+	}
+
+	@Override
+	public Class<ConversionRequest> getType() {
+		return ConversionRequest.class;
+	}
+
+	@Override
+	public Converter<?, ?> getHandler(final Object src, final Class<?> dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public Converter<?, ?> getHandler(final Class<?> src, final Class<?> dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public Converter<?, ?> getHandler(final Object src, final Type dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public Converter<?, ?> getHandler(final Class<?> src, final Type dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public boolean supports(final Object src, final Class<?> dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public boolean supports(final Class<?> src, final Class<?> dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public boolean supports(final Object src, final Type dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public boolean supports(final Class<?> src, final Type dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
+
+	@Override
+	public Collection<Object> getCompatibleInputs(Class<?> dest) {
+		Set<Object> objects = new LinkedHashSet<Object>();
+
+		for (final Converter<?, ?> c : getInstances()) {
+			if (dest.isAssignableFrom(c.getOutputType())) {
+				c.populateInputCandidates(objects);
+			}
+		}
+
+		return new ArrayList<Object>(objects);
+	}
 
 	@Override
 	public Object convert(Object src, Type dest) {
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index 1f2318a95..6249432c7 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -31,12 +31,6 @@
 
 package org.scijava.convert;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
 
@@ -48,70 +42,5 @@
 @Plugin(type = Service.class)
 public class DefaultConvertService extends AbstractConvertService
 {
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public Class<Converter<?, ?>> getPluginType() {
-		return (Class)Converter.class;
-	}
-
-	@Override
-	public Class<ConversionRequest> getType() {
-		return ConversionRequest.class;
-	}
-
-	// -- ConversionService methods --
-
-	@Override
-	public Converter<?, ?> getHandler(final Object src, final Class<?> dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Converter<?, ?> getHandler(final Class<?> src, final Class<?> dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Converter<?, ?> getHandler(final Object src, final Type dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Converter<?, ?> getHandler(final Class<?> src, final Type dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Object src, final Class<?> dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Class<?> src, final Class<?> dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Object src, final Type dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Class<?> src, final Type dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Collection<Object> getCompatibleInputs(Class<?> dest) {
-		Set<Object> objects = new LinkedHashSet<Object>();
-
-		for (final Converter<?, ?> c : getInstances()) {
-			if (dest.isAssignableFrom(c.getOutputType())) {
-				c.populateInputCandidates(objects);
-			}
-		}
-
-		return new ArrayList<Object>(objects);
-	}
+	// Trivial implementation
 }

From 1e100de55aeecf64f821d2d8fc2de4c7316c2f30 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 17 Feb 2016 12:25:30 -0600
Subject: [PATCH 0108/1208] Remove convoluted getCompatibleInputs logic

Given this method has a return type of Collection, there is no need to
use an ordered set or to then build that set into a list.
---
 src/main/java/org/scijava/convert/AbstractConvertService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 01fef9974..15adab229 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -106,7 +106,7 @@ public boolean supports(final Class<?> src, final Type dest) {
 
 	@Override
 	public Collection<Object> getCompatibleInputs(Class<?> dest) {
-		Set<Object> objects = new LinkedHashSet<Object>();
+		Set<Object> objects = new HashSet<Object>();
 
 		for (final Converter<?, ?> c : getInstances()) {
 			if (dest.isAssignableFrom(c.getOutputType())) {
@@ -114,7 +114,7 @@ public Collection<Object> getCompatibleInputs(Class<?> dest) {
 			}
 		}
 
-		return new ArrayList<Object>(objects);
+		return objects;
 	}
 
 	@Override

From 284e1be5bee581eec5adaa703a05d63ca99ace2f Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 17 Feb 2016 12:27:34 -0600
Subject: [PATCH 0109/1208] AbstractConvertService: apply code template

---
 .../convert/AbstractConvertService.java       | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 15adab229..3db4ba433 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -32,31 +32,27 @@
 package org.scijava.convert;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.scijava.plugin.AbstractHandlerService;
 import org.scijava.util.ConversionUtils;
 
 /**
- * Abstract superclass for {@link ConvertService} implementations. Sets
- * this service as the active delegate service in {@link ConversionUtils}.
+ * Abstract superclass for {@link ConvertService} implementations. Sets this
+ * service as the active delegate service in {@link ConversionUtils}.
  *
  * @author Mark Hiner
  */
-public abstract class AbstractConvertService extends
-	AbstractHandlerService<ConversionRequest, Converter<?, ?>> implements
-	ConvertService
-{
+public abstract class AbstractConvertService extends AbstractHandlerService<ConversionRequest, Converter<?, ?>>
+		implements ConvertService {
 
 	// -- ConversionService methods --
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public Class<Converter<?, ?>> getPluginType() {
-		return (Class)Converter.class;
+		return (Class) Converter.class;
 	}
 
 	@Override
@@ -105,8 +101,8 @@ public boolean supports(final Class<?> src, final Type dest) {
 	}
 
 	@Override
-	public Collection<Object> getCompatibleInputs(Class<?> dest) {
-		Set<Object> objects = new HashSet<Object>();
+	public Collection<Object> getCompatibleInputs(final Class<?> dest) {
+		final Set<Object> objects = new HashSet<Object>();
 
 		for (final Converter<?, ?> c : getInstances()) {
 			if (dest.isAssignableFrom(c.getOutputType())) {
@@ -118,29 +114,29 @@ public Collection<Object> getCompatibleInputs(Class<?> dest) {
 	}
 
 	@Override
-	public Object convert(Object src, Type dest) {
+	public Object convert(final Object src, final Type dest) {
 		return convert(new ConversionRequest(src, dest));
 	}
 
 	@Override
-	public <T> T convert(Object src, Class<T> dest) {
+	public <T> T convert(final Object src, final Class<T> dest) {
 		// NB: repeated code with convert(ConversionRequest), because the
 		// handler's convert method respects the T provided
-		Converter<?, ?> handler = getHandler(src, dest);
+		final Converter<?, ?> handler = getHandler(src, dest);
 		return handler == null ? null : handler.convert(src, dest);
 	}
 
 	@Override
-	public Object convert(ConversionRequest request) {
-		Converter<?, ?> handler = getHandler(request);
+	public Object convert(final ConversionRequest request) {
+		final Converter<?, ?> handler = getHandler(request);
 		return handler == null ? null : handler.convert(request);
 	}
 
 	@Override
-	public Collection<Class<?>> getCompatibleInputClasses(Class<?> dest) {
-		Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
+	public Collection<Class<?>> getCompatibleInputClasses(final Class<?> dest) {
+		final Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
 
-		for (Converter<?, ?> converter : getInstances()) {
+		for (final Converter<?, ?> converter : getInstances()) {
 			addIfMatches(dest, converter.getOutputType(), converter.getInputType(), compatibleClasses);
 		}
 
@@ -148,10 +144,10 @@ public Collection<Class<?>> getCompatibleInputClasses(Class<?> dest) {
 	}
 
 	@Override
-	public Collection<Class<?>> getCompatibleOutputClasses(Class<?> source) {
-		Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
+	public Collection<Class<?>> getCompatibleOutputClasses(final Class<?> source) {
+		final Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
 
-		for (Converter<?, ?> converter : getInstances()) {
+		for (final Converter<?, ?> converter : getInstances()) {
 			addIfMatches(source, converter.getInputType(), converter.getOutputType(), compatibleClasses);
 		}
 
@@ -168,9 +164,11 @@ public void initialize() {
 	// -- Helper methods --
 
 	/**
-	 * Test two classes; if they match, a third class is added to the provided set of classes.
+	 * Test two classes; if they match, a third class is added to the provided
+	 * set of classes.
 	 */
-	private void addIfMatches(Class<?> c1, Class<?> c2, Class<?> toAdd, Set<Class<?>> classes) {
-		if (c1 == c2) classes.add(toAdd);
+	private void addIfMatches(final Class<?> c1, final Class<?> c2, final Class<?> toAdd, final Set<Class<?>> classes) {
+		if (c1 == c2)
+			classes.add(toAdd);
 	}
 }

From 6c2b116b3fb5f1925b6d0ac90884731e12be1e7b Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 17 Feb 2016 12:47:37 -0600
Subject: [PATCH 0110/1208] ModuleService: getSingleIn/Output for classes

Add getSingleInput and getSingleOutput methods that can take a
collection of classes to match. If there is a single unresolved input
that matches any of these classes it will be identified.

This enables generalized preprocessors that may want to handle multiple
classes with similar logic (e.g. classes that can be easily converted).
---
 .../scijava/module/DefaultModuleService.java  | 45 +++++++++++++++----
 .../org/scijava/module/ModuleService.java     | 12 +++++
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 2bd74928f..0b6c619d8 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -33,8 +33,10 @@
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -252,14 +254,24 @@ public <M extends Module> M waitFor(final Future<M> future) {
 	public <T> ModuleItem<T> getSingleInput(final Module module,
 		final Class<T> type)
 	{
-		return getSingleItem(module, type, module.getInfo().inputs());
+		return getTypedSingleItem(module, type, module.getInfo().inputs());
 	}
 
 	@Override
 	public <T> ModuleItem<T> getSingleOutput(final Module module,
 		final Class<T> type)
 	{
-		return getSingleItem(module, type, module.getInfo().outputs());
+		return getTypedSingleItem(module, type, module.getInfo().outputs());
+	}
+
+	@Override
+	public ModuleItem<?> getSingleInput(Module module, Collection<Class<?>> types) {
+		return getSingleItem(module, types, module.getInfo().inputs());
+	}
+
+	@Override
+	public ModuleItem<?> getSingleOutput(Module module, Collection<Class<?>> types) {
+		return getSingleItem(module, types, module.getInfo().outputs());
 	}
 
 	@Override
@@ -431,20 +443,35 @@ private void assignInputs(final Module module,
 		}
 	}
 
-	private <T> ModuleItem<T> getSingleItem(final Module module,
+	private <T> ModuleItem<T> getTypedSingleItem(final Module module,
 		final Class<T> type, final Iterable<ModuleItem<?>> items)
 	{
-		ModuleItem<T> result = null;
+		Set<Class<?>> types = new HashSet<Class<?>>();
+		types.add(type);
+		@SuppressWarnings("unchecked")
+		ModuleItem<T> result = (ModuleItem<T>) getSingleItem(module, types, items);
+		return result;
+	}
+
+	private ModuleItem<?> getSingleItem(final Module module,
+		final Collection<Class<?>> types, final Iterable<ModuleItem<?>> items)
+	{
+		ModuleItem<?> result = null;
+
 		for (final ModuleItem<?> item : items) {
 			final String name = item.getName();
 			final boolean resolved = module.isResolved(name);
 			if (resolved) continue; // skip resolved inputs
 			if (!item.isAutoFill()) continue; // skip unfillable inputs
-			if (!type.isAssignableFrom(item.getType())) continue;
-			if (result != null) return null; // multiple matching items
-			@SuppressWarnings("unchecked")
-			final ModuleItem<T> typedItem = (ModuleItem<T>) item;
-			result = typedItem;
+			final Class<?> itemType = item.getType();
+			for (final Class<?> type : types) {
+				if (type.isAssignableFrom(itemType)) {
+					if (result != null) return null; // multiple matching module items
+					result = item;
+					// This module item matches, so no need to check more classes.
+					break;
+				}
+			}
 		}
 		return result;
 	}
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index e49850715..21ee456cc 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -274,6 +274,18 @@ <M extends Module> Future<M> run(M module,
 	 */
 	<T> ModuleItem<T> getSingleOutput(Module module, Class<T> type);
 
+	/**
+	 * As {@link #getSingleInput(Module, Class)} but will match with a set of
+	 * potential classes, at the cost of generic parameter safety.
+	 */
+	ModuleItem<?> getSingleInput(Module module, Collection<Class<?>> types);
+
+	/**
+	 * As {@link #getSingleOutput(Module, Class)} but will match with a set of
+	 * potential classes, at the cost of generic parameter safety.
+	 */
+	ModuleItem<?> getSingleOutput(Module module, Collection<Class<?>> types);
+
 	/**
 	 * Registers the given value for the given {@link ModuleItem} using the
 	 * {@link PrefService}.

From d0d30ef39723aa428cbd9b8287273454e07e6851 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 Feb 2016 11:38:14 -0600
Subject: [PATCH 0111/1208] SciJavaPlugin: add Converter to plugin types list

---
 src/main/java/org/scijava/plugin/SciJavaPlugin.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 001094ba6..86d906c67 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -47,6 +47,8 @@
  * application menus.</li>
  * <li>{@link org.scijava.console.ConsoleArgument} - plugins that handle
  * arguments passed to the application as command line parameters.</li>
+ * <li>{@link org.scijava.convert.Converter} - plugins which translate objects
+ * between data types.</li>
  * <li>{@link org.scijava.display.Display} - plugins that visualize objects,
  * often used to display module outputs.</li>
  * <li>{@link org.scijava.io.IOPlugin} - plugins that read or write data.</li>

From 04755c9b17035c0b8c3674c39f15c87eb15e97b4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Feb 2016 13:50:38 -0600
Subject: [PATCH 0112/1208] Gateway: add missing UIService accessor

---
 src/main/java/org/scijava/AbstractGateway.java | 6 ++++++
 src/main/java/org/scijava/Gateway.java         | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 603e6a7a4..d09dfd936 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -61,6 +61,7 @@
 import org.scijava.thread.ThreadService;
 import org.scijava.tool.IconService;
 import org.scijava.tool.ToolService;
+import org.scijava.ui.UIService;
 import org.scijava.widget.WidgetService;
 
 /**
@@ -233,6 +234,11 @@ public ToolService tool() {
 		return get(ToolService.class);
 	}
 
+	@Override
+	public UIService ui() {
+		return get(UIService.class);
+	}
+
 	@Override
 	public WidgetService widget() {
 		return get(WidgetService.class);
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index a034682dd..73df53a5a 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -59,6 +59,7 @@
 import org.scijava.thread.ThreadService;
 import org.scijava.tool.IconService;
 import org.scijava.tool.ToolService;
+import org.scijava.ui.UIService;
 import org.scijava.widget.WidgetService;
 
 /**
@@ -318,6 +319,13 @@ public interface Gateway extends RichPlugin, Versioned {
 	 */
 	ToolService tool();
 
+	/**
+	 * Gets this application context's {@link UIService}.
+	 *
+	 * @return The {@link UIService} of this application context.
+	 */
+	UIService ui();
+
 	/**
 	 * Gets this application context's {@link WidgetService}.
 	 *

From 28a2ab40b38517e0e8977a5860be1976fd7b59cc Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 23 Apr 2015 11:08:09 -0500
Subject: [PATCH 0113/1208] Add new converters for primitive numerical types

---
 .../org/scijava/convert/NumberConverters.java | 173 ++++++++++++++++++
 .../convert/NumberToBigDecimalConverter.java  |  62 +++++++
 .../convert/NumberToBigIntegerConverter.java  |  53 ++++++
 .../convert/NumberToDoubleConverter.java      |  51 ++++++
 .../convert/NumberToFloatConverter.java       |  51 ++++++
 .../convert/NumberToIntegerConverter.java     |  51 ++++++
 .../convert/NumberToLongConverter.java        |  51 ++++++
 .../convert/NumberToNumberConverter.java      |  64 +++++++
 .../convert/NumberToShortConverter.java       |  51 ++++++
 9 files changed, 607 insertions(+)
 create mode 100644 src/main/java/org/scijava/convert/NumberConverters.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToDoubleConverter.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToFloatConverter.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToIntegerConverter.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToLongConverter.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToNumberConverter.java
 create mode 100644 src/main/java/org/scijava/convert/NumberToShortConverter.java

diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
new file mode 100644
index 000000000..c8dc7412c
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -0,0 +1,173 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigInteger;
+
+import org.scijava.plugin.Plugin;
+
+/**
+ * Converter plugins that convert from primitive numeric types to other
+ * primitive numeric types.
+ *
+ * @author Alison Walter
+ */
+public final class NumberConverters {
+
+	private NumberConverters() {
+		// prevent instantiation of container class
+	}
+	
+	//convert to short 
+	@Plugin(type = Converter.class)
+	public static class ByteToShortConverter extends NumberToShortConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+	
+	//convert to int
+	@Plugin(type = Converter.class)
+	public static class ByteToIntegerConverter extends NumberToIntegerConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+	
+	@Plugin(type = Converter.class)
+	public static class ShortToIntegerConverter extends NumberToIntegerConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+	
+	//convert to long
+	@Plugin(type = Converter.class)
+	public static class ByteToLongConverter extends NumberToLongConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+	
+	@Plugin(type = Converter.class)
+	public static class ShortToLongConverter extends NumberToLongConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+	
+	@Plugin(type = Converter.class)
+	public static class IntegerToLongConverter extends NumberToLongConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+	
+	//convert to float
+	@Plugin(type = Converter.class)
+	public static class ByteToFloatConverter extends NumberToFloatConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+	
+	@Plugin(type = Converter.class)
+	public static class ShortToFloatConverter extends NumberToFloatConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	
+	//convert to double
+	@Plugin(type = Converter.class)
+	public static class ByteToDoubleConverter extends NumberToDoubleConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToDoubleConverter extends NumberToDoubleConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class IntegerToDoubleConverter extends NumberToDoubleConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class FloatToDoubleConverter extends NumberToDoubleConverter<Float> {
+		@Override public Class<Float> getInputType() { return Float.class; }
+	}
+	
+	//convert to BigInteger
+	@Plugin(type = Converter.class)
+	public static class ByteToBigIntegerConverter extends NumberToBigIntegerConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToBigIntegerConverter extends NumberToBigIntegerConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class IntegerToBigIntegerConverter extends NumberToBigIntegerConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class LongToBigIntegerConverter extends NumberToBigIntegerConverter<Long> {
+		@Override public Class<Long> getInputType() { return Long.class; }
+	}
+	
+	//convert to BigDecimal 
+	@Plugin(type = Converter.class)
+	public static class ByteToBigDecimalConverter extends NumberToBigDecimalConverter<Byte> {
+		@Override public Class<Byte> getInputType() { return Byte.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class ShortToBigDecimalConverter extends NumberToBigDecimalConverter<Short> {
+		@Override public Class<Short> getInputType() { return Short.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class IntegerToBigDecimalConverter extends NumberToBigDecimalConverter<Integer> {
+		@Override public Class<Integer> getInputType() { return Integer.class; }
+	}
+	
+	@Plugin(type = Converter.class)
+	public static class LongToBigDecimalConverter extends NumberToBigDecimalConverter<Long> {
+		@Override public Class<Long> getInputType() { return Long.class; }
+	}
+
+	@Plugin(type = Converter.class)
+	public static class FloatToBigDecimalConverter extends NumberToBigDecimalConverter<Float> {
+		@Override public Class<Float> getInputType() { return Float.class; }
+	}
+	
+	@Plugin(type = Converter.class)
+	public static class DoubleToBigDecimalConverter extends NumberToBigDecimalConverter<Double> {
+		@Override public Class<Double> getInputType() { return Double.class; }
+	}
+	
+	@Plugin(type = Converter.class)
+	public static class BigIntegerToBigDecimalConverter extends NumberToBigDecimalConverter<BigInteger> {
+		@Override public Class<BigInteger> getInputType() { return BigInteger.class; }
+	}
+
+}
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
new file mode 100644
index 000000000..dca1eed41
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+/**
+ * Converts numbers to BigDecimals.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToBigDecimalConverter<N extends Number> extends NumberToNumberConverter<N, BigDecimal> {
+
+	@Override
+	public BigDecimal convert(Number n) {
+		// cannot get doubleValue of a BigInteger
+		if(BigInteger.class.isInstance(n)){
+			return new BigDecimal((BigInteger) n);
+		}
+		// Using .doubleValue on a long would cause loss of accuracy
+		else if(Long.class.isInstance(n)){
+			return new BigDecimal(n.longValue());
+		}
+		return new BigDecimal(n.doubleValue());
+	}
+
+	@Override
+	public Class<BigDecimal> getOutputType() {
+		return BigDecimal.class;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
new file mode 100644
index 000000000..6b16b21bc
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -0,0 +1,53 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigInteger;
+
+/**
+ * Converts numbers to BigIntegers.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToBigIntegerConverter<N extends Number> extends NumberToNumberConverter<N, BigInteger> {
+
+	@Override
+	public BigInteger convert(Number n) {
+		return BigInteger.valueOf(n.longValue());
+	}
+
+	@Override
+	public Class<BigInteger> getOutputType() {
+		return BigInteger.class;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
new file mode 100644
index 000000000..05fd1ce74
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Converts numbers to doubles.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToDoubleConverter<N extends Number> extends NumberToNumberConverter<N, Double> {
+
+	@Override
+	public Double convert(Number n) {
+		return n.doubleValue();
+	}
+
+	@Override
+	public Class<Double> getOutputType() {
+		return Double.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
new file mode 100644
index 000000000..368ab0bd9
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Converts numbers to floats.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToFloatConverter<N extends Number> extends NumberToNumberConverter<N, Float> {
+
+	@Override
+	public Float convert(Number n) {
+		return n.floatValue();
+	}
+
+	@Override
+	public Class<Float> getOutputType() {
+		return Float.class;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
new file mode 100644
index 000000000..f16a48208
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Converts numbers to integers.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToIntegerConverter<N extends Number> extends NumberToNumberConverter<N, Integer> {
+
+	@Override
+	public Integer convert(Number n) {
+		return n.intValue();
+	}
+
+	@Override
+	public Class<Integer> getOutputType() {
+		return Integer.class;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
new file mode 100644
index 000000000..314db3b9e
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Converts numbers to longs.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToLongConverter<N extends Number> extends NumberToNumberConverter<N, Long> {
+
+	@Override
+	public Long convert(Number n) {
+		return n.longValue();
+	}
+
+	@Override
+	public Class<Long> getOutputType() {
+		return Long.class;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
new file mode 100644
index 000000000..8a41b1b3b
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.util.ConversionUtils;
+
+/**
+ * Converts numbers to numbers, and throws IllegalArgumentException for null or
+ * invalid input.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToNumberConverter<I extends Number, O extends Number>
+	extends AbstractConverter<I, O>
+{
+
+	@Override
+	public <T> T convert(final Object src, final Class<T> dest) {
+		if (src == null || dest == null) throw new IllegalArgumentException(
+			"Null input");
+		if (!getInputType().isInstance(src)) {
+			throw new IllegalArgumentException("Expected input of type " +
+				getInputType().getSimpleName() + ", but got " +
+				src.getClass().getSimpleName());
+		}
+		if (ConversionUtils.getNonprimitiveType(dest) != getOutputType()) {
+			throw new IllegalArgumentException(
+				"Expected output class of " + getOutputType().getSimpleName() +
+				", but got " + dest.getSimpleName());
+		}
+		return (T) convert((Number) src);
+	}
+
+	public abstract O convert(Number n);
+}
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
new file mode 100644
index 000000000..133b3cc80
--- /dev/null
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Converts numbers to shorts.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToShortConverter<N extends Number> extends NumberToNumberConverter<N, Short> {
+
+	@Override
+	public Short convert(Number n) {
+		return n.shortValue();
+	}
+
+	@Override
+	public Class<Short> getOutputType() {
+		return Short.class;
+	}
+
+}

From 601ece4813136b27376abbda69f667a7d6da5994 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 23 Apr 2015 11:11:02 -0500
Subject: [PATCH 0114/1208] Add unit tests for primitive number converters

---
 .../convert/AbstractNumberConverterTests.java | 209 ++++++++++++++++++
 .../BigIntegerToBigDecimalConverterTest.java  |  60 +++++
 .../ByteToBigDecimalConverterTest.java        |  57 +++++
 .../ByteToBigIntegerConverterTest.java        |  58 +++++
 .../convert/ByteToDoubleConverterTest.java    |  57 +++++
 .../convert/ByteToFloatConverterTest.java     |  57 +++++
 .../convert/ByteToIntegerConverterTest.java   |  57 +++++
 .../convert/ByteToLongConverterTest.java      |  57 +++++
 .../convert/ByteToShortConverterTest.java     |  58 +++++
 .../DoubleToBigDecimalConverterTest.java      |  57 +++++
 .../FloatToBigDecimalConverterTest.java       |  57 +++++
 .../convert/FloatToDoubleConverterTest.java   |  57 +++++
 .../IntegerToBigDecimalConverterTest.java     |  58 +++++
 .../IntegerToBigIntegerConverterTest.java     |  57 +++++
 .../convert/IntegerToDoubleConverterTest.java |  57 +++++
 .../convert/IntegerToLongConverterTest.java   |  57 +++++
 .../LongToBigDecimalConverterTest.java        |  57 +++++
 .../LongToBigIntegerConverterTest.java        |  57 +++++
 .../convert/NumberToBigDecimalTest.java       |  59 +++++
 .../convert/NumberToBigIntegerTest.java       |  63 ++++++
 .../scijava/convert/NumberToDoubleTest.java   |  60 +++++
 .../scijava/convert/NumberToFloatTest.java    |  61 +++++
 .../scijava/convert/NumberToIntegerTest.java  |  60 +++++
 .../org/scijava/convert/NumberToLongTest.java |  60 +++++
 .../scijava/convert/NumberToShortTest.java    |  57 +++++
 .../ShortToBigDecimalConverterTest.java       |  57 +++++
 .../ShortToBigIntegerConverterTest.java       |  57 +++++
 .../convert/ShortToDoubleConverterTest.java   |  57 +++++
 .../convert/ShortToFloatConverterTest.java    |  57 +++++
 .../convert/ShortToIntegerConverterTest.java  |  57 +++++
 .../convert/ShortToLongConverterTest.java     |  57 +++++
 31 files changed, 1946 insertions(+)
 create mode 100644 src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
 create mode 100644 src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ByteToLongConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ByteToShortConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/NumberToBigDecimalTest.java
 create mode 100644 src/test/java/org/scijava/convert/NumberToBigIntegerTest.java
 create mode 100644 src/test/java/org/scijava/convert/NumberToDoubleTest.java
 create mode 100644 src/test/java/org/scijava/convert/NumberToFloatTest.java
 create mode 100644 src/test/java/org/scijava/convert/NumberToIntegerTest.java
 create mode 100644 src/test/java/org/scijava/convert/NumberToLongTest.java
 create mode 100644 src/test/java/org/scijava/convert/NumberToShortTest.java
 create mode 100644 src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/ShortToLongConverterTest.java

diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
new file mode 100644
index 000000000..23505adfb
--- /dev/null
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -0,0 +1,209 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Tests converter plugins that convert from primitive numeric types to other
+ * primitive numeric types.
+ * 
+ * @author Alison Walter
+ */
+public abstract class AbstractNumberConverterTests {
+
+	protected NumberToNumberConverter<?, ?> converter = getConverter();
+	protected Class<?> srcType = converter.getInputType();
+	protected Class<?> destType = converter.getOutputType();
+
+	public abstract Number getSrc();
+
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+
+	public abstract Number getExpectedValue();
+
+	public abstract Number getInvalidInput();
+
+	public abstract Class<?> getInvalidOutput();
+
+	/**
+	 * Test case for the wrapper classes
+	 */
+	@Test
+	public void testWrapper() {
+		final Number src = getSrc();
+		final Number expect = getExpectedValue();
+		assertTrue(destType.isInstance(converter.convert(src, destType)));
+		assertEquals(expect, converter.convert(src, destType));
+	}
+
+	/**
+	 * Test case for primitive values
+	 */
+	@Test
+	public void testPrimitive() {
+		final Number src = getSrc();
+		final Number expect = getExpectedValue();
+		if (!destType.equals(BigInteger.class) &&
+			!destType.equals(BigDecimal.class))
+		{
+			// byte to number converters
+			if (srcType.equals(Byte.class)) {
+				final byte b = src.byteValue();
+				if (destType.equals(Short.class)) {
+					final short s = expect.shortValue();
+					assertTrue(s == converter.convert(b, short.class));
+				}
+				else if (destType.equals(Integer.class)) {
+					final int i = expect.intValue();
+					assertTrue(i == converter.convert(b, int.class));
+				}
+				else if (destType.equals(Long.class)) {
+					final long l = expect.longValue();
+					assertTrue(l == converter.convert(b, long.class));
+				}
+				else if (destType.equals(Float.class)) {
+					final float f = expect.floatValue();
+					assertTrue(f == converter.convert(b, float.class));
+				}
+				else {
+					final double d = expect.doubleValue();
+					assertTrue(d == converter.convert(b, double.class));
+				}
+			}
+			// int to number converters
+			else if (srcType.equals(Integer.class)) {
+				final int i = src.intValue();
+				if (destType.equals(Long.class)) {
+					final long l = expect.longValue();
+					assertTrue(l == converter.convert(i, long.class));
+				}
+				else {
+					final double d = expect.doubleValue();
+					assertTrue(d == converter.convert(i, double.class));
+				}
+			}
+			// short to number converters
+			else if (srcType.equals(Short.class)) {
+				final short s = src.shortValue();
+				if (destType.equals(Integer.class)) {
+					final int i = expect.intValue();
+					assertTrue(i == converter.convert(s, int.class));
+				}
+				else if (destType.equals(Long.class)) {
+					final long l = expect.longValue();
+					assertTrue(l == converter.convert(s, long.class));
+				}
+				else if (destType.equals(Float.class)) {
+					final float f = expect.floatValue();
+					assertTrue(f == converter.convert(s, float.class));
+				}
+				else {
+					final double d = expect.doubleValue();
+					assertTrue(d == converter.convert(s, double.class));
+				}
+			}
+			// float to number converters
+			else if (srcType.equals(Float.class)) {
+				final float f = expect.floatValue();
+				final double d = expect.doubleValue();
+				assertTrue(d == converter.convert(f, double.class));
+			}
+			else {
+				// longs and doubles can't be converted to anything beside bigInteger
+				// and big decimal
+			}
+		}
+		else {
+			// no prim equivalents for BigInteger and BigDecimal
+		}
+	}
+
+	/**
+	 * Test case for null input
+	 */
+	@Test
+	public void nullInput() {
+		iae("Null input", null, null);
+	}
+
+	/**
+	 * Test case for invalid input class
+	 */
+	@Test
+	public void incorrectInputType() {
+		final Number input = getInvalidInput();
+		final String message =
+			"Expected input of type " + srcType.getSimpleName() + ", but got " +
+				input.getClass().getSimpleName();
+		iae(message, input, destType);
+	}
+
+	/**
+	 * Test case for invalid output class
+	 */
+	@Test
+	public void incorrectOutputType() {
+		final Class<?> output = getInvalidOutput();
+		final Number src = getSrc();
+		final String message =
+			"Expected output class of " + destType.getSimpleName() + ", but got " +
+				output.getSimpleName();
+		iae(message, src, output);
+	}
+
+	@Rule
+	public ExpectedException exception = ExpectedException.none();
+
+	// helper methods
+	protected void
+		iae(final String message, final Number src, final Class<?> dest)
+	{
+		exception(IllegalArgumentException.class, message, src, dest);
+	}
+
+	protected void exception(final Class<? extends Throwable> excType,
+		final String message, final Number src, final Class<?> dest)
+	{
+		exception.expect(excType);
+		exception.expectMessage(message);
+		converter.convert(src, dest);
+	}
+}
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
new file mode 100644
index 000000000..b493aa868
--- /dev/null
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigInteger;
+
+import org.scijava.convert.NumberConverters.BigIntegerToBigDecimalConverter;
+
+/**
+ * Tests {@link BigIntegerToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public class BigIntegerToBigDecimalConverterTest extends NumberToBigDecimalTest
+{
+
+	@Override
+	public Number getSrc() {
+		return BigInteger.valueOf(7l);
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.BigIntegerToBigDecimalConverter();
+	}
+
+	@Override
+	public Number getInvalidInput() {
+		return new Long(46l);
+	}
+}
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
new file mode 100644
index 000000000..50c1ee02f
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ByteToBigDecimalConverter;
+
+/**
+ * Tests {@link ByteToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ByteToBigDecimalConverterTest extends NumberToBigDecimalTest {
+
+  @Override
+  public Number getSrc() {
+    return new Byte((byte) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ByteToBigDecimalConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Short((short) 101);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
new file mode 100644
index 000000000..58637e90f
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ByteToBigIntegerConverter;
+
+/**
+ * Tests {@link ByteToBigIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ByteToBigIntegerConverterTest extends NumberToBigIntegerTest {
+
+		@Override
+		public Number getSrc() {
+			return new Byte((byte) 7);
+		}
+
+		@Override
+		public NumberToNumberConverter<?, ?> getConverter() {
+			return new NumberConverters.ByteToBigIntegerConverter();
+		}
+
+		@Override
+		public Number getInvalidInput() {
+			return new Short((short) 101);
+		}
+	}
+
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
new file mode 100644
index 000000000..e3eb340ed
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ByteToDoubleConverter;
+
+/**
+ * Tests {@link ByteToDoubleConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ByteToDoubleConverterTest extends NumberToDoubleTest {
+
+  @Override
+  public Number getSrc() {
+    return new Byte((byte) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ByteToDoubleConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Short((short) 101);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
new file mode 100644
index 000000000..0fe7238c1
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ByteToFloatConverter;
+
+/**
+ * Tests {@link ByteToFloatConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ByteToFloatConverterTest extends NumberToFloatTest {
+
+  @Override
+  public Number getSrc() {
+    return new Byte((byte) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ByteToFloatConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Double(7.67d);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
new file mode 100644
index 000000000..972aa84d2
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ByteToIntegerConverter;
+
+/**
+ * Tests {@link ByteToIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ByteToIntegerConverterTest extends NumberToIntegerTest {
+
+  @Override
+  public Number getSrc() {
+    return new Byte((byte) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ByteToIntegerConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Long(12l);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
new file mode 100644
index 000000000..f9b849e30
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ByteToLongConverter;
+
+/**
+ * Tests {@link ByteToLongConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ByteToLongConverterTest extends NumberToLongTest {
+
+  @Override
+  public Number getSrc() {
+    return new Byte((byte) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ByteToLongConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Double(12d);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
new file mode 100644
index 000000000..4033863c1
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ByteToShortConverter;
+
+/**
+ * Tests {@link ByteToShortConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ByteToShortConverterTest extends NumberToShortTest {
+
+  @Override
+  public Number getSrc() {
+    return new Byte((byte) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ByteToShortConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Integer(12);
+  }
+
+}
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
new file mode 100644
index 000000000..be9af7c86
--- /dev/null
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.DoubleToBigDecimalConverter;
+
+/**
+ * Tests {@link DoubleToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public class DoubleToBigDecimalConverterTest extends NumberToBigDecimalTest {
+
+  @Override
+  public Number getSrc() {
+    return new Double(7.0d);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.DoubleToBigDecimalConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Short((short) 7);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
new file mode 100644
index 000000000..bb8ce3715
--- /dev/null
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.FloatToBigDecimalConverter;
+
+/**
+ * Tests {@link FloatToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public class FloatToBigDecimalConverterTest extends NumberToBigDecimalTest {
+
+  @Override
+  public Number getSrc() {
+    return new Float(7f);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.FloatToBigDecimalConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Integer(394);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
new file mode 100644
index 000000000..12f9b03cc
--- /dev/null
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.FloatToDoubleConverter;
+
+/**
+ * Tests {@link FloatToDoubleConverter}.
+ *
+ * @author Alison Walter
+ */
+public class FloatToDoubleConverterTest extends NumberToDoubleTest {
+
+  @Override
+  public Number getSrc() {
+    return new Float(7.0f);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.FloatToDoubleConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Integer(394);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
new file mode 100644
index 000000000..56a509b7b
--- /dev/null
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.IntegerToBigDecimalConverter;
+
+/**
+ * Tests {@link IntegerToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public class IntegerToBigDecimalConverterTest extends NumberToBigDecimalTest {
+
+		@Override
+		public Number getSrc() {
+			return new Integer(7);
+		}
+
+		@Override
+		public NumberToNumberConverter<?, ?> getConverter() {
+			return new NumberConverters.IntegerToBigDecimalConverter();
+		}
+
+		@Override
+		public Number getInvalidInput() {
+			return new Byte((byte) 2);
+		}
+	}
+
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
new file mode 100644
index 000000000..b6a04d3b8
--- /dev/null
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.IntegerToBigIntegerConverter;
+
+/**
+ * Tests {@link IntegerToBigIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public class IntegerToBigIntegerConverterTest extends NumberToBigIntegerTest {
+
+  @Override
+  public Number getSrc() {
+    return new Integer(7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.IntegerToBigIntegerConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Byte((byte) 2);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
new file mode 100644
index 000000000..2882d3c1e
--- /dev/null
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.IntegerToDoubleConverter;
+
+/**
+ * Tests {@link IntegerToDoubleConverter}.
+ *
+ * @author Alison Walter
+ */
+public class IntegerToDoubleConverterTest extends NumberToDoubleTest {
+
+  @Override
+  public Number getSrc() {
+    return new Integer(7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.IntegerToDoubleConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Byte((byte) 2);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
new file mode 100644
index 000000000..a7350b569
--- /dev/null
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.IntegerToLongConverter;
+
+/**
+ * Tests {@link IntegerToLongConverter}.
+ *
+ * @author Alison Walter
+ */
+public class IntegerToLongConverterTest extends NumberToLongTest {
+
+  @Override
+  public Number getSrc() {
+    return new Integer(7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.IntegerToLongConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Float(7.67f);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
new file mode 100644
index 000000000..d7b584279
--- /dev/null
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.LongToBigDecimalConverter;
+
+/**
+ * Tests {@link LongToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public class LongToBigDecimalConverterTest extends NumberToBigDecimalTest {
+
+  @Override
+  public Number getSrc() {
+    return new Long(7l);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.LongToBigDecimalConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Integer(394);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
new file mode 100644
index 000000000..9ff8a1e81
--- /dev/null
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.LongToBigIntegerConverter;
+
+/**
+ * Tests {@link LongToBigIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public class LongToBigIntegerConverterTest extends NumberToBigIntegerTest {
+
+  @Override
+  public Number getSrc() {
+    return new Long(7l);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.LongToBigIntegerConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Integer(394);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/NumberToBigDecimalTest.java b/src/test/java/org/scijava/convert/NumberToBigDecimalTest.java
new file mode 100644
index 000000000..09f57d33d
--- /dev/null
+++ b/src/test/java/org/scijava/convert/NumberToBigDecimalTest.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigDecimal;
+
+/**
+ * Tests {@link NumberToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToBigDecimalTest extends AbstractNumberConverterTests{
+	@Override
+	public abstract Number getSrc();
+	@Override
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+	@Override
+	public abstract Number getInvalidInput();
+
+	@Override
+	public Number getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
+}
diff --git a/src/test/java/org/scijava/convert/NumberToBigIntegerTest.java b/src/test/java/org/scijava/convert/NumberToBigIntegerTest.java
new file mode 100644
index 000000000..53dc35230
--- /dev/null
+++ b/src/test/java/org/scijava/convert/NumberToBigIntegerTest.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.math.BigInteger;
+
+/**
+ * Tests {@link NumberToBigIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToBigIntegerTest extends
+	AbstractNumberConverterTests
+{
+
+	@Override
+	public abstract Number getSrc();
+
+	@Override
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+
+	@Override
+	public abstract Number getInvalidInput();
+
+	@Override
+	public Number getExpectedValue() {
+		return BigInteger.valueOf(7l);
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
+}
diff --git a/src/test/java/org/scijava/convert/NumberToDoubleTest.java b/src/test/java/org/scijava/convert/NumberToDoubleTest.java
new file mode 100644
index 000000000..f1108e461
--- /dev/null
+++ b/src/test/java/org/scijava/convert/NumberToDoubleTest.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+
+/**
+ * Tests {@link NumberToDoubleConverter}.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToDoubleTest extends AbstractNumberConverterTests {
+
+	@Override
+	public abstract Number getSrc();
+
+	@Override
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+
+	@Override
+	public abstract Number getInvalidInput();
+
+	@Override
+	public Number getExpectedValue() {
+		return new Double(7.0d);
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
+}
diff --git a/src/test/java/org/scijava/convert/NumberToFloatTest.java b/src/test/java/org/scijava/convert/NumberToFloatTest.java
new file mode 100644
index 000000000..45938573f
--- /dev/null
+++ b/src/test/java/org/scijava/convert/NumberToFloatTest.java
@@ -0,0 +1,61 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+
+/**
+ * Tests {@link NumberToFloatConverter}.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToFloatTest extends AbstractNumberConverterTests {
+
+	@Override
+	public abstract Number getSrc();
+
+	@Override
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+
+	@Override
+	public abstract Number getInvalidInput();
+
+	@Override
+	public Number getExpectedValue() {
+		return new Float(7f);
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Long.class;
+	}
+}
+
diff --git a/src/test/java/org/scijava/convert/NumberToIntegerTest.java b/src/test/java/org/scijava/convert/NumberToIntegerTest.java
new file mode 100644
index 000000000..e3b3c7043
--- /dev/null
+++ b/src/test/java/org/scijava/convert/NumberToIntegerTest.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Tests {@link NumberToIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToIntegerTest extends AbstractNumberConverterTests {
+
+	@Override
+	public abstract Number getSrc();
+
+	@Override
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+
+	@Override
+	public abstract Number getInvalidInput();
+
+	@Override
+	public Number getExpectedValue() {
+		return new Integer(7);
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Short.class;
+	}
+
+}
diff --git a/src/test/java/org/scijava/convert/NumberToLongTest.java b/src/test/java/org/scijava/convert/NumberToLongTest.java
new file mode 100644
index 000000000..d35ec3b45
--- /dev/null
+++ b/src/test/java/org/scijava/convert/NumberToLongTest.java
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+/**
+ * Tests {@link NumberToLongConverter}.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToLongTest extends AbstractNumberConverterTests {
+
+	@Override
+	public abstract Number getSrc();
+
+	@Override
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+
+	@Override
+	public abstract Number getInvalidInput();
+
+	@Override
+	public Number getExpectedValue() {
+		return new Long(7l);
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
+}
diff --git a/src/test/java/org/scijava/convert/NumberToShortTest.java b/src/test/java/org/scijava/convert/NumberToShortTest.java
new file mode 100644
index 000000000..ce42892af
--- /dev/null
+++ b/src/test/java/org/scijava/convert/NumberToShortTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+
+/**
+ * Tests {@link NumberToShortConverter}.
+ *
+ * @author Alison Walter
+ */
+public abstract class NumberToShortTest extends AbstractNumberConverterTests{
+	@Override
+	public abstract Number getSrc();
+	@Override
+	public abstract NumberToNumberConverter<?, ?> getConverter();
+	@Override
+	public abstract Number getInvalidInput();
+
+	@Override
+	public Number getExpectedValue() {
+		return new Short((short) 7);
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+}
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
new file mode 100644
index 000000000..a38ad653b
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ShortToBigDecimalConverter;
+
+/**
+ * Tests {@link ShortToBigDecimalConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ShortToBigDecimalConverterTest extends NumberToBigDecimalTest {
+
+  @Override
+  public Number getSrc() {
+    return new Short((short) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ShortToBigDecimalConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Long(81l);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
new file mode 100644
index 000000000..2e08e04b8
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ShortToBigIntegerConverter;
+
+/**
+ * Tests {@link ShortToBigIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ShortToBigIntegerConverterTest extends NumberToBigIntegerTest {
+
+  @Override
+  public Number getSrc() {
+    return new Short((short) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ShortToBigIntegerConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Long(81l);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
new file mode 100644
index 000000000..e16306f59
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ShortToDoubleConverter;
+
+/**
+ * Tests {@link ShortToDoubleConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ShortToDoubleConverterTest extends NumberToDoubleTest {
+
+  @Override
+  public Number getSrc() {
+    return new Short((short) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ShortToDoubleConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Long(81l);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
new file mode 100644
index 000000000..5cd65d1e9
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ShortToFloatConverter;
+
+/**
+ * Tests {@link ShortToFloatConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ShortToFloatConverterTest extends NumberToFloatTest {
+
+  @Override
+  public Number getSrc() {
+    return new Short((short) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ShortToFloatConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Long(89l);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
new file mode 100644
index 000000000..4743b7912
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ShortToIntegerConverter;
+
+/**
+ * Tests {@link ShortToIntegerConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ShortToIntegerConverterTest extends NumberToIntegerTest {
+
+  @Override
+  public Number getSrc() {
+    return new Short((short) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ShortToIntegerConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Float(7.67f);
+  }
+}
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
new file mode 100644
index 000000000..ff2c3fbdc
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.convert.NumberConverters.ShortToLongConverter;
+
+/**
+ * Tests {@link ShortToLongConverter}.
+ *
+ * @author Alison Walter
+ */
+public class ShortToLongConverterTest extends NumberToLongTest {
+
+  @Override
+  public Number getSrc() {
+    return new Short((short) 7);
+  }
+
+  @Override
+  public NumberToNumberConverter<?, ?> getConverter() {
+    return new NumberConverters.ShortToLongConverter();
+  }
+
+  @Override
+  public Number getInvalidInput() {
+    return new Float(7.67f);
+  }
+}

From 93318d2516a60042e884e2d2fe8daa67fb8f5338 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 23 Apr 2015 12:02:56 -0500
Subject: [PATCH 0115/1208] Added asBigDecimal and asBigInteger methods

---
 .../java/org/scijava/util/NumberUtils.java     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 8189764a0..108610ba3 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -31,6 +31,9 @@
 
 package org.scijava.util;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 
 /**
  * Useful methods for working with {@link Number} objects.
@@ -53,6 +56,21 @@ public static Number toNumber(final Object value, final Class<?> type) {
 		return num == null ? null : ConversionUtils.cast(num, Number.class);
 	}
 
+	public static BigDecimal asBigDecimal(final Number n) {
+		// Using .doubleValue on a long or BigInteger would cause loss of accuracy
+		if(BigInteger.class.isInstance(n)){
+			return new BigDecimal((BigInteger) n);
+		}
+		else if(Long.class.isInstance(n)){
+			return new BigDecimal(n.longValue());
+		}
+		return new BigDecimal(n.doubleValue());
+	}
+
+	public static BigInteger asBigInteger(final Number n) {
+		return BigInteger.valueOf(n.longValue());
+	}
+
 	public static Number getMinimumNumber(final Class<?> type) {
 		if (ClassUtils.isByte(type)) return Byte.MIN_VALUE;
 		if (ClassUtils.isShort(type)) return Short.MIN_VALUE;

From e7a35c95e244968848b7eabf992d8caf5f5b773b Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 23 Apr 2015 12:06:00 -0500
Subject: [PATCH 0116/1208] Implemented asBigInteger and asBigDecimal in
 converters

---
 .../convert/NumberToBigDecimalConverter.java     | 13 +++----------
 .../convert/NumberToBigIntegerConverter.java     | 16 ++++++++++------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index dca1eed41..b18178b1b 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -32,7 +32,8 @@
 package org.scijava.convert;
 
 import java.math.BigDecimal;
-import java.math.BigInteger;
+
+import org.scijava.util.NumberUtils;
 
 /**
  * Converts numbers to BigDecimals.
@@ -43,15 +44,7 @@ public abstract class NumberToBigDecimalConverter<N extends Number> extends Numb
 
 	@Override
 	public BigDecimal convert(Number n) {
-		// cannot get doubleValue of a BigInteger
-		if(BigInteger.class.isInstance(n)){
-			return new BigDecimal((BigInteger) n);
-		}
-		// Using .doubleValue on a long would cause loss of accuracy
-		else if(Long.class.isInstance(n)){
-			return new BigDecimal(n.longValue());
-		}
-		return new BigDecimal(n.doubleValue());
+		return NumberUtils.asBigDecimal(n);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 6b16b21bc..b8d0449e2 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.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
@@ -33,16 +33,20 @@
 
 import java.math.BigInteger;
 
+import org.scijava.util.NumberUtils;
+
 /**
  * Converts numbers to BigIntegers.
  *
  * @author Alison Walter
  */
-public abstract class NumberToBigIntegerConverter<N extends Number> extends NumberToNumberConverter<N, BigInteger> {
+public abstract class NumberToBigIntegerConverter<N extends Number> extends
+	NumberToNumberConverter<N, BigInteger>
+{
 
 	@Override
-	public BigInteger convert(Number n) {
-		return BigInteger.valueOf(n.longValue());
+	public BigInteger convert(final Number n) {
+		return NumberUtils.asBigInteger(n);
 	}
 
 	@Override
@@ -50,4 +54,4 @@ public Class<BigInteger> getOutputType() {
 		return BigInteger.class;
 	}
 
-}
\ No newline at end of file
+}

From 889440263c368978a05b32ba4d977aa5eb00ecdc Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 23 Apr 2015 12:08:13 -0500
Subject: [PATCH 0117/1208] Added getPrimitiveType method

---
 .../org/scijava/util/ConversionUtils.java     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 0f343d157..fdc38de19 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -122,6 +122,41 @@ public static boolean canCast(final Object src, final Class<?> dest) {
 		return src == null || canCast(src.getClass(), dest);
 	}
 
+	/**
+	 * Returns the primitive {@link Class} closest to the given type.
+	 * <p>
+	 * Specifically, the following type conversions are done:
+	 * <ul>
+	 * <li>Boolean.class becomes boolean.class</li>
+	 * <li>Byte.class becomes byte.class</li>
+	 * <li>Character.class becomes char.class</li>
+	 * <li>Double.class becomes double.class</li>
+	 * <li>Float.class becomes float.class</li>
+	 * <li>Integer.class becomes int.class</li>
+	 * <li>Long.class becomes long.class</li>
+	 * <li>Short.class becomes short.class</li>
+	 * <li>Void.class becomes void.class</li>
+	 * </ul>
+	 * All other types are unchanged.
+	 * </p>
+	 */
+	public static <T> Class<T> getPrimitiveType(final Class<T> type) {
+		final Class<?> destType;
+		if (type == Boolean.class) destType = boolean.class;
+		else if (type == Byte.class) destType = byte.class;
+		else if (type == Character.class) destType = char.class;
+		else if (type == Double.class) destType = double.class;
+		else if (type == Float.class) destType = float.class;
+		else if (type == Integer.class) destType = int.class;
+		else if (type == Long.class) destType = long.class;
+		else if (type == Short.class) destType = short.class;
+		else if (type == Void.class) destType = void.class;
+		else destType = type;
+		@SuppressWarnings("unchecked")
+		final Class<T> result = (Class<T>) destType;
+		return result;
+	}
+
 	/**
 	 * Returns the non-primitive {@link Class} closest to the given type.
 	 * <p>

From ab408b67f9ed6b2e6fb29bb0e4e28cf987aebaec Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 23 Apr 2015 12:20:53 -0500
Subject: [PATCH 0118/1208] Changed testPrimitive to use getPrimitiveType
 method

---
 .../convert/AbstractNumberConverterTests.java | 79 +------------------
 1 file changed, 3 insertions(+), 76 deletions(-)

diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 23505adfb..854c99974 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -34,12 +34,10 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.scijava.util.ConversionUtils;
 
 /**
  * Tests converter plugins that convert from primitive numeric types to other
@@ -81,79 +79,8 @@ public void testWrapper() {
 	public void testPrimitive() {
 		final Number src = getSrc();
 		final Number expect = getExpectedValue();
-		if (!destType.equals(BigInteger.class) &&
-			!destType.equals(BigDecimal.class))
-		{
-			// byte to number converters
-			if (srcType.equals(Byte.class)) {
-				final byte b = src.byteValue();
-				if (destType.equals(Short.class)) {
-					final short s = expect.shortValue();
-					assertTrue(s == converter.convert(b, short.class));
-				}
-				else if (destType.equals(Integer.class)) {
-					final int i = expect.intValue();
-					assertTrue(i == converter.convert(b, int.class));
-				}
-				else if (destType.equals(Long.class)) {
-					final long l = expect.longValue();
-					assertTrue(l == converter.convert(b, long.class));
-				}
-				else if (destType.equals(Float.class)) {
-					final float f = expect.floatValue();
-					assertTrue(f == converter.convert(b, float.class));
-				}
-				else {
-					final double d = expect.doubleValue();
-					assertTrue(d == converter.convert(b, double.class));
-				}
-			}
-			// int to number converters
-			else if (srcType.equals(Integer.class)) {
-				final int i = src.intValue();
-				if (destType.equals(Long.class)) {
-					final long l = expect.longValue();
-					assertTrue(l == converter.convert(i, long.class));
-				}
-				else {
-					final double d = expect.doubleValue();
-					assertTrue(d == converter.convert(i, double.class));
-				}
-			}
-			// short to number converters
-			else if (srcType.equals(Short.class)) {
-				final short s = src.shortValue();
-				if (destType.equals(Integer.class)) {
-					final int i = expect.intValue();
-					assertTrue(i == converter.convert(s, int.class));
-				}
-				else if (destType.equals(Long.class)) {
-					final long l = expect.longValue();
-					assertTrue(l == converter.convert(s, long.class));
-				}
-				else if (destType.equals(Float.class)) {
-					final float f = expect.floatValue();
-					assertTrue(f == converter.convert(s, float.class));
-				}
-				else {
-					final double d = expect.doubleValue();
-					assertTrue(d == converter.convert(s, double.class));
-				}
-			}
-			// float to number converters
-			else if (srcType.equals(Float.class)) {
-				final float f = expect.floatValue();
-				final double d = expect.doubleValue();
-				assertTrue(d == converter.convert(f, double.class));
-			}
-			else {
-				// longs and doubles can't be converted to anything beside bigInteger
-				// and big decimal
-			}
-		}
-		else {
-			// no prim equivalents for BigInteger and BigDecimal
-		}
+		assertEquals(expect, converter.convert(src, ConversionUtils
+			.getPrimitiveType(destType)));
 	}
 
 	/**

From e12536696f1be061eafd62d51e8ad05be5db51a5 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Tue, 28 Apr 2015 10:30:03 -0500
Subject: [PATCH 0119/1208] Modify tests to no longer depend on obsolete files

This also narrows the return types as appropriate for each concrete
type.
---
 .../BigIntegerToBigDecimalConverterTest.java  | 20 ++++++--
 .../ByteToBigDecimalConverterTest.java        | 46 +++++++++++-------
 .../ByteToBigIntegerConverterTest.java        | 45 +++++++++++-------
 .../convert/ByteToDoubleConverterTest.java    | 43 ++++++++++-------
 .../convert/ByteToFloatConverterTest.java     | 42 ++++++++++-------
 .../convert/ByteToIntegerConverterTest.java   | 43 ++++++++++-------
 .../convert/ByteToLongConverterTest.java      | 43 ++++++++++-------
 .../convert/ByteToShortConverterTest.java     | 42 ++++++++++-------
 .../DoubleToBigDecimalConverterTest.java      | 46 +++++++++++-------
 .../FloatToBigDecimalConverterTest.java       | 47 ++++++++++++-------
 .../convert/FloatToDoubleConverterTest.java   | 43 ++++++++++-------
 .../IntegerToBigDecimalConverterTest.java     | 45 +++++++++++-------
 .../IntegerToBigIntegerConverterTest.java     | 47 ++++++++++++-------
 .../convert/IntegerToDoubleConverterTest.java | 43 ++++++++++-------
 .../convert/IntegerToLongConverterTest.java   | 42 ++++++++++-------
 .../LongToBigDecimalConverterTest.java        | 46 +++++++++++-------
 .../LongToBigIntegerConverterTest.java        | 45 +++++++++++-------
 .../ShortToBigDecimalConverterTest.java       | 47 ++++++++++++-------
 .../ShortToBigIntegerConverterTest.java       | 46 +++++++++++-------
 .../convert/ShortToDoubleConverterTest.java   | 42 ++++++++++-------
 .../convert/ShortToFloatConverterTest.java    | 42 ++++++++++-------
 .../convert/ShortToIntegerConverterTest.java  | 43 ++++++++++-------
 .../convert/ShortToLongConverterTest.java     | 43 ++++++++++-------
 23 files changed, 635 insertions(+), 356 deletions(-)

diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index b493aa868..29205a905 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -31,6 +31,7 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 import org.scijava.convert.NumberConverters.BigIntegerToBigDecimalConverter;
@@ -40,11 +41,12 @@
  *
  * @author Alison Walter
  */
-public class BigIntegerToBigDecimalConverterTest extends NumberToBigDecimalTest
+public class BigIntegerToBigDecimalConverterTest extends
+	AbstractNumberConverterTests
 {
 
 	@Override
-	public Number getSrc() {
+	public BigInteger getSrc() {
 		return BigInteger.valueOf(7l);
 	}
 
@@ -54,7 +56,17 @@ public Number getSrc() {
 	}
 
 	@Override
-	public Number getInvalidInput() {
-		return new Long(46l);
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 46l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
 	}
 }
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 50c1ee02f..7ca8a2e19 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
+
 import org.scijava.convert.NumberConverters.ByteToBigDecimalConverter;
 
 /**
@@ -38,20 +40,32 @@
  *
  * @author Alison Walter
  */
-public class ByteToBigDecimalConverterTest extends NumberToBigDecimalTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToBigDecimalConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Short((short) 101);
-  }
+public class ByteToBigDecimalConverterTest extends AbstractNumberConverterTests
+{
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToBigDecimalConverter();
+	}
+
+	@Override
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Short getInvalidInput() {
+		return (short) 101;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index 58637e90f..871c66956 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigInteger;
+
 import org.scijava.convert.NumberConverters.ByteToBigIntegerConverter;
 
 /**
@@ -38,21 +40,32 @@
  *
  * @author Alison Walter
  */
-public class ByteToBigIntegerConverterTest extends NumberToBigIntegerTest {
-
-		@Override
-		public Number getSrc() {
-			return new Byte((byte) 7);
-		}
-
-		@Override
-		public NumberToNumberConverter<?, ?> getConverter() {
-			return new NumberConverters.ByteToBigIntegerConverter();
-		}
-
-		@Override
-		public Number getInvalidInput() {
-			return new Short((short) 101);
-		}
+public class ByteToBigIntegerConverterTest extends AbstractNumberConverterTests
+{
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToBigIntegerConverter();
+	}
+
+	@Override
+	public BigInteger getExpectedValue() {
+		return BigInteger.valueOf(7l);
+	}
+
+	@Override
+	public Short getInvalidInput() {
+		return (short) 101;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
 	}
 
+}
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index e3eb340ed..c8ce44631 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToDoubleConverterTest extends NumberToDoubleTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToDoubleConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Short((short) 101);
-  }
+public class ByteToDoubleConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToDoubleConverter();
+	}
+
+	@Override
+	public Double getExpectedValue() {
+		return 7.0d;
+	}
+
+	@Override
+	public Short getInvalidInput() {
+		return (short) 101;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 0fe7238c1..be49e244b 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -38,20 +38,30 @@
  *
  * @author Alison Walter
  */
-public class ByteToFloatConverterTest extends NumberToFloatTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToFloatConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Double(7.67d);
-  }
+public class ByteToFloatConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToFloatConverter();
+	}
+
+	@Override
+	public Float getExpectedValue() {
+		return 7f;
+	}
+
+	@Override
+	public Double getInvalidInput() {
+		return 7.67d;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Long.class;
+	}
 }
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 972aa84d2..82e8bd95b 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToIntegerConverterTest extends NumberToIntegerTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToIntegerConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Long(12l);
-  }
+public class ByteToIntegerConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToIntegerConverter();
+	}
+
+	@Override
+	public Integer getExpectedValue() {
+		return 7;
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 12l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Short.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index f9b849e30..6c14de3ef 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToLongConverterTest extends NumberToLongTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToLongConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Double(12d);
-  }
+public class ByteToLongConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToLongConverter();
+	}
+
+	@Override
+	public Long getExpectedValue() {
+		return 7l;
+	}
+
+	@Override
+	public Double getInvalidInput() {
+		return 12d;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index 4033863c1..4407bb916 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -38,21 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ByteToShortConverterTest extends NumberToShortTest {
-
-  @Override
-  public Number getSrc() {
-    return new Byte((byte) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ByteToShortConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Integer(12);
-  }
+public class ByteToShortConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Byte getSrc() {
+		return (byte) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ByteToShortConverter();
+	}
+
+	@Override
+	public Short getExpectedValue() {
+		return (short) 7;
+	}
+
+	@Override
+	public Integer getInvalidInput() {
+		return 12;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
 
 }
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index be9af7c86..7c444cbde 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
+
 import org.scijava.convert.NumberConverters.DoubleToBigDecimalConverter;
 
 /**
@@ -38,20 +40,32 @@
  *
  * @author Alison Walter
  */
-public class DoubleToBigDecimalConverterTest extends NumberToBigDecimalTest {
-
-  @Override
-  public Number getSrc() {
-    return new Double(7.0d);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.DoubleToBigDecimalConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Short((short) 7);
-  }
+public class DoubleToBigDecimalConverterTest extends
+	AbstractNumberConverterTests
+{
+
+	@Override
+	public Double getSrc() {
+		return 7.0d;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.DoubleToBigDecimalConverter();
+	}
+
+	@Override
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Short getInvalidInput() {
+		return (short) 7;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
 }
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index bb8ce3715..e30e1c8f8 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
+
 import org.scijava.convert.NumberConverters.FloatToBigDecimalConverter;
 
 /**
@@ -38,20 +40,33 @@
  *
  * @author Alison Walter
  */
-public class FloatToBigDecimalConverterTest extends NumberToBigDecimalTest {
-
-  @Override
-  public Number getSrc() {
-    return new Float(7f);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.FloatToBigDecimalConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Integer(394);
-  }
+public class FloatToBigDecimalConverterTest extends
+	AbstractNumberConverterTests
+{
+
+	@Override
+	public Float getSrc() {
+		return 7f;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.FloatToBigDecimalConverter();
+	}
+
+	@Override
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Integer getInvalidInput() {
+		return 394;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index 12f9b03cc..00bf08c86 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class FloatToDoubleConverterTest extends NumberToDoubleTest {
-
-  @Override
-  public Number getSrc() {
-    return new Float(7.0f);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.FloatToDoubleConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Integer(394);
-  }
+public class FloatToDoubleConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Float getSrc() {
+		return 7.0f;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.FloatToDoubleConverter();
+	}
+
+	@Override
+	public Double getExpectedValue() {
+		return 7.0d;
+	}
+
+	@Override
+	public Integer getInvalidInput() {
+		return 394;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 56a509b7b..d4c41e516 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
+
 import org.scijava.convert.NumberConverters.IntegerToBigDecimalConverter;
 
 /**
@@ -38,21 +40,32 @@
  *
  * @author Alison Walter
  */
-public class IntegerToBigDecimalConverterTest extends NumberToBigDecimalTest {
-
-		@Override
-		public Number getSrc() {
-			return new Integer(7);
-		}
-
-		@Override
-		public NumberToNumberConverter<?, ?> getConverter() {
-			return new NumberConverters.IntegerToBigDecimalConverter();
-		}
-
-		@Override
-		public Number getInvalidInput() {
-			return new Byte((byte) 2);
-		}
+public class IntegerToBigDecimalConverterTest extends
+	AbstractNumberConverterTests
+{
+
+	@Override
+	public Integer getSrc() {
+		return 7;
 	}
 
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.IntegerToBigDecimalConverter();
+	}
+
+	@Override
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Byte getInvalidInput() {
+		return (byte) 2;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+}
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index b6a04d3b8..f6762db3a 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigInteger;
+
 import org.scijava.convert.NumberConverters.IntegerToBigIntegerConverter;
 
 /**
@@ -38,20 +40,33 @@
  *
  * @author Alison Walter
  */
-public class IntegerToBigIntegerConverterTest extends NumberToBigIntegerTest {
-
-  @Override
-  public Number getSrc() {
-    return new Integer(7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.IntegerToBigIntegerConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Byte((byte) 2);
-  }
+public class IntegerToBigIntegerConverterTest extends
+	AbstractNumberConverterTests
+{
+
+	@Override
+	public Integer getSrc() {
+		return 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.IntegerToBigIntegerConverter();
+	}
+
+	@Override
+	public BigInteger getExpectedValue() {
+		return BigInteger.valueOf(7l);
+	}
+
+	@Override
+	public Byte getInvalidInput() {
+		return (byte) 2;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 2882d3c1e..23f8db5ef 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class IntegerToDoubleConverterTest extends NumberToDoubleTest {
-
-  @Override
-  public Number getSrc() {
-    return new Integer(7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.IntegerToDoubleConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Byte((byte) 2);
-  }
+public class IntegerToDoubleConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Integer getSrc() {
+		return 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.IntegerToDoubleConverter();
+	}
+
+	@Override
+	public Double getExpectedValue() {
+		return 7.0d;
+	}
+
+	@Override
+	public Byte getInvalidInput() {
+		return (byte) 2;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index a7350b569..eb6b7604e 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -38,20 +38,30 @@
  *
  * @author Alison Walter
  */
-public class IntegerToLongConverterTest extends NumberToLongTest {
-
-  @Override
-  public Number getSrc() {
-    return new Integer(7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.IntegerToLongConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Float(7.67f);
-  }
+public class IntegerToLongConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Integer getSrc() {
+		return 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.IntegerToLongConverter();
+	}
+
+	@Override
+	public Long getExpectedValue() {
+		return 7l;
+	}
+
+	@Override
+	public Float getInvalidInput() {
+		return 7.67f;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
 }
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index d7b584279..83be6b66e 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
+
 import org.scijava.convert.NumberConverters.LongToBigDecimalConverter;
 
 /**
@@ -38,20 +40,32 @@
  *
  * @author Alison Walter
  */
-public class LongToBigDecimalConverterTest extends NumberToBigDecimalTest {
-
-  @Override
-  public Number getSrc() {
-    return new Long(7l);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.LongToBigDecimalConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Integer(394);
-  }
+public class LongToBigDecimalConverterTest extends AbstractNumberConverterTests
+{
+
+	@Override
+	public Long getSrc() {
+		return 7l;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.LongToBigDecimalConverter();
+	}
+
+	@Override
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Integer getInvalidInput() {
+		return 394;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 9ff8a1e81..678d6770f 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigInteger;
+
 import org.scijava.convert.NumberConverters.LongToBigIntegerConverter;
 
 /**
@@ -38,20 +40,31 @@
  *
  * @author Alison Walter
  */
-public class LongToBigIntegerConverterTest extends NumberToBigIntegerTest {
-
-  @Override
-  public Number getSrc() {
-    return new Long(7l);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.LongToBigIntegerConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Integer(394);
-  }
+public class LongToBigIntegerConverterTest extends AbstractNumberConverterTests
+{
+
+	@Override
+	public Long getSrc() {
+		return 7l;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.LongToBigIntegerConverter();
+	}
+
+	@Override
+	public BigInteger getExpectedValue() {
+		return BigInteger.valueOf(7l);
+	}
+
+	@Override
+	public Integer getInvalidInput() {
+		return 394;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
 }
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index a38ad653b..851968907 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigDecimal;
+
 import org.scijava.convert.NumberConverters.ShortToBigDecimalConverter;
 
 /**
@@ -38,20 +40,33 @@
  *
  * @author Alison Walter
  */
-public class ShortToBigDecimalConverterTest extends NumberToBigDecimalTest {
-
-  @Override
-  public Number getSrc() {
-    return new Short((short) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ShortToBigDecimalConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Long(81l);
-  }
+public class ShortToBigDecimalConverterTest extends
+	AbstractNumberConverterTests
+{
+
+	@Override
+	public Short getSrc() {
+		return (short) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ShortToBigDecimalConverter();
+	}
+
+	@Override
+	public BigDecimal getExpectedValue() {
+		return new BigDecimal(7d);
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 81l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index 2e08e04b8..f6e9e37a3 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -31,6 +31,8 @@
 
 package org.scijava.convert;
 
+import java.math.BigInteger;
+
 import org.scijava.convert.NumberConverters.ShortToBigIntegerConverter;
 
 /**
@@ -38,20 +40,32 @@
  *
  * @author Alison Walter
  */
-public class ShortToBigIntegerConverterTest extends NumberToBigIntegerTest {
-
-  @Override
-  public Number getSrc() {
-    return new Short((short) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ShortToBigIntegerConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Long(81l);
-  }
+public class ShortToBigIntegerConverterTest extends
+	AbstractNumberConverterTests
+{
+
+	@Override
+	public Short getSrc() {
+		return (short) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ShortToBigIntegerConverter();
+	}
+
+	@Override
+	public BigInteger getExpectedValue() {
+		return BigInteger.valueOf(7l);
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 81l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
 }
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index e16306f59..0fdf6c6c3 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -38,20 +38,30 @@
  *
  * @author Alison Walter
  */
-public class ShortToDoubleConverterTest extends NumberToDoubleTest {
-
-  @Override
-  public Number getSrc() {
-    return new Short((short) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ShortToDoubleConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Long(81l);
-  }
+public class ShortToDoubleConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Short getSrc() {
+		return (short) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ShortToDoubleConverter();
+	}
+
+	@Override
+	public Double getExpectedValue() {
+		return 7.0d;
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 81l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Byte.class;
+	}
 }
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index 5cd65d1e9..e9db0a38b 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -38,20 +38,30 @@
  *
  * @author Alison Walter
  */
-public class ShortToFloatConverterTest extends NumberToFloatTest {
-
-  @Override
-  public Number getSrc() {
-    return new Short((short) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ShortToFloatConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Long(89l);
-  }
+public class ShortToFloatConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Short getSrc() {
+		return (short) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ShortToFloatConverter();
+	}
+
+	@Override
+	public Float getExpectedValue() {
+		return 7f;
+	}
+
+	@Override
+	public Long getInvalidInput() {
+		return 89l;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Long.class;
+	}
 }
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 4743b7912..24033528d 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ShortToIntegerConverterTest extends NumberToIntegerTest {
-
-  @Override
-  public Number getSrc() {
-    return new Short((short) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ShortToIntegerConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Float(7.67f);
-  }
+public class ShortToIntegerConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Short getSrc() {
+		return (short) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ShortToIntegerConverter();
+	}
+
+	@Override
+	public Integer getExpectedValue() {
+		return 7;
+	}
+
+	@Override
+	public Float getInvalidInput() {
+		return 7.67f;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Short.class;
+	}
+
 }
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index ff2c3fbdc..c1586a412 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -38,20 +38,31 @@
  *
  * @author Alison Walter
  */
-public class ShortToLongConverterTest extends NumberToLongTest {
-
-  @Override
-  public Number getSrc() {
-    return new Short((short) 7);
-  }
-
-  @Override
-  public NumberToNumberConverter<?, ?> getConverter() {
-    return new NumberConverters.ShortToLongConverter();
-  }
-
-  @Override
-  public Number getInvalidInput() {
-    return new Float(7.67f);
-  }
+public class ShortToLongConverterTest extends AbstractNumberConverterTests {
+
+	@Override
+	public Short getSrc() {
+		return (short) 7;
+	}
+
+	@Override
+	public NumberToNumberConverter<?, ?> getConverter() {
+		return new NumberConverters.ShortToLongConverter();
+	}
+
+	@Override
+	public Long getExpectedValue() {
+		return 7l;
+	}
+
+	@Override
+	public Float getInvalidInput() {
+		return 7.67f;
+	}
+
+	@Override
+	public Class<?> getInvalidOutput() {
+		return Float.class;
+	}
+
 }

From a79d883f367db9c20ab8ef048ebd2087aa2a709b Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Tue, 28 Apr 2015 10:30:03 -0500
Subject: [PATCH 0120/1208] Remove obsolete test files

They are redundant with the new more granular test classes.
---
 .../convert/NumberToBigDecimalTest.java       | 59 -----------------
 .../convert/NumberToBigIntegerTest.java       | 63 -------------------
 .../scijava/convert/NumberToDoubleTest.java   | 60 ------------------
 .../scijava/convert/NumberToFloatTest.java    | 61 ------------------
 .../scijava/convert/NumberToIntegerTest.java  | 60 ------------------
 .../org/scijava/convert/NumberToLongTest.java | 60 ------------------
 .../scijava/convert/NumberToShortTest.java    | 57 -----------------
 7 files changed, 420 deletions(-)
 delete mode 100644 src/test/java/org/scijava/convert/NumberToBigDecimalTest.java
 delete mode 100644 src/test/java/org/scijava/convert/NumberToBigIntegerTest.java
 delete mode 100644 src/test/java/org/scijava/convert/NumberToDoubleTest.java
 delete mode 100644 src/test/java/org/scijava/convert/NumberToFloatTest.java
 delete mode 100644 src/test/java/org/scijava/convert/NumberToIntegerTest.java
 delete mode 100644 src/test/java/org/scijava/convert/NumberToLongTest.java
 delete mode 100644 src/test/java/org/scijava/convert/NumberToShortTest.java

diff --git a/src/test/java/org/scijava/convert/NumberToBigDecimalTest.java b/src/test/java/org/scijava/convert/NumberToBigDecimalTest.java
deleted file mode 100644
index 09f57d33d..000000000
--- a/src/test/java/org/scijava/convert/NumberToBigDecimalTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.convert;
-
-import java.math.BigDecimal;
-
-/**
- * Tests {@link NumberToBigDecimalConverter}.
- *
- * @author Alison Walter
- */
-public abstract class NumberToBigDecimalTest extends AbstractNumberConverterTests{
-	@Override
-	public abstract Number getSrc();
-	@Override
-	public abstract NumberToNumberConverter<?, ?> getConverter();
-	@Override
-	public abstract Number getInvalidInput();
-
-	@Override
-	public Number getExpectedValue() {
-		return new BigDecimal(7d);
-	}
-
-	@Override
-	public Class<?> getInvalidOutput() {
-		return Float.class;
-	}
-
-}
diff --git a/src/test/java/org/scijava/convert/NumberToBigIntegerTest.java b/src/test/java/org/scijava/convert/NumberToBigIntegerTest.java
deleted file mode 100644
index 53dc35230..000000000
--- a/src/test/java/org/scijava/convert/NumberToBigIntegerTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.convert;
-
-import java.math.BigInteger;
-
-/**
- * Tests {@link NumberToBigIntegerConverter}.
- *
- * @author Alison Walter
- */
-public abstract class NumberToBigIntegerTest extends
-	AbstractNumberConverterTests
-{
-
-	@Override
-	public abstract Number getSrc();
-
-	@Override
-	public abstract NumberToNumberConverter<?, ?> getConverter();
-
-	@Override
-	public abstract Number getInvalidInput();
-
-	@Override
-	public Number getExpectedValue() {
-		return BigInteger.valueOf(7l);
-	}
-
-	@Override
-	public Class<?> getInvalidOutput() {
-		return Byte.class;
-	}
-}
diff --git a/src/test/java/org/scijava/convert/NumberToDoubleTest.java b/src/test/java/org/scijava/convert/NumberToDoubleTest.java
deleted file mode 100644
index f1108e461..000000000
--- a/src/test/java/org/scijava/convert/NumberToDoubleTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.convert;
-
-
-/**
- * Tests {@link NumberToDoubleConverter}.
- *
- * @author Alison Walter
- */
-public abstract class NumberToDoubleTest extends AbstractNumberConverterTests {
-
-	@Override
-	public abstract Number getSrc();
-
-	@Override
-	public abstract NumberToNumberConverter<?, ?> getConverter();
-
-	@Override
-	public abstract Number getInvalidInput();
-
-	@Override
-	public Number getExpectedValue() {
-		return new Double(7.0d);
-	}
-
-	@Override
-	public Class<?> getInvalidOutput() {
-		return Byte.class;
-	}
-}
diff --git a/src/test/java/org/scijava/convert/NumberToFloatTest.java b/src/test/java/org/scijava/convert/NumberToFloatTest.java
deleted file mode 100644
index 45938573f..000000000
--- a/src/test/java/org/scijava/convert/NumberToFloatTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.convert;
-
-
-/**
- * Tests {@link NumberToFloatConverter}.
- *
- * @author Alison Walter
- */
-public abstract class NumberToFloatTest extends AbstractNumberConverterTests {
-
-	@Override
-	public abstract Number getSrc();
-
-	@Override
-	public abstract NumberToNumberConverter<?, ?> getConverter();
-
-	@Override
-	public abstract Number getInvalidInput();
-
-	@Override
-	public Number getExpectedValue() {
-		return new Float(7f);
-	}
-
-	@Override
-	public Class<?> getInvalidOutput() {
-		return Long.class;
-	}
-}
-
diff --git a/src/test/java/org/scijava/convert/NumberToIntegerTest.java b/src/test/java/org/scijava/convert/NumberToIntegerTest.java
deleted file mode 100644
index e3b3c7043..000000000
--- a/src/test/java/org/scijava/convert/NumberToIntegerTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.convert;
-
-/**
- * Tests {@link NumberToIntegerConverter}.
- *
- * @author Alison Walter
- */
-public abstract class NumberToIntegerTest extends AbstractNumberConverterTests {
-
-	@Override
-	public abstract Number getSrc();
-
-	@Override
-	public abstract NumberToNumberConverter<?, ?> getConverter();
-
-	@Override
-	public abstract Number getInvalidInput();
-
-	@Override
-	public Number getExpectedValue() {
-		return new Integer(7);
-	}
-
-	@Override
-	public Class<?> getInvalidOutput() {
-		return Short.class;
-	}
-
-}
diff --git a/src/test/java/org/scijava/convert/NumberToLongTest.java b/src/test/java/org/scijava/convert/NumberToLongTest.java
deleted file mode 100644
index d35ec3b45..000000000
--- a/src/test/java/org/scijava/convert/NumberToLongTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.convert;
-
-/**
- * Tests {@link NumberToLongConverter}.
- *
- * @author Alison Walter
- */
-public abstract class NumberToLongTest extends AbstractNumberConverterTests {
-
-	@Override
-	public abstract Number getSrc();
-
-	@Override
-	public abstract NumberToNumberConverter<?, ?> getConverter();
-
-	@Override
-	public abstract Number getInvalidInput();
-
-	@Override
-	public Number getExpectedValue() {
-		return new Long(7l);
-	}
-
-	@Override
-	public Class<?> getInvalidOutput() {
-		return Float.class;
-	}
-
-}
diff --git a/src/test/java/org/scijava/convert/NumberToShortTest.java b/src/test/java/org/scijava/convert/NumberToShortTest.java
deleted file mode 100644
index ce42892af..000000000
--- a/src/test/java/org/scijava/convert/NumberToShortTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.convert;
-
-
-/**
- * Tests {@link NumberToShortConverter}.
- *
- * @author Alison Walter
- */
-public abstract class NumberToShortTest extends AbstractNumberConverterTests{
-	@Override
-	public abstract Number getSrc();
-	@Override
-	public abstract NumberToNumberConverter<?, ?> getConverter();
-	@Override
-	public abstract Number getInvalidInput();
-
-	@Override
-	public Number getExpectedValue() {
-		return new Short((short) 7);
-	}
-
-	@Override
-	public Class<?> getInvalidOutput() {
-		return Float.class;
-	}
-}

From 737174507c1eed66028a6536da63fa016c4d2003 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 30 Apr 2015 09:31:38 -0500
Subject: [PATCH 0121/1208] Implemented asBigDecimal and asBigInteger in junit
 tests

---
 .../scijava/convert/BigIntegerToBigDecimalConverterTest.java | 5 +++--
 .../org/scijava/convert/ByteToBigDecimalConverterTest.java   | 3 ++-
 .../org/scijava/convert/ByteToBigIntegerConverterTest.java   | 3 ++-
 .../org/scijava/convert/DoubleToBigDecimalConverterTest.java | 3 ++-
 .../org/scijava/convert/FloatToBigDecimalConverterTest.java  | 3 ++-
 .../scijava/convert/IntegerToBigDecimalConverterTest.java    | 3 ++-
 .../scijava/convert/IntegerToBigIntegerConverterTest.java    | 3 ++-
 .../org/scijava/convert/LongToBigDecimalConverterTest.java   | 3 ++-
 .../org/scijava/convert/LongToBigIntegerConverterTest.java   | 3 ++-
 .../org/scijava/convert/ShortToBigDecimalConverterTest.java  | 3 ++-
 .../org/scijava/convert/ShortToBigIntegerConverterTest.java  | 3 ++-
 11 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index 29205a905..8775bcf74 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -35,6 +35,7 @@
 import java.math.BigInteger;
 
 import org.scijava.convert.NumberConverters.BigIntegerToBigDecimalConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link BigIntegerToBigDecimalConverter}.
@@ -47,7 +48,7 @@ public class BigIntegerToBigDecimalConverterTest extends
 
 	@Override
 	public BigInteger getSrc() {
-		return BigInteger.valueOf(7l);
+		return NumberUtils.asBigInteger(7l);
 	}
 
 	@Override
@@ -57,7 +58,7 @@ public BigInteger getSrc() {
 
 	@Override
 	public BigDecimal getExpectedValue() {
-		return new BigDecimal(7d);
+		return NumberUtils.asBigDecimal(7d);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 7ca8a2e19..137857f2b 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigDecimal;
 
 import org.scijava.convert.NumberConverters.ByteToBigDecimalConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link ByteToBigDecimalConverter}.
@@ -55,7 +56,7 @@ public Byte getSrc() {
 
 	@Override
 	public BigDecimal getExpectedValue() {
-		return new BigDecimal(7d);
+		return NumberUtils.asBigDecimal(7d);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index 871c66956..b36aa1dd7 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigInteger;
 
 import org.scijava.convert.NumberConverters.ByteToBigIntegerConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link ByteToBigIntegerConverter}.
@@ -55,7 +56,7 @@ public Byte getSrc() {
 
 	@Override
 	public BigInteger getExpectedValue() {
-		return BigInteger.valueOf(7l);
+		return NumberUtils.asBigInteger(7l);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index 7c444cbde..4172e42a8 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigDecimal;
 
 import org.scijava.convert.NumberConverters.DoubleToBigDecimalConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link DoubleToBigDecimalConverter}.
@@ -56,7 +57,7 @@ public Double getSrc() {
 
 	@Override
 	public BigDecimal getExpectedValue() {
-		return new BigDecimal(7d);
+		return NumberUtils.asBigDecimal(7d);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index e30e1c8f8..8db1d49a4 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigDecimal;
 
 import org.scijava.convert.NumberConverters.FloatToBigDecimalConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link FloatToBigDecimalConverter}.
@@ -56,7 +57,7 @@ public Float getSrc() {
 
 	@Override
 	public BigDecimal getExpectedValue() {
-		return new BigDecimal(7d);
+		return NumberUtils.asBigDecimal(7d);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index d4c41e516..6fd1f64ff 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigDecimal;
 
 import org.scijava.convert.NumberConverters.IntegerToBigDecimalConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link IntegerToBigDecimalConverter}.
@@ -56,7 +57,7 @@ public Integer getSrc() {
 
 	@Override
 	public BigDecimal getExpectedValue() {
-		return new BigDecimal(7d);
+		return NumberUtils.asBigDecimal(7d);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index f6762db3a..21276deac 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigInteger;
 
 import org.scijava.convert.NumberConverters.IntegerToBigIntegerConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link IntegerToBigIntegerConverter}.
@@ -56,7 +57,7 @@ public Integer getSrc() {
 
 	@Override
 	public BigInteger getExpectedValue() {
-		return BigInteger.valueOf(7l);
+		return NumberUtils.asBigInteger(7l);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 83be6b66e..e28ea2cb1 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigDecimal;
 
 import org.scijava.convert.NumberConverters.LongToBigDecimalConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link LongToBigDecimalConverter}.
@@ -55,7 +56,7 @@ public Long getSrc() {
 
 	@Override
 	public BigDecimal getExpectedValue() {
-		return new BigDecimal(7d);
+		return NumberUtils.asBigDecimal(7d);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 678d6770f..632f5deaa 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigInteger;
 
 import org.scijava.convert.NumberConverters.LongToBigIntegerConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link LongToBigIntegerConverter}.
@@ -55,7 +56,7 @@ public Long getSrc() {
 
 	@Override
 	public BigInteger getExpectedValue() {
-		return BigInteger.valueOf(7l);
+		return NumberUtils.asBigInteger(7l);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index 851968907..4d1c6caa2 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigDecimal;
 
 import org.scijava.convert.NumberConverters.ShortToBigDecimalConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link ShortToBigDecimalConverter}.
@@ -56,7 +57,7 @@ public Short getSrc() {
 
 	@Override
 	public BigDecimal getExpectedValue() {
-		return new BigDecimal(7d);
+		return NumberUtils.asBigDecimal(7d);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index f6e9e37a3..c920e5d51 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -34,6 +34,7 @@
 import java.math.BigInteger;
 
 import org.scijava.convert.NumberConverters.ShortToBigIntegerConverter;
+import org.scijava.util.NumberUtils;
 
 /**
  * Tests {@link ShortToBigIntegerConverter}.
@@ -56,7 +57,7 @@ public Short getSrc() {
 
 	@Override
 	public BigInteger getExpectedValue() {
-		return BigInteger.valueOf(7l);
+		return NumberUtils.asBigInteger(7l);
 	}
 
 	@Override

From a95d8260a315dda5e6af73d754fd7a05a28d3981 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Thu, 20 Aug 2015 13:55:27 -0500
Subject: [PATCH 0122/1208] Converters: never pass primitives

In the AbstractConverter we should ensure that nonprimitive types are
always returned for input/output classes.
---
 src/main/java/org/scijava/convert/AbstractConverter.java  | 6 ++++--
 src/test/java/org/scijava/convert/ConvertServiceTest.java | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 058624d94..00a827aa1 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -108,8 +108,10 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
-		return ConversionUtils.canCast(src, getInputType()) &&
-			ConversionUtils.canCast(getOutputType(), dest);
+		final Class<?> saneSrc = ConversionUtils.getNonprimitiveType(src);
+		final Class<?> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		return ConversionUtils.canCast(saneSrc, getInputType()) &&
+			ConversionUtils.canCast(getOutputType(), saneDest);
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 18a3deed9..b2d5fd7fd 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -188,9 +188,9 @@ public void testCanConvert() {
 		assertTrue(convertService.supports(double.class, float.class));
 		assertTrue(convertService.supports(float.class, double.class));
 
-		// boxing is not reported to work
-		// TODO: Consider changing this behavior.
-		assertFalse(convertService.supports(int.class, Number.class));
+		// check that boxing works
+		assertTrue(convertService.supports(int.class, Number.class));
+		assertTrue(convertService.supports(Integer.class, double.class));
 
 		// can convert anything to string
 		assertTrue(convertService.supports(Object.class, String.class));

From aee1dbcbf46ef0f5a3ad966265d939e1d4f00643 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Feb 2016 14:20:34 -0600
Subject: [PATCH 0123/1208] CastingConverter: fix line breaks of big comment

---
 .../org/scijava/convert/CastingConverter.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 00ebb1f0b..cdcd86234 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -63,17 +63,14 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		// NB: Regardless of whether the destination type is an array or
-		// collection,
-		// we still want to cast directly if doing so is possible. But note that
-		// in
-		// general, this check does not detect cases of incompatible generic
-		// parameter types. If this limitation becomes a problem in the future
-		// we
-		// can extend the logic here to provide additional signatures of canCast
-		// which operate on Types in general rather than only Classes. However,
-		// the
-		// logic could become complex very quickly in various subclassing cases,
-		// generic parameters resolved vs. propagated, etc.
+		// collection, we still want to cast directly if doing so is possible.
+		// But note that in general, this check does not detect cases of
+		// incompatible generic parameter types. If this limitation becomes a
+		// problem in the future we can extend the logic here to provide
+		// additional signatures of canCast which operate on Types in general
+		// rather than only Classes. However, the logic could become complex
+		// very quickly in various subclassing cases, generic parameters
+		// resolved vs. propagated, etc.
 		final Class<?> c = GenericUtils.getClass(dest);
 		return (T) ConversionUtils.cast(src, c);
 	}

From 839d3edbc36d4e7e13071bb724917669ab449bbc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Feb 2016 14:20:49 -0600
Subject: [PATCH 0124/1208] CastingConverter: fix priority

Writing "FIRST_PRIORITY - 1" is the same as "FIRST_PRIORITY",
since that constant equals Double.POSITIVE_INFINITY.
---
 src/main/java/org/scijava/convert/CastingConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index cdcd86234..395a06435 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -41,7 +41,7 @@
  *
  * @author Mark Hiner hinerm at gmail.com
  */
-@Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY - 1)
+@Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY)
 public class CastingConverter extends AbstractConverter<Object, Object> {
 
 	@SuppressWarnings("deprecation")

From 955b22c7bf3835aaf92e3560ee20ecf3fb4b8953 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Mon, 22 Feb 2016 14:21:08 -0600
Subject: [PATCH 0125/1208] ConvertService: Restore LinkedHashSet use

Fix breaking in unit test
---
 src/main/java/org/scijava/convert/AbstractConvertService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 3db4ba433..a0b46cd94 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -34,6 +34,7 @@
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.scijava.plugin.AbstractHandlerService;
@@ -102,7 +103,7 @@ public boolean supports(final Class<?> src, final Type dest) {
 
 	@Override
 	public Collection<Object> getCompatibleInputs(final Class<?> dest) {
-		final Set<Object> objects = new HashSet<Object>();
+		final Set<Object> objects = new LinkedHashSet<Object>();
 
 		for (final Converter<?, ?> c : getInstances()) {
 			if (dest.isAssignableFrom(c.getOutputType())) {

From 0fd01f6b5246821e8636715b0cacfc2d9bed7ec5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 25 Jun 2014 15:18:21 -0500
Subject: [PATCH 0126/1208] Add API to give explicit file chooser title

The method UserInterface#chooseFile(String, File, String) is given
a deprecated default implementation in AbstractUserInterface to
avoid requiring a major version bump according to SemVer.
---
 .../org/scijava/ui/AbstractUserInterface.java | 23 +++++++++++++++++++
 .../java/org/scijava/ui/DefaultUIService.java |  9 ++++++++
 src/main/java/org/scijava/ui/UIService.java   | 17 ++++++++++++++
 .../java/org/scijava/ui/UserInterface.java    | 14 +++++++++++
 4 files changed, 63 insertions(+)

diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 8234027ea..22a318808 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -31,6 +31,7 @@
 
 package org.scijava.ui;
 
+import java.io.File;
 import java.util.List;
 
 import org.scijava.app.StatusService;
@@ -47,6 +48,7 @@
 import org.scijava.ui.console.ConsolePane;
 import org.scijava.ui.viewer.DisplayViewer;
 import org.scijava.ui.viewer.DisplayWindow;
+import org.scijava.widget.FileWidget;
 
 /**
  * Abstract superclass for {@link UserInterface} implementations.
@@ -186,6 +188,19 @@ public ConsolePane<?> getConsolePane() {
 		return null;
 	}
 
+	@Override
+	public File chooseFile(final File file, final String style) {
+		return chooseFile(fileChooserTitle(style), file, style);
+	}
+
+	@Deprecated
+	@Override
+	public File chooseFile(final String title, final File file,
+		final String style)
+	{
+		throw new UnsupportedOperationException("No default implementation.");
+	}
+
 	@Override
 	public void saveLocation() {
 		final ApplicationFrame appFrame = getApplicationFrame();
@@ -216,4 +231,12 @@ protected void createUI() {
 		restoreLocation();
 	}
 
+	/** Gets a default file chooser title to use when none is given. */
+	protected String fileChooserTitle(final String style) {
+		if (style.equals(FileWidget.DIRECTORY_STYLE)) return "Choose a directory";
+		if (style.equals(FileWidget.OPEN_STYLE)) return "Open";
+		if (style.equals(FileWidget.SAVE_STYLE)) return "Save";
+		return "Choose a file";
+	}
+
 }
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index ebaaf00cd..61f7644e3 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -340,6 +340,15 @@ public File chooseFile(final File file, final String style) {
 		return ui.chooseFile(file, style);
 	}
 
+	@Override
+	public File
+		chooseFile(final String title, final File file, final String style)
+	{
+		final UserInterface ui = getDefaultUI();
+		if (ui == null) return null;
+		return ui.chooseFile(title, file, style);
+	}
+
 	@Override
 	public void showContextMenu(final String menuRoot, final Display<?> display,
 		final int x, final int y)
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 1fe2bbd79..787da5810 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -276,6 +276,23 @@ DialogPrompt.Result showDialog(String message, String title,
 	 */
 	File chooseFile(File file, String style);
 
+	/**
+	 * Prompts the user to choose a file.
+	 * <p>
+	 * The prompt is displayed in the default user interface.
+	 * </p>
+	 * 
+	 * @param title Title to use in the file chooser dialog.
+	 * @param file The initial value displayed in the file chooser prompt.
+	 * @param style The style of chooser to use:
+	 *          <ul>
+	 *          <li>{@link FileWidget#OPEN_STYLE}</li>
+	 *          <li>{@link FileWidget#SAVE_STYLE}</li>
+	 *          <li>{@link FileWidget#DIRECTORY_STYLE}</li>
+	 *          </ul>
+	 */
+	File chooseFile(String title, File file, String style);
+
 	/**
 	 * Displays a popup context menu for the given display at the specified
 	 * position.
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 32a97c6d6..7eadc1cb2 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -133,6 +133,20 @@ DialogPrompt dialogPrompt(String message, String title,
 	 */
 	File chooseFile(File file, String style);
 
+	/**
+	 * Prompts the user to choose a file.
+	 * 
+	 * @param title Title to use in the file chooser dialog.
+	 * @param file The initial value displayed in the file chooser prompt.
+	 * @param style The style of chooser to use:
+	 *          <ul>
+	 *          <li>{@link FileWidget#OPEN_STYLE}</li>
+	 *          <li>{@link FileWidget#SAVE_STYLE}</li>
+	 *          <li>{@link FileWidget#DIRECTORY_STYLE}</li>
+	 *          </ul>
+	 */
+	File chooseFile(String title, File file, String style);
+
 	/**
 	 * Displays a popup context menu for the given display at the specified
 	 * position.

From 8a654598ef252186417751ed137fe5b1ce3b5355 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 23 Feb 2016 11:05:31 -0600
Subject: [PATCH 0127/1208] CommandModule: fix horrible bug in cancelation

If your Command implemented Cancelable, then calling cancel(...) from
within the command itself (e.g., from an initializer callback) did not
actually cancel anything, because the wrapping CommandModule instance
did not recognize the cancelation state of its wrapped Command.

Now, the CommandModule always leans on its wrapped Command for all
cancelation-related operations, unless the Command itself does not
implement Cancelable.

Noticed by Richard Domander. Thanks to Mark Hiner for help debugging.
---
 .../java/org/scijava/command/CommandModule.java  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index d392b6c58..793fde188 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -86,7 +86,11 @@ public class CommandModule extends AbstractModule implements Cancelable,
 	@Parameter
 	private Context context;
 
-	/** Reason for cancelation, or null if not canceled. */
+	/**
+	 * Reason for cancelation, or null if not canceled. Note that this field is
+	 * only relevant if the delegate {@link Command} is not itself
+	 * {@link Cancelable}.
+	 */
 	private String cancelReason;
 
 	/** Creates a command module for the given {@link PluginInfo}. */
@@ -205,20 +209,26 @@ public void run() {
 
 	@Override
 	public boolean isCanceled() {
+		if (command instanceof Cancelable) {
+			return ((Cancelable) command).isCanceled();
+		}
 		return cancelReason != null;
 	}
 
 	@Override
 	public void cancel(final String reason) {
-		cancelReason = reason == null ? "" : reason;
 		if (command instanceof Cancelable) {
-			// propagate cancelation to the command instance itself
 			((Cancelable) command).cancel(reason);
+			return;
 		}
+		cancelReason = reason == null ? "" : reason;
 	}
 
 	@Override
 	public String getCancelReason() {
+		if (command instanceof Cancelable) {
+			return ((Cancelable) command).getCancelReason();
+		}
 		return cancelReason;
 	}
 

From 6156f2221f1c0448376485e7f0937d2f41301866 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 23 Feb 2016 11:58:05 -0600
Subject: [PATCH 0128/1208] Add regression test for CommandModule cancelation

This validates the bug-fix in 8a654598ef252186417751ed137fe5b1ce3b5355.
---
 .../scijava/command/CommandModuleTest.java    | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 src/test/java/org/scijava/command/CommandModuleTest.java

diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
new file mode 100644
index 000000000..49d40bafc
--- /dev/null
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -0,0 +1,114 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.command;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.ExecutionException;
+
+import org.junit.Test;
+import org.scijava.Cancelable;
+import org.scijava.Context;
+import org.scijava.module.Module;
+import org.scijava.module.process.AbstractPreprocessorPlugin;
+import org.scijava.module.process.PreprocessorPlugin;
+import org.scijava.plugin.Plugin;
+
+/** Regression tests for {@link CommandModule}. */
+public class CommandModuleTest {
+
+	@Test
+	public void testCancelable() throws InterruptedException, ExecutionException {
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+		final CommandModule ice = commandService.run(IceCommand.class, true).get();
+		final Cancelable c = (Cancelable) ice.getDelegateObject();
+		assertTrue(ice.isCanceled());
+		assertTrue(c.isCanceled());
+		assertEquals("Stop! Collaborate and listen!", ice.getCancelReason());
+		assertEquals("Stop! Collaborate and listen!", c.getCancelReason());
+	}
+	
+	@Test
+	public void testNotCancelable() throws InterruptedException,
+		ExecutionException
+	{
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+		final CommandModule fire = commandService.run(FireCommand.class, true).get();
+		assertFalse(fire.getDelegateObject() instanceof Cancelable);
+		assertTrue(fire.isCanceled());
+		assertEquals("NO SINGING!", fire.getCancelReason());
+	}
+
+	// -- Helper classes --
+
+	/** A command which implements {@link Cancelable}. */
+	@Plugin(type = Command.class, initializer = "init")
+	public static class IceCommand extends ContextCommand {
+
+		public void init() {
+			cancel("Stop! Collaborate and listen!");
+		}
+
+		@Override
+		public void run() {
+			throw new IllegalStateException("Unexpected");
+		}
+	}
+
+	/** A command which does not implement {@link Cancelable}. */
+	@Plugin(type = Command.class)
+	public static class FireCommand implements Command {
+
+		@Override
+		public void run() {
+			throw new IllegalStateException("Unexpected");
+		}
+	}
+
+	@Plugin(type = PreprocessorPlugin.class)
+	public static class CommandCanceler extends AbstractPreprocessorPlugin {
+
+		@Override
+		public void process(final Module module) {
+			final Object command = module.getDelegateObject();
+			if (command instanceof IceCommand || command instanceof FireCommand) {
+				// NB: A Monty Python quote which is also a Game of Thrones reference.
+				// That's right -- we did that.
+				cancel("NO SINGING!");
+			}
+		}
+	}
+}

From b5b50a407b919da20c9e5249e610d246464183f5 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 23 Feb 2016 14:01:08 -0600
Subject: [PATCH 0129/1208] Bump parent to pom-scijava 9.4.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fedd6a8ed..467dba4c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.3.0</version>
+		<version>9.4.0</version>
 		<relativePath />
 	</parent>
 

From 5d9e1bb1e54448940c3026cb26a61798ffc85618 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 23 Feb 2016 14:16:55 -0600
Subject: [PATCH 0130/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 467dba4c9..bdf34da26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.51.0-SNAPSHOT</version>
+	<version>2.51.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 1a90a15edeb2c7b46e952787cfe5b82d1fd36005 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 23 Feb 2016 15:35:46 -0600
Subject: [PATCH 0131/1208] POM: bump minor version, due to new ScriptREPL API

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bdf34da26..8ac75c7c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.51.1-SNAPSHOT</version>
+	<version>2.52.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From e558c7270c9411acd83c6ef81fb6f05eaeb74cd4 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 24 Feb 2016 08:36:35 -0600
Subject: [PATCH 0132/1208] Bump parent to pom-scijava 9.5.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8ac75c7c0..56d4c73fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.4.0</version>
+		<version>9.5.0</version>
 		<relativePath />
 	</parent>
 

From 837b9de89d52deafc8918e9f0cd80438b49a97bc Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 24 Feb 2016 08:46:26 -0600
Subject: [PATCH 0133/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 56d4c73fc..1c5d63071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.52.0-SNAPSHOT</version>
+	<version>2.52.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 1278e71533982a80f68a3c81248b36e6ef3573d1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 Feb 2016 13:06:15 -0600
Subject: [PATCH 0134/1208] ClassUtils: use consistent method argument name

The other loadClass uses "String name" rather than "className"
so let's do the same here.
---
 src/main/java/org/scijava/util/ClassUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index bf7f4141d..8065f4f5d 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -96,8 +96,8 @@ private ClassUtils() {
 	 * @return The loaded class, or null if the class could not be loaded.
 	 * @see #loadClass(String, ClassLoader)
 	 */
-	public static Class<?> loadClass(final String className) {
-		return loadClass(className, null);
+	public static Class<?> loadClass(final String name) {
+		return loadClass(name, null);
 	}
 
 	/**

From 684697ecb55742f349abc375aea4ed74910d8562 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 Feb 2016 13:07:51 -0600
Subject: [PATCH 0135/1208] ClassUtils: add missing @param field to javadoc

---
 src/main/java/org/scijava/util/ClassUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 8065f4f5d..7976ce750 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -93,6 +93,7 @@ private ClassUtils() {
 	 * Loads the class with the given name, using the current thread's context
 	 * class loader, or null if it cannot be loaded.
 	 *
+	 * @param name The name of the class to load.
 	 * @return The loaded class, or null if the class could not be loaded.
 	 * @see #loadClass(String, ClassLoader)
 	 */

From 7f2683595d71e0c4c81f4105abd5496dba4efc8d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 Feb 2016 13:23:44 -0600
Subject: [PATCH 0136/1208] ClassUtils: throw exceptions in loadClass methods

We keep the old behavior of returning null, both for convenience and for
backwards compatibility. But we add a "boolean quietly" flag which, when
set to false, makes the methods throw IllegalArgumentException instead.

This avoids problems where downstream code needs to know _why_ a class
couldn't be loaded, but the exception was eaten in the loadClass method.
---
 .../java/org/scijava/util/ClassUtils.java     | 53 +++++++++++++++++--
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 7976ce750..2ef416612 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -95,10 +95,46 @@ private ClassUtils() {
 	 *
 	 * @param name The name of the class to load.
 	 * @return The loaded class, or null if the class could not be loaded.
-	 * @see #loadClass(String, ClassLoader)
+	 * @see #loadClass(String, ClassLoader, boolean)
 	 */
 	public static Class<?> loadClass(final String name) {
-		return loadClass(name, null);
+		return loadClass(name, null, true);
+	}
+
+	/**
+	 * Loads the class with the given name, using the specified
+	 * {@link ClassLoader}, or null if it cannot be loaded.
+	 *
+	 * @param name The name of the class to load.
+	 * @param classLoader The class loader with which to load the class; if null,
+	 *          the current thread's context class loader will be used.
+	 * @return The loaded class, or null if the class could not be loaded.
+	 * @see #loadClass(String, ClassLoader, boolean)
+	 */
+	public static Class<?> loadClass(final String name,
+		final ClassLoader classLoader)
+	{
+		return loadClass(name, classLoader, true);
+	}
+
+	/**
+	 * Loads the class with the given name, using the current thread's context
+	 * class loader.
+	 *
+	 * @param className the name of the class to load
+	 * @param quietly Whether to return {@code null} (rather than throwing
+	 *          {@link IllegalArgumentException}) if something goes wrong loading
+	 *          the class
+	 * @return The loaded class, or {@code null} if the class could not be loaded
+	 *         and the {@code quietly} flag is set.
+	 * @see #loadClass(String, ClassLoader, boolean)
+	 * @throws IllegalArgumentException If the class cannot be loaded and the
+	 *           {@code quietly} flag is not set.
+	 */
+	public static Class<?> loadClass(final String className,
+		final boolean quietly)
+	{
+		return loadClass(className, null, quietly);
 	}
 
 	/**
@@ -120,10 +156,16 @@ public static Class<?> loadClass(final String name) {
 	 * @param name The name of the class to load.
 	 * @param classLoader The class loader with which to load the class; if null,
 	 *          the current thread's context class loader will be used.
-	 * @return The loaded class, or null if the class could not be loaded.
+	 * @param quietly Whether to return {@code null} (rather than throwing
+	 *          {@link IllegalArgumentException}) if something goes wrong loading
+	 *          the class
+	 * @return The loaded class, or {@code null} if the class could not be loaded
+	 *         and the {@code quietly} flag is set.
+	 * @throws IllegalArgumentException If the class cannot be loaded and the
+	 *           {@code quietly} flag is not set.
 	 */
 	public static Class<?> loadClass(final String name,
-		final ClassLoader classLoader)
+		final ClassLoader classLoader, final boolean quietly)
 	{
 		// handle primitive types
 		if (name.equals("Z") || name.equals("boolean")) return boolean.class;
@@ -171,7 +213,8 @@ public static Class<?> loadClass(final String name,
 			// Not ClassNotFoundException.
 			// Not NoClassDefFoundError.
 			// Not UnsupportedClassVersionError!
-			return null;
+			if (quietly) return null;
+			throw new IllegalArgumentException("Cannot load class: " + className, t);
 		}
 	}
 

From 6bff68c00c940c2d070e57334f5d578e960c5a65 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 Feb 2016 13:56:13 -0600
Subject: [PATCH 0137/1208] ClassUtilsTest: test the failure cases

---
 src/test/java/org/scijava/util/ClassUtilsTest.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 561e5d6c5..a32dffe57 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -116,6 +116,16 @@ public void testLoadClass() {
 		assertLoaded(Number[][].class, "[[Ljava.lang.Number;");
 	}
 
+	@Test
+	public void testFailureQuiet() {
+		assertNull(ClassUtils.loadClass("a.non.existent.class"));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testFailureLoud() {
+		ClassUtils.loadClass("a.non.existent.class", false);
+	}
+
 	@Test
 	public void testGetArrayClass() {
 		assertSame(boolean[].class, ClassUtils.getArrayClass(boolean.class));

From 7f9576d5912bad2c8deb3474608cca9ff744e9f1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 Feb 2016 14:06:59 -0600
Subject: [PATCH 0138/1208] When class loading fails, chain the reason

Several places in SciJava Common call the ClassUtils.loadClass routine.
Previously, that routine simply returned null without explanation when
the class could not be loaded for any reason. Now, by setting the
'quietly' flag to false, we can do proper exception handling so that the
reason for failure is known and can be passed along to the caller.

So this commit does that in all the places where it makes sense.

This commit is dedicated to Eike Heinz!
---
 src/main/java/org/scijava/Context.java        |  5 +----
 .../org/scijava/main/DefaultMainService.java  |  5 ++++-
 .../java/org/scijava/menu/ShadowMenu.java     | 19 +++++++++++++------
 .../java/org/scijava/plugin/PluginInfo.java   | 14 ++++++++------
 .../scijava/script/DefaultScriptService.java  | 11 +++++++----
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index b5693b86e..1ec38127f 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -320,10 +320,7 @@ public <S extends Service> S service(final Class<S> c) {
 	 *           service.
 	 */
 	public Service service(final String className) {
-		final Class<?> c = ClassUtils.loadClass(className);
-		if (c == null) {
-			throw new IllegalArgumentException("No such class: " + className);
-		}
+		final Class<?> c = ClassUtils.loadClass(className, false);
 		if (!Service.class.isAssignableFrom(c)) {
 			throw new IllegalArgumentException("Not a service class: " + c.getName());
 		}
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 31de081fd..725eaaa09 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -101,10 +101,13 @@ public String[] args() {
 		@Override
 		public void exec() {
 			try {
-				final Class<?> mainClass = ClassUtils.loadClass(className);
+				final Class<?> mainClass = ClassUtils.loadClass(className, false);
 				final Method main = mainClass.getMethod("main", String[].class);
 				main.invoke(null, new Object[] { args });
 			}
+			catch (final IllegalArgumentException exc) {
+				if (log != null) log.error(exc);
+			}
 			catch (final NoSuchMethodException exc) {
 				if (log != null) {
 					log.error("No main method for class: " + className, exc);
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index a2c87b573..ec9b90b28 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -231,13 +231,20 @@ public URL getIconURL() {
 			else return null;
 		}
 		final String className = moduleInfo.getDelegateClassName();
-		final Class<?> c = ClassUtils.loadClass(className);
-		if (c == null) return null;
-		final URL iconURL = c.getResource(iconPath);
-		if (iconURL == null) {
-			if (log != null) log.error("Could not load icon: " + iconPath);
+		try {
+			final Class<?> c = ClassUtils.loadClass(className, false);
+			final URL iconURL = c.getResource(iconPath);
+			if (iconURL == null) {
+				if (log != null) log.error("Could not load icon: " + iconPath);
+			}
+			return iconURL;
+		}
+		catch (final IllegalArgumentException exc) {
+			final String message = "Could not load icon for class: " + className;
+			if (log.isDebug()) log.debug(message, exc);
+			else log.error(message);
+			return null;
 		}
-		return iconURL;
 	}
 
 	/**
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index b60843f9b..a5d4efa01 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -280,13 +280,15 @@ public String getClassName() {
 	@Override
 	public Class<? extends PT> loadClass() throws InstantiableException {
 		if (pluginClass == null) {
-			final Class<?> c = ClassUtils.loadClass(className, classLoader);
-			if (c == null) {
-				throw new InstantiableException("Class not found: " + className);
+			try {
+				final Class<?> c = ClassUtils.loadClass(className, classLoader, false);
+				@SuppressWarnings("unchecked")
+				final Class<? extends PT> typedClass = (Class<? extends PT>) c;
+				pluginClass = typedClass;
+			}
+			catch (final IllegalArgumentException exc) {
+				throw new InstantiableException("Class not found: " + className, exc);
 			}
-			@SuppressWarnings("unchecked")
-			final Class<? extends PT> typedClass = (Class<? extends PT>) c;
-			pluginClass = typedClass;
 		}
 
 		return pluginClass;
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 7bc916f1f..e04efee2d 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -255,13 +255,16 @@ public synchronized Class<?> lookupClass(final String alias)
 		final Class<?> type = aliasMap().get(alias);
 		if (type != null) return type;
 
-		final Class<?> c = ClassUtils.loadClass(alias);
-		if (c != null) {
+		try {
+			final Class<?> c = ClassUtils.loadClass(alias, false);
 			aliasMap().put(alias, c);
 			return c;
 		}
-
-		throw new ScriptException("Unknown type: " + alias);
+		catch (final IllegalArgumentException exc) {
+			final ScriptException se = new ScriptException("Unknown type: " + alias);
+			se.initCause(exc);
+			throw se;
+		}
 	}
 
 	// -- PTService methods --

From 1ddc51edebcf6c6af3bec505a13a649dccf1ae41 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 24 Feb 2016 14:36:54 -0600
Subject: [PATCH 0139/1208] Revert "Add empty option for not-required parameter
 in Widget"

This reverts commit 45ab6cf22dc3c33400bc40a17885e968f4eaa8ad.

This will require a revision of how the ObjectPool is handled in
widgets, as it currently breaks the javadoc contract (in that if a null
value is added to the ObjectPool, the item value is forced to be null).
---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 3e02f907a..4f5052fb1 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -87,8 +87,6 @@ public DefaultWidgetModel(final Context context, final InputPanel<?, ?> inputPan
 		this.module = module;
 		this.item = item;
 		this.objectPool = objectPool;
-		if (!item.isRequired())
-			this.objectPool.add(0, null);
 		convertedObjects = new WeakHashMap<Object, Object>();
 
 		if (item.getValue(module) == null) {
@@ -317,10 +315,8 @@ private Object ensureValidObject(final Object value) {
 
 	/** Ensures the value is on the given list. */
 	private Object ensureValid(final Object value, final List<?> list) {
-		if (value == null)
-			return list.contains(null);
 		for (final Object o : list) {
-			if (value.equals(o)) return value; // value is valid
+			if (o.equals(value)) return value; // value is valid
 			// check if value was converted and cached
 			final Object convertedValue = convertedObjects.get(o);
 			if (convertedValue != null && value.equals(convertedValue)) {

From 1171f79f46b3427a336da1f6326100c8bd4e86f9 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 24 Feb 2016 14:48:38 -0600
Subject: [PATCH 0140/1208] Bump parent to pom-scijava 9.5.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1c5d63071..406cdba6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.5.0</version>
+		<version>9.5.1</version>
 		<relativePath />
 	</parent>
 

From f6732d9296c2e8d6b4d1c9f4010377401ca674fd Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 24 Feb 2016 15:07:43 -0600
Subject: [PATCH 0141/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 406cdba6e..da14e21bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.52.1-SNAPSHOT</version>
+	<version>2.52.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 3d73fce0cd3d891f7f01cfceb08bce7a7a4d783c Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 26 Feb 2016 10:28:38 -0600
Subject: [PATCH 0142/1208] ConsoleArguments: rename aliases to flags

"Alias" would imply that there is one canonical way to invoke a given
ConsoleArgument.
---
 .../console/AbstractConsoleArgument.java      | 26 ++++++++++---------
 .../scijava/main/console/MainArgument.java    |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 0aa170e03..118a9dbe1 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -46,20 +46,20 @@ public abstract class AbstractConsoleArgument extends
 	AbstractHandlerPlugin<LinkedList<String>> implements ConsoleArgument
 {
 	private int numArgs;
-	private Set<String> aliasFlags;
+	private Set<String> flags;
 
 	public AbstractConsoleArgument() {
 		this(1, new String[0]);
 	}
 
-	public AbstractConsoleArgument(final String... aliases) {
-		this(1, aliases);
+	public AbstractConsoleArgument(final String... flags) {
+		this(1, flags);
 	}
 	
-	public AbstractConsoleArgument(final int requiredArgs, final String... aliases) {
+	public AbstractConsoleArgument(final int requiredArgs, final String... flags) {
 		numArgs = requiredArgs;
-		aliasFlags = new HashSet<String>();
-		for (final String s : aliases) aliasFlags.add(s);
+		this.flags = new HashSet<String>();
+		for (final String s : flags) this.flags.add(s);
 	}
 
 	// -- Typed methods --
@@ -67,7 +67,7 @@ public AbstractConsoleArgument(final int requiredArgs, final String... aliases)
 	@Override
 	public boolean supports(final LinkedList<String> args) {
 		if (args == null || args.size() < numArgs) return false;
-		return isAlias(args);
+		return isFlag(args);
 	}
 
 	@Override
@@ -77,11 +77,13 @@ public Class<LinkedList<String>> getType() {
 	}
 
 	/**
-	 * @return true if there are no aliases for this {@code ConsoleArgument}, or
-	 *         at least one alias matches the first argument in the provided
-	 *         list
+	 * Check if the given list of arguments starts with a flag that matches this
+	 * {@link ConsoleArgument}.
+	 *
+	 * @return true iff one of this argument's flags matches the first string in
+	 *         the given list, or this argument has no explicit flags.
 	 */
-	protected boolean isAlias(final LinkedList<String> args) {
-		return aliasFlags.isEmpty() || aliasFlags.contains(args.getFirst());
+	protected boolean isFlag(final LinkedList<String> args) {
+		return flags.isEmpty() || flags.contains(args.getFirst());
 	}
 }
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 152182ae9..1311008a7 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -73,7 +73,7 @@ public void handle(final LinkedList<String> args) {
 		final String className = args.removeFirst();
 
 		final List<String> argList = new ArrayList<String>();
-		while (!args.isEmpty() && !isAlias(args) && !isSeparator(args)) {
+		while (!args.isEmpty() && !isFlag(args) && !isSeparator(args)) {
 			argList.add(args.removeFirst());
 		}
 		if (isSeparator(args)) args.removeFirst(); // remove the -- separator

From 8e1a5226c898197664d4753291d916598ce08e45 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 26 Feb 2016 10:39:10 -0600
Subject: [PATCH 0143/1208] Extract ConsoleUtils.hasParam method

For checking if a non-flag argument is available
---
 .../org/scijava/command/console/RunArgument.java     |  2 +-
 src/main/java/org/scijava/console/ConsoleUtils.java  | 12 ++++++++++++
 .../scijava/script/console/RunScriptArgument.java    |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 6d44e8b88..59e283dba 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -74,7 +74,7 @@ public void handle(final LinkedList<String> args) {
 
 		args.removeFirst(); // --run
 		final String commandToRun = args.removeFirst();
-		final String paramString = args.isEmpty() ? "" : args.removeFirst();
+		final String paramString = ConsoleUtils.hasParam(args) ? "" : args.removeFirst();
 
 		run(commandToRun, paramString);
 	}
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 3e1557fef..cb26cc550 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -32,6 +32,7 @@
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.Map;
 
 import org.scijava.command.CommandInfo;
@@ -83,4 +84,15 @@ else if (logService != null)
 		return inputMap;
 
 	}
+
+	/**
+	 * Test if the next argument is an appropriate parameter to a
+	 * {@link ConsoleArgument}.
+	 *
+	 * @return {@code true} if the first argument of the given list does not
+	 *         start with a {@code '-'} character.
+	 */
+	public static boolean hasParam(final LinkedList<String> args) {
+		return !(args.isEmpty() || args.getFirst().startsWith("-"));
+	}
 }
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index 5b12156d3..b7b663968 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -72,7 +72,7 @@ public void handle(final LinkedList<String> args) {
 
 		args.removeFirst(); // --run
 		final String scriptToRun = args.removeFirst();
-		final String paramString = args.isEmpty() ? "" : args.removeFirst();
+		final String paramString = ConsoleUtils.hasParam(args) ? "" : args.removeFirst();
 
 		run(scriptToRun, paramString);
 	}

From 6c1f4e971629e4687b72a6b86fef549995f1ed17 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 26 Feb 2016 10:46:42 -0600
Subject: [PATCH 0144/1208] ConsoleUtils: Document parseParameterString

---
 .../java/org/scijava/console/ConsoleUtils.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index cb26cc550..72ccde7fa 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -47,18 +47,36 @@
  */
 public final class ConsoleUtils {
 
+	/**
+	 * @see #parseParameterString(String, ModuleInfo, LogService)
+	 */
 	public static Map<String, Object> parseParameterString(final String parameterString) {
 		return parseParameterString(parameterString, (CommandInfo)null);
 	}
 
+	/**
+	 * @see #parseParameterString(String, ModuleInfo, LogService)
+	 */
 	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info) {
 		return parseParameterString(parameterString, info, null);
 	}
 
+	/**
+	 * @see #parseParameterString(String, ModuleInfo, LogService)
+	 */
 	public static Map<String, Object> parseParameterString(final String parameterString, final LogService logService) {
 		return parseParameterString(parameterString, null, logService);
 	}
 
+	/**
+	 * Helper method for turning a parameter string into a {@code Map} of
+	 * key:value pairs. If a {@link ModuleInfo} is provided, the parameter
+	 * string is assumed to be a comma-separated list of values, ordered
+	 * according to the {@code ModuleInfo's} inputs. Otherwise, the parameter
+	 * string is assumed to be a comma-separated list of "key=value" pairs.
+	 *
+	 * TODO reconcile with attribute parsing of {@link ScriptInfo}
+	 */
 	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info, final LogService logService) {
 		final Map<String, Object> inputMap = new HashMap<String, Object>();
 

From 6fa80b1c0ca0b3536644b8a57ec83a6e10e99568 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 26 Feb 2016 12:20:54 -0600
Subject: [PATCH 0145/1208] Gateway: add a handy launch(String...) method

This performs launch operations standard to most SciJava applications.
This code migrated from a static method of imagej/imagej:

    net.imagej.Main.launch(String...)

With this change, the standard launch process is accessible to all
SciJava applications in a DRY way, while still being configurable
for applications with special needs. Typically, such applications will
define their own Gateway implementation which extends AbstractGateway;
hence, these applications can override launch(String...) to modify
their launch behavior.

We considered creating a LaunchService with LaunchAction plugins,
but it seemed potentially overcomplicated.
---
 pom.xml                                        |  2 +-
 src/main/java/org/scijava/AbstractGateway.java | 17 +++++++++++++++++
 src/main/java/org/scijava/Gateway.java         | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index da14e21bc..9ec636dcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.52.2-SNAPSHOT</version>
+	<version>2.53.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index d09dfd936..202cab0f1 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -89,6 +89,23 @@ public AbstractGateway(final String appName, final Context context) {
 
 	// -- Gateway methods --
 
+	@Override
+	public void launch(final String... args) {
+		// parse command line arguments
+		console().processArgs(args);
+
+		// launch main methods
+		final int mainCount = main().execMains();
+
+		// display the user interface (NB: does not block)
+		if (mainCount == 0 && !ui().isHeadless()) ui().showUI();
+
+		if (ui().isHeadless()) {
+			// now that CLI processing/execution is done, we can shut down
+			getContext().dispose();
+		}
+	}
+
 	@Override
 	public String getShortName() {
 		return getClass().getName().toLowerCase();
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 73df53a5a..6ef437ea5 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -120,6 +120,24 @@
  */
 public interface Gateway extends RichPlugin, Versioned {
 
+	/**
+	 * Perform launch operations associated with this gateway.
+	 * <p>
+	 * Typical operations might include:
+	 * </p>
+	 * <ul>
+	 * <li>Handle the given command line arguments using the
+	 * {@link ConsoleService}.</li>
+	 * <li>Execute registered main classes of the {@link MainService}.</li>
+	 * <li>Display the default user interface using the {@link UIService}.</li>
+	 * <li>In some circumstances (e.g., when running headless), dispose the
+	 * context after launch operations are complete.</li>
+	 * </ul>
+	 * 
+	 * @param args The arguments to pass to the application.
+	 */
+	void launch(String... args);
+
 	/**
 	 * Gets a very succinct name for use referring to this gateway, e.g. as a
 	 * variable name for scripting.

From b6e26190ea04f2d67e81671c1b0a9c31dc2de462 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 26 Feb 2016 15:10:41 -0600
Subject: [PATCH 0146/1208] DisplayPostprocessor: always name displays

---
 .../org/scijava/display/DisplayPostprocessor.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 092122db3..4d43d0aa5 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -36,6 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.scijava.Named;
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.module.Module;
@@ -113,13 +114,16 @@ private void handleOutput(final String defaultName, final Object output) {
 			}
 			else {
 				// create a new display for the output
-				final Display<?> display = displayService.createDisplay(output);
+				String name = null;
+
+				// TODO rework how displays are named
+				if (output instanceof Named) name = ((Named)output).getName();
+
+				if (name == null) name = defaultName;
+
+				final Display<?> display = displayService.createDisplay(name, output);
 				if (display != null) {
 					displays.add(display);
-					if (display.getName() == null) {
-						// set a default name based on the parameter
-						display.setName(defaultName);
-					}
 				}
 			}
 		}

From 3c8cf8299347a6885a3cb19dce4ce66f64357940 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 26 Feb 2016 15:22:22 -0600
Subject: [PATCH 0147/1208] DisplayService: flesh out createDisplay javadoc

It is important to note that calling createDisplay publishes a
DisplayCreatedEvent, which triggers some actions in other services.
---
 .../org/scijava/display/DisplayService.java    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 98dd2b6da..80915dd74 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -33,6 +33,8 @@
 
 import java.util.List;
 
+import org.scijava.display.event.DisplayCreatedEvent;
+import org.scijava.display.event.DisplayDeletedEvent;
 import org.scijava.event.EventService;
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.PluginInfo;
@@ -114,7 +116,13 @@ <DT extends Display<?>> List<PluginInfo<DT>> getDisplayPluginsOfType(
 	boolean isUniqueName(String name);
 
 	/**
-	 * Creates a display for the given object.
+	 * Creates a display for the given object, publishing a
+	 * {@link DisplayCreatedEvent} to notify interested parties. In particular:
+	 * <ul>
+	 * <li>Visible UIs will respond to this event by showing the display.</li>
+	 * <li>The {@link ObjectService} will add the new display to its index, until
+	 * a corresponding {@link DisplayDeletedEvent} is later published.</li>
+	 * </ul>
 	 * 
 	 * @param o The object for which a display should be created. The object is
 	 *          then added to the display.
@@ -129,7 +137,13 @@ <DT extends Display<?>> List<PluginInfo<DT>> getDisplayPluginsOfType(
 	Display<?> createDisplay(Object o);
 
 	/**
-	 * Creates a display for the given object.
+	 * Creates a display for the given object, publishing a
+	 * {@link DisplayCreatedEvent} to notify interested parties. In particular:
+	 * <ul>
+	 * <li>Visible UIs will respond to this event by showing the display.</li>
+	 * <li>The {@link ObjectService} will add the new display to its index, until
+	 * a corresponding {@link DisplayDeletedEvent} is later published.</li>
+	 * </ul>
 	 * 
 	 * @param name The name to be assigned to the display.
 	 * @param o The object for which a display should be created. The object is

From d9a68ec20ec37b68717297ba61a4db157d25e552 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 26 Feb 2016 15:22:56 -0600
Subject: [PATCH 0148/1208] DisplayService: add a createDisplayQuietly method

This method creates a display without publishing a DisplayCreatedEvent.
It is the caller's responsibility to deal with ramifications of that.

This method is introduced to maintain backwards compatibility with the
old behavior. The display framework will probably be substantially
redesigned soon, at which point all of this will become moot. But in the
meantime, it is handy to be able to create a display without showing it.

This commit is dedicated to Richard Domander!
---
 .../display/DefaultDisplayService.java        | 11 ++++++--
 .../org/scijava/display/DisplayService.java   | 25 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index ec11b5c20..40f94b786 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -209,6 +209,15 @@ public Display<?> createDisplay(final Object o) {
 
 	@Override
 	public Display<?> createDisplay(final String name, final Object o) {
+		final Display<?> display = createDisplayQuietly(o);
+		if (display == null) return null;
+		if (name != null) display.setName(name);
+		eventService.publish(new DisplayCreatedEvent(display));
+		return display;
+	}
+
+	@Override
+	public Display<?> createDisplayQuietly(final Object o) {
 		// get available display plugins from the plugin service
 		final List<PluginInfo<Display<?>>> displayPlugins = getDisplayPlugins();
 
@@ -219,8 +228,6 @@ public Display<?> createDisplay(final String name, final Object o) {
 			// TODO: how to handle multiple matches? prompt user with dialog box?
 			if (display.canDisplay(o)) {
 				display.display(o);
-				if (name != null) display.setName(name);
-				eventService.publish(new DisplayCreatedEvent(display));
 				return display;
 			}
 		}
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 80915dd74..20f0d33e6 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -123,6 +123,10 @@ <DT extends Display<?>> List<PluginInfo<DT>> getDisplayPluginsOfType(
 	 * <li>The {@link ObjectService} will add the new display to its index, until
 	 * a corresponding {@link DisplayDeletedEvent} is later published.</li>
 	 * </ul>
+	 * <p>
+	 * To create a {@link Display} without publishing an event, see
+	 * {@link #createDisplayQuietly}.
+	 * </p>
 	 * 
 	 * @param o The object for which a display should be created. The object is
 	 *          then added to the display.
@@ -144,6 +148,10 @@ <DT extends Display<?>> List<PluginInfo<DT>> getDisplayPluginsOfType(
 	 * <li>The {@link ObjectService} will add the new display to its index, until
 	 * a corresponding {@link DisplayDeletedEvent} is later published.</li>
 	 * </ul>
+	 * <p>
+	 * To create a {@link Display} without publishing an event, see
+	 * {@link #createDisplayQuietly}.
+	 * </p>
 	 * 
 	 * @param name The name to be assigned to the display.
 	 * @param o The object for which a display should be created. The object is
@@ -158,4 +166,21 @@ <DT extends Display<?>> List<PluginInfo<DT>> getDisplayPluginsOfType(
 	 */
 	Display<?> createDisplay(String name, Object o);
 
+	/**
+	 * Creates a display for the given object, without publishing a
+	 * {@link DisplayCreatedEvent}. Hence, the display will not be automatically
+	 * shown or tracked.
+	 * 
+	 * @param o The object for which a display should be created. The object is
+	 *          then added to the display.
+	 * @return Newly created {@code Display<?>} containing the given object. The
+	 *         Display is typed with ? rather than T matching the Object because
+	 *         it is possible for the Display to be a collection of some other
+	 *         sort of object than the one being added. For example, ImageDisplay
+	 *         is a {@code Display<DataView>} with the DataView wrapping a
+	 *         Dataset, yet the ImageDisplay supports adding Datasets directly,
+	 *         taking care of wrapping them in a DataView as needed.
+	 */
+	Display<?> createDisplayQuietly(Object o);
+
 }

From b1d102fa7f077b2f3d3d48ffd7b19f21e73e8f98 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Mon, 29 Feb 2016 14:29:09 -0600
Subject: [PATCH 0149/1208] Fix ConsoleUtils.hasParam use

If there is a parameter, it should be removed. Fixes issue with
unconsumed command-line inputs.
---
 src/main/java/org/scijava/command/console/RunArgument.java      | 2 +-
 src/main/java/org/scijava/script/console/RunScriptArgument.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 59e283dba..aca51500c 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -74,7 +74,7 @@ public void handle(final LinkedList<String> args) {
 
 		args.removeFirst(); // --run
 		final String commandToRun = args.removeFirst();
-		final String paramString = ConsoleUtils.hasParam(args) ? "" : args.removeFirst();
+		final String paramString = ConsoleUtils.hasParam(args) ? args.removeFirst() : "";
 
 		run(commandToRun, paramString);
 	}
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index b7b663968..df8c94204 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -72,7 +72,7 @@ public void handle(final LinkedList<String> args) {
 
 		args.removeFirst(); // --run
 		final String scriptToRun = args.removeFirst();
-		final String paramString = ConsoleUtils.hasParam(args) ? "" : args.removeFirst();
+		final String paramString = ConsoleUtils.hasParam(args) ? args.removeFirst() : "";
 
 		run(scriptToRun, paramString);
 	}

From aeefc14ed3f487d52331e306c6fa11bbe17ea62d Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 2 Mar 2016 10:15:19 -0600
Subject: [PATCH 0150/1208] Bump parent to pom-scijava 9.6.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9ec636dcc..4504dc86e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.5.1</version>
+		<version>9.6.0</version>
 		<relativePath />
 	</parent>
 

From 9aaf422735833a483c09feb38a2afe8ecfc298b6 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 2 Mar 2016 11:55:15 -0600
Subject: [PATCH 0151/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4504dc86e..b897191dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.53.0-SNAPSHOT</version>
+	<version>2.53.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From f9967e17f691cb83c432691f5f6314c76087b173 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 16 Mar 2016 10:19:24 -0500
Subject: [PATCH 0152/1208] AbstractScriptLanguage: avoid NPE on Name

Add a check for a null Info, in case a ScriptLanguage is unannotated.
---
 src/main/java/org/scijava/script/AbstractScriptLanguage.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index f50965015..ee2ffdd03 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -38,6 +38,7 @@
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.plugin.AbstractRichPlugin;
+import org.scijava.plugin.PluginInfo;
 import org.scijava.util.VersionUtils;
 
 /**
@@ -106,7 +107,9 @@ public String getEngineName() {
 
 	@Override
 	public String getLanguageName() {
-		final String name = getInfo().getName();
+		String name = null;
+		final PluginInfo<?> info = getInfo();
+		if (info != null) name = info.getName();
 		return name != null && !name.isEmpty() ? name : inferNameFromClassName();
 	}
 

From ea8c6471e4d5a723eb0a2f58fd7f3c17d821a8d3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 24 Mar 2016 08:58:20 -0500
Subject: [PATCH 0153/1208] DefaultUIService: give a hint why no UIs are found

Multiple people have now been confused by this error.
So let's give a suggestion how to overcome it.

See:
* http://forum.imagej.net/t/basic-imagej2-question-how-to-open-imagej/1179
* http://forum.imagej.net/t/register-virtual-stack-slices-plugin-hangs-on-macos/1123/12
---
 src/main/java/org/scijava/ui/DefaultUIService.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 61f7644e3..7f8907dbb 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -159,9 +159,7 @@ public void addUI(final String name, final UserInterface ui) {
 	public void showUI() {
 		if (disposed) return;
 		final UserInterface ui = getDefaultUI();
-		if (ui == null) {
-			throw new IllegalStateException("No UIs available.");
-		}
+		if (ui == null) throw noUIsAvailableException();
 		showUI(ui);
 	}
 
@@ -188,9 +186,7 @@ public void showUI(final UserInterface ui) {
 	@Override
 	public boolean isVisible() {
 		final UserInterface ui = getDefaultUI();
-		if (ui == null) {
-			throw new IllegalStateException("No UIs available.");
-		}
+		if (ui == null) throw noUIsAvailableException();
 		return ui.isVisible();
 	}
 
@@ -547,4 +543,10 @@ private void addUserInterface(final String name, final UserInterface ui) {
 	private String getTitle() {
 		return appService.getApp().getTitle();
 	}
+
+	private IllegalStateException noUIsAvailableException() {
+		return new IllegalStateException("No UIs available. " +
+			"Please add a component containing a UIPlugin " +
+			"(e.g., scijava-ui-swing) to your class-path.");
+	}
 }

From 1e9c40d6f77878a522eedd3ac03dda9c0c493f35 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 29 Mar 2016 14:48:16 -0500
Subject: [PATCH 0154/1208] ScriptInfo: make assignAttribute code more compact

And hopefully easier to read.

This also generalizes it to any Object values, not just String values,
which will come in handy shortly.
---
 .../java/org/scijava/script/ScriptInfo.java   | 101 ++++++------------
 1 file changed, 33 insertions(+), 68 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index d8af44045..32dd70e76 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -421,78 +421,43 @@ private <T> void addItem(final String name, final Class<T> type,
 	}
 
 	private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
-		final String key, final String value) throws ScriptException
+		final String k, final Object v) throws ScriptException
 	{
 		// CTR: There must be an easier way to do this.
 		// Just compile the thing using javac? Or parse via javascript, maybe?
-		if ("callback".equalsIgnoreCase(key)) {
-			item.setCallback(value);
-		}
-		else if ("choices".equalsIgnoreCase(key)) {
+		if (is(k, "callback")) item.setCallback(as(v, String.class));
+		else if (is(k, "choices")) {
 			// FIXME: Regex above won't handle {a,b,c} syntax.
-//			item.setChoices(choices);
-		}
-		else if ("columns".equalsIgnoreCase(key)) {
-			item.setColumnCount(convertService.convert(value, int.class));
-		}
-		else if ("description".equalsIgnoreCase(key)) {
-			item.setDescription(value);
-		}
-		else if ("initializer".equalsIgnoreCase(key)) {
-			item.setInitializer(value);
-		}
-		else if ("type".equalsIgnoreCase(key)) {
-			item.setIOType(convertService.convert(value, ItemIO.class));
-		}
-		else if ("label".equalsIgnoreCase(key)) {
-			item.setLabel(value);
-		}
-		else if ("max".equalsIgnoreCase(key)) {
-			item.setMaximumValue(convertService.convert(value, item.getType()));
-		}
-		else if ("min".equalsIgnoreCase(key)) {
-			item.setMinimumValue(convertService.convert(value, item.getType()));
-		}
-		else if ("name".equalsIgnoreCase(key)) {
-			item.setName(value);
-		}
-		else if ("persist".equalsIgnoreCase(key)) {
-			item.setPersisted(convertService.convert(value, boolean.class));
-		}
-		else if ("persistKey".equalsIgnoreCase(key)) {
-			item.setPersistKey(value);
-		}
-		else if ("required".equalsIgnoreCase(key)) {
-			item.setRequired(convertService.convert(value, boolean.class));
-		}
-		else if ("softMax".equalsIgnoreCase(key)) {
-			item.setSoftMaximum(convertService.convert(value, item.getType()));
-		}
-		else if ("softMin".equalsIgnoreCase(key)) {
-			item.setSoftMinimum(convertService.convert(value, item.getType()));
-		}
-		else if ("stepSize".equalsIgnoreCase(key)) {
-			try {
-				final double stepSize = Double.parseDouble(value);
-				item.setStepSize(stepSize);
-			}
-			catch (final NumberFormatException exc) {
-				log.warn("Script parameter " + item.getName() +
-					" has an invalid stepSize: " + value);
-			}
-		}
-		else if ("style".equalsIgnoreCase(key)) {
-			item.setWidgetStyle(value);
-		}
-		else if ("visibility".equalsIgnoreCase(key)) {
-			item.setVisibility(convertService.convert(value, ItemVisibility.class));
-		}
-		else if ("value".equalsIgnoreCase(key)) {
-			item.setDefaultValue(convertService.convert(value, item.getType()));
-		}
-		else {
-			throw new ScriptException("Invalid attribute name: " + key);
-		}
+//			item.setChoices(list(v, item.getType()));
+		}
+		else if (is(k, "columns")) item.setColumnCount(as(v, int.class));
+		else if (is(k, "description")) item.setDescription(as(v, String.class));
+		else if (is(k, "initializer")) item.setInitializer(as(v, String.class));
+		else if (is(k, "type")) item.setIOType(as(v, ItemIO.class));
+		else if (is(k, "label")) item.setLabel(as(v, String.class));
+		else if (is(k, "max")) item.setMaximumValue(as(v, item.getType()));
+		else if (is(k, "min")) item.setMinimumValue(as(v, item.getType()));
+		else if (is(k, "name")) item.setName(as(v, String.class));
+		else if (is(k, "persist")) item.setPersisted(as(v, boolean.class));
+		else if (is(k, "persistKey")) item.setPersistKey(as(v, String.class));
+		else if (is(k, "required")) item.setRequired(as(v, boolean.class));
+		else if (is(k, "softMax")) item.setSoftMaximum(as(v, item.getType()));
+		else if (is(k, "softMin")) item.setSoftMinimum(as(v, item.getType()));
+		else if (is(k, "stepSize")) item.setStepSize(as(v, double.class));
+		else if (is(k, "style")) item.setWidgetStyle(as(v, String.class));
+		else if (is(k, "visibility")) item.setVisibility(as(v, ItemVisibility.class));
+		else if (is(k, "value")) item.setDefaultValue(as(v, item.getType()));
+		else throw new ScriptException("Invalid attribute name: " + k);
+	}
+
+	/** Super terse comparison helper method. */
+	private boolean is(final String key, final String desired) {
+		return desired.equalsIgnoreCase(key);
+	}
+
+	/** Super terse conversion helper method. */
+	private <T> T as(final Object v, final Class<T> type) {
+		return convertService.convert(v, type);
 	}
 
 	/**

From dfed65f9f3d34f9e111b32659e0649148f66f67a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 29 Mar 2016 14:51:21 -0500
Subject: [PATCH 0155/1208] ScriptInfo: generalize attr values to Object

This will come in handy shortly when we switch to SJEP.
---
 src/main/java/org/scijava/script/ScriptInfo.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 32dd70e76..c2f47ce2c 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -347,7 +347,7 @@ private void parseParam(final String param) throws ScriptException {
 	}
 
 	private void parseParam(final String param,
-		final HashMap<String, String> attrs) throws ScriptException
+		final HashMap<String, Object> attrs) throws ScriptException
 	{
 		final String[] tokens = param.trim().split("[ \t\n]+");
 		checkValid(tokens.length >= 1, param);
@@ -371,11 +371,11 @@ private void parseParam(final String param,
 	}
 
 	/** Parses a comma-delimited list of {@code key=value} pairs into a map. */
-	private HashMap<String, String> parseAttrs(final String attrs)
+	private HashMap<String, Object> parseAttrs(final String attrs)
 		throws ScriptException
 	{
 		// TODO: We probably want to use a real CSV parser.
-		final HashMap<String, String> attrsMap = new HashMap<String, String>();
+		final HashMap<String, Object> attrsMap = new HashMap<String, Object>();
 		for (final String token : attrs.split(",")) {
 			if (token.isEmpty()) continue;
 			final int equals = token.indexOf("=");
@@ -402,18 +402,18 @@ private void checkValid(final boolean valid, final String param)
 
 	/** Adds an output for the value returned by the script itself. */
 	private void addReturnValue() throws ScriptException {
-		final HashMap<String, String> attrs = new HashMap<String, String>();
+		final HashMap<String, Object> attrs = new HashMap<String, Object>();
 		attrs.put("type", "OUTPUT");
 		addItem(ScriptModule.RETURN_VALUE, Object.class, attrs);
 	}
 
 	private <T> void addItem(final String name, final Class<T> type,
-		final Map<String, String> attrs) throws ScriptException
+		final Map<String, Object> attrs) throws ScriptException
 	{
 		final DefaultMutableModuleItem<T> item =
 			new DefaultMutableModuleItem<T>(this, name, type);
 		for (final String key : attrs.keySet()) {
-			final String value = attrs.get(key);
+			final Object value = attrs.get(key);
 			assignAttribute(item, key, value);
 		}
 		if (item.isInput()) registerInput(item);

From aea2aca34cb9edae99134662878ffc3d5124bfed Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 29 Mar 2016 15:02:50 -0500
Subject: [PATCH 0156/1208] ScriptInfo: use SJEP for more robust attr parsing

SJEP version 3.0.0 includes improved support for "group" operators,
including parentheses, square brackets and curly braces. And its
default expression evaluator aggregates groups into List objects,
which can be easily consumed by the ScriptInfo attribute parser.

Closes #156.
---
 pom.xml                                       |  7 +++
 .../java/org/scijava/script/ScriptInfo.java   | 52 ++++++++++++++-----
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index b897191dc..eaf6ea6bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,9 +116,16 @@
 
 	<properties>
 		<scijava.jvm.test.version>1.8</scijava.jvm.test.version>
+		<scijava-expression-parser.version>3.0.0</scijava-expression-parser.version>
 	</properties>
 
 	<dependencies>
+		<!-- SciJava dependencies -->
+		<dependency>
+			<groupId>org.scijava</groupId>
+			<artifactId>scijava-expression-parser</artifactId>
+		</dependency>
+
 		<!-- Third-party dependencies -->
 		<dependency>
 			<groupId>com.googlecode.gentyref</groupId>
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index c2f47ce2c..5ee896b4c 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -38,8 +38,11 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.script.ScriptException;
@@ -56,6 +59,8 @@
 import org.scijava.module.DefaultMutableModuleItem;
 import org.scijava.module.ModuleException;
 import org.scijava.plugin.Parameter;
+import org.scijava.sjep.Variable;
+import org.scijava.sjep.eval.DefaultEvaluator;
 import org.scijava.util.DigestUtils;
 import org.scijava.util.FileUtils;
 
@@ -337,11 +342,11 @@ private void parseParam(final String param) throws ScriptException {
 		if (rParen < lParen) {
 			throw new ScriptException("Invalid parameter: " + param);
 		}
-		if (lParen < 0) parseParam(param, parseAttrs(""));
+		if (lParen < 0) parseParam(param, parseAttrs("()"));
 		else {
 			final String cutParam =
 				param.substring(0, lParen) + param.substring(rParen + 1);
-			final String attrs = param.substring(lParen + 1, rParen);
+			final String attrs = param.substring(lParen, rParen + 1);
 			parseParam(cutParam, parseAttrs(attrs));
 		}
 	}
@@ -374,20 +379,39 @@ private void parseParam(final String param,
 	private HashMap<String, Object> parseAttrs(final String attrs)
 		throws ScriptException
 	{
-		// TODO: We probably want to use a real CSV parser.
-		final HashMap<String, Object> attrsMap = new HashMap<String, Object>();
-		for (final String token : attrs.split(",")) {
-			if (token.isEmpty()) continue;
-			final int equals = token.indexOf("=");
-			if (equals < 0) throw new ScriptException("Invalid attribute: " + token);
-			final String key = token.substring(0, equals).trim();
-			String value = token.substring(equals + 1).trim();
-			if (value.startsWith("\"") && value.endsWith("\"")) {
-				value = value.substring(1, value.length() - 1);
+		// NB: Parse the attributes using the SciJava Expression Parser.
+		final DefaultEvaluator e = new DefaultEvaluator();
+		try {
+			final Object result = e.evaluate(attrs);
+			if (result == null) throw new ScriptException("Unparseable attributes");
+			final List<?> list;
+			if (result instanceof List) list = (List<?>) result;
+			else if (result instanceof Variable) {
+				list = Collections.singletonList(result);
+			}
+			else {
+				throw new ScriptException("Unexpected attributes type: " +
+					result.getClass().getName());
+			}
+
+			final HashMap<String, Object> attrsMap = new HashMap<String, Object>();
+			for (final Object o : list) {
+				if (o instanceof Variable) {
+					final Variable v = (Variable) o;
+					attrsMap.put(v.getToken(), e.value(v));
+				}
+				else {
+					throw new ScriptException("Invalid attribute: " + o);
+				}
 			}
-			attrsMap.put(key, value);
+			return attrsMap;
+		}
+		catch (final IllegalArgumentException exc) {
+			final ScriptException se = new ScriptException(
+				"Error parsing attributes");
+			se.initCause(exc);
+			throw se;
 		}
-		return attrsMap;
 	}
 
 	private boolean isIOType(final String token) {

From ddd4e909d384e33dcf905acb79ea2e8d84ca060a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 29 Mar 2016 15:40:45 -0500
Subject: [PATCH 0157/1208] ScriptInfo: parse choices attribute

Now that we use SJEP, this is straightforward to do.
---
 src/main/java/org/scijava/script/ScriptInfo.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 5ee896b4c..fefcbb663 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -38,7 +38,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -450,10 +450,7 @@ private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
 		// CTR: There must be an easier way to do this.
 		// Just compile the thing using javac? Or parse via javascript, maybe?
 		if (is(k, "callback")) item.setCallback(as(v, String.class));
-		else if (is(k, "choices")) {
-			// FIXME: Regex above won't handle {a,b,c} syntax.
-//			item.setChoices(list(v, item.getType()));
-		}
+		else if (is(k, "choices")) item.setChoices(asList(v, item.getType()));
 		else if (is(k, "columns")) item.setColumnCount(as(v, int.class));
 		else if (is(k, "description")) item.setDescription(as(v, String.class));
 		else if (is(k, "initializer")) item.setInitializer(as(v, String.class));
@@ -484,6 +481,15 @@ private <T> T as(final Object v, final Class<T> type) {
 		return convertService.convert(v, type);
 	}
 
+	private <T> List<T> asList(final Object v, final Class<T> type) {
+		final ArrayList<T> result = new ArrayList<T>();
+		final List<?> list = as(v, List.class);
+		for (final Object item : list) {
+			result.add(as(item, type));
+		}
+		return result;
+	}
+
 	/**
 	 * Read entire contents of a Reader and return as String.
 	 *

From cbf405b5cc9d9d7896d58869c2fc02ecb9ac5695 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 29 Mar 2016 15:39:15 -0500
Subject: [PATCH 0158/1208] ScriptInfoTest: also test that choices match

Of course, all the parameters currently being tested have no choices.
But that will change in the next commit.
---
 .../java/org/scijava/script/ScriptInfoTest.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index df64ad513..1211b9130 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -42,6 +42,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -146,21 +147,23 @@ public void testParameters() {
 		final ScriptInfo info =
 			new ScriptInfo(context, "params.bsizes", new StringReader(script));
 
+		final List<?> noChoices = Collections.emptyList();
+
 		final ModuleItem<?> log = info.getInput("log");
 		assertItem("log", LogService.class, null, ItemIO.INPUT, false, true, null,
-			null, null, null, null, null, null, null, log);
+			null, null, null, null, null, null, null, noChoices, log);
 
 		final ModuleItem<?> sliderValue = info.getInput("sliderValue");
 		assertItem("sliderValue", int.class, "Slider Value", ItemIO.INPUT, true,
-			true, null, "slider", 11, null, null, 5, 15, 3.0, sliderValue);
+			true, null, "slider", 11, null, null, 5, 15, 3.0, noChoices, sliderValue);
 
 		final ModuleItem<?> buffer = info.getOutput("buffer");
 		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,
-			null, null, null, null, null, null, null, null, buffer);
+			null, null, null, null, null, null, null, null, noChoices, buffer);
 
 		final ModuleItem<?> result = info.getOutput("result");
 		assertItem("result", Object.class, null, ItemIO.OUTPUT, true, true, null,
-			null, null, null, null, null, null, null, result);
+			null, null, null, null, null, null, null, noChoices, result);
 
 		int inputCount = 0;
 		final ModuleItem<?>[] inputs = { log, sliderValue, buffer };
@@ -180,7 +183,7 @@ private void assertItem(final String name, final Class<?> type,
 		final boolean persist, final String persistKey, final String style,
 		final Object value, final Object min, final Object max,
 		final Object softMin, final Object softMax, final Number stepSize,
-		final ModuleItem<?> item)
+		final List<?> choices, final ModuleItem<?> item)
 	{
 		assertEquals(name, item.getName());
 		assertSame(type, item.getType());
@@ -196,6 +199,7 @@ private void assertItem(final String name, final Class<?> type,
 		assertEquals(softMin, item.getSoftMinimum());
 		assertEquals(softMax, item.getSoftMaximum());
 		assertEquals(stepSize, item.getStepSize());
+		assertEquals(choices, item.getChoices());
 	}
 
 	/**

From 66fc545f7d46a97496ce2b6eb4f0fd5ec79aeaba Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 29 Mar 2016 15:41:23 -0500
Subject: [PATCH 0159/1208] ScriptInfoTest: add a multiple choice parameter

Now that we parse the choices attribute, let's test that it works.
---
 src/test/java/org/scijava/script/ScriptInfoTest.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 1211b9130..887b8d52b 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -142,6 +142,8 @@ public void testParameters() {
 			"% @LogService(required = false) log\n" + //
 			"% @int(label=\"Slider Value\", softMin=5, softMax=15, " + //
 			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
+			"% @String(persist = false, " + //
+			"choices={'quick brown fox', 'lazy dog'}) animal\n" + //
 			"% @BOTH java.lang.StringBuilder buffer";
 
 		final ScriptInfo info =
@@ -157,6 +159,12 @@ public void testParameters() {
 		assertItem("sliderValue", int.class, "Slider Value", ItemIO.INPUT, true,
 			true, null, "slider", 11, null, null, 5, 15, 3.0, noChoices, sliderValue);
 
+		final ModuleItem<?> animal = info.getInput("animal");
+		final List<String> animalChoices = //
+			Arrays.asList("quick brown fox", "lazy dog");
+		assertItem("animal", String.class, null, ItemIO.INPUT, true, false,
+			null, null, null, null, null, null, null, null, animalChoices, animal);
+
 		final ModuleItem<?> buffer = info.getOutput("buffer");
 		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,
 			null, null, null, null, null, null, null, null, noChoices, buffer);
@@ -166,7 +174,7 @@ public void testParameters() {
 			null, null, null, null, null, null, null, noChoices, result);
 
 		int inputCount = 0;
-		final ModuleItem<?>[] inputs = { log, sliderValue, buffer };
+		final ModuleItem<?>[] inputs = { log, sliderValue, animal, buffer };
 		for (final ModuleItem<?> inItem : info.inputs()) {
 			assertSame(inputs[inputCount++], inItem);
 		}

From 14e04912fdbce7e1b46515cd09d49a10042fc1d7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 31 Mar 2016 18:56:36 -0500
Subject: [PATCH 0160/1208] ScriptLanguageIndex: fix gentle language addition

When adding a language "gently" (i.e., without ovewriting existing
languages), we should be smarter about not overwriting _any_ of the
language names or extensions. Otherwise, a lower-priority language
can override a higher-priority one with respect to a specific name
or extension.
---
 .../scijava/script/ScriptLanguageIndex.java   | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index dfae11751..eb8797612 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -75,32 +75,24 @@ public ScriptLanguageIndex(final LogService logService) {
 	}
 
 	public boolean add(final ScriptEngineFactory factory, final boolean gently) {
-		final String duplicateName = checkDuplicate(factory);
-		if (duplicateName != null) {
-			if (gently) return false;
-			if (log != null) {
-				log.warn("Duplicate scripting language '" +
-					duplicateName + "': existing=" +
-					byName.get(duplicateName).getClass().getName() +
-					", new=" + factory.getClass().getName());
-			}
-		}
+		boolean result = false;
 
 		final ScriptLanguage language = wrap(factory);
 
 		// add language names
-		byName.put(language.getLanguageName(), language);
+		result |= put("name", byName, language.getLanguageName(), language, gently);
 		for (final String name : language.getNames()) {
-			byName.put(name, language);
+			result |= put("name", byName, name, language, gently);
 		}
 
 		// add file extensions
 		for (final String extension : language.getExtensions()) {
 			if ("".equals(extension)) continue;
-			byExtension.put(extension, language);
+			result |= put("extension", byExtension, extension, language, gently);
 		}
 
-		return super.add(language);
+		result |= super.add(language);
+		return result;
 	}
 
 	public ScriptLanguage getByExtension(final String extension) {
@@ -137,13 +129,19 @@ public boolean add(final ScriptLanguage language) {
 
 	// -- Helper methods --
 
-	private String checkDuplicate(final ScriptEngineFactory factory) {
-		for (final String name : factory.getNames()) {
-			if (byName.containsKey(name)) {
-				return name;
+	private boolean put(final String type, final Map<String, ScriptLanguage> map,
+		final String key, final ScriptLanguage value, final boolean gently)
+	{
+		if (gently && map.containsKey(key)) {
+			if (log != null) {
+				log.warn("Not registering " + type + " '" + key +
+					"' for scripting language " + value.getClass().getName() +
+					": existing=" + map.get(key).getClass().getName());
 			}
+			return false;
 		}
-		return null;
+		map.put(key, value);
+		return true;
 	}
 
 	private ScriptLanguage wrap(final ScriptEngineFactory factory) {

From 26334909e5869e8e2a8419679810a1f9e4c3b7fa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 31 Mar 2016 18:59:08 -0500
Subject: [PATCH 0161/1208] DefaultScriptService: always add languages gently

Otherwise, lower-priority languages overwrite higher-priority ones!
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index e04efee2d..f5ef235fe 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -343,7 +343,7 @@ private synchronized void initScriptLanguageIndex() {
 
 		// add ScriptLanguage plugins
 		for (final ScriptLanguage language : getInstances()) {
-			index.add(language, false);
+			index.add(language, true);
 		}
 
 		// Now look for the ScriptEngines in javax.scripting. We only do that

From f29650e3d52e06518809068de8786896e2a422b4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Apr 2016 09:55:15 -0500
Subject: [PATCH 0162/1208] DefaultScriptService: do not wrap JSR-223 engines

In theory, it was nice to try to expose all available JSR-223
ScriptEngineFactory implementations as SciJava script languages.

However, without an associated explicit ScriptLanguage plugin,
there are limitations to what the SciJava framework can achieve.

And there was related behavior which could be construed as a bug:
each SciJava scripting component now exposes its ScriptLanguage as
a ScriptEngineFactory via the javax.services mechanism so that it
can be used from other JSR-223 applications not built on SJC. This
caused them to be discovered and added to the ScriptLanguageIndex
twice: once as ScriptLanguage plugins directly, and again as
wrapped JSR-223 ScriptEngineFactory implementations. While we could
make the ScriptService smarter about this situation, it is easier
to simply stop wrapping vanilla JSR-223 ScriptEngineFactory
classes, because we have no use cases relying on it. (The only
engine I know of which has no associated SciJava scripting
component is AppleScript on OS X, and AFAIK, no one writes
AppleScript scripts in anger in ImageJ.)
---
 .../org/scijava/script/DefaultScriptService.java   | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index f5ef235fe..e1317cc58 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -346,20 +346,6 @@ private synchronized void initScriptLanguageIndex() {
 			index.add(language, true);
 		}
 
-		// Now look for the ScriptEngines in javax.scripting. We only do that
-		// now since the javax.scripting framework does not provide all the
-		// functionality we might want to use in a SciJava application.
-		final ScriptEngineManager manager = new ScriptEngineManager();
-		for (final ScriptEngineFactory factory : manager.getEngineFactories()) {
-			index.add(factory, true);
-		}
-
-		// Inject the context into languages which need it: the
-		// wrapped engine factories from the ScriptEngineManager.
-		for (final ScriptLanguage language : index) {
-			if (language.getContext() == null) language.setContext(getContext());
-		}
-
 		scriptLanguageIndex = index;
 	}
 

From a753c33dad496317ec067244ec1fab5107731481 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Apr 2016 10:46:41 -0500
Subject: [PATCH 0163/1208] ScriptLanguageIndex: clarify add behavior cases

When adding a script language to the index, behavior depends on a couple
of factors:

- whether each key is already in the map
- whether that key points to the same value, or different one
- whether the gently flag is set

We now log what happens in more situations, especially in debug mode.
---
 .../scijava/script/ScriptLanguageIndex.java   | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index eb8797612..3e15a91d8 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -132,14 +132,32 @@ public boolean add(final ScriptLanguage language) {
 	private boolean put(final String type, final Map<String, ScriptLanguage> map,
 		final String key, final ScriptLanguage value, final boolean gently)
 	{
-		if (gently && map.containsKey(key)) {
-			if (log != null) {
-				log.warn("Not registering " + type + " '" + key +
-					"' for scripting language " + value.getClass().getName() +
-					": existing=" + map.get(key).getClass().getName());
+		final ScriptLanguage existing = map.get(key);
+
+		if (existing == value) {
+			// Duplicate key/value pair; do not overwrite.
+			if (log != null && log.isDebug()) {
+				// In debug mode, warn about the duplicate (since it is atypical).
+				log.debug(overwriteMessage(false, type, key, value, existing));
 			}
 			return false;
 		}
+
+		if (existing != null) {
+			// Conflicting value; behavior depends on mode.
+			if (gently) {
+				// Do not overwrite the previous value.
+				if (log != null && log.isWarn()) {
+					log.warn(overwriteMessage(false, type, key, value, existing));
+				}
+				return false;
+			}
+			if (log != null && log.isDebug()) {
+				// In debug mode, warn about overwriting.
+				log.debug(overwriteMessage(true, type, key, value, existing));
+			}
+		}
+
 		map.put(key, value);
 		return true;
 	}
@@ -149,4 +167,14 @@ private ScriptLanguage wrap(final ScriptEngineFactory factory) {
 		return new AdaptedScriptLanguage(factory);
 	}
 
+	/** Helper method of {@link #put}. */
+	private String overwriteMessage(final boolean overwrite, final String type,
+		final String key, final ScriptLanguage proposed,
+		final ScriptLanguage existing)
+	{
+		return (overwrite ? "Overwriting " : "Not overwriting ") + type + //
+			" '" + key + "':\n\tproposed = " + proposed.getClass().getName() +
+			"\n\texisting = " + existing.getClass().getName();
+	}
+
 }

From cb1a16dff204d50362d2a4bd1f6353b86faebbb5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Apr 2016 10:49:26 -0500
Subject: [PATCH 0164/1208] ScriptLanguageIndex: add javadoc to helper method

---
 src/main/java/org/scijava/script/ScriptLanguageIndex.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 3e15a91d8..4563dbd97 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -162,6 +162,7 @@ private boolean put(final String type, final Map<String, ScriptLanguage> map,
 		return true;
 	}
 
+	/** Helper method of {@link #add(ScriptEngineFactory, boolean)}. */
 	private ScriptLanguage wrap(final ScriptEngineFactory factory) {
 		if (factory instanceof ScriptLanguage) return (ScriptLanguage) factory;
 		return new AdaptedScriptLanguage(factory);

From 60d5d130aefbc66f000899cce23791e35aac62bd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Apr 2016 13:42:35 -0500
Subject: [PATCH 0165/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eaf6ea6bc..b26b94caa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.53.1-SNAPSHOT</version>
+	<version>2.53.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From a809ffb85b0afb95fb1df52bc0c1f472aa8efd19 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 20:32:18 -0500
Subject: [PATCH 0166/1208] Fix StatusServiceTest

Name it consistently with all other service tests.
And add the missing class javadoc and @author tag.
---
 ...efaultStatusServiceTest.java => StatusServiceTest.java} | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 rename src/test/java/org/scijava/app/{DefaultStatusServiceTest.java => StatusServiceTest.java} (98%)

diff --git a/src/test/java/org/scijava/app/DefaultStatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
similarity index 98%
rename from src/test/java/org/scijava/app/DefaultStatusServiceTest.java
rename to src/test/java/org/scijava/app/StatusServiceTest.java
index eca692637..58a049138 100644
--- a/src/test/java/org/scijava/app/DefaultStatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -48,7 +48,12 @@
 import org.scijava.event.EventHandler;
 import org.scijava.plugin.Parameter;
 
-public class DefaultStatusServiceTest {
+/**
+ * Tests {@link StatusService}.
+ * 
+ * @author Lee Kamentsky
+ */
+public class StatusServiceTest {
 
 	private Context context;
 	private StatusListener statusListener;

From 5ebbc0a7710f49d1068d591e8d726c47dd71631c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Feb 2016 13:45:06 -0600
Subject: [PATCH 0167/1208] Add a service for executing Java classes

This code migrated from the JavaService/JavaRunner API of the
scijava/scripting-java component.

See #226.
---
 pom.xml                                       |  2 +-
 .../org/scijava/run/AbstractClassRunner.java  | 53 ++++++++++++
 .../java/org/scijava/run/ClassRunner.java     | 58 +++++++++++++
 .../org/scijava/run/DefaultRunService.java    | 83 +++++++++++++++++++
 src/main/java/org/scijava/run/RunService.java | 51 ++++++++++++
 .../java/org/scijava/ContextCreationTest.java |  1 +
 6 files changed, 247 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/run/AbstractClassRunner.java
 create mode 100644 src/main/java/org/scijava/run/ClassRunner.java
 create mode 100644 src/main/java/org/scijava/run/DefaultRunService.java
 create mode 100644 src/main/java/org/scijava/run/RunService.java

diff --git a/pom.xml b/pom.xml
index b26b94caa..86a4aaaaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.53.2-SNAPSHOT</version>
+	<version>2.54.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/run/AbstractClassRunner.java b/src/main/java/org/scijava/run/AbstractClassRunner.java
new file mode 100644
index 000000000..1acd7d45d
--- /dev/null
+++ b/src/main/java/org/scijava/run/AbstractClassRunner.java
@@ -0,0 +1,53 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.run;
+
+import org.scijava.plugin.AbstractHandlerPlugin;
+
+/**
+ * Abstract superclass of {@link ClassRunner} implementations.
+ * 
+ * @author Curtis Rueden
+ */
+public abstract class AbstractClassRunner extends
+	AbstractHandlerPlugin<Class<?>> implements ClassRunner
+{
+
+	// -- Typed methods --
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public Class<Class<?>> getType() {
+		return (Class) Class.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/run/ClassRunner.java b/src/main/java/org/scijava/run/ClassRunner.java
new file mode 100644
index 000000000..ef7d0ffd5
--- /dev/null
+++ b/src/main/java/org/scijava/run/ClassRunner.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.run;
+
+import javax.script.ScriptException;
+
+import org.scijava.plugin.HandlerPlugin;
+import org.scijava.plugin.Plugin;
+
+/**
+ * A plugin which extends the {@link RunService}'s execution handling. A
+ * {@link ClassRunner} knows how to execute certain classes, beyond just Java's
+ * usual {@code main} method.
+ * <p>
+ * Class runner plugins discoverable at runtime must implement this interface
+ * and be annotated with @{@link Plugin} with attribute {@link Plugin#type()} =
+ * {@link ClassRunner}.class. While it possible to create a class runner plugin
+ * merely by implementing this interface, it is encouraged to instead extend
+ * {@link AbstractClassRunner}, for convenience.
+ * </p>
+ * 
+ * @author Curtis Rueden
+ */
+public interface ClassRunner extends HandlerPlugin<Class<?>> {
+
+	/** Executes the given class. */
+	void run(Class<?> c) throws ScriptException;
+
+}
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
new file mode 100644
index 000000000..687098663
--- /dev/null
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.run;
+
+import javax.script.ScriptException;
+
+import org.scijava.log.LogService;
+import org.scijava.plugin.AbstractHandlerService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.Service;
+
+/**
+ * Default service for managing available {@link ClassRunner} plugins.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultRunService extends
+	AbstractHandlerService<Class<?>, ClassRunner> implements RunService
+{
+
+	@Parameter
+	private LogService log;
+
+	// -- RunService methods --
+
+	@Override
+	public void run(final Class<?> c) throws ScriptException {
+		for (final ClassRunner runner : getInstances()) {
+			if (runner.supports(c)) {
+				runner.run(c);
+				return;
+			}
+		}
+		log.error("Unknown class type: " + c.getName());
+	}
+
+	// -- PTService methods --
+
+	@Override
+	public Class<ClassRunner> getPluginType() {
+		return ClassRunner.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public Class<Class<?>> getType() {
+		return (Class) Class.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
new file mode 100644
index 000000000..e1b8e9c0e
--- /dev/null
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.run;
+
+import javax.script.ScriptException;
+
+import org.scijava.plugin.HandlerService;
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for service that manages available {@link ClassRunner} plugins.
+ * 
+ * @author Curtis Rueden
+ */
+public interface RunService extends
+	HandlerService<Class<?>, ClassRunner>, SciJavaService
+{
+
+	/** Executes the given class using the most appropriate handler. */
+	void run(Class<?> c) throws ScriptException;
+
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index be2871145..e3955a6c7 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -105,6 +105,7 @@ public void testFull() {
 				org.scijava.platform.DefaultPlatformService.class,
 				org.scijava.plugin.DefaultPluginService.class,
 				org.scijava.prefs.DefaultPrefService.class,
+				org.scijava.run.DefaultRunService.class,
 				org.scijava.script.DefaultScriptHeaderService.class,
 				org.scijava.text.DefaultTextService.class,
 				org.scijava.thread.DefaultThreadService.class,

From 39d5e3b1794954f26c8ad06866267e4a19019a8d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Feb 2016 13:47:51 -0600
Subject: [PATCH 0168/1208] Add a ClassRunner for Command plugins

Migrated from the CommandJavaRunner of scijava/scripting-java.
---
 .../scijava/command/run/CommandRunner.java    | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 src/main/java/org/scijava/command/run/CommandRunner.java

diff --git a/src/main/java/org/scijava/command/run/CommandRunner.java b/src/main/java/org/scijava/command/run/CommandRunner.java
new file mode 100644
index 000000000..acd7e60e6
--- /dev/null
+++ b/src/main/java/org/scijava/command/run/CommandRunner.java
@@ -0,0 +1,76 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.command.run;
+
+import org.scijava.command.Command;
+import org.scijava.command.CommandInfo;
+import org.scijava.command.CommandService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.plugin.PluginService;
+import org.scijava.run.AbstractClassRunner;
+import org.scijava.run.ClassRunner;
+
+/**
+ * Runs the given {@link Command} class.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = ClassRunner.class)
+public class CommandRunner extends AbstractClassRunner {
+
+	@Parameter
+	private PluginService pluginService;
+
+	@Parameter
+	private CommandService commandService;
+
+	// -- ClassRunner methods --
+
+	@Override
+	public void run(final Class<?> c) {
+		@SuppressWarnings("unchecked")
+		final Class<? extends Command> commandClass =  (Class<? extends Command>) c;
+		final Plugin annotation = c.getAnnotation(Plugin.class);
+		final CommandInfo info = new CommandInfo(commandClass, annotation);
+		pluginService.addPlugin(info);
+		commandService.run(info, true);
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final Class<?> c) {
+		return Command.class.isAssignableFrom(c);
+	}
+
+}

From 8272eb03c8c9fe53af934a1fca58da5a72aeccdf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Feb 2016 13:49:41 -0600
Subject: [PATCH 0169/1208] Add a ClassRunner for main methods of classes

Migrated from the MainJavaRunner of scijava/scripting-java.
---
 .../java/org/scijava/main/run/MainRunner.java | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 src/main/java/org/scijava/main/run/MainRunner.java

diff --git a/src/main/java/org/scijava/main/run/MainRunner.java b/src/main/java/org/scijava/main/run/MainRunner.java
new file mode 100644
index 000000000..cfdd43b5d
--- /dev/null
+++ b/src/main/java/org/scijava/main/run/MainRunner.java
@@ -0,0 +1,98 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.main.run;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.script.ScriptException;
+
+import org.scijava.Priority;
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.run.AbstractClassRunner;
+import org.scijava.run.ClassRunner;
+
+/**
+ * Executes the given class's {@code main} method.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = ClassRunner.class, priority = Priority.LOW_PRIORITY)
+public class MainRunner extends AbstractClassRunner {
+
+	@Parameter(required = false)
+	private LogService log;
+
+	// -- ClassRunner methods --
+
+	@Override
+	public void run(final Class<?> c) throws ScriptException {
+		try {
+			getMain(c).invoke(null, new Object[] { new String[0] });
+		}
+		catch (final IllegalArgumentException exc) {
+			throw new ScriptException(exc);
+		}
+		catch (final IllegalAccessException exc) {
+			throw new ScriptException(exc);
+		}
+		catch (final InvocationTargetException exc) {
+			throw new ScriptException(exc);
+		}
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final Class<?> c) {
+		return getMain(c) != null;
+	}
+
+	// -- Helper methods --
+
+	private Method getMain(final Class<?> c) {
+		try {
+			return c.getMethod("main", String[].class);
+		}
+		catch (final SecurityException exc) {
+			if (log != null) log.debug(exc);
+			return null;
+		}
+		catch (final NoSuchMethodException exc) {
+			if (log != null) log.debug(exc);
+			return null;
+		}
+	}
+
+}

From ef2adf3646286e42e64930dc5d70b7e4872da094 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Feb 2016 15:20:05 -0600
Subject: [PATCH 0170/1208] RunService: use InvocationTargetException instead

The code migrated from scijava/scripting-java used ScriptException.
But now that this code is part of core SJC, and is not script-specific
anymore, it makes more sense to use InvocationTargetException instead.
---
 src/main/java/org/scijava/main/run/MainRunner.java   | 11 +++--------
 src/main/java/org/scijava/run/ClassRunner.java       |  4 ++--
 src/main/java/org/scijava/run/DefaultRunService.java |  6 +++---
 src/main/java/org/scijava/run/RunService.java        |  4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/main/run/MainRunner.java b/src/main/java/org/scijava/main/run/MainRunner.java
index cfdd43b5d..05d528f93 100644
--- a/src/main/java/org/scijava/main/run/MainRunner.java
+++ b/src/main/java/org/scijava/main/run/MainRunner.java
@@ -34,8 +34,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import javax.script.ScriptException;
-
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -57,18 +55,15 @@ public class MainRunner extends AbstractClassRunner {
 	// -- ClassRunner methods --
 
 	@Override
-	public void run(final Class<?> c) throws ScriptException {
+	public void run(final Class<?> c) throws InvocationTargetException {
 		try {
 			getMain(c).invoke(null, new Object[] { new String[0] });
 		}
 		catch (final IllegalArgumentException exc) {
-			throw new ScriptException(exc);
+			throw new InvocationTargetException(exc);
 		}
 		catch (final IllegalAccessException exc) {
-			throw new ScriptException(exc);
-		}
-		catch (final InvocationTargetException exc) {
-			throw new ScriptException(exc);
+			throw new InvocationTargetException(exc);
 		}
 	}
 
diff --git a/src/main/java/org/scijava/run/ClassRunner.java b/src/main/java/org/scijava/run/ClassRunner.java
index ef7d0ffd5..9a1ad7302 100644
--- a/src/main/java/org/scijava/run/ClassRunner.java
+++ b/src/main/java/org/scijava/run/ClassRunner.java
@@ -31,7 +31,7 @@
 
 package org.scijava.run;
 
-import javax.script.ScriptException;
+import java.lang.reflect.InvocationTargetException;
 
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
@@ -53,6 +53,6 @@
 public interface ClassRunner extends HandlerPlugin<Class<?>> {
 
 	/** Executes the given class. */
-	void run(Class<?> c) throws ScriptException;
+	void run(Class<?> c) throws InvocationTargetException;
 
 }
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index 687098663..aac4b1bbb 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -31,7 +31,7 @@
 
 package org.scijava.run;
 
-import javax.script.ScriptException;
+import java.lang.reflect.InvocationTargetException;
 
 import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractHandlerService;
@@ -55,14 +55,14 @@ public class DefaultRunService extends
 	// -- RunService methods --
 
 	@Override
-	public void run(final Class<?> c) throws ScriptException {
+	public void run(final Class<?> c) throws InvocationTargetException {
 		for (final ClassRunner runner : getInstances()) {
 			if (runner.supports(c)) {
 				runner.run(c);
 				return;
 			}
 		}
-		log.error("Unknown class type: " + c.getName());
+		throw new IllegalArgumentException("Unknown class type: " + c.getName());
 	}
 
 	// -- PTService methods --
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index e1b8e9c0e..0730309e9 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -31,7 +31,7 @@
 
 package org.scijava.run;
 
-import javax.script.ScriptException;
+import java.lang.reflect.InvocationTargetException;
 
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
@@ -46,6 +46,6 @@ public interface RunService extends
 {
 
 	/** Executes the given class using the most appropriate handler. */
-	void run(Class<?> c) throws ScriptException;
+	void run(Class<?> c) throws InvocationTargetException;
 
 }

From 6dff174797938dbbea95f83ac6745adf3067deca Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Feb 2016 15:26:29 -0600
Subject: [PATCH 0171/1208] RunService: allow passing arguments to executions

When running a class, you might want to pass some arguments. To be sure,
this is useful for two of our primary use cases: main methods & modules.
---
 .../scijava/command/run/CommandRunner.java    |  4 ++--
 .../java/org/scijava/main/run/MainRunner.java | 22 +++++++++++++++++--
 .../java/org/scijava/run/ClassRunner.java     |  4 ++--
 .../org/scijava/run/DefaultRunService.java    |  4 +++-
 src/main/java/org/scijava/run/RunService.java |  7 ++++--
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/command/run/CommandRunner.java b/src/main/java/org/scijava/command/run/CommandRunner.java
index acd7e60e6..ec085ef96 100644
--- a/src/main/java/org/scijava/command/run/CommandRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandRunner.java
@@ -57,13 +57,13 @@ public class CommandRunner extends AbstractClassRunner {
 	// -- ClassRunner methods --
 
 	@Override
-	public void run(final Class<?> c) {
+	public void run(final Class<?> c, final Object... args) {
 		@SuppressWarnings("unchecked")
 		final Class<? extends Command> commandClass =  (Class<? extends Command>) c;
 		final Plugin annotation = c.getAnnotation(Plugin.class);
 		final CommandInfo info = new CommandInfo(commandClass, annotation);
 		pluginService.addPlugin(info);
-		commandService.run(info, true);
+		commandService.run(info, true, args);
 	}
 
 	// -- Typed methods --
diff --git a/src/main/java/org/scijava/main/run/MainRunner.java b/src/main/java/org/scijava/main/run/MainRunner.java
index 05d528f93..36d2a6474 100644
--- a/src/main/java/org/scijava/main/run/MainRunner.java
+++ b/src/main/java/org/scijava/main/run/MainRunner.java
@@ -55,9 +55,12 @@ public class MainRunner extends AbstractClassRunner {
 	// -- ClassRunner methods --
 
 	@Override
-	public void run(final Class<?> c) throws InvocationTargetException {
+	public void run(final Class<?> c, final Object... args)
+		throws InvocationTargetException
+	{
+		final Object[] sArgs = stringify(args);
 		try {
-			getMain(c).invoke(null, new Object[] { new String[0] });
+			getMain(c).invoke(null, new Object[] { sArgs });
 		}
 		catch (final IllegalArgumentException exc) {
 			throw new InvocationTargetException(exc);
@@ -90,4 +93,19 @@ private Method getMain(final Class<?> c) {
 		}
 	}
 
+	/** Ensures each element is a {@link String}. */
+	private String[] stringify(final Object... o) {
+		final String[] s;
+		if (o == null) s = null;
+		else {
+			s = new String[o.length];
+			for (int i = 0; i < o.length; i++) {
+				if (o[i] == null) s[i] = null;
+				else if (o[i] instanceof String) s[i] = (String) o[i];
+				else s[i] = o[i].toString();
+			}
+		}
+		return s;
+	}
+
 }
diff --git a/src/main/java/org/scijava/run/ClassRunner.java b/src/main/java/org/scijava/run/ClassRunner.java
index 9a1ad7302..79e279a1a 100644
--- a/src/main/java/org/scijava/run/ClassRunner.java
+++ b/src/main/java/org/scijava/run/ClassRunner.java
@@ -52,7 +52,7 @@
  */
 public interface ClassRunner extends HandlerPlugin<Class<?>> {
 
-	/** Executes the given class. */
-	void run(Class<?> c) throws InvocationTargetException;
+	/** Executes the given class, with the specified arguments. */
+	void run(Class<?> c, Object... args) throws InvocationTargetException;
 
 }
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index aac4b1bbb..06d76556f 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -55,7 +55,9 @@ public class DefaultRunService extends
 	// -- RunService methods --
 
 	@Override
-	public void run(final Class<?> c) throws InvocationTargetException {
+	public void run(final Class<?> c, final Object... args)
+		throws InvocationTargetException
+	{
 		for (final ClassRunner runner : getInstances()) {
 			if (runner.supports(c)) {
 				runner.run(c);
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 0730309e9..2dec65342 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -45,7 +45,10 @@ public interface RunService extends
 	HandlerService<Class<?>, ClassRunner>, SciJavaService
 {
 
-	/** Executes the given class using the most appropriate handler. */
-	void run(Class<?> c) throws InvocationTargetException;
+	/**
+	 * Executes the given class using the most appropriate handler, passing the
+	 * given arguments to the execution.
+	 */
+	void run(Class<?> c, Object... args) throws InvocationTargetException;
 
 }

From cd3a2e493a36a3fec4f34668ba16a4bb57514c1f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Feb 2016 14:46:55 -0600
Subject: [PATCH 0172/1208] ModuleService: add getModuleById method

This looks up Identifiable ModuleInfos by their identifiers.

Migrated from the ModuleUtils class of the imagej/imagej-omero project.
---
 .../org/scijava/module/DefaultModuleService.java     | 12 ++++++++++++
 src/main/java/org/scijava/module/ModuleService.java  |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index cee5be523..67b1a1907 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -41,6 +41,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import org.scijava.Identifiable;
 import org.scijava.MenuPath;
 import org.scijava.Priority;
 import org.scijava.convert.ConvertService;
@@ -140,6 +141,17 @@ public List<ModuleInfo> getModules() {
 		return moduleIndex.getAll();
 	}
 
+	@Override
+	public ModuleInfo getModuleById(final String id) {
+		// TODO: Cache identifiers in a hash?
+		for (final ModuleInfo info : getModules()) {
+			if (!(info instanceof Identifiable)) continue;
+			final String infoID = ((Identifiable) info).getIdentifier();
+			if (id.equals(infoID)) return info;
+		}
+		return null;
+	}
+
 	@Override
 	public ModuleInfo getModuleForAccelerator(final Accelerator acc) {
 		for (final ModuleInfo info : getModules()) {
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 21ee456cc..6d3613c9e 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -36,6 +36,7 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
+import org.scijava.Identifiable;
 import org.scijava.Prioritized;
 import org.scijava.input.Accelerator;
 import org.scijava.module.process.ModulePostprocessor;
@@ -90,6 +91,14 @@ public interface ModuleService extends SciJavaService {
 	/** Gets the list of available modules. */
 	List<ModuleInfo> getModules();
 
+	/**
+	 * Gets the module with the given identifier string.
+	 * 
+	 * @param id The identifier string corresponding to the desired module.
+	 * @return The {@link Identifiable} module with the given identifier.
+	 */
+	ModuleInfo getModuleById(String id);
+
 	/**
 	 * Gets the module for a given keyboard shortcut.
 	 * 

From 8626a3cba2a071c8ea6d84434690e2c54ac5d1fe Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 13:52:41 -0500
Subject: [PATCH 0173/1208] Add a ParseService using SJEP

This is a generalization of the code in ScriptInfo#parseAttrs(String).
---
 .../scijava/parse/DefaultParseService.java    | 141 ++++++++++++++++++
 src/main/java/org/scijava/parse/Item.java     |  53 +++++++
 src/main/java/org/scijava/parse/Items.java    |  58 +++++++
 .../java/org/scijava/parse/ParseService.java  |  57 +++++++
 .../java/org/scijava/ContextCreationTest.java |   1 +
 5 files changed, 310 insertions(+)
 create mode 100644 src/main/java/org/scijava/parse/DefaultParseService.java
 create mode 100644 src/main/java/org/scijava/parse/Item.java
 create mode 100644 src/main/java/org/scijava/parse/Items.java
 create mode 100644 src/main/java/org/scijava/parse/ParseService.java

diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
new file mode 100644
index 000000000..4ea6fbaf2
--- /dev/null
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -0,0 +1,141 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.parse;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.scijava.plugin.Plugin;
+import org.scijava.service.AbstractService;
+import org.scijava.service.Service;
+import org.scijava.sjep.Variable;
+import org.scijava.sjep.eval.DefaultEvaluator;
+import org.scijava.util.ObjectArray;
+
+/**
+ * Default service for parsing strings.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultParseService extends AbstractService implements
+	ParseService
+{
+
+	@Override
+	public Items parse(final String arg) {
+		return new ItemsList(arg);
+	}
+
+	// -- Helper classes --
+
+	/**
+	 * {@link Items} implementation backed by the
+	 * <a href="https://github.com/scijava/scijava-expression-parser">SciJava
+	 * Expression Parser</a>.
+	 */
+	private static class ItemsList extends ObjectArray<Item> implements Items {
+
+		public ItemsList(final String arg) {
+			super(Item.class);
+			parseItems(arg);
+		}
+
+		@Override
+		public Map<String, Object> asMap() {
+			final LinkedHashMap<String, Object> map =
+				new LinkedHashMap<String, Object>();
+			for (final Item item : this) {
+				map.put(item.name(), item.value());
+			}
+			return map;
+		}
+
+		@Override
+		public boolean isMap() {
+			for (final Item item : this) {
+				if (item.name() == null) return false;
+			}
+			return true;
+		}
+
+		@Override
+		public boolean isList() {
+			for (final Item item : this) {
+				if (item.name() != null) return false;
+			}
+			return true;
+		}
+
+		private void parseItems(final String arg) {
+			final DefaultEvaluator e = new DefaultEvaluator();
+			final Object result = e.evaluate("(" + arg + ")");
+			if (result == null) {
+				throw new IllegalStateException("Error parsing string: '" + arg + "'");
+			}
+			final List<?> list;
+			if (result instanceof List) list = (List<?>) result;
+			else list = Collections.singletonList(result);
+
+			for (final Object o : list) {
+				final String name;
+				final Object value;
+				if (o instanceof Variable) {
+					final Variable v = (Variable) o;
+					name = v.getToken();
+					value = e.value(v);
+				}
+				else {
+					name = null;
+					value = o;
+				}
+				add(new Item() {
+
+					@Override
+					public String name() {
+						return name;
+					}
+
+					@Override
+					public Object value() {
+						return value;
+					}
+
+				});
+			}
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
new file mode 100644
index 000000000..311227ae7
--- /dev/null
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -0,0 +1,53 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.parse;
+
+/**
+ * An item from the list of parsed items; i.e.: a name/value pair.
+ * <p>
+ * NB: It is unfortunate that we cannot use {@code javafx.util.Pair}, but it is:
+ * A) Java 8; and B) part of JavaFX rather than core Java.
+ * </p>
+ * 
+ * @author Curtis Rueden
+ */
+public interface Item {
+
+	/**
+	 * Gets the name of the item, or {@code null} if unnamed (i.e., raw value with
+	 * no equals sign).
+	 */
+	String name();
+
+	/** Gets the value of the item. */
+	Object value();
+}
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
new file mode 100644
index 000000000..af1187620
--- /dev/null
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -0,0 +1,58 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.parse;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An ordered list of items, some of which might be key/value pairs, and some of
+ * which might be raw values.
+ * 
+ * @author Curtis Rueden
+ */
+public interface Items extends List<Item> {
+
+	/**
+	 * Gets the parsed items as a map. The map will have the same iteration
+	 * order as the original list.
+	 */
+	Map<String, Object> asMap();
+
+	/** Returns true iff all items are named key/value pairs. */
+	boolean isMap();
+
+	/** Returns true iff there are no named key/value pairs among the items. */
+	boolean isList();
+
+}
+
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
new file mode 100644
index 000000000..1b64b7d8a
--- /dev/null
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.parse;
+
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for service that parses strings.
+ *
+ * @author Curtis Rueden
+ */
+public interface ParseService extends SciJavaService {
+
+	/**
+	 * Parses a comma-delimited list of data elements.
+	 * <p>
+	 * Some data elements might be {@code key=value} pairs, while others might be
+	 * raw values (i.e., no equals sign).
+	 * </p>
+	 * 
+	 * @param arg The string to parse.
+	 * @return A parsed list of {@link Item}s.
+	 * @throws IllegalArgumentException If the string does not conform to expected
+	 *           syntax.
+	 */
+	Items parse(String arg);
+
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index e3955a6c7..abbab3c9b 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -102,6 +102,7 @@ public void testFull() {
 				org.scijava.module.DefaultModuleService.class,
 				org.scijava.object.DefaultObjectService.class,
 				org.scijava.options.DefaultOptionsService.class,
+				org.scijava.parse.DefaultParseService.class,
 				org.scijava.platform.DefaultPlatformService.class,
 				org.scijava.plugin.DefaultPluginService.class,
 				org.scijava.prefs.DefaultPrefService.class,

From 5f82f77fe17a1d680aa5d4335eeff7138c4f7409 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 14:16:55 -0500
Subject: [PATCH 0174/1208] Add unit tests for ParseService

---
 .../org/scijava/parse/ParseServiceTest.java   | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 src/test/java/org/scijava/parse/ParseServiceTest.java

diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
new file mode 100644
index 000000000..80894ef47
--- /dev/null
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -0,0 +1,137 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.parse;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+
+/**
+ * Tests {@link ParseService}.
+ *
+ * @author Curtis Rueden
+ */
+public class ParseServiceTest {
+
+	private ParseService parser;
+
+	@Before
+	public void setUp() {
+		final Context context = new Context(ParseService.class);
+		parser = context.service(ParseService.class);
+	}
+
+	@After
+	public void tearDown() {
+		parser.getContext().dispose();
+	}
+
+	/** Tests {@link ParseService#parse(String)}. */
+	@Test
+	public void testEmpty() {
+		final Items items = parser.parse("");
+		assertTrue(items.isEmpty());
+		assertTrue(items.isList());
+		assertTrue(items.isMap());
+		assertMapCorrect(items);
+	}
+
+	@Test
+	public void testList() {
+		final Items items = parser.parse("1,2,3,4,5");
+		assertEquals(5, items.size());
+		assertTrue(items.isList());
+		assertFalse(items.isMap());
+		assertSame(1, items.get(0).value());
+		assertSame(2, items.get(1).value());
+		assertSame(3, items.get(2).value());
+		assertSame(4, items.get(3).value());
+		assertSame(5, items.get(4).value());
+		assertNull(items.get(0).name());
+		assertNull(items.get(1).name());
+		assertNull(items.get(2).name());
+		assertNull(items.get(3).name());
+		assertNull(items.get(4).name());
+	}
+
+	@Test
+	public void testMap() {
+		final Items items = parser.parse(
+			"foo='bar', animal='Quick brown fox', colors={'red', 'green', 'blue'}");
+		assertEquals(3, items.size());
+		assertFalse(items.isList());
+		assertTrue(items.isMap());
+		assertEquals("foo", items.get(0).name());
+		assertEquals("bar", items.get(0).value());
+		assertEquals("animal", items.get(1).name());
+		assertEquals("Quick brown fox", items.get(1).value());
+		assertEquals("colors", items.get(2).name());
+		final Object colors = items.get(2).value();
+		assertTrue(colors instanceof List);
+		final List<?> colorsList = (List<?>) colors;
+		assertEquals(3, colorsList.size());
+		assertEquals("red", colorsList.get(0));
+		assertEquals("green", colorsList.get(1));
+		assertEquals("blue", colorsList.get(2));
+
+		assertMapCorrect(items);
+	}
+
+	// -- Helper methods --
+
+	private void assertMapCorrect(final Items items) {
+		final Map<String, Object> map = items.asMap();
+		assertEquals(items.size(), map.size());
+
+		// test that map contents match
+		for (final Item item : items) {
+			assertSame(item.value(), map.get(item.name()));
+		}
+
+		// test that map iteration order is the same
+		int index = 0;
+		for (final Object value : map.values()) {
+			assertSame("" + index + ":", items.get(index++).value(), value);
+		}
+	}
+
+}

From d94e0b8d6bfd750b174008b563206dd3164b6797 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 14:20:51 -0500
Subject: [PATCH 0175/1208] ScriptInfo: lean on the new ParseService

---
 .../scijava/script/DefaultScriptService.java  |  4 ++
 .../java/org/scijava/script/ScriptInfo.java   | 49 +++----------------
 2 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index e1317cc58..db11308bd 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -60,6 +60,7 @@
 import org.scijava.module.Module;
 import org.scijava.module.ModuleService;
 import org.scijava.object.LazyObjects;
+import org.scijava.parse.ParseService;
 import org.scijava.plugin.AbstractSingletonService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -92,6 +93,9 @@ public class DefaultScriptService extends
 	@Parameter
 	private CommandService commandService;
 
+	@Parameter
+	private ParseService parser;
+
 	@Parameter
 	private LogService log;
 
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index fefcbb663..67c028b0a 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -39,7 +39,6 @@
 import java.io.StringReader;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -58,9 +57,8 @@
 import org.scijava.module.AbstractModuleInfo;
 import org.scijava.module.DefaultMutableModuleItem;
 import org.scijava.module.ModuleException;
+import org.scijava.parse.ParseService;
 import org.scijava.plugin.Parameter;
-import org.scijava.sjep.Variable;
-import org.scijava.sjep.eval.DefaultEvaluator;
 import org.scijava.util.DigestUtils;
 import org.scijava.util.FileUtils;
 
@@ -90,6 +88,9 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	@Parameter
 	private ScriptService scriptService;
 
+	@Parameter
+	private ParseService parser;
+
 	@Parameter
 	private ConvertService convertService;
 
@@ -346,13 +347,13 @@ private void parseParam(final String param) throws ScriptException {
 		else {
 			final String cutParam =
 				param.substring(0, lParen) + param.substring(rParen + 1);
-			final String attrs = param.substring(lParen, rParen + 1);
+			final String attrs = param.substring(lParen + 1, rParen);
 			parseParam(cutParam, parseAttrs(attrs));
 		}
 	}
 
 	private void parseParam(final String param,
-		final HashMap<String, Object> attrs) throws ScriptException
+		final Map<String, Object> attrs) throws ScriptException
 	{
 		final String[] tokens = param.trim().split("[ \t\n]+");
 		checkValid(tokens.length >= 1, param);
@@ -376,42 +377,8 @@ private void parseParam(final String param,
 	}
 
 	/** Parses a comma-delimited list of {@code key=value} pairs into a map. */
-	private HashMap<String, Object> parseAttrs(final String attrs)
-		throws ScriptException
-	{
-		// NB: Parse the attributes using the SciJava Expression Parser.
-		final DefaultEvaluator e = new DefaultEvaluator();
-		try {
-			final Object result = e.evaluate(attrs);
-			if (result == null) throw new ScriptException("Unparseable attributes");
-			final List<?> list;
-			if (result instanceof List) list = (List<?>) result;
-			else if (result instanceof Variable) {
-				list = Collections.singletonList(result);
-			}
-			else {
-				throw new ScriptException("Unexpected attributes type: " +
-					result.getClass().getName());
-			}
-
-			final HashMap<String, Object> attrsMap = new HashMap<String, Object>();
-			for (final Object o : list) {
-				if (o instanceof Variable) {
-					final Variable v = (Variable) o;
-					attrsMap.put(v.getToken(), e.value(v));
-				}
-				else {
-					throw new ScriptException("Invalid attribute: " + o);
-				}
-			}
-			return attrsMap;
-		}
-		catch (final IllegalArgumentException exc) {
-			final ScriptException se = new ScriptException(
-				"Error parsing attributes");
-			se.initCause(exc);
-			throw se;
-		}
+	private Map<String, Object> parseAttrs(final String attrs) {
+		return parser.parse(attrs).asMap();
 	}
 
 	private boolean isIOType(final String token) {

From 09caa26220ae8dcbb061ce15520973755a37c410 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 14:26:52 -0500
Subject: [PATCH 0176/1208] DefaultScriptService: remove unneeded imports

---
 src/main/java/org/scijava/script/DefaultScriptService.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index db11308bd..cdb25e50c 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -45,8 +45,6 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import javax.script.ScriptEngineFactory;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
 import org.scijava.Context;

From 36f32e63b341f93553fb8087cef1242c027719aa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 14:31:13 -0500
Subject: [PATCH 0177/1208] 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.
---
 .../java/org/scijava/command/console/RunArgument.java  |  6 +++---
 src/main/java/org/scijava/console/ConsoleUtils.java    | 10 +++++-----
 .../java/org/scijava/script/ScriptLanguageIndex.java   |  6 +++---
 .../org/scijava/script/console/RunScriptArgument.java  |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index aca51500c..cfff0dd47 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/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);
 		}
 	}
 
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 72ccde7fa..75fd39021 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/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");
 
 			}
 		}
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 4563dbd97..f05329780 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/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) {
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index df8c94204..c4e2f6d89 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/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);
 		}
 	}
 

From 0931e1c0bbab737c85f106d11743cacce8d3bd36 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 14:35:03 -0500
Subject: [PATCH 0178/1208] Remove email address from @author tags

ImageJ convention is to use only the name, without email address.
The email address can be found in the pom.xml file and/or Git history.

Philosophically, we really do not want to encourage anyone to email us
directly about the code -- public communication channels are better.
And pragmatically, putting the email address in source in an invitation
for it to get out of sync.
---
 src/main/java/org/scijava/command/console/RunArgument.java      | 2 +-
 src/main/java/org/scijava/console/ConsoleUtils.java             | 2 +-
 src/main/java/org/scijava/console/HeadlessArgument.java         | 2 +-
 src/main/java/org/scijava/convert/CastingConverter.java         | 2 +-
 src/main/java/org/scijava/script/console/RunScriptArgument.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index cfff0dd47..305bcd494 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -48,7 +48,7 @@
  *
  * @author Curtis Rueden
  * @author Johannes Schindelin
- * @author Mark Hiner hinerm at gmail.com
+ * @author Mark Hiner
  */
 @Plugin(type = ConsoleArgument.class)
 public class RunArgument extends AbstractConsoleArgument {
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 75fd39021..577881ae3 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -43,7 +43,7 @@
 /**
  * Helper class for {@link ConsoleArgument}s.
  *
- * @author Mark Hiner hinerm at gmail.com
+ * @author Mark Hiner
  */
 public final class ConsoleUtils {
 
diff --git a/src/main/java/org/scijava/console/HeadlessArgument.java b/src/main/java/org/scijava/console/HeadlessArgument.java
index e075c9250..6f67331ce 100644
--- a/src/main/java/org/scijava/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/console/HeadlessArgument.java
@@ -42,7 +42,7 @@
  * and the enclosing {@link Context} will not be used after the
  * {@link ConsoleService} argument processing is complete.
  *
- * @author Mark Hiner hinerm at gmail.com
+ * @author Mark Hiner
  */
 @Plugin(type = ConsoleArgument.class)
 public class HeadlessArgument extends AbstractConsoleArgument {
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 395a06435..da6fe9d90 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -39,7 +39,7 @@
 /**
  * Minimal {@link Converter} implementation to do direct casting.
  *
- * @author Mark Hiner hinerm at gmail.com
+ * @author Mark Hiner
  */
 @Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY)
 public class CastingConverter extends AbstractConverter<Object, Object> {
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index c4e2f6d89..9627693d7 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -46,7 +46,7 @@
 /**
  * {@link ConsoleArgument} for executing scripts directly.
  *
- * @author Mark Hiner hinerm at gmail.com
+ * @author Mark Hiner
  */
 @Plugin(type = ConsoleArgument.class)
 public class RunScriptArgument extends AbstractConsoleArgument {

From 5bd5a4382ad63aeefafd1885fa909bd67adf986f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 15:21:30 -0500
Subject: [PATCH 0179/1208] CommandRunner: do not add new command to the index

I may regret this later. But it is much simpler and easier to understand
if we just run the command class directly, rather than wrapping it in a
new CommandInfo and then adding it to the PluginIndex.

If we later decide to restore the PluginIndex-modifying behavior, let's
do it in a nicer way where we have a method in CommandService that does
this work, rather than needing to recapitulate its internals here.
---
 src/main/java/org/scijava/command/run/CommandRunner.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/command/run/CommandRunner.java b/src/main/java/org/scijava/command/run/CommandRunner.java
index ec085ef96..d25529628 100644
--- a/src/main/java/org/scijava/command/run/CommandRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandRunner.java
@@ -32,7 +32,6 @@
 package org.scijava.command.run;
 
 import org.scijava.command.Command;
-import org.scijava.command.CommandInfo;
 import org.scijava.command.CommandService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -60,10 +59,7 @@ public class CommandRunner extends AbstractClassRunner {
 	public void run(final Class<?> c, final Object... args) {
 		@SuppressWarnings("unchecked")
 		final Class<? extends Command> commandClass =  (Class<? extends Command>) c;
-		final Plugin annotation = c.getAnnotation(Plugin.class);
-		final CommandInfo info = new CommandInfo(commandClass, annotation);
-		pluginService.addPlugin(info);
-		commandService.run(info, true, args);
+		commandService.run(commandClass, true, args);
 	}
 
 	// -- Typed methods --

From 10791637a73bc6f16948d9f5f9d02619d476aa51 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 15:19:16 -0500
Subject: [PATCH 0180/1208] Rename ClassRunner to CodeRunner

The name CodeRunner is more suitably general. See next commit.
---
 .../java/org/scijava/command/run/CommandRunner.java    | 10 +++++-----
 src/main/java/org/scijava/main/run/MainRunner.java     | 10 +++++-----
 ...bstractClassRunner.java => AbstractCodeRunner.java} |  6 +++---
 .../scijava/run/{ClassRunner.java => CodeRunner.java}  |  8 ++++----
 src/main/java/org/scijava/run/DefaultRunService.java   | 10 +++++-----
 src/main/java/org/scijava/run/RunService.java          |  4 ++--
 6 files changed, 24 insertions(+), 24 deletions(-)
 rename src/main/java/org/scijava/run/{AbstractClassRunner.java => AbstractCodeRunner.java} (91%)
 rename src/main/java/org/scijava/run/{ClassRunner.java => CodeRunner.java} (89%)

diff --git a/src/main/java/org/scijava/command/run/CommandRunner.java b/src/main/java/org/scijava/command/run/CommandRunner.java
index d25529628..fcd081ca4 100644
--- a/src/main/java/org/scijava/command/run/CommandRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandRunner.java
@@ -36,16 +36,16 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;
-import org.scijava.run.AbstractClassRunner;
-import org.scijava.run.ClassRunner;
+import org.scijava.run.AbstractCodeRunner;
+import org.scijava.run.CodeRunner;
 
 /**
  * Runs the given {@link Command} class.
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = ClassRunner.class)
-public class CommandRunner extends AbstractClassRunner {
+@Plugin(type = CodeRunner.class)
+public class CommandRunner extends AbstractCodeRunner {
 
 	@Parameter
 	private PluginService pluginService;
@@ -53,7 +53,7 @@ public class CommandRunner extends AbstractClassRunner {
 	@Parameter
 	private CommandService commandService;
 
-	// -- ClassRunner methods --
+	// -- CodeRunner methods --
 
 	@Override
 	public void run(final Class<?> c, final Object... args) {
diff --git a/src/main/java/org/scijava/main/run/MainRunner.java b/src/main/java/org/scijava/main/run/MainRunner.java
index 36d2a6474..1c7296e2f 100644
--- a/src/main/java/org/scijava/main/run/MainRunner.java
+++ b/src/main/java/org/scijava/main/run/MainRunner.java
@@ -38,21 +38,21 @@
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.run.AbstractClassRunner;
-import org.scijava.run.ClassRunner;
+import org.scijava.run.AbstractCodeRunner;
+import org.scijava.run.CodeRunner;
 
 /**
  * Executes the given class's {@code main} method.
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = ClassRunner.class, priority = Priority.LOW_PRIORITY)
-public class MainRunner extends AbstractClassRunner {
+@Plugin(type = CodeRunner.class, priority = Priority.LOW_PRIORITY)
+public class MainRunner extends AbstractCodeRunner {
 
 	@Parameter(required = false)
 	private LogService log;
 
-	// -- ClassRunner methods --
+	// -- CodeRunner methods --
 
 	@Override
 	public void run(final Class<?> c, final Object... args)
diff --git a/src/main/java/org/scijava/run/AbstractClassRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
similarity index 91%
rename from src/main/java/org/scijava/run/AbstractClassRunner.java
rename to src/main/java/org/scijava/run/AbstractCodeRunner.java
index 1acd7d45d..116c7f187 100644
--- a/src/main/java/org/scijava/run/AbstractClassRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -34,12 +34,12 @@
 import org.scijava.plugin.AbstractHandlerPlugin;
 
 /**
- * Abstract superclass of {@link ClassRunner} implementations.
+ * Abstract superclass of {@link CodeRunner} implementations.
  * 
  * @author Curtis Rueden
  */
-public abstract class AbstractClassRunner extends
-	AbstractHandlerPlugin<Class<?>> implements ClassRunner
+public abstract class AbstractCodeRunner extends
+	AbstractHandlerPlugin<Class<?>> implements CodeRunner
 {
 
 	// -- Typed methods --
diff --git a/src/main/java/org/scijava/run/ClassRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
similarity index 89%
rename from src/main/java/org/scijava/run/ClassRunner.java
rename to src/main/java/org/scijava/run/CodeRunner.java
index 79e279a1a..77888ec86 100644
--- a/src/main/java/org/scijava/run/ClassRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -38,19 +38,19 @@
 
 /**
  * A plugin which extends the {@link RunService}'s execution handling. A
- * {@link ClassRunner} knows how to execute certain classes, beyond just Java's
+ * {@link CodeRunner} knows how to execute certain classes, beyond just Java's
  * usual {@code main} method.
  * <p>
  * Class runner plugins discoverable at runtime must implement this interface
  * and be annotated with @{@link Plugin} with attribute {@link Plugin#type()} =
- * {@link ClassRunner}.class. While it possible to create a class runner plugin
+ * {@link CodeRunner}.class. While it possible to create a class runner plugin
  * merely by implementing this interface, it is encouraged to instead extend
- * {@link AbstractClassRunner}, for convenience.
+ * {@link AbstractCodeRunner}, for convenience.
  * </p>
  * 
  * @author Curtis Rueden
  */
-public interface ClassRunner extends HandlerPlugin<Class<?>> {
+public interface CodeRunner extends HandlerPlugin<Class<?>> {
 
 	/** Executes the given class, with the specified arguments. */
 	void run(Class<?> c, Object... args) throws InvocationTargetException;
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index 06d76556f..7385b8684 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -40,13 +40,13 @@
 import org.scijava.service.Service;
 
 /**
- * Default service for managing available {@link ClassRunner} plugins.
+ * Default service for managing available {@link CodeRunner} plugins.
  * 
  * @author Curtis Rueden
  */
 @Plugin(type = Service.class)
 public class DefaultRunService extends
-	AbstractHandlerService<Class<?>, ClassRunner> implements RunService
+	AbstractHandlerService<Class<?>, CodeRunner> implements RunService
 {
 
 	@Parameter
@@ -58,7 +58,7 @@ public class DefaultRunService extends
 	public void run(final Class<?> c, final Object... args)
 		throws InvocationTargetException
 	{
-		for (final ClassRunner runner : getInstances()) {
+		for (final CodeRunner runner : getInstances()) {
 			if (runner.supports(c)) {
 				runner.run(c);
 				return;
@@ -70,8 +70,8 @@ public void run(final Class<?> c, final Object... args)
 	// -- PTService methods --
 
 	@Override
-	public Class<ClassRunner> getPluginType() {
-		return ClassRunner.class;
+	public Class<CodeRunner> getPluginType() {
+		return CodeRunner.class;
 	}
 
 	// -- Typed methods --
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 2dec65342..667f88e0b 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -37,12 +37,12 @@
 import org.scijava.service.SciJavaService;
 
 /**
- * Interface for service that manages available {@link ClassRunner} plugins.
+ * Interface for service that manages available {@link CodeRunner} plugins.
  * 
  * @author Curtis Rueden
  */
 public interface RunService extends
-	HandlerService<Class<?>, ClassRunner>, SciJavaService
+	HandlerService<Class<?>, CodeRunner>, SciJavaService
 {
 
 	/**

From 6328ca8851ad1b917b2b4ba71917a7496330860c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 16:08:18 -0500
Subject: [PATCH 0181/1208] Rename MainRunner to MainCodeRunner

This is for clarity and consistency.
---
 .../scijava/main/run/{MainRunner.java => MainCodeRunner.java}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/org/scijava/main/run/{MainRunner.java => MainCodeRunner.java} (98%)

diff --git a/src/main/java/org/scijava/main/run/MainRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
similarity index 98%
rename from src/main/java/org/scijava/main/run/MainRunner.java
rename to src/main/java/org/scijava/main/run/MainCodeRunner.java
index 1c7296e2f..611717431 100644
--- a/src/main/java/org/scijava/main/run/MainRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -47,7 +47,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = CodeRunner.class, priority = Priority.LOW_PRIORITY)
-public class MainRunner extends AbstractCodeRunner {
+public class MainCodeRunner extends AbstractCodeRunner {
 
 	@Parameter(required = false)
 	private LogService log;

From dd3271cd0c45d695a6396767104d8c79d12fce58 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 16:08:37 -0500
Subject: [PATCH 0182/1208] Rename CommandRunner to CommandCodeRunner

This is for clarity and consistency.
---
 .../command/run/{CommandRunner.java => CommandCodeRunner.java}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/org/scijava/command/run/{CommandRunner.java => CommandCodeRunner.java} (97%)

diff --git a/src/main/java/org/scijava/command/run/CommandRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
similarity index 97%
rename from src/main/java/org/scijava/command/run/CommandRunner.java
rename to src/main/java/org/scijava/command/run/CommandCodeRunner.java
index fcd081ca4..cb952787e 100644
--- a/src/main/java/org/scijava/command/run/CommandRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -45,7 +45,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = CodeRunner.class)
-public class CommandRunner extends AbstractCodeRunner {
+public class CommandCodeRunner extends AbstractCodeRunner {
 
 	@Parameter
 	private PluginService pluginService;

From 4c46eddc448ea5501c033c5216f0aba0da5cb791 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 15:30:44 -0500
Subject: [PATCH 0183/1208] Generalize CodeRunner from Class to Object

Sometimes we want to run Class objects. Sometimes String identifiers.
Sometimes maybe other things. Rather than overtype things with a new
interface, let's just use good ol' Object here, for flexibility.
---
 .../command/run/CommandCodeRunner.java        | 21 ++++++++++----
 .../org/scijava/main/run/MainCodeRunner.java  | 19 ++++++++----
 .../org/scijava/run/AbstractCodeRunner.java   |  7 ++---
 src/main/java/org/scijava/run/CodeRunner.java | 17 +++++++----
 .../org/scijava/run/DefaultRunService.java    | 29 ++++++++++++++-----
 src/main/java/org/scijava/run/RunService.java | 16 +++++++---
 6 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index cb952787e..f2a510802 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -56,17 +56,26 @@ public class CommandCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Class<?> c, final Object... args) {
-		@SuppressWarnings("unchecked")
-		final Class<? extends Command> commandClass =  (Class<? extends Command>) c;
-		commandService.run(commandClass, true, args);
+	public void run(final Object code, final Object... args) {
+		commandService.run(getCommandClass(code), true, args);
 	}
 
 	// -- Typed methods --
 
 	@Override
-	public boolean supports(final Class<?> c) {
-		return Command.class.isAssignableFrom(c);
+	public boolean supports(final Object code) {
+		return getCommandClass(code) != null;
+	}
+
+	// -- Helper methods --
+
+	private Class<? extends Command> getCommandClass(final Object code) {
+		if (!(code instanceof Class)) return null;
+		final Class<?> c = (Class<?>) code;
+		if (!Command.class.isAssignableFrom(c)) return null;
+		@SuppressWarnings("unchecked")
+		final Class<? extends Command> commandClass = (Class<? extends Command>) c;
+		return commandClass;
 	}
 
 }
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 611717431..80c24a052 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -40,6 +40,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.run.AbstractCodeRunner;
 import org.scijava.run.CodeRunner;
+import org.scijava.util.ClassUtils;
 
 /**
  * Executes the given class's {@code main} method.
@@ -55,12 +56,12 @@ public class MainCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Class<?> c, final Object... args)
+	public void run(final Object code, final Object... args)
 		throws InvocationTargetException
 	{
 		final Object[] sArgs = stringify(args);
 		try {
-			getMain(c).invoke(null, new Object[] { sArgs });
+			getMain(code).invoke(null, new Object[] { sArgs });
 		}
 		catch (final IllegalArgumentException exc) {
 			throw new InvocationTargetException(exc);
@@ -73,13 +74,15 @@ public void run(final Class<?> c, final Object... args)
 	// -- Typed methods --
 
 	@Override
-	public boolean supports(final Class<?> c) {
-		return getMain(c) != null;
+	public boolean supports(final Object code) {
+		return getMain(code) != null;
 	}
 
 	// -- Helper methods --
 
-	private Method getMain(final Class<?> c) {
+	private Method getMain(final Object code) {
+		final Class<?> c = getClass(code);
+		if (c == null) return null;
 		try {
 			return c.getMethod("main", String[].class);
 		}
@@ -93,6 +96,12 @@ private Method getMain(final Class<?> c) {
 		}
 	}
 
+	private Class<?> getClass(final Object code) {
+		if (code instanceof Class) return (Class<?>) code;
+		if (code instanceof String) return ClassUtils.loadClass((String) code);
+		return null;
+	}
+
 	/** Ensures each element is a {@link String}. */
 	private String[] stringify(final Object... o) {
 		final String[] s;
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 116c7f187..fa1ce41d7 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -39,15 +39,14 @@
  * @author Curtis Rueden
  */
 public abstract class AbstractCodeRunner extends
-	AbstractHandlerPlugin<Class<?>> implements CodeRunner
+	AbstractHandlerPlugin<Object> implements CodeRunner
 {
 
 	// -- Typed methods --
 
 	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<Class<?>> getType() {
-		return (Class) Class.class;
+	public Class<Object> getType() {
+		return Object.class;
 	}
 
 }
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index 77888ec86..c5dab3c96 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -33,15 +33,17 @@
 
 import java.lang.reflect.InvocationTargetException;
 
+import org.scijava.Identifiable;
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
 
 /**
  * A plugin which extends the {@link RunService}'s execution handling. A
- * {@link CodeRunner} knows how to execute certain classes, beyond just Java's
- * usual {@code main} method.
+ * {@link CodeRunner} knows how to execute code of a certain form, such as the
+ * {@code main} method of a Java {@link Class}, or an {@link Identifiable}
+ * SciJava module.
  * <p>
- * Class runner plugins discoverable at runtime must implement this interface
+ * Code runner plugins discoverable at runtime must implement this interface
  * and be annotated with @{@link Plugin} with attribute {@link Plugin#type()} =
  * {@link CodeRunner}.class. While it possible to create a class runner plugin
  * merely by implementing this interface, it is encouraged to instead extend
@@ -50,9 +52,12 @@
  * 
  * @author Curtis Rueden
  */
-public interface CodeRunner extends HandlerPlugin<Class<?>> {
+public interface CodeRunner extends HandlerPlugin<Object> {
 
-	/** Executes the given class, with the specified arguments. */
-	void run(Class<?> c, Object... args) throws InvocationTargetException;
+	/**
+	 * Executes the code identified by the given object, passing the
+	 * specified arguments as inputs.
+	 */
+	void run(Object code, Object... args) throws InvocationTargetException;
 
 }
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index 7385b8684..cf6828f9a 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -32,6 +32,7 @@
 package org.scijava.run;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
 
 import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractHandlerService;
@@ -46,7 +47,7 @@
  */
 @Plugin(type = Service.class)
 public class DefaultRunService extends
-	AbstractHandlerService<Class<?>, CodeRunner> implements RunService
+	AbstractHandlerService<Object, CodeRunner> implements RunService
 {
 
 	@Parameter
@@ -55,16 +56,29 @@ public class DefaultRunService extends
 	// -- RunService methods --
 
 	@Override
-	public void run(final Class<?> c, final Object... args)
+	public void run(final Object code, final Object... args)
 		throws InvocationTargetException
 	{
 		for (final CodeRunner runner : getInstances()) {
-			if (runner.supports(c)) {
-				runner.run(c);
+			if (runner.supports(code)) {
+				runner.run(code, args);
 				return;
 			}
 		}
-		throw new IllegalArgumentException("Unknown class type: " + c.getName());
+		throw new IllegalArgumentException("Unknown code type: " + code);
+	}
+
+	@Override
+	public void run(final Object code, final Map<String, Object> inputMap)
+		throws InvocationTargetException
+	{
+		for (final CodeRunner runner : getInstances()) {
+			if (runner.supports(code)) {
+				runner.run(code, inputMap);
+				return;
+			}
+		}
+		throw new IllegalArgumentException("Unknown code type: " + code);
 	}
 
 	// -- PTService methods --
@@ -77,9 +91,8 @@ public Class<CodeRunner> getPluginType() {
 	// -- Typed methods --
 
 	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<Class<?>> getType() {
-		return (Class) Class.class;
+	public Class<Object> getType() {
+		return Object.class;
 	}
 
 }
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 667f88e0b..2a9b4db85 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -32,6 +32,7 @@
 package org.scijava.run;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
 
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
@@ -42,13 +43,20 @@
  * @author Curtis Rueden
  */
 public interface RunService extends
-	HandlerService<Class<?>, CodeRunner>, SciJavaService
+	HandlerService<Object, CodeRunner>, SciJavaService
 {
 
 	/**
-	 * Executes the given class using the most appropriate handler, passing the
-	 * given arguments to the execution.
+	 * Executes the given code using the most appropriate handler, passing the
+	 * specified arguments as inputs.
 	 */
-	void run(Class<?> c, Object... args) throws InvocationTargetException;
+	void run(Object code, Object... args) throws InvocationTargetException;
+
+	/**
+	 * Executes the given code using the most appropriate handler, passing the
+	 * arguments in the specified map as inputs.
+	 */
+	void run(Object code, Map<String, Object> inputMap)
+		throws InvocationTargetException;
 
 }

From 571c053902b4af1d4ef3996b48c7d61b883f2233 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 15:31:35 -0500
Subject: [PATCH 0184/1208] RunScriptArgument: throw exception for bogus input

If a non-script is given, the supports method will return false.
It is a precondition of run that supports return true; if not,
we are justified in throwing an exception.
---
 .../org/scijava/script/console/RunScriptArgument.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index 9627693d7..eab90b8c6 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -94,9 +94,11 @@ public boolean supports(final LinkedList<String> args) {
 	private void run(final String scriptToRun, final String paramString) {
 		final File script = getScript(scriptToRun);
 
-		// couldn't find anything to run
-		if (script == null)
-			return;
+		if (script == null) {
+			// couldn't find anything to run
+			throw new UnsupportedOperationException(//
+				"Not a script: '" + scriptToRun + "'");
+		}
 
 		final ScriptInfo info = scriptService.getScript(script);
 

From 5f51acf3c6ec9fe17f8c09084cd0e8b5aafafbf8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 15:39:17 -0500
Subject: [PATCH 0185/1208] CodeRunner: add API for running with an input map

---
 .../org/scijava/command/run/CommandCodeRunner.java     | 10 ++++++++++
 src/main/java/org/scijava/main/run/MainCodeRunner.java |  9 +++++++++
 src/main/java/org/scijava/run/CodeRunner.java          |  8 ++++++++
 3 files changed, 27 insertions(+)

diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index f2a510802..440cf8b68 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -31,6 +31,9 @@
 
 package org.scijava.command.run;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
 import org.scijava.command.Command;
 import org.scijava.command.CommandService;
 import org.scijava.plugin.Parameter;
@@ -60,6 +63,13 @@ public void run(final Object code, final Object... args) {
 		commandService.run(getCommandClass(code), true, args);
 	}
 
+	@Override
+	public void run(final Object code, final Map<String, Object> inputMap)
+		throws InvocationTargetException
+	{
+		commandService.run(getCommandClass(code), true, inputMap);
+	}
+
 	// -- Typed methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 80c24a052..a34ad8861 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -33,6 +33,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Map;
 
 import org.scijava.Priority;
 import org.scijava.log.LogService;
@@ -71,6 +72,14 @@ public void run(final Object code, final Object... args)
 		}
 	}
 
+	@Override
+	public void run(final Object code, final Map<String, Object> inputMap)
+		throws InvocationTargetException
+	{
+		throw new UnsupportedOperationException(
+			"Cannot execute main method with a map of inputs");
+	}
+
 	// -- Typed methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index c5dab3c96..98129b975 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -32,6 +32,7 @@
 package org.scijava.run;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
 
 import org.scijava.Identifiable;
 import org.scijava.plugin.HandlerPlugin;
@@ -60,4 +61,11 @@ public interface CodeRunner extends HandlerPlugin<Object> {
 	 */
 	void run(Object code, Object... args) throws InvocationTargetException;
 
+	/**
+	 * Executes the code identified by the given object, passing the arguments in
+	 * the specified map as inputs.
+	 */
+	void run(Object code, Map<String, Object> inputMap)
+		throws InvocationTargetException;
+
 }

From 5d2ed7cd773ec9ce82ca26ae17a8055541ef6332 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 15:55:27 -0500
Subject: [PATCH 0186/1208] Add a ConsoleArgument which uses the RunService

Now that we have the RunService, all supported flavors of --run
can (hopefully!) go through it, via additional CodeRunner plugins.
---
 .../org/scijava/run/console/RunArgument.java  | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 src/main/java/org/scijava/run/console/RunArgument.java

diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
new file mode 100644
index 000000000..4ed621aaa
--- /dev/null
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.run.console;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.LinkedList;
+
+import org.scijava.console.AbstractConsoleArgument;
+import org.scijava.console.ConsoleArgument;
+import org.scijava.console.ConsoleUtils;
+import org.scijava.log.LogService;
+import org.scijava.parse.Items;
+import org.scijava.parse.ParseService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.run.RunService;
+
+/**
+ * Handles the {@code --run} command line argument.
+ *
+ * @author Curtis Rueden
+ */
+@Plugin(type = ConsoleArgument.class)
+public class RunArgument extends AbstractConsoleArgument {
+
+	@Parameter
+	private RunService runService;
+
+	@Parameter
+	private ParseService parser;
+
+	@Parameter
+	private LogService log;
+
+	// -- Constructor --
+
+	public RunArgument() {
+		super(2, "--run");
+	}
+
+	// -- ConsoleArgument methods --
+
+	@Override
+	public void handle(final LinkedList<String> args) {
+		if (!supports(args)) return;
+
+		args.removeFirst(); // --run
+		final String code = args.removeFirst();
+		final String arg = ConsoleUtils.hasParam(args) ? args.removeFirst() : null;
+
+		final Items items = parser.parse(arg);
+		try {
+			if (arg == null) runService.run(code);
+			else if (items.isMap()) runService.run(code, items.asMap());
+			else if (items.isList()) runService.run(code, items.toArray());
+			else {
+				throw new IllegalArgumentException("Arguments are inconsistent. " +
+					"Please pass either a list of key/value pairs, " +
+					"or a list of values.");
+			}
+		}
+		catch (final InvocationTargetException exc) {
+			throw new RuntimeException(exc);
+		}
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		if (!super.supports(args)) return false;
+		return runService.supports(args.get(1));
+	}
+
+}

From 03e550418ba36ff795eeed204dd4369bcd273ac4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 15:59:44 -0500
Subject: [PATCH 0187/1208] CommandRunner: remove unused service parameter

---
 src/main/java/org/scijava/command/run/CommandCodeRunner.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index 440cf8b68..e96f46267 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -38,7 +38,6 @@
 import org.scijava.command.CommandService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.PluginService;
 import org.scijava.run.AbstractCodeRunner;
 import org.scijava.run.CodeRunner;
 
@@ -50,9 +49,6 @@
 @Plugin(type = CodeRunner.class)
 public class CommandCodeRunner extends AbstractCodeRunner {
 
-	@Parameter
-	private PluginService pluginService;
-
 	@Parameter
 	private CommandService commandService;
 

From 6453d2fe1c5813a5472bf322ca60751bfd3d0574 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 16:06:47 -0500
Subject: [PATCH 0188/1208] Add a CodeRunner for Identifiable SciJava modules

---
 .../scijava/module/run/ModuleCodeRunner.java  | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 src/main/java/org/scijava/module/run/ModuleCodeRunner.java

diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
new file mode 100644
index 000000000..3b6cbac4d
--- /dev/null
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.run;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+import org.scijava.Identifiable;
+import org.scijava.module.ModuleInfo;
+import org.scijava.module.ModuleService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.run.AbstractCodeRunner;
+import org.scijava.run.CodeRunner;
+
+/**
+ * Runs the given {@link Identifiable} SciJava module.
+ * 
+ * @author Curtis Rueden
+ * @see ModuleInfo
+ */
+@Plugin(type = CodeRunner.class)
+public class ModuleCodeRunner extends AbstractCodeRunner {
+
+	@Parameter
+	private ModuleService moduleService;
+
+	// -- CodeRunner methods --
+
+	@Override
+	public void run(final Object code, final Object... args) {
+		moduleService.run(getModuleInfo(code), true, args);
+	}
+
+	@Override
+	public void run(final Object code, final Map<String, Object> inputMap)
+		throws InvocationTargetException
+	{
+		moduleService.run(getModuleInfo(code), true, inputMap);
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final Object code) {
+		return getModuleInfo(code) != null;
+	}
+
+	// -- Helper methods --
+
+	private ModuleInfo getModuleInfo(final Object code) {
+		if (!(code instanceof String)) return null;
+		final String id = (String) code;
+		return moduleService.getModuleById(id);
+	}
+
+}

From d5234858669a6963ed9ae9f7efa008c30550fcea Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 18:46:00 -0500
Subject: [PATCH 0189/1208] Wait for command or module execution to complete

CodeRunner plugins should fully execute their associated code,
blocking until execution is complete.
---
 .../command/run/CommandCodeRunner.java        |  8 +++++---
 .../scijava/module/run/ModuleCodeRunner.java  |  8 +++++---
 .../org/scijava/run/AbstractCodeRunner.java   | 20 +++++++++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index e96f46267..dc1a12e2d 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -55,15 +55,17 @@ public class CommandCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Object code, final Object... args) {
-		commandService.run(getCommandClass(code), true, args);
+	public void run(final Object code, final Object... args)
+		throws InvocationTargetException
+	{
+		waitFor(commandService.run(getCommandClass(code), true, args));
 	}
 
 	@Override
 	public void run(final Object code, final Map<String, Object> inputMap)
 		throws InvocationTargetException
 	{
-		commandService.run(getCommandClass(code), true, inputMap);
+		waitFor(commandService.run(getCommandClass(code), true, inputMap));
 	}
 
 	// -- Typed methods --
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 3b6cbac4d..03f1a9f3c 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -57,15 +57,17 @@ public class ModuleCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Object code, final Object... args) {
-		moduleService.run(getModuleInfo(code), true, args);
+	public void run(final Object code, final Object... args)
+		throws InvocationTargetException
+	{
+		waitFor(moduleService.run(getModuleInfo(code), true, args));
 	}
 
 	@Override
 	public void run(final Object code, final Map<String, Object> inputMap)
 		throws InvocationTargetException
 	{
-		moduleService.run(getModuleInfo(code), true, inputMap);
+		waitFor(moduleService.run(getModuleInfo(code), true, inputMap));
 	}
 
 	// -- Typed methods --
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index fa1ce41d7..ce118eab4 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -31,6 +31,10 @@
 
 package org.scijava.run;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
 import org.scijava.plugin.AbstractHandlerPlugin;
 
 /**
@@ -49,4 +53,20 @@ public Class<Object> getType() {
 		return Object.class;
 	}
 
+	// -- Internal methods --
+
+	protected <T> T waitFor(final Future<T> future)
+		throws InvocationTargetException
+	{
+		try {
+			return future.get();
+		}
+		catch (final InterruptedException exc) {
+			throw new InvocationTargetException(exc);
+		}
+		catch (final ExecutionException exc) {
+			throw new InvocationTargetException(exc);
+		}
+	}
+
 }

From fdbfce3117b61cb9c41a72d12d7cb376e755c092 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 18:47:50 -0500
Subject: [PATCH 0190/1208] Add a CodeRunner plugin that executes scripts

---
 .../scijava/script/run/ScriptCodeRunner.java  | 112 ++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/run/ScriptCodeRunner.java

diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
new file mode 100644
index 000000000..da6f4cd07
--- /dev/null
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -0,0 +1,112 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.run;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+import javax.script.ScriptException;
+
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.run.AbstractCodeRunner;
+import org.scijava.run.CodeRunner;
+import org.scijava.script.ScriptService;
+
+/**
+ * Runs the given script.
+ * 
+ * @author Curtis Rueden
+ * @author Mark Hiner
+ */
+@Plugin(type = CodeRunner.class)
+public class ScriptCodeRunner extends AbstractCodeRunner {
+
+	@Parameter
+	private ScriptService scriptService;
+
+	// -- CodeRunner methods --
+
+	@Override
+	public void run(final Object code, final Object... args)
+		throws InvocationTargetException
+	{
+		try {
+			waitFor(scriptService.run(getScript(code), true, args));
+		}
+		catch (final FileNotFoundException exc) {
+			throw new InvocationTargetException(exc);
+		}
+		catch (final ScriptException exc) {
+			throw new InvocationTargetException(exc);
+		}
+	}
+
+	@Override
+	public void run(final Object code, final Map<String, Object> inputMap)
+		throws InvocationTargetException
+	{
+		try {
+			waitFor(scriptService.run(getScript(code), true, inputMap));
+		}
+		catch (final FileNotFoundException exc) {
+			throw new InvocationTargetException(exc);
+		}
+		catch (final ScriptException exc) {
+			throw new InvocationTargetException(exc);
+		}
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final Object code) {
+		return getScript(code) != null;
+	}
+
+	// -- Helper methods --
+
+	private File getScript(final Object code) {
+		final File scriptFile;
+		if (code instanceof File) scriptFile = (File) code;
+		else if (code instanceof String) scriptFile = new File((String) code);
+		else return null;
+
+		if (!scriptFile.exists()) return null;
+		if (!scriptService.canHandleFile(scriptFile)) return null;
+
+		return scriptFile;
+	}
+
+}

From b02aee7ea5a9adbb0b8fcba9a89183276475326a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 19:01:01 -0500
Subject: [PATCH 0191/1208] CommandCodeRunner: allow running commands by title

The soon-to-be-deprecated org.scijava.command.console.RunArgument
supports that, so we need to keep supporting it here, too.
---
 .../command/run/CommandCodeRunner.java        | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index dc1a12e2d..40b34de68 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 
 import org.scijava.command.Command;
+import org.scijava.command.CommandInfo;
 import org.scijava.command.CommandService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -58,21 +59,29 @@ public class CommandCodeRunner extends AbstractCodeRunner {
 	public void run(final Object code, final Object... args)
 		throws InvocationTargetException
 	{
-		waitFor(commandService.run(getCommandClass(code), true, args));
+		final Class<? extends Command> c = getCommandClass(code);
+		if (c != null) waitFor(commandService.run(c, true, args));
+
+		final CommandInfo info = getCommandInfo(code);
+		if (info != null) waitFor(commandService.run(info, true, args));
 	}
 
 	@Override
 	public void run(final Object code, final Map<String, Object> inputMap)
 		throws InvocationTargetException
 	{
-		waitFor(commandService.run(getCommandClass(code), true, inputMap));
+		final Class<? extends Command> c = getCommandClass(code);
+		if (c != null) waitFor(commandService.run(c, true, inputMap));
+
+		final CommandInfo info = getCommandInfo(code);
+		if (info != null) waitFor(commandService.run(info, true, inputMap));
 	}
 
 	// -- Typed methods --
 
 	@Override
 	public boolean supports(final Object code) {
-		return getCommandClass(code) != null;
+		return getCommandClass(code) != null || getCommandInfo(code) != null;
 	}
 
 	// -- Helper methods --
@@ -86,4 +95,19 @@ private Class<? extends Command> getCommandClass(final Object code) {
 		return commandClass;
 	}
 
+	private CommandInfo getCommandInfo(final Object code) {
+		if (!(code instanceof String)) return null;
+		final String command = (String) code;
+
+		final CommandInfo info = commandService.getCommand(command);
+		if (info != null) return info;
+
+		// command was not a class name; search for command by title instead
+		for (final CommandInfo ci : commandService.getCommands()) {
+			if (command.equals(ci.getTitle())) return ci;
+		}
+
+		return null;
+	}
+
 }

From ea4748f148837821a31dcb3846ed2188806a0163 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 17:03:50 -0500
Subject: [PATCH 0192/1208] Deprecate the "--class" CLI flag

The "--run" support has been generalized now, such that continuing
to support this specialization is more trouble than it is worth.
---
 .../org/scijava/command/console/RunArgument.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 305bcd494..26924fa0d 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -44,12 +44,9 @@
 import org.scijava.plugin.Plugin;
 
 /**
- * Handles the {@code --run} command line argument.
- *
- * @author Curtis Rueden
- * @author Johannes Schindelin
- * @author Mark Hiner
+ * @deprecated Use {@link org.scijava.run.console.RunArgument} instead.
  */
+@Deprecated
 @Plugin(type = ConsoleArgument.class)
 public class RunArgument extends AbstractConsoleArgument {
 
@@ -62,7 +59,7 @@ public class RunArgument extends AbstractConsoleArgument {
 	// -- Constructor --
 
 	public RunArgument() {
-		super(2, "--run", "--class");
+		super(2, "--class");
 	}
 
 	// -- ConsoleArgument methods --
@@ -72,7 +69,10 @@ public void handle(final LinkedList<String> args) {
 		if (!supports(args))
 			return;
 
-		args.removeFirst(); // --run
+		log.warn("The --class flag is deprecated, and will\n" +
+			"be removed in a future release. Use --run instead.");
+
+		args.removeFirst(); // --class
 		final String commandToRun = args.removeFirst();
 		final String paramString = ConsoleUtils.hasParam(args) ? args.removeFirst() : "";
 

From 3d02bc86e3b6f886651f2e3b3c4d82ee1c3c84fb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 19:53:59 -0500
Subject: [PATCH 0193/1208] Deprecate the "--script" CLI flag

The "--run" support has been generalized now, such that continuing
to support this specialization is more trouble than it is worth.
---
 .../scijava/script/console/RunScriptArgument.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index eab90b8c6..0bc8347c1 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -44,10 +44,9 @@
 import org.scijava.script.ScriptService;
 
 /**
- * {@link ConsoleArgument} for executing scripts directly.
- *
- * @author Mark Hiner
+ * @deprecated Use {@link org.scijava.run.console.RunArgument} instead.
  */
+@Deprecated
 @Plugin(type = ConsoleArgument.class)
 public class RunScriptArgument extends AbstractConsoleArgument {
 
@@ -60,7 +59,7 @@ public class RunScriptArgument extends AbstractConsoleArgument {
 	// -- Constructor --
 
 	public RunScriptArgument() {
-		super(2, "--run", "--script");
+		super(2, "--script");
 	}
 
 	// -- ConsoleArgument methods --
@@ -70,7 +69,10 @@ public void handle(final LinkedList<String> args) {
 		if (!supports(args))
 			return;
 
-		args.removeFirst(); // --run
+		log.warn("The --script flag is deprecated, and will\n" +
+			"be removed in a future release. Use --run instead.");
+
+		args.removeFirst(); // --script
 		final String scriptToRun = args.removeFirst();
 		final String paramString = ConsoleUtils.hasParam(args) ? args.removeFirst() : "";
 

From aec9f92d3da02ea4136573f68d360fdc833415ad Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 20:29:50 -0500
Subject: [PATCH 0194/1208] Add unit tests for RunService

---
 .../java/org/scijava/run/RunServiceTest.java  | 127 ++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 src/test/java/org/scijava/run/RunServiceTest.java

diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
new file mode 100644
index 000000000..228eacb37
--- /dev/null
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -0,0 +1,127 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.run;
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.plugin.Plugin;
+
+/**
+ * Tests {@link RunService}.
+ *
+ * @author Curtis Rueden
+ */
+public class RunServiceTest {
+
+	private RunService runService;
+
+	@Before
+	public void setUp() {
+		runService = new Context().service(RunService.class);
+	}
+
+	@After
+	public void tearDown() {
+		runService.context().dispose();
+	}
+
+	/** Tests {@link RunService#run(Object, Object...)}. */
+	@Test
+	public void testRunList() throws InvocationTargetException {
+		final StringBuilder sb = new StringBuilder();
+		runService.run(sb, "foo", "bar", "fu bar");
+		assertEquals("|foo|bar|fu bar|", sb.toString());
+	}
+
+	/** Tests {@link RunService#run(Object, Object...)}. */
+	@Test
+	public void testRunMap() throws InvocationTargetException {
+		final StringBuilder sb = new StringBuilder();
+		final Map<String, Object> inputMap = new LinkedHashMap<String, Object>();
+		inputMap.put("foo", "bar");
+		inputMap.put("animal", "quick brown fox");
+		inputMap.put("number", 33);
+		runService.run(sb, inputMap);
+		assertEquals("|foo=bar|animal=quick brown fox|number=33|", sb.toString());
+	}
+
+	// -- Helper classes --
+
+	/** A {@link CodeRunner} that stringifies its arguments. */
+	@Plugin(type = CodeRunner.class)
+	public static class StringRunner extends AbstractCodeRunner {
+
+		@Override
+		public void run(final Object code, final Object... args)
+			throws InvocationTargetException
+		{
+			final StringBuilder sb = getStringBuilder(code);
+			sb.append("|");
+			for (final Object arg : args) {
+				sb.append(arg);
+				sb.append("|");
+			}
+		}
+
+		@Override
+		public void run(final Object code, final Map<String, Object> inputMap)
+			throws InvocationTargetException
+		{
+			final StringBuilder sb = getStringBuilder(code);
+			sb.append("|");
+			for (final String key : inputMap.keySet()) {
+				sb.append(key);
+				sb.append("=");
+				sb.append(inputMap.get(key));
+				sb.append("|");
+			}
+		}
+
+		@Override
+		public boolean supports(final Object code) {
+			return getStringBuilder(code) != null;
+		}
+
+		private StringBuilder getStringBuilder(final Object code) {
+			return code instanceof StringBuilder ? (StringBuilder) code : null;
+		}
+	}
+
+}

From bfc0a60a97a804cce713bb8855f799493059a405 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Apr 2016 20:50:47 -0500
Subject: [PATCH 0195/1208] Add unit tests for CodeRunner plugins

(Well, not the ScriptCodeRunner. Testing that one is too annoying,
at least for the moment.)
---
 .../command/run/CommandCodeRunnerTest.java    | 136 +++++++++++++++++
 .../scijava/main/run/MainCodeRunnerTest.java  |  95 ++++++++++++
 .../module/run/ModuleCodeRunnerTest.java      | 137 ++++++++++++++++++
 3 files changed, 368 insertions(+)
 create mode 100644 src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
 create mode 100644 src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
 create mode 100644 src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java

diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
new file mode 100644
index 000000000..8a1ed203b
--- /dev/null
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -0,0 +1,136 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.command.run;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.ItemIO;
+import org.scijava.command.Command;
+import org.scijava.command.CommandService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+
+/**
+ * Tests {@link CommandCodeRunner}.
+ * 
+ * @author Curtis Rueden
+ */
+public class CommandCodeRunnerTest {
+
+	private Context context;
+	private CommandCodeRunner runner;
+
+	@Before
+	public void setUp() {
+		context = new Context(CommandService.class);
+		runner = new CommandCodeRunner();
+		context.inject(runner);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	@Test
+	public void testRunList() throws InvocationTargetException {
+		final StringBuilder buffer = new StringBuilder();
+
+		runner.run(OpenSesame.class, "buffer", buffer);
+		assertEquals("Alakazam", buffer.toString());
+
+		runner.run(OpenSesame.class, "buffer", buffer, "magicWord", "Shazam");
+		assertEquals("AlakazamShazam", buffer.toString());
+
+		runner.run("Open Sesame", "buffer", buffer, "magicWord", "Marzipan");
+		assertEquals("AlakazamShazamMarzipan", buffer.toString());
+	}
+
+	@Test
+	public void testRunMap() throws InvocationTargetException {
+		final StringBuilder buffer = new StringBuilder();
+
+		final Map<String, Object> inputMap = new HashMap<String, Object>();
+		inputMap.put("buffer", buffer);
+
+		runner.run(OpenSesame.class, inputMap);
+		assertEquals("Alakazam", buffer.toString());
+
+		inputMap.put("magicWord", "Shazam");
+		runner.run(OpenSesame.class, inputMap);
+		assertEquals("AlakazamShazam", buffer.toString());
+
+		inputMap.put("magicWord", "Marzipan");
+		runner.run("Open Sesame", inputMap);
+		assertEquals("AlakazamShazamMarzipan", buffer.toString());
+	}
+
+	@Test
+	public void testSupports() {
+		assertTrue(runner.supports(OpenSesame.class));
+		assertTrue(runner.supports(OpenSesame.class.getName()));
+		assertTrue(runner.supports("Open Sesame"));
+
+		assertFalse(runner.supports(CommandCodeRunnerTest.class));
+		assertFalse(runner.supports("Not an actual command"));
+		assertFalse(runner.supports(0));
+	}
+
+	// -- Helper methods --
+
+	@Plugin(type = Command.class, label = "Open Sesame")
+	public static class OpenSesame implements Command {
+
+		@Parameter(type = ItemIO.BOTH)
+		private StringBuilder buffer;
+
+		@Parameter(required = false, persist = false)
+		private String magicWord;
+
+		@Override
+		public void run() {
+			buffer.append(magicWord == null ? "Alakazam" : magicWord);
+		}
+
+	}
+
+}
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
new file mode 100644
index 000000000..9814b758b
--- /dev/null
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -0,0 +1,95 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.main.run;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests {@link MainCodeRunner}.
+ * 
+ * @author Curtis Rueden
+ */
+public class MainCodeRunnerTest {
+
+	private MainCodeRunner runner;
+
+	@Before
+	public void setUp() {
+		runner = new MainCodeRunner();
+	}
+
+	@Test
+	public void testRunList() throws InvocationTargetException {
+		runner.run(Counter.class);
+		assertEquals(Counter.counter, 0);
+		runner.run(Counter.class, "a");
+		assertEquals(Counter.counter, 1);
+		runner.run(Counter.class, "b", "c");
+		assertEquals(Counter.counter, 3);
+		runner.run(Counter.class, "d", "e", "f");
+		assertEquals(Counter.counter, 6);
+	}
+
+	@Test(expected = UnsupportedOperationException.class)
+	public void testRunMap() throws InvocationTargetException {
+		runner.run(Counter.class, new HashMap<String, Object>());
+	}
+
+	@Test
+	public void testSupports() {
+		assertTrue(runner.supports(Counter.class));
+		assertTrue(runner.supports(Counter.class.getName()));
+
+		assertFalse(runner.supports(getClass()));
+		assertFalse(runner.supports("Not an actual class"));
+		assertFalse(runner.supports(0));
+	}
+
+	// -- Helper classes --
+
+	public static class Counter {
+
+		public static int counter;
+
+		public static void main(final String[] args) {
+			counter += args.length;
+		}
+	}
+}
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
new file mode 100644
index 000000000..99dec327f
--- /dev/null
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -0,0 +1,137 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.run;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.ItemIO;
+import org.scijava.module.DefaultMutableModule;
+import org.scijava.module.DefaultMutableModuleInfo;
+import org.scijava.module.DefaultMutableModuleItem;
+import org.scijava.module.ModuleService;
+
+/**
+ * Tests {@link ModuleCodeRunner}.
+ * 
+ * @author Curtis Rueden
+ */
+public class ModuleCodeRunnerTest {
+
+	private Context context;
+	private ModuleCodeRunner runner;
+
+	@Before
+	public void setUp() {
+		context = new Context(ModuleService.class);
+		context.service(ModuleService.class).addModule(new AlphabetModuleInfo());
+		runner = new ModuleCodeRunner();
+		context.inject(runner);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	@Test
+	public void testRunList() throws InvocationTargetException {
+		final StringBuilder sb = new StringBuilder();
+		runner.run("module:" + AlphabetModule.class.getName(), //
+			"buffer", sb, "length", 3);
+		assertEquals("ABC", sb.toString());
+	}
+
+	@Test
+	public void testRunMap() throws InvocationTargetException {
+		final StringBuilder sb = new StringBuilder();
+		final Map<String, Object> inputMap = new HashMap<String, Object>();
+		inputMap.put("buffer", sb);
+		inputMap.put("length", 4);
+		runner.run("module:" + AlphabetModule.class.getName(), inputMap);
+		assertEquals("ABCD", sb.toString());
+	}
+
+	@Test
+	public void testSupports() {
+		assertTrue(runner.supports("module:" + AlphabetModule.class.getName()));
+
+		assertFalse(runner.supports("module:" + getClass().getName()));
+	}
+
+	// -- Helper classes --
+
+	/** A module that writes the alphabet into a buffer. */
+	public static class AlphabetModule extends DefaultMutableModule {
+
+		@Override
+		public AlphabetModuleInfo getInfo() { return new AlphabetModuleInfo(); }
+
+		@Override
+		public void run() {
+			final StringBuilder sb = (StringBuilder) getInput("buffer");
+			final int length = (Integer) getInput("length");
+			sb.setLength(0);
+			for (int i = 0; i < length; i++) {
+				final char letter = (char) ('A' + i);
+				sb.append(letter);
+			}
+		}
+	}
+
+	/** Module metadata for {@link AlphabetModule}. */
+	public static class AlphabetModuleInfo extends DefaultMutableModuleInfo {
+
+		public AlphabetModuleInfo() {
+			// So much fun to construct modules by hand! Who needs commands?
+			setModuleClass(AlphabetModule.class);
+			final DefaultMutableModuleItem<StringBuilder> bufferItem =
+				new DefaultMutableModuleItem<StringBuilder>(this, "buffer",
+					StringBuilder.class);
+			bufferItem.setIOType(ItemIO.BOTH);
+			addInput(bufferItem);
+			addInput(new DefaultMutableModuleItem<Integer>(this, "length",
+				int.class));
+		}
+
+	}
+
+}

From 001b3dd8a77ba865bd17e175215822ece2325458 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 5 Apr 2016 17:15:17 -0500
Subject: [PATCH 0196/1208] Move parameter logic to AbstractConsoleArgument

The AbstractConsoleArgument already had a protected isFlag method;
for consistently, let's just put single parameter extraction there too.
---
 .../scijava/console/AbstractConsoleArgument.java    | 13 +++++++++++++
 .../java/org/scijava/run/console/RunArgument.java   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 118a9dbe1..8c48af157 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -86,4 +86,17 @@ public Class<LinkedList<String>> getType() {
 	protected boolean isFlag(final LinkedList<String> args) {
 		return flags.isEmpty() || flags.contains(args.getFirst());
 	}
+
+	/**
+	 * If the next argument is an appropriate parameter to a
+	 * {@link ConsoleArgument}, retrieves it; otherwise, returns null.
+	 *
+	 * @return The first argument of the given list, if it does not
+	 *         start with a {@code '-'} character; or null otherwise.
+	 */
+	protected String getParam(final LinkedList<String> args) {
+		if (args.isEmpty()) return null;
+		final String arg = args.getFirst();
+		return arg.startsWith("-") ? null : arg;
+	}
 }
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 4ed621aaa..8897bf519 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -75,7 +75,7 @@ public void handle(final LinkedList<String> args) {
 
 		args.removeFirst(); // --run
 		final String code = args.removeFirst();
-		final String arg = ConsoleUtils.hasParam(args) ? args.removeFirst() : null;
+		final String arg = getParam(args);
 
 		final Items items = parser.parse(arg);
 		try {

From b254d8e26647404394d3347d2e4c7ca352a2a69e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 5 Apr 2016 17:16:15 -0500
Subject: [PATCH 0197/1208] Deprecate the ConsoleUtils utility class

All of its needed functionality moved elsewhere.
---
 .../org/scijava/console/ConsoleUtils.java     | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 577881ae3..8c078fde4 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -39,44 +39,32 @@
 import org.scijava.log.LogService;
 import org.scijava.module.ModuleInfo;
 import org.scijava.module.ModuleItem;
+import org.scijava.parse.ParseService;
 
-/**
- * Helper class for {@link ConsoleArgument}s.
- *
- * @author Mark Hiner
- */
+/** @deprecated Use alternatives instead (see individual method docs). */
+@Deprecated
 public final class ConsoleUtils {
 
-	/**
-	 * @see #parseParameterString(String, ModuleInfo, LogService)
-	 */
+	/** @deprecated Use {@link ParseService} instead. */
+	@Deprecated
 	public static Map<String, Object> parseParameterString(final String parameterString) {
 		return parseParameterString(parameterString, (CommandInfo)null);
 	}
 
-	/**
-	 * @see #parseParameterString(String, ModuleInfo, LogService)
-	 */
+	/** @deprecated Use {@link ParseService} instead. */
+	@Deprecated
 	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info) {
 		return parseParameterString(parameterString, info, null);
 	}
 
-	/**
-	 * @see #parseParameterString(String, ModuleInfo, LogService)
-	 */
+	/** @deprecated Use {@link ParseService} instead. */
+	@Deprecated
 	public static Map<String, Object> parseParameterString(final String parameterString, final LogService log) {
 		return parseParameterString(parameterString, null, log);
 	}
 
-	/**
-	 * Helper method for turning a parameter string into a {@code Map} of
-	 * key:value pairs. If a {@link ModuleInfo} is provided, the parameter
-	 * string is assumed to be a comma-separated list of values, ordered
-	 * according to the {@code ModuleInfo's} inputs. Otherwise, the parameter
-	 * string is assumed to be a comma-separated list of "key=value" pairs.
-	 *
-	 * TODO reconcile with attribute parsing of {@link ScriptInfo}
-	 */
+	/** @deprecated Use {@link ParseService} instead. */
+	@Deprecated
 	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info, final LogService log) {
 		final Map<String, Object> inputMap = new HashMap<String, Object>();
 
@@ -104,12 +92,10 @@ else if (log != null)
 	}
 
 	/**
-	 * Test if the next argument is an appropriate parameter to a
-	 * {@link ConsoleArgument}.
-	 *
-	 * @return {@code true} if the first argument of the given list does not
-	 *         start with a {@code '-'} character.
+	 * @deprecated Use {@link AbstractConsoleArgument#getParam(LinkedList)}
+	 *             instead.
 	 */
+	@Deprecated
 	public static boolean hasParam(final LinkedList<String> args) {
 		return !(args.isEmpty() || args.getFirst().startsWith("-"));
 	}

From 7b39b2e10a0132bef40c570ec2f769fda1827bfc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 6 Apr 2016 09:15:57 -0500
Subject: [PATCH 0198/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 86a4aaaaa..7e7669c37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.54.0-SNAPSHOT</version>
+	<version>2.54.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From b917ce373841ad3e676594dbb315933bc0b21128 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 6 Apr 2016 10:30:11 -0500
Subject: [PATCH 0199/1208] Make pre- and post-processor plugins singletons

They are now each managed by a SingletonService.

And the ModuleService uses those services to obtain the instances.

Closes #232.
---
 .../scijava/module/DefaultModuleService.java  | 12 +++--
 .../process/DefaultPostprocessorService.java  | 54 +++++++++++++++++++
 .../process/DefaultPreprocessorService.java   | 54 +++++++++++++++++++
 .../module/process/PostprocessorPlugin.java   |  4 +-
 .../module/process/PostprocessorService.java  | 45 ++++++++++++++++
 .../module/process/PreprocessorPlugin.java    |  4 +-
 .../module/process/PreprocessorService.java   | 45 ++++++++++++++++
 .../java/org/scijava/ContextCreationTest.java |  2 +
 8 files changed, 212 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
 create mode 100644 src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
 create mode 100644 src/main/java/org/scijava/module/process/PostprocessorService.java
 create mode 100644 src/main/java/org/scijava/module/process/PreprocessorService.java

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 67b1a1907..f04fd5977 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -53,11 +53,12 @@
 import org.scijava.module.process.ModulePostprocessor;
 import org.scijava.module.process.ModulePreprocessor;
 import org.scijava.module.process.PostprocessorPlugin;
+import org.scijava.module.process.PostprocessorService;
 import org.scijava.module.process.PreprocessorPlugin;
+import org.scijava.module.process.PreprocessorService;
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.PluginService;
 import org.scijava.prefs.PrefService;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
@@ -84,7 +85,10 @@ public class DefaultModuleService extends AbstractService implements
 	private EventService eventService;
 
 	@Parameter
-	private PluginService pluginService;
+	private PreprocessorService preprocessorService;
+
+	@Parameter
+	private PostprocessorService postprocessorService;
 
 	@Parameter
 	private ObjectService objectService;
@@ -364,13 +368,13 @@ public void initialize() {
 	/** Creates the preprocessor chain. */
 	private List<? extends PreprocessorPlugin> pre(final boolean process) {
 		if (!process) return null;
-		return pluginService.createInstancesOfType(PreprocessorPlugin.class);
+		return preprocessorService.getInstances();
 	}
 
 	/** Creates the postprocessor chain. */
 	private List<? extends PostprocessorPlugin> post(final boolean process) {
 		if (!process) return null;
-		return pluginService.createInstancesOfType(PostprocessorPlugin.class);
+		return postprocessorService.getInstances();
 	}
 
 	/**
diff --git a/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java b/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
new file mode 100644
index 000000000..581c300da
--- /dev/null
+++ b/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * SCIFIO library for reading and converting scientific file formats.
+ * %%
+ * Copyright (C) 2011 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.process;
+
+import org.scijava.plugin.AbstractSingletonService;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.Service;
+
+/**
+ * Default service for managing available {@link PostprocessorPlugin}s.
+ *
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultPostprocessorService extends
+	AbstractSingletonService<PostprocessorPlugin> implements PostprocessorService
+{
+
+	// -- PTService methods --
+
+	@Override
+	public Class<PostprocessorPlugin> getPluginType() {
+		return PostprocessorPlugin.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java b/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
new file mode 100644
index 000000000..05ff59eda
--- /dev/null
+++ b/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * SCIFIO library for reading and converting scientific file formats.
+ * %%
+ * Copyright (C) 2011 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.process;
+
+import org.scijava.plugin.AbstractSingletonService;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.Service;
+
+/**
+ * Default service for managing available {@link PreprocessorPlugin}s.
+ *
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultPreprocessorService extends
+	AbstractSingletonService<PreprocessorPlugin> implements PreprocessorService
+{
+
+	// -- PTService methods --
+
+	@Override
+	public Class<PreprocessorPlugin> getPluginType() {
+		return PreprocessorPlugin.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index 37bfbcd34..ef21ba10b 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Contextual;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.SciJavaPlugin;
+import org.scijava.plugin.SingletonPlugin;
 
 /**
  * A postprocessor plugin defines a step that occurs immediately following the
@@ -51,7 +51,7 @@
  * @author Curtis Rueden
  * @see ModulePostprocessor
  */
-public interface PostprocessorPlugin extends SciJavaPlugin, Contextual,
+public interface PostprocessorPlugin extends SingletonPlugin, Contextual,
 	ModulePostprocessor
 {
 	// PostprocessorPlugin is a module postprocessor,
diff --git a/src/main/java/org/scijava/module/process/PostprocessorService.java b/src/main/java/org/scijava/module/process/PostprocessorService.java
new file mode 100644
index 000000000..cf8552c5d
--- /dev/null
+++ b/src/main/java/org/scijava/module/process/PostprocessorService.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * SCIFIO library for reading and converting scientific file formats.
+ * %%
+ * Copyright (C) 2011 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.process;
+
+import org.scijava.plugin.SingletonService;
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for service which manages available {@link PostprocessorPlugin}s.
+ *
+ * @author Curtis Rueden
+ */
+public interface PostprocessorService extends
+	SingletonService<PostprocessorPlugin>, SciJavaService
+{
+	// NB: No implementation needed.
+}
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index 1fa632790..cb53fa9ae 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Contextual;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.SciJavaPlugin;
+import org.scijava.plugin.SingletonPlugin;
 
 /**
  * A preprocessor plugin defines a step that occurs just prior to the actual
@@ -51,7 +51,7 @@
  * @author Curtis Rueden
  * @see ModulePreprocessor
  */
-public interface PreprocessorPlugin extends SciJavaPlugin, Contextual,
+public interface PreprocessorPlugin extends SingletonPlugin, Contextual,
 	ModulePreprocessor
 {
 	// PreprocessorPlugin is a module preprocessor,
diff --git a/src/main/java/org/scijava/module/process/PreprocessorService.java b/src/main/java/org/scijava/module/process/PreprocessorService.java
new file mode 100644
index 000000000..b0792ddae
--- /dev/null
+++ b/src/main/java/org/scijava/module/process/PreprocessorService.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * SCIFIO library for reading and converting scientific file formats.
+ * %%
+ * Copyright (C) 2011 - 2015 Board of Regents of the University of
+ * Wisconsin-Madison
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.process;
+
+import org.scijava.plugin.SingletonService;
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for service which manages available {@link PreprocessorPlugin}s.
+ *
+ * @author Curtis Rueden
+ */
+public interface PreprocessorService extends
+	SingletonService<PreprocessorPlugin>, SciJavaService
+{
+	// NB: No implementation needed.
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index abbab3c9b..da59f1d23 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -100,6 +100,8 @@ public void testFull() {
 				org.scijava.main.DefaultMainService.class,
 				org.scijava.menu.DefaultMenuService.class,
 				org.scijava.module.DefaultModuleService.class,
+				org.scijava.module.process.DefaultPostprocessorService.class,
+				org.scijava.module.process.DefaultPreprocessorService.class,
 				org.scijava.object.DefaultObjectService.class,
 				org.scijava.options.DefaultOptionsService.class,
 				org.scijava.parse.DefaultParseService.class,

From 31df424de4f6c30cd49f8d2272ebb0c530bd877f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 6 Apr 2016 15:38:53 -0500
Subject: [PATCH 0200/1208] Happy New Year 2016

---
 LICENSE.txt                                           |  2 +-
 .../java/org/scijava/convert/NumberConverters.java    |  6 +++---
 .../scijava/convert/NumberToBigDecimalConverter.java  |  4 ++--
 .../scijava/convert/NumberToBigIntegerConverter.java  |  6 +++---
 .../org/scijava/convert/NumberToDoubleConverter.java  |  2 +-
 .../org/scijava/convert/NumberToFloatConverter.java   |  4 ++--
 .../org/scijava/convert/NumberToIntegerConverter.java |  4 ++--
 .../org/scijava/convert/NumberToLongConverter.java    |  4 ++--
 .../org/scijava/convert/NumberToNumberConverter.java  |  6 +++---
 .../org/scijava/convert/NumberToShortConverter.java   |  2 +-
 .../module/process/DefaultPostprocessorService.java   | 11 ++++++-----
 .../module/process/DefaultPreprocessorService.java    | 11 ++++++-----
 .../scijava/module/process/PostprocessorService.java  | 11 ++++++-----
 .../scijava/module/process/PreprocessorService.java   | 11 ++++++-----
 src/main/java/org/scijava/parse/ParseService.java     |  4 ++--
 src/main/java/org/scijava/script/ScriptREPL.java      |  2 +-
 .../scijava/convert/AbstractNumberConverterTests.java |  6 +++---
 .../convert/BigIntegerToBigDecimalConverterTest.java  |  6 +++---
 .../convert/ByteToBigDecimalConverterTest.java        |  6 +++---
 .../convert/ByteToBigIntegerConverterTest.java        |  6 +++---
 .../scijava/convert/ByteToDoubleConverterTest.java    |  6 +++---
 .../org/scijava/convert/ByteToFloatConverterTest.java |  6 +++---
 .../scijava/convert/ByteToIntegerConverterTest.java   |  6 +++---
 .../org/scijava/convert/ByteToLongConverterTest.java  |  6 +++---
 .../org/scijava/convert/ByteToShortConverterTest.java |  6 +++---
 .../convert/DoubleToBigDecimalConverterTest.java      |  6 +++---
 .../convert/FloatToBigDecimalConverterTest.java       |  6 +++---
 .../scijava/convert/FloatToDoubleConverterTest.java   |  6 +++---
 .../convert/IntegerToBigDecimalConverterTest.java     |  6 +++---
 .../convert/IntegerToBigIntegerConverterTest.java     |  6 +++---
 .../scijava/convert/IntegerToDoubleConverterTest.java |  6 +++---
 .../scijava/convert/IntegerToLongConverterTest.java   |  6 +++---
 .../convert/LongToBigDecimalConverterTest.java        |  6 +++---
 .../convert/LongToBigIntegerConverterTest.java        |  6 +++---
 .../convert/ShortToBigDecimalConverterTest.java       |  6 +++---
 .../convert/ShortToBigIntegerConverterTest.java       |  6 +++---
 .../scijava/convert/ShortToDoubleConverterTest.java   |  6 +++---
 .../scijava/convert/ShortToFloatConverterTest.java    |  6 +++---
 .../scijava/convert/ShortToIntegerConverterTest.java  |  6 +++---
 .../org/scijava/convert/ShortToLongConverterTest.java |  6 +++---
 src/test/java/org/scijava/parse/ParseServiceTest.java |  4 ++--
 41 files changed, 121 insertions(+), 117 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 242746407..4513c78b9 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2015, Board of Regents of the University of
+Copyright (c) 2009 - 2016, Board of Regents of the University of
 Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
 Institute of Molecular Cell Biology and Genetics.
 All rights reserved.
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index c8dc7412c..678addc1c 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index b18178b1b..fb24c86f5 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
@@ -52,4 +52,4 @@ public Class<BigDecimal> getOutputType() {
 		return BigDecimal.class;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index b8d0449e2..30825bebf 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 05fd1ce74..911959663 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index 368ab0bd9..ee3c9f46c 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
@@ -48,4 +48,4 @@ public Class<Float> getOutputType() {
 		return Float.class;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index f16a48208..aef88f2ed 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
@@ -48,4 +48,4 @@ public Class<Integer> getOutputType() {
 		return Integer.class;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index 314db3b9e..d60844eaf 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
@@ -48,4 +48,4 @@ public Class<Long> getOutputType() {
 		return Long.class;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index 8a41b1b3b..1f0436fef 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 133b3cc80..b6fa2bcfd 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java b/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
index 581c300da..beab91032 100644
--- a/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
+++ b/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
@@ -1,19 +1,20 @@
 /*
  * #%L
- * SCIFIO library for reading and converting scientific file formats.
+ * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2011 - 2015 Board of Regents of the University of
- * Wisconsin-Madison
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java b/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
index 05ff59eda..39b95f79f 100644
--- a/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
+++ b/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
@@ -1,19 +1,20 @@
 /*
  * #%L
- * SCIFIO library for reading and converting scientific file formats.
+ * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2011 - 2015 Board of Regents of the University of
- * Wisconsin-Madison
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/module/process/PostprocessorService.java b/src/main/java/org/scijava/module/process/PostprocessorService.java
index cf8552c5d..26d7afb07 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorService.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorService.java
@@ -1,19 +1,20 @@
 /*
  * #%L
- * SCIFIO library for reading and converting scientific file formats.
+ * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2011 - 2015 Board of Regents of the University of
- * Wisconsin-Madison
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/module/process/PreprocessorService.java b/src/main/java/org/scijava/module/process/PreprocessorService.java
index b0792ddae..84580c7b0 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorService.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorService.java
@@ -1,19 +1,20 @@
 /*
  * #%L
- * SCIFIO library for reading and converting scientific file formats.
+ * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2011 - 2015 Board of Regents of the University of
- * Wisconsin-Madison
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 1b64b7d8a..31e63d5c6 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.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
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index e3536bd97..c3ce836ac 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 854c99974..32618f0d9 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index 8775bcf74..502104206 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 137857f2b..4741a8c5d 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index b36aa1dd7..7cf5030e3 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index c8ce44631..0c398fac6 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index be49e244b..846d4df75 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 82e8bd95b..f3a3ad127 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 6c14de3ef..5ab8a85c9 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index 4407bb916..8045395cb 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index 4172e42a8..a8faeac1d 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index 8db1d49a4..ea2ce8f74 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index 00bf08c86..f8632d524 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 6fd1f64ff..e56bec712 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index 21276deac..a5df04620 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 23f8db5ef..114246f17 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index eb6b7604e..489f3eeb1 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index e28ea2cb1..2a874eb5c 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 632f5deaa..98d432a10 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index 4d1c6caa2..12c1f0596 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index c920e5d51..ad166093f 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index 0fdf6c6c3..585fa52a1 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index e9db0a38b..7c64a1b26 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 24033528d..4d0b3d557 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index c1586a412..a3162331c 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2015 Board of Regents of the University of
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index 80894ef47..a125dfff8 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.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

From d056704b15cd4e8c7139a6a3e87d634432f26ff0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 6 Apr 2016 15:39:10 -0500
Subject: [PATCH 0201/1208] Add a ScriptEngine adapter

This is similar to the AdaptedScriptLanguage, but for ScriptEngine.
It will be used shortly by the scijava/scripting-scala project.
---
 pom.xml                                       |   2 +-
 .../scijava/script/AdaptedScriptEngine.java   | 140 ++++++++++++++++++
 2 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/script/AdaptedScriptEngine.java

diff --git a/pom.xml b/pom.xml
index 7e7669c37..f64763fa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.54.1-SNAPSHOT</version>
+	<version>2.55.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
new file mode 100644
index 000000000..381b99017
--- /dev/null
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script;
+
+import java.io.Reader;
+
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptException;
+
+/**
+ * Abstract superclass for {@link ScriptEngine} implementations which adapt an
+ * existing {@link ScriptEngine}.
+ * <p>
+ * This is useful for situations where a JSR-223-compliant script engine has
+ * been provided, but whose behavior we need to extend or tweak.
+ * </p>
+ *
+ * @author Curtis Rueden
+ */
+public class AdaptedScriptEngine implements ScriptEngine {
+
+	private final ScriptEngine engine;
+
+	public AdaptedScriptEngine(final ScriptEngine engine) {
+		this.engine = engine;
+	}
+
+	// -- ScriptEngine methods --
+
+	@Override
+	public Object eval(final String script, final ScriptContext context)
+		throws ScriptException
+	{
+		return engine.eval(script, context);
+	}
+
+	@Override
+	public Object eval(final Reader reader, final ScriptContext context)
+		throws ScriptException
+	{
+		return engine.eval(reader, context);
+	}
+
+	@Override
+	public Object eval(final String script) throws ScriptException {
+		return engine.eval(script);
+	}
+
+	@Override
+	public Object eval(final Reader reader) throws ScriptException {
+		return engine.eval(reader);
+	}
+
+	@Override
+	public Object eval(final String script, final Bindings n)
+		throws ScriptException
+	{
+		return engine.eval(script, n);
+	}
+
+	@Override
+	public Object eval(final Reader reader, final Bindings n)
+		throws ScriptException
+	{
+		return engine.eval(reader, n);
+	}
+
+	@Override
+	public void put(final String key, final Object value) {
+		engine.put(key, value);
+	}
+
+	@Override
+	public Object get(final String key) {
+		return engine.get(key);
+	}
+
+	@Override
+	public Bindings getBindings(final int scope) {
+		return engine.getBindings(scope);
+	}
+
+	@Override
+	public void setBindings(final Bindings bindings, final int scope) {
+		engine.setBindings(bindings, scope);
+	}
+
+	@Override
+	public Bindings createBindings() {
+		return engine.createBindings();
+	}
+
+	@Override
+	public ScriptContext getContext() {
+		return engine.getContext();
+	}
+
+	@Override
+	public void setContext(final ScriptContext context) {
+		engine.setContext(context);
+	}
+
+	@Override
+	public ScriptEngineFactory getFactory() {
+		return engine.getFactory();
+	}
+
+}

From e3619bf8962798a4b2fc8ddcc844bd3d4961990c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 6 Apr 2016 16:06:14 -0500
Subject: [PATCH 0202/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f64763fa5..6387ed173 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.55.0-SNAPSHOT</version>
+	<version>2.55.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From e292f0099ca8a9ff67d51658171a425eb814f239 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Apr 2016 08:16:01 -0500
Subject: [PATCH 0203/1208] PluginIndexTest: clean up the test contexts

---
 src/test/java/org/scijava/plugin/PluginIndexTest.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 04ffbd149..a29df6309 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -73,6 +73,8 @@ public void testGetPluginsOfClass() {
 		final PluginInfo<SciJavaPlugin> plugin =
 			pluginService.getPlugin(FooBar.class);
 		assertSame(testPlugin, plugin);
+
+		context.dispose();
 	}
 
 	/**
@@ -102,6 +104,8 @@ public void testGetPluginsOfClassString() {
 
 		final PluginInfo<SciJavaPlugin> plugin = pluginService.getPlugin(fakeClass);
 		assertSame(testPlugin, plugin);
+
+		context.dispose();
 	}
 
 	/** A dummy plugin for testing the plugin service. */

From 47607a690feab664fc58ef8110af117ab54bd0a9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Apr 2016 07:34:02 -0500
Subject: [PATCH 0204/1208] Add a feature to blacklist certain plugins

Right now, it must be done using the scijava.plugin.blacklist system
property, a colon-separated list of regexes defining plugins to ignore.

If this idea works out well, we can expose the API such that the
blacklist can be specified per context instead of globally.
---
 .../scijava/plugin/DefaultPluginFinder.java   | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 5c5796e75..9f2c22424 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -31,8 +31,11 @@
 
 package org.scijava.plugin;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 import org.scijava.annotations.Index;
 import org.scijava.annotations.IndexItem;
@@ -51,6 +54,8 @@ public class DefaultPluginFinder implements PluginFinder {
 	/** Class loader to use when querying the annotation indexes. */
 	private final ClassLoader customClassLoader;
 
+	private final PluginBlacklist blacklist;
+
 	// -- Constructors --
 
 	public DefaultPluginFinder() {
@@ -59,6 +64,7 @@ public DefaultPluginFinder() {
 
 	public DefaultPluginFinder(final ClassLoader classLoader) {
 		customClassLoader = classLoader;
+		blacklist = new SysPropBlacklist();
 	}
 
 	// -- PluginFinder methods --
@@ -77,6 +83,7 @@ public HashMap<String, Throwable> findPlugins(
 
 		// create a PluginInfo object for each item in the index
 		for (final IndexItem<Plugin> item : annotationIndex) {
+			if (blacklist.contains(item.className())) continue;
 			try {
 				final PluginInfo<?> info = createInfo(item, classLoader);
 				plugins.add(info);
@@ -109,4 +116,47 @@ private ClassLoader getClassLoader() {
 		return Thread.currentThread().getContextClassLoader();
 	}
 
+	// -- Helper classes --
+
+	private interface PluginBlacklist {
+		boolean contains(String className);
+	}
+
+	/**
+	 * A blacklist defined by the {@code scijava.plugin.blacklist} system
+	 * property, formatted as a colon-separated list of regexes.
+	 * <p>
+	 * If a plugin class matches any of the regexes, it is excluded from the
+	 * plugin index.
+	 * </p>
+	 */
+	private class SysPropBlacklist implements PluginBlacklist {
+		private final List<Pattern> patterns;
+
+		public SysPropBlacklist() {
+			final String sysProp = System.getProperty("scijava.plugin.blacklist");
+			final String[] regexes = //
+				sysProp == null ? new String[0] : sysProp.split(":");
+			patterns = new ArrayList<Pattern>(regexes.length);
+			for (final String regex : regexes) {
+				try {
+					patterns.add(Pattern.compile(regex));
+				}
+				catch (final PatternSyntaxException exc) {
+					// NB: Ignore this malformed pattern.
+				}
+			}
+		}
+
+		// -- PluginBlacklist methods --
+
+		@Override
+		public boolean contains(final String className) {
+			for (final Pattern pattern : patterns) {
+				if (pattern.matcher(className).matches()) return true;
+			}
+			return false;
+		}
+	}
+
 }

From e7becba239a28c8d9aee392285214a870dc217ee Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Apr 2016 08:16:24 -0500
Subject: [PATCH 0205/1208] Add tests for the plugin blacklisting feature

---
 .../org/scijava/plugin/PluginFinderTest.java  | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/test/java/org/scijava/plugin/PluginFinderTest.java

diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
new file mode 100644
index 000000000..1c8df132f
--- /dev/null
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -0,0 +1,78 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.plugin;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+import org.scijava.Context;
+
+/**
+ * Tests {@link PluginFinder}.
+ * 
+ * @author Curtis Rueden
+ */
+public class PluginFinderTest {
+
+	/**
+	 * Tests that the {@code scijava.plugin.blacklist} system property works to
+	 * exclude plugins from the index, even when they are on the classpath.
+	 */
+	@Test
+	public void testPluginBlacklistSystemProperty() {
+		// check that the plugin is there, normally
+		Context context = new Context(PluginService.class);
+		PluginService pluginService = context.service(PluginService.class);
+		PluginInfo<SciJavaPlugin> plugin = //
+			pluginService.getPlugin(BlacklistedPlugin.class);
+		assertSame(BlacklistedPlugin.class.getName(), plugin.getClassName());
+		context.dispose();
+
+		// blacklist the plugin, then check that it is absent
+		System.setProperty("scijava.plugin.blacklist", ".*BlacklistedPlugin");
+		context = new Context(PluginService.class);
+		pluginService = context.service(PluginService.class);
+		plugin = pluginService.getPlugin(BlacklistedPlugin.class);
+		assertNull(plugin);
+		context.dispose();
+
+		// reset the system
+		System.getProperties().remove("scijava.plugin.blacklist");
+	}
+
+	@Plugin(type = SciJavaPlugin.class)
+	public static class BlacklistedPlugin implements SciJavaPlugin {
+		// NB: No implementation needed.
+	}
+
+}

From 85cc2b5755ae064081ac5fe5d317873c65ee5323 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Apr 2016 11:01:15 -0500
Subject: [PATCH 0206/1208] ScriptREPL: make evaluation errors less verbose

When something goes wrong interpreting a line of code, let's just
display the error message, not the whole stack trace, unless we are in
debug mode.
---
 src/main/java/org/scijava/script/ScriptREPL.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index c3ce836ac..4d0564a89 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -42,6 +42,7 @@
 import java.util.List;
 
 import javax.script.Bindings;
+import javax.script.ScriptException;
 
 import org.scijava.Context;
 import org.scijava.Gateway;
@@ -154,7 +155,17 @@ public boolean evaluate(final String line) {
 					out.println(s(result));
 				}
 			}
+			catch (final ScriptException exc) {
+				// NB: Something went wrong interpreting the line of code.
+				// Let's just display the error message, unless we are in debug mode.
+				if (log.isDebug()) exc.printStackTrace(out);
+				else {
+					final String msg = exc.getMessage();
+					out.println(msg == null ? exc.getClass().getName() : msg);
+				}
+			}
 			catch (final Throwable exc) {
+				// NB: Something unusual went wrong. Dump the whole exception always.
 				exc.printStackTrace(out);
 			}
 		}

From 4b87b622b0089bdbaad98a39b9a6c61d70195c9e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Apr 2016 11:20:38 -0500
Subject: [PATCH 0207/1208] ScriptService: fix out-of-date javadoc

As of f29650e3d52e06518809068de8786896e2a422b4, we no longer auto-wrap
vanilla JSR-223 ScriptEngineFactory implementations available on the
classpath. So let's not claim that we do in the javadoc.
---
 src/main/java/org/scijava/script/ScriptService.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index a9f1f470e..3f016abd9 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -74,13 +74,9 @@ public interface ScriptService extends SingletonService<ScriptLanguage>,
 	ScriptLanguageIndex getIndex();
 
 	/**
-	 * Gets the available scripting languages, including wrapped
-	 * {@link ScriptEngineFactory} instances available from the Java scripting
-	 * framework itself.
+	 * Gets the available scripting languages.
 	 * <p>
-	 * This method is similar to {@link #getInstances()}, except that
-	 * {@link #getInstances()} only returns {@link ScriptLanguage} subclasses
-	 * annotated with @{@link Plugin}.
+	 * This method does the same thing as {@link #getInstances()}.
 	 * </p>
 	 */
 	List<ScriptLanguage> getLanguages();

From a57b47816a34703c6a1f07ee70ee6ee8d517b78c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Apr 2016 13:17:37 -0500
Subject: [PATCH 0208/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6387ed173..00b62eb19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.55.1-SNAPSHOT</version>
+	<version>2.55.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 2b6eb9b740c789adfae68f3d58a7d2ab4f3558d6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 11 Apr 2016 09:40:57 -0500
Subject: [PATCH 0209/1208] POM: add ImageJ wiki URL for Kevin Mader

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 00b62eb19..2ad80e64b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
 		</contributor>
 		<contributor>
 			<name>Kevin Mader</name>
+			<url>http://imagej.net/User:Ksmader</url>
 			<properties><id>kmader</id></properties>
 		</contributor>
 		<contributor>

From d03cc39ba2738d398e47d80d11003d191350d3b6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 11 Apr 2016 16:25:29 -0500
Subject: [PATCH 0210/1208] Ensure all core services implement SciJavaService

This commit also adds a test to prevent this issue in the future.
---
 src/main/java/org/scijava/app/AppService.java           | 3 ++-
 src/main/java/org/scijava/convert/ConvertService.java   | 4 +++-
 src/test/java/org/scijava/service/ServiceIndexTest.java | 9 +++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 8853b0d56..f7d00844a 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -34,13 +34,14 @@
 import java.util.Map;
 
 import org.scijava.plugin.SingletonService;
+import org.scijava.service.SciJavaService;
 
 /**
  * Interface for application-level functionality.
  * 
  * @author Curtis Rueden
  */
-public interface AppService extends SingletonService<App> {
+public interface AppService extends SingletonService<App>, SciJavaService {
 
 	/** Gets the foremost application (the one with the highest priority). */
 	App getApp();
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index adb219061..caf9d1d68 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -35,6 +35,7 @@
 import java.util.Collection;
 
 import org.scijava.plugin.HandlerService;
+import org.scijava.service.SciJavaService;
 
 /**
  * Service for converting between types using an extensible plugin:
@@ -46,8 +47,9 @@
  * @author Mark Hiner
  */
 public interface ConvertService extends
-	HandlerService<ConversionRequest, Converter<?, ?>>
+	HandlerService<ConversionRequest, Converter<?, ?>>, SciJavaService
 {
+
 	/**
 	 * @see Converter#convert(Object, Type)
 	 */
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 7629ddcd3..0bae8801b 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -34,6 +34,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
@@ -66,6 +67,14 @@ public void testGetAll() {
 		assertSame(StderrLogService.class, all.get(3).getClass());
 	}
 
+	@Test
+	public void testMarkerInterfaces() {
+		final Context context = new Context();
+		for (Service s : context.getServiceIndex().getAll()) {
+			assertTrue(s.getClass().getName(), s instanceof SciJavaService);
+		}
+	}
+
 	/**
 	 * Test the {@link ServiceIndex#getPrevService(Class, Class)} operation.
 	 */

From afab5fd2de2a499c9f4fde79c3410f59cd19ec92 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Apr 2016 16:00:58 -0500
Subject: [PATCH 0211/1208] AbstractBasicDetails: add missing final keywords

---
 src/main/java/org/scijava/AbstractBasicDetails.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index cfeae9f66..507665b1c 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -53,7 +53,7 @@ public abstract class AbstractBasicDetails implements BasicDetails {
 	private String description;
 
 	/** Table of extra key/value pairs. */
-	private Map<String, String> values = new HashMap<String, String>();
+	private final Map<String, String> values = new HashMap<String, String>();
 
 	// -- Object methods --
 
@@ -102,7 +102,7 @@ public void setDescription(final String description) {
 	}
 
 	@Override
-	public void set(String key, String value) {
+	public void set(final String key, final String value) {
 		values.put(key, value);
 	}
 

From be41b8e2913fb5fc1f6059cbcc1dca1065a98f90 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Apr 2016 16:02:02 -0500
Subject: [PATCH 0212/1208] ScriptInfo: support all attrs

When an arbitrary key/value pair is given, we should set
it as an attribute rather than throwing an exception.

In Java, the way these are specified is rather verbose:

    @Parameter(attrs = { @Attr(name="foo", value="bar") })
    private int value;

But for scripts, it is now not only possible, but much more succinct:

    // @int value(foo="bar")

Noticed by Gabriel Einsdorf.
---
 src/main/java/org/scijava/script/ScriptInfo.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 67c028b0a..d23134478 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -399,7 +399,7 @@ private void addReturnValue() throws ScriptException {
 	}
 
 	private <T> void addItem(final String name, final Class<T> type,
-		final Map<String, Object> attrs) throws ScriptException
+		final Map<String, Object> attrs)
 	{
 		final DefaultMutableModuleItem<T> item =
 			new DefaultMutableModuleItem<T>(this, name, type);
@@ -412,7 +412,7 @@ private <T> void addItem(final String name, final Class<T> type,
 	}
 
 	private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
-		final String k, final Object v) throws ScriptException
+		final String k, final Object v)
 	{
 		// CTR: There must be an easier way to do this.
 		// Just compile the thing using javac? Or parse via javascript, maybe?
@@ -435,7 +435,7 @@ private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
 		else if (is(k, "style")) item.setWidgetStyle(as(v, String.class));
 		else if (is(k, "visibility")) item.setVisibility(as(v, ItemVisibility.class));
 		else if (is(k, "value")) item.setDefaultValue(as(v, item.getType()));
-		else throw new ScriptException("Invalid attribute name: " + k);
+		else item.set(k, v.toString());
 	}
 
 	/** Super terse comparison helper method. */

From 004bf6c24deb784b13b67c292225169de9b89d2d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 14 Apr 2016 08:59:58 -0500
Subject: [PATCH 0213/1208] ScriptInfoTest: test custom attribute population

---
 src/test/java/org/scijava/script/ScriptInfoTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 887b8d52b..664ea358c 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -142,7 +142,7 @@ public void testParameters() {
 			"% @LogService(required = false) log\n" + //
 			"% @int(label=\"Slider Value\", softMin=5, softMax=15, " + //
 			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
-			"% @String(persist = false, " + //
+			"% @String(persist = false, family='Carnivora', " + //
 			"choices={'quick brown fox', 'lazy dog'}) animal\n" + //
 			"% @BOTH java.lang.StringBuilder buffer";
 
@@ -164,6 +164,7 @@ public void testParameters() {
 			Arrays.asList("quick brown fox", "lazy dog");
 		assertItem("animal", String.class, null, ItemIO.INPUT, true, false,
 			null, null, null, null, null, null, null, null, animalChoices, animal);
+		assertEquals(animal.get("family"), "Carnivora"); // test custom attribute
 
 		final ModuleItem<?> buffer = info.getOutput("buffer");
 		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,

From 5b24cd50f960ee589cf9d97d826dadd187938a94 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 20 Apr 2016 10:18:43 -0500
Subject: [PATCH 0214/1208] Revert "Make pre- and post-processor plugins
 singletons"

This reverts commit b917ce373841ad3e676594dbb315933bc0b21128.

These plugin instances are stateful as they are Cancelable, thus they
should not be singletons.
---
 pom.xml                                       |  2 +-
 .../scijava/module/DefaultModuleService.java  | 12 ++--
 .../process/DefaultPostprocessorService.java  | 55 -------------------
 .../process/DefaultPreprocessorService.java   | 55 -------------------
 .../module/process/PostprocessorPlugin.java   |  4 +-
 .../module/process/PostprocessorService.java  | 46 ----------------
 .../module/process/PreprocessorPlugin.java    |  4 +-
 .../module/process/PreprocessorService.java   | 46 ----------------
 .../java/org/scijava/ContextCreationTest.java |  2 -
 9 files changed, 9 insertions(+), 217 deletions(-)
 delete mode 100644 src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
 delete mode 100644 src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
 delete mode 100644 src/main/java/org/scijava/module/process/PostprocessorService.java
 delete mode 100644 src/main/java/org/scijava/module/process/PreprocessorService.java

diff --git a/pom.xml b/pom.xml
index 2ad80e64b..efae373bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.55.2-SNAPSHOT</version>
+	<version>2.56.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index f04fd5977..67b1a1907 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -53,12 +53,11 @@
 import org.scijava.module.process.ModulePostprocessor;
 import org.scijava.module.process.ModulePreprocessor;
 import org.scijava.module.process.PostprocessorPlugin;
-import org.scijava.module.process.PostprocessorService;
 import org.scijava.module.process.PreprocessorPlugin;
-import org.scijava.module.process.PreprocessorService;
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.plugin.PluginService;
 import org.scijava.prefs.PrefService;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
@@ -85,10 +84,7 @@ public class DefaultModuleService extends AbstractService implements
 	private EventService eventService;
 
 	@Parameter
-	private PreprocessorService preprocessorService;
-
-	@Parameter
-	private PostprocessorService postprocessorService;
+	private PluginService pluginService;
 
 	@Parameter
 	private ObjectService objectService;
@@ -368,13 +364,13 @@ public void initialize() {
 	/** Creates the preprocessor chain. */
 	private List<? extends PreprocessorPlugin> pre(final boolean process) {
 		if (!process) return null;
-		return preprocessorService.getInstances();
+		return pluginService.createInstancesOfType(PreprocessorPlugin.class);
 	}
 
 	/** Creates the postprocessor chain. */
 	private List<? extends PostprocessorPlugin> post(final boolean process) {
 		if (!process) return null;
-		return postprocessorService.getInstances();
+		return pluginService.createInstancesOfType(PostprocessorPlugin.class);
 	}
 
 	/**
diff --git a/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java b/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
deleted file mode 100644
index beab91032..000000000
--- a/src/main/java/org/scijava/module/process/DefaultPostprocessorService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.module.process;
-
-import org.scijava.plugin.AbstractSingletonService;
-import org.scijava.plugin.Plugin;
-import org.scijava.service.Service;
-
-/**
- * Default service for managing available {@link PostprocessorPlugin}s.
- *
- * @author Curtis Rueden
- */
-@Plugin(type = Service.class)
-public class DefaultPostprocessorService extends
-	AbstractSingletonService<PostprocessorPlugin> implements PostprocessorService
-{
-
-	// -- PTService methods --
-
-	@Override
-	public Class<PostprocessorPlugin> getPluginType() {
-		return PostprocessorPlugin.class;
-	}
-
-}
diff --git a/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java b/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
deleted file mode 100644
index 39b95f79f..000000000
--- a/src/main/java/org/scijava/module/process/DefaultPreprocessorService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.module.process;
-
-import org.scijava.plugin.AbstractSingletonService;
-import org.scijava.plugin.Plugin;
-import org.scijava.service.Service;
-
-/**
- * Default service for managing available {@link PreprocessorPlugin}s.
- *
- * @author Curtis Rueden
- */
-@Plugin(type = Service.class)
-public class DefaultPreprocessorService extends
-	AbstractSingletonService<PreprocessorPlugin> implements PreprocessorService
-{
-
-	// -- PTService methods --
-
-	@Override
-	public Class<PreprocessorPlugin> getPluginType() {
-		return PreprocessorPlugin.class;
-	}
-
-}
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index ef21ba10b..37bfbcd34 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Contextual;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.SingletonPlugin;
+import org.scijava.plugin.SciJavaPlugin;
 
 /**
  * A postprocessor plugin defines a step that occurs immediately following the
@@ -51,7 +51,7 @@
  * @author Curtis Rueden
  * @see ModulePostprocessor
  */
-public interface PostprocessorPlugin extends SingletonPlugin, Contextual,
+public interface PostprocessorPlugin extends SciJavaPlugin, Contextual,
 	ModulePostprocessor
 {
 	// PostprocessorPlugin is a module postprocessor,
diff --git a/src/main/java/org/scijava/module/process/PostprocessorService.java b/src/main/java/org/scijava/module/process/PostprocessorService.java
deleted file mode 100644
index 26d7afb07..000000000
--- a/src/main/java/org/scijava/module/process/PostprocessorService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.module.process;
-
-import org.scijava.plugin.SingletonService;
-import org.scijava.service.SciJavaService;
-
-/**
- * Interface for service which manages available {@link PostprocessorPlugin}s.
- *
- * @author Curtis Rueden
- */
-public interface PostprocessorService extends
-	SingletonService<PostprocessorPlugin>, SciJavaService
-{
-	// NB: No implementation needed.
-}
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index cb53fa9ae..1fa632790 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -33,7 +33,7 @@
 
 import org.scijava.Contextual;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.SingletonPlugin;
+import org.scijava.plugin.SciJavaPlugin;
 
 /**
  * A preprocessor plugin defines a step that occurs just prior to the actual
@@ -51,7 +51,7 @@
  * @author Curtis Rueden
  * @see ModulePreprocessor
  */
-public interface PreprocessorPlugin extends SingletonPlugin, Contextual,
+public interface PreprocessorPlugin extends SciJavaPlugin, Contextual,
 	ModulePreprocessor
 {
 	// PreprocessorPlugin is a module preprocessor,
diff --git a/src/main/java/org/scijava/module/process/PreprocessorService.java b/src/main/java/org/scijava/module/process/PreprocessorService.java
deleted file mode 100644
index 84580c7b0..000000000
--- a/src/main/java/org/scijava/module/process/PreprocessorService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.module.process;
-
-import org.scijava.plugin.SingletonService;
-import org.scijava.service.SciJavaService;
-
-/**
- * Interface for service which manages available {@link PreprocessorPlugin}s.
- *
- * @author Curtis Rueden
- */
-public interface PreprocessorService extends
-	SingletonService<PreprocessorPlugin>, SciJavaService
-{
-	// NB: No implementation needed.
-}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index da59f1d23..abbab3c9b 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -100,8 +100,6 @@ public void testFull() {
 				org.scijava.main.DefaultMainService.class,
 				org.scijava.menu.DefaultMenuService.class,
 				org.scijava.module.DefaultModuleService.class,
-				org.scijava.module.process.DefaultPostprocessorService.class,
-				org.scijava.module.process.DefaultPreprocessorService.class,
 				org.scijava.object.DefaultObjectService.class,
 				org.scijava.options.DefaultOptionsService.class,
 				org.scijava.parse.DefaultParseService.class,

From 27abde60ccfeafc7c71461e27b2251d23a2779ac Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Wed, 20 Apr 2016 09:52:03 -0500
Subject: [PATCH 0215/1208] Add regression test for aggressive cancelation

Ensure commands run after a command is canceled are not themselves
canceled.
---
 .../org/scijava/command/CommandModuleTest.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 49d40bafc..d19a9d86f 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -58,8 +58,12 @@ public void testCancelable() throws InterruptedException, ExecutionException {
 		assertTrue(c.isCanceled());
 		assertEquals("Stop! Collaborate and listen!", ice.getCancelReason());
 		assertEquals("Stop! Collaborate and listen!", c.getCancelReason());
+
+		final CommandModule crow = commandService.run(CrowCommand.class, true).get();
+		assertFalse(crow.isCanceled());
 	}
-	
+
+
 	@Test
 	public void testNotCancelable() throws InterruptedException,
 		ExecutionException
@@ -98,6 +102,16 @@ public void run() {
 		}
 	}
 
+	/** A {@link Cancelable} command which is not auto-canceled. */
+	@Plugin(type = Command.class)
+	public static class CrowCommand extends ContextCommand {
+
+		@Override
+		public void run() {
+			// everything's good
+		}
+	}
+
 	@Plugin(type = PreprocessorPlugin.class)
 	public static class CommandCanceler extends AbstractPreprocessorPlugin {
 

From 54a6b54bbcf5f6e6b6c0fe2dfc8666859a199c92 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 20 Apr 2016 20:19:52 -0500
Subject: [PATCH 0216/1208] Use imagej.net URL for all developers

And remove the superfluous (and prone to obsolescence) other info.
---
 pom.xml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index efae373bf..8f64f6671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,10 +27,7 @@
 		<developer>
 			<id>ctrueden</id>
 			<name>Curtis Rueden</name>
-			<email>ctrueden@wisc.edu</email>
-			<url>http://loci.wisc.edu/people/curtis-rueden</url>
-			<organization>UW-Madison LOCI</organization>
-			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
+			<url>http://imagej.net/User:Rueden</url>
 			<roles>
 				<role>founder</role>
 				<role>lead</role>
@@ -40,15 +37,11 @@
 				<role>support</role>
 				<role>maintainer</role>
 			</roles>
-			<timezone>-6</timezone>
 		</developer>
 		<developer>
 			<id>hinerm</id>
 			<name>Mark Hiner</name>
-			<email>hiner@wisc.edu</email>
-			<url>http://loci.wisc.edu/people/mark-hiner</url>
-			<organization>UW-Madison LOCI</organization>
-			<organizationUrl>http://loci.wisc.edu/</organizationUrl>
+			<url>http://imagej.net/User:Hinerm</url>
 			<roles>
 				<role>lead</role>
 				<role>developer</role>
@@ -57,7 +50,6 @@
 				<role>support</role>
 				<role>maintainer</role>
 			</roles>
-			<timezone>-6</timezone>
 		</developer>
 	</developers>
 	<contributors>

From fb31fe64926e5b90d0b3ef6be4803b693f690193 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 20 Apr 2016 20:22:11 -0500
Subject: [PATCH 0217/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8f64f6671..67530d876 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.56.0-SNAPSHOT</version>
+	<version>2.56.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From b43000861a1ff388be6978d63a8e0000ba5e8515 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Apr 2016 15:56:07 -0500
Subject: [PATCH 0218/1208] ScriptREPL: fail nicely if there are no languages

---
 .../java/org/scijava/script/ScriptREPL.java   | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 4d0564a89..6096c4116 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -122,15 +122,24 @@ public void initialize() {
 		out.println("Welcome to the SciJava REPL!");
 		out.println();
 		help();
+		final List<ScriptLanguage> langs = scriptService.getLanguages();
+		if (langs.isEmpty()) {
+			out.println("--------------------------------------------------------------");
+			out.println("Uh oh! There are no SciJava script languages available!");
+			out.println("Are any on your classpath? E.g.: org.scijava:scripting-groovy?");
+			out.println("--------------------------------------------------------------");
+			out.println();
+			return;
+		}
 		out.println("Have fun!");
 		out.println();
-		lang(scriptService.getLanguages().get(0).getLanguageName());
+		lang(langs.get(0).getLanguageName());
 		populateBindings(interpreter.getBindings());
 	}
 
 	/** Outputs the prompt. */
 	public void prompt() {
-		out.print(interpreter.isReady() ? "> " : "\\ ");
+		out.print(interpreter == null || interpreter.isReady() ? "> " : "\\ ");
 	}
 
 	/**
@@ -148,6 +157,9 @@ public boolean evaluate(final String line) {
 		else if (tLine.startsWith(":lang ")) lang(line.substring(6).trim());
 		else if (line.trim().equals(":quit")) return false;
 		else {
+			// ensure that a script language is active
+			if (interpreter == null) return true;
+
 			// pass the input to the current interpreter for evaluation
 			try {
 				final Object result = interpreter.interpret(line);
@@ -190,6 +202,8 @@ public void help() {
 
 	/** Lists variables in the script context. */
 	public void vars() {
+		if (interpreter == null) return; // no active script language
+
 		final List<String> keys = new ArrayList<String>();
 		final List<Object> types = new ArrayList<Object>();
 		final Bindings bindings = interpreter.getBindings();
@@ -213,7 +227,8 @@ public void lang(final String langName) {
 		// create the new interpreter
 		final ScriptLanguage language = scriptService.getLanguageByName(langName);
 		if (language == null) {
-			throw new IllegalArgumentException("No such language: " + langName);
+			out.println("No such language: " + langName);
+			return;
 		}
 		final ScriptInterpreter newInterpreter =
 			new DefaultScriptInterpreter(language);

From 254dd05f9026f1d02fec4818a65e1f9206ce542d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Apr 2016 20:20:05 -0500
Subject: [PATCH 0219/1208] ServiceIndexTest: dispose contexts in unit tests

---
 .../org/scijava/service/ServiceIndexTest.java   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 0bae8801b..b8c7f8f6c 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -65,6 +65,7 @@ public void testGetAll() {
 		assertSame(DefaultPluginService.class, all.get(1).getClass());
 		assertSame(DefaultThreadService.class, all.get(2).getClass());
 		assertSame(StderrLogService.class, all.get(3).getClass());
+		context.dispose();
 	}
 
 	@Test
@@ -73,6 +74,7 @@ public void testMarkerInterfaces() {
 		for (Service s : context.getServiceIndex().getAll()) {
 			assertTrue(s.getClass().getName(), s instanceof SciJavaService);
 		}
+		context.dispose();
 	}
 
 	/**
@@ -80,9 +82,11 @@ public void testMarkerInterfaces() {
 	 */
 	@Test
 	public void testGetPrevService() {
+		final Context context = new Context(SciJavaService.class);
+
 		// Create a service index where the OptionsService hierarchy should be:
 		// HigherOptionsService > DefaultOptionsService > LowerOptionsService
-		final ServiceIndex serviceIndex = setUpPrivateServices();
+		final ServiceIndex serviceIndex = setUpPrivateServices(context);
 
 		// DefaultOptionsService should be the previous service to LowerOptionsService
 		assertEquals(DefaultOptionsService.class, serviceIndex.getPrevService(
@@ -96,6 +100,8 @@ public void testGetPrevService() {
 		// There should not be a previous service before HigherOptionsService
 		assertNull(serviceIndex.getPrevService(OptionsService.class,
 			HigherOptionsService.class));
+
+		context.dispose();
 	}
 
 	/**
@@ -103,9 +109,11 @@ public void testGetPrevService() {
 	 */
 	@Test
 	public void testGetNextService() {
+		final Context context = new Context(SciJavaService.class);
+
 		// Create a service index where the OptionsService hierarchy should be:
 		// HigherOptionService > DefaultOptionService > LowerOptionService
-		final ServiceIndex serviceIndex = setUpPrivateServices();
+		final ServiceIndex serviceIndex = setUpPrivateServices(context);
 
 		// DefaultOptionsService should be the next service to HigherOptionsService
 		assertEquals(DefaultOptionsService.class, serviceIndex.getNextService(
@@ -119,6 +127,8 @@ public void testGetNextService() {
 		// There should not be a next service after LowerOptionsService
 		assertNull(serviceIndex.getNextService(OptionsService.class,
 			LowerOptionsService.class));
+
+		context.dispose();
 	}
 
 	// -- Helper methods --
@@ -126,8 +136,7 @@ public void testGetNextService() {
 	/**
 	 * @return A {@link ServiceIndex} with all private services manually added.
 	 */
-	private ServiceIndex setUpPrivateServices() {
-		final Context context = new Context(SciJavaService.class);
+	private ServiceIndex setUpPrivateServices(final Context context) {
 		final ServiceIndex serviceIndex = context.getServiceIndex();
 		serviceIndex.add(new HigherOptionsService());
 		serviceIndex.add(new LowerOptionsService());

From 1f213f22147465f6b3d9dce2558baaf8e3ef84c7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Apr 2016 20:20:16 -0500
Subject: [PATCH 0220/1208] ServiceIndexTest: add missing final keyword

---
 src/test/java/org/scijava/service/ServiceIndexTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index b8c7f8f6c..200db1a85 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -71,7 +71,7 @@ public void testGetAll() {
 	@Test
 	public void testMarkerInterfaces() {
 		final Context context = new Context();
-		for (Service s : context.getServiceIndex().getAll()) {
+		for (final Service s : context.getServiceIndex().getAll()) {
 			assertTrue(s.getClass().getName(), s instanceof SciJavaService);
 		}
 		context.dispose();

From b42fe551abfe93ebc337dac62e9e8aa32eb13a26 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 25 Apr 2016 12:54:34 -0500
Subject: [PATCH 0221/1208] ScriptREPL: do not needlessly trim again

---
 src/main/java/org/scijava/script/ScriptREPL.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 6096c4116..8e85ad77f 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -155,7 +155,7 @@ public boolean evaluate(final String line) {
 		else if (tLine.equals(":vars")) vars();
 		else if (tLine.equals(":langs")) langs();
 		else if (tLine.startsWith(":lang ")) lang(line.substring(6).trim());
-		else if (line.trim().equals(":quit")) return false;
+		else if (tLine.equals(":quit")) return false;
 		else {
 			// ensure that a script language is active
 			if (interpreter == null) return true;

From bbac0d9945b0b0008e541535b2811dee5c732435 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 25 Apr 2016 12:55:14 -0500
Subject: [PATCH 0222/1208] DefaultScriptInterpreter: fix newline accumulation

From @skalarproduktraum: "Before when walking the history,
a trailing \n got appended to the submitted command.
Unfortunately, these accumulated over time."

Fixes scijava/scijava-ui-swing#21.
---
 .../org/scijava/script/DefaultScriptInterpreter.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index f6c630348..649787886 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -186,22 +186,23 @@ public Object interpret(final String line) throws ScriptException {
 			if (!shouldEvaluatePendingInput(true)) return MORE_INPUT_PENDING;
 		}
 
+		if (pendingLineCount > 0) buffer.append("\n");
 		pendingLineCount++;
 		buffer.append(line);
-		buffer.append("\n");
+		final String command = buffer.toString();
 
 		if (!(engine instanceof Compilable)) {
 			// Not a compilable language.
 			// Evaluate directly, with no multi-line statements possible.
 			try {
-				return eval(buffer.toString());
+				return eval(command);
 			}
 			finally {
 				reset();
 			}
 		}
 
-		final CompiledScript cs = tryCompiling(buffer.toString(),
+		final CompiledScript cs = tryCompiling(command, //
 			getPendingLineCount(), line.length());
 
 		if (cs == null) {
@@ -215,7 +216,7 @@ public Object interpret(final String line) throws ScriptException {
 		}
 		// Command is complete; evaluate the compiled script.
 		try {
-			addToHistory(buffer.toString());
+			addToHistory(command);
 			return cs.eval();
 		}
 		finally {

From 0ce6c58c9632034b6b82c329b37db92bc3f633d7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 4 May 2016 13:45:20 -0500
Subject: [PATCH 0223/1208] POM: add URL for Gabriel Einsdorf

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 67530d876..c47ff87ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
 		</contributor>
 		<contributor>
 			<name>Gabriel Einsdorf</name>
+			<url>http://imagej.net/User:Gab1one</url>
 			<properties><id>gab1one</id></properties>
 		</contributor>
 		<contributor>

From 235051db24f6691f1547fba3a825a823ce392f4b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 11:01:19 -0400
Subject: [PATCH 0224/1208] DefaultScriptService: support arrays of aliases

When typing a script parameter on e.g. "String[][]", where "String" is
aliases to "java.lang.String", we want this to work as expected for all
array dimensionalities, rather than needing to explicitly alias all the
array types too.
---
 .../scijava/script/DefaultScriptService.java  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index cdb25e50c..35b145dbc 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -254,8 +254,12 @@ public void addAlias(final String alias, final Class<?> type) {
 	public synchronized Class<?> lookupClass(final String alias)
 		throws ScriptException
 	{
-		final Class<?> type = aliasMap().get(alias);
-		if (type != null) return type;
+		final String componentAlias = stripArrayNotation(alias);
+		final Class<?> type = aliasMap().get(componentAlias);
+		if (type != null) {
+			final int arrayDim = (alias.length() - componentAlias.length()) / 2;
+			return makeArrayType(type, arrayDim);
+		}
 
 		try {
 			final Class<?> c = ClassUtils.loadClass(alias, false);
@@ -473,4 +477,16 @@ private Future<ScriptModule> cast(final Future<Module> future) {
 		return (Future) future;
 	}
 
+	// -- Helper methods - aliases --
+
+	private String stripArrayNotation(final String alias) {
+		if (!alias.endsWith("[]")) return alias;
+		return stripArrayNotation(alias.substring(0, alias.length() - 2));
+	}
+
+	private Class<?> makeArrayType(final Class<?> type, final int arrayDim) {
+		if (arrayDim <= 0) return type;
+		return makeArrayType(ClassUtils.getArrayClass(type), arrayDim - 1);
+	}
+
 }

From 0372d6af751dc46e074f41187e363dd51b9c092a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 11:02:22 -0400
Subject: [PATCH 0225/1208] ScriptServiceTest: test arrays of aliases

---
 .../org/scijava/script/ScriptServiceTest.java | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index 60a249232..a7c5a075a 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -32,10 +32,13 @@
 package org.scijava.script;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 import java.io.File;
 import java.util.List;
 
+import javax.script.ScriptException;
+
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.util.AppUtils;
@@ -72,4 +75,33 @@ public void testSystemProperty() {
 		assertEquals(dir2, scriptDirs.get(2).getAbsolutePath());
 	}
 
+	@Test
+	public void testArrayAliases() throws ScriptException {
+		final Context ctx = new Context(ScriptService.class);
+		final ScriptService ss = ctx.service(ScriptService.class);
+
+		final Class<?> pInt2D = ss.lookupClass("int[][]");
+		assertSame(int[][].class, pInt2D);
+		final Class<?> pInt1D = ss.lookupClass("int[]");
+		assertSame(int[].class, pInt1D);
+		final Class<?> pInt = ss.lookupClass("int");
+		assertSame(int.class, pInt);
+
+		final Class<?> oInt2D = ss.lookupClass("Integer[][]");
+		assertSame(Integer[][].class, oInt2D);
+		final Class<?> oInt1D = ss.lookupClass("Integer[]");
+		assertSame(Integer[].class, oInt1D);
+		final Class<?> oInt = ss.lookupClass("Integer");
+		assertSame(Integer.class, oInt);
+
+		final Class<?> str2D = ss.lookupClass("String[][]");
+		assertSame(String[][].class, str2D);
+		final Class<?> str1D = ss.lookupClass("String[]");
+		assertSame(String[].class, str1D);
+		final Class<?> str = ss.lookupClass("String");
+		assertSame(String.class, str);
+
+		ctx.dispose();
+	}
+
 }

From be376ed976e1a89d4f567f66941f194f6eb8e1b0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 16:13:16 -0400
Subject: [PATCH 0226/1208] Remove unused imports

---
 src/main/java/org/scijava/run/console/RunArgument.java    | 1 -
 src/main/java/org/scijava/script/ScriptService.java       | 2 --
 src/test/java/org/scijava/command/CommandServiceTest.java | 2 --
 src/test/java/org/scijava/display/DisplayTest.java        | 3 ---
 src/test/java/org/scijava/main/MainServiceTest.java       | 1 -
 src/test/java/org/scijava/menu/ShadowMenuTest.java        | 2 --
 src/test/java/org/scijava/options/OptionsTest.java        | 2 --
 src/test/java/org/scijava/prefs/PrefServiceTest.java      | 1 -
 src/test/java/org/scijava/test/TestUtilsTest.java         | 1 -
 src/test/java/org/scijava/util/ColorRGBTest.java          | 2 --
 10 files changed, 17 deletions(-)

diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 8897bf519..729e5e385 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -36,7 +36,6 @@
 
 import org.scijava.console.AbstractConsoleArgument;
 import org.scijava.console.ConsoleArgument;
-import org.scijava.console.ConsoleUtils;
 import org.scijava.log.LogService;
 import org.scijava.parse.Items;
 import org.scijava.parse.ParseService;
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 3f016abd9..dfdb08115 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -40,13 +40,11 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import javax.script.ScriptEngineFactory;
 import javax.script.ScriptException;
 
 import org.scijava.MenuPath;
 import org.scijava.module.process.PostprocessorPlugin;
 import org.scijava.module.process.PreprocessorPlugin;
-import org.scijava.plugin.Plugin;
 import org.scijava.plugin.SingletonService;
 import org.scijava.service.SciJavaService;
 
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index df8f1f565..2921d7979 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -35,8 +35,6 @@
 
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.command.Command;
-import org.scijava.command.CommandService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index ed6ad0d81..b99635b17 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -38,9 +38,6 @@
 
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.display.Display;
-import org.scijava.display.DisplayService;
-import org.scijava.display.TextDisplay;
 
 /**
  * Unit tests for core {@link Display} classes.
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index fd1382213..d3ec4aca5 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -39,7 +39,6 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.console.ConsoleService;
-import org.scijava.main.console.MainArgument;
 
 /**
  * Tests {@link MainService}.
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 0e8bf5a58..458d41387 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -43,8 +43,6 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.MenuPath;
-import org.scijava.menu.ShadowMenu;
-import org.scijava.menu.ShadowMenuIterator;
 import org.scijava.module.DefaultMutableModuleInfo;
 import org.scijava.module.ModuleInfo;
 
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 9e59fc7e8..04c01667c 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -39,8 +39,6 @@
 
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.options.OptionsPlugin;
-import org.scijava.options.OptionsService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index c217544d8..660acbcfe 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -45,7 +45,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.prefs.PrefService;
 
 /**
  * Tests {@link PrefService}.
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 1fe7f508d..7e6c6278f 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -40,7 +40,6 @@
 import java.util.Arrays;
 
 import org.junit.Test;
-import org.scijava.test.TestUtils;
 
 /**
  * Tests the {@link TestUtils}.
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 89d73f52a..25f3d8c69 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -37,8 +37,6 @@
 import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
-import org.scijava.util.ColorRGB;
-import org.scijava.util.Colors;
 
 /**
  * Tests {@link ColorRGB}.

From da2e6466bfd6d1bf36bd0e840a10227e9b3027e7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 16:13:24 -0400
Subject: [PATCH 0227/1208] POM: bump pom-scijava parent to 10.5.0

And bump the minimum Java version to Java 8.
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c47ff87ba..9414cc57e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.6.0</version>
+		<version>10.5.0</version>
 		<relativePath />
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.56.1-SNAPSHOT</version>
+	<version>2.57.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
@@ -109,7 +109,7 @@
 	</ciManagement>
 
 	<properties>
-		<scijava.jvm.test.version>1.8</scijava.jvm.test.version>
+		<scijava.jvm.version>1.8</scijava.jvm.version>
 		<scijava-expression-parser.version>3.0.0</scijava-expression-parser.version>
 	</properties>
 

From 09feb4d38b7579fcf2572dad0b45bc876c8eb33b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 16:19:56 -0400
Subject: [PATCH 0228/1208] Use diamond syntax

Thank you Java 7!
---
 .../org/scijava/AbstractBasicDetails.java     |  2 +-
 .../annotations/AbstractIndexWriter.java      | 12 ++--
 .../annotations/AnnotationCombiner.java       |  2 +-
 .../annotations/AnnotationProcessor.java      | 12 ++--
 .../scijava/annotations/ByteCodeAnalyzer.java |  8 +--
 .../scijava/annotations/EclipseHelper.java    |  2 +-
 .../java/org/scijava/annotations/Index.java   |  8 +--
 .../org/scijava/annotations/IndexReader.java  |  4 +-
 .../annotations/legacy/LegacyReader.java      | 10 ++--
 .../org/scijava/app/DefaultAppService.java    |  2 +-
 .../scijava/cache/DefaultCacheService.java    |  2 +-
 .../java/org/scijava/command/CommandInfo.java | 14 ++---
 .../scijava/command/CommandModuleItem.java    |  2 +-
 .../command/DefaultCommandService.java        |  8 +--
 .../scijava/command/DynamicCommandInfo.java   |  2 +-
 .../console/AbstractConsoleArgument.java      |  2 +-
 .../org/scijava/console/ConsoleUtils.java     |  2 +-
 .../console/DefaultConsoleService.java        |  4 +-
 .../scijava/console/MultiOutputStream.java    |  2 +-
 .../convert/AbstractConvertService.java       |  6 +-
 .../org/scijava/convert/DefaultConverter.java |  4 +-
 .../org/scijava/display/AbstractDisplay.java  |  2 +-
 .../display/DefaultDisplayService.java        |  4 +-
 .../scijava/display/DisplayPostprocessor.java |  2 +-
 .../scijava/event/DefaultEventHistory.java    |  4 +-
 .../scijava/event/DefaultEventService.java    | 12 ++--
 .../scijava/input/DefaultInputService.java    |  4 +-
 src/main/java/org/scijava/input/KeyCode.java  |  4 +-
 .../org/scijava/io/AbstractDataHandle.java    |  2 +-
 .../scijava/io/DefaultRecentFileService.java  |  4 +-
 src/main/java/org/scijava/io/URILocation.java |  2 +-
 .../org/scijava/log/AbstractLogService.java   |  2 +-
 .../org/scijava/main/DefaultMainService.java  |  2 +-
 .../scijava/main/console/MainArgument.java    |  2 +-
 .../org/scijava/menu/DefaultMenuService.java  |  6 +-
 .../java/org/scijava/menu/ShadowMenu.java     | 12 ++--
 .../org/scijava/menu/ShadowMenuIterator.java  |  2 +-
 .../org/scijava/module/AbstractModule.java    |  8 +--
 .../scijava/module/AbstractModuleInfo.java    |  8 +--
 .../scijava/module/DefaultModuleService.java  |  4 +-
 .../scijava/module/DefaultMutableModule.java  |  4 +-
 .../module/DefaultMutableModuleItem.java      |  2 +-
 .../java/org/scijava/module/MethodRef.java    |  2 +-
 .../scijava/object/DefaultObjectService.java  |  2 +-
 .../java/org/scijava/object/ObjectIndex.java  | 18 +++---
 .../org/scijava/object/SortedObjectIndex.java |  6 +-
 .../org/scijava/object/event/ListEvent.java   |  2 +-
 .../scijava/parse/DefaultParseService.java    |  2 +-
 .../plugin/AbstractSingletonService.java      |  4 +-
 .../scijava/plugin/DefaultPluginFinder.java   |  6 +-
 .../scijava/plugin/DefaultPluginService.java  |  6 +-
 .../java/org/scijava/plugin/PluginIndex.java  |  2 +-
 .../org/scijava/prefs/DefaultPrefService.java |  4 +-
 .../scijava/script/DefaultScriptService.java  | 12 ++--
 src/main/java/org/scijava/script/History.java |  2 +-
 .../org/scijava/script/InvocationObject.java  |  2 +-
 .../java/org/scijava/script/ScriptFinder.java |  2 +-
 .../java/org/scijava/script/ScriptInfo.java   |  6 +-
 .../scijava/script/ScriptLanguageIndex.java   |  4 +-
 .../java/org/scijava/script/ScriptREPL.java   | 12 ++--
 .../org/scijava/service/ServiceHelper.java    |  6 +-
 src/main/java/org/scijava/test/TestUtils.java |  2 +-
 .../scijava/thread/DefaultThreadService.java  |  2 +-
 .../org/scijava/tool/DefaultToolService.java  |  8 +--
 .../java/org/scijava/ui/DefaultUIService.java | 10 ++--
 .../java/org/scijava/ui/dnd/MIMEType.java     |  4 +-
 .../java/org/scijava/util/ArrayUtils.java     |  4 +-
 .../java/org/scijava/util/ClassUtils.java     | 12 ++--
 src/main/java/org/scijava/util/Colors.java    |  2 +-
 .../java/org/scijava/util/DebugUtils.java     |  2 +-
 src/main/java/org/scijava/util/FileUtils.java |  2 +-
 .../java/org/scijava/util/IteratorPlus.java   |  2 +-
 .../org/scijava/util/LastRecentlyUsed.java    |  4 +-
 .../java/org/scijava/util/MirrorWebsite.java  | 12 ++--
 src/main/java/org/scijava/util/POM.java       |  4 +-
 .../org/scijava/util/ReflectedUniverse.java   |  2 +-
 .../org/scijava/util/ServiceCombiner.java     |  2 +-
 src/main/java/org/scijava/util/Timing.java    |  2 +-
 src/main/java/org/scijava/util/XML.java       |  2 +-
 .../widget/AbstractInputHarvester.java        |  2 +-
 .../scijava/widget/AbstractInputPanel.java    |  2 +-
 .../scijava/widget/DefaultWidgetModel.java    |  2 +-
 .../java/org/scijava/ContextCreationTest.java |  4 +-
 .../annotations/DirectoryIndexerTest.java     |  6 +-
 .../org/scijava/app/StatusServiceTest.java    |  2 +-
 .../command/run/CommandCodeRunnerTest.java    |  2 +-
 .../scijava/console/ConsoleServiceTest.java   |  6 +-
 .../console/SystemPropertyArgumentTest.java   |  2 +-
 .../scijava/convert/ConvertServiceTest.java   | 12 ++--
 .../org/scijava/event/EventServiceTest.java   |  2 +-
 .../java/org/scijava/menu/ShadowMenuTest.java |  2 +-
 .../module/run/ModuleCodeRunnerTest.java      |  6 +-
 .../org/scijava/object/ObjectIndexTest.java   | 30 +++++-----
 .../scijava/object/SortedObjectIndexTest.java |  4 +-
 .../java/org/scijava/options/OptionsTest.java |  2 +-
 .../org/scijava/plugin/PluginIndexTest.java   |  4 +-
 .../org/scijava/prefs/PrefServiceTest.java    |  4 +-
 .../java/org/scijava/run/RunServiceTest.java  |  2 +-
 .../org/scijava/script/ScriptFinderTest.java  |  2 +-
 .../java/org/scijava/util/BoolArrayTest.java  |  2 +-
 .../java/org/scijava/util/ByteArrayTest.java  |  2 +-
 .../java/org/scijava/util/CharArrayTest.java  |  2 +-
 .../org/scijava/util/ConversionUtilsTest.java |  6 +-
 .../org/scijava/util/DoubleArrayTest.java     |  2 +-
 .../java/org/scijava/util/FloatArrayTest.java |  2 +-
 .../java/org/scijava/util/IntArrayTest.java   |  2 +-
 .../scijava/util/LastRecentlyUsedTest.java    |  4 +-
 .../java/org/scijava/util/LongArrayTest.java  |  2 +-
 .../org/scijava/util/ObjectArrayTest.java     | 60 +++++++++----------
 .../java/org/scijava/util/ShortArrayTest.java |  2 +-
 110 files changed, 282 insertions(+), 282 deletions(-)

diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index 507665b1c..513cf0258 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -53,7 +53,7 @@ public abstract class AbstractBasicDetails implements BasicDetails {
 	private String description;
 
 	/** Table of extra key/value pairs. */
-	private final Map<String, String> values = new HashMap<String, String>();
+	private final Map<String, String> values = new HashMap<>();
 
 	// -- Object methods --
 
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index fe58d191f..f8238b0fa 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -61,7 +61,7 @@
 public abstract class AbstractIndexWriter {
 
 	private final Map<String, Map<String, Object>> map =
-		new ConcurrentSkipListMap<String, Map<String, Object>>();
+		new ConcurrentSkipListMap<>();
 
 	protected synchronized boolean foundAnnotations() {
 		return !map.isEmpty();
@@ -72,10 +72,10 @@ protected synchronized void add(final Map<String, Object> annotationValues,
 	{
 		Map<String, Object> list = map.get(annotationName);
 		if (list == null) {
-			list = new LinkedHashMap<String, Object>();
+			list = new LinkedHashMap<>();
 			map.put(annotationName, list);
 		}
-		final Map<String, Object> o = new TreeMap<String, Object>();
+		final Map<String, Object> o = new TreeMap<>();
 		o.put("class", className);
 		o.put("values", annotationValues);
 		list.put(className, o);
@@ -128,7 +128,7 @@ protected synchronized void merge(final String annotationName,
 		}
 		Map<String, Object> m = map.get(annotationName);
 		if (m == null) {
-			m = new LinkedHashMap<String, Object>();
+			m = new LinkedHashMap<>();
 			map.put(annotationName, m);
 		}
 		/*
@@ -184,7 +184,7 @@ else if (o instanceof Enum) {
 	}
 
 	protected <A extends Annotation> Map<String, Object> adapt(A annotation) {
-		Map<String, Object> result = new TreeMap<String, Object>();
+		Map<String, Object> result = new TreeMap<>();
 		for (Method method : annotation.annotationType().getMethods())
 			try {
 				if (method.getDeclaringClass() == annotation.annotationType()) {
@@ -204,7 +204,7 @@ protected <A extends Annotation> Map<String, Object> adapt(A annotation) {
 	}
 
 	private static Map<String, Object> adapt(Enum<?> e) {
-		Map<String, Object> result = new TreeMap<String, Object>();
+		Map<String, Object> result = new TreeMap<>();
 		result.put("enum", e.getClass().getName());
 		result.put("value", e.name());
 		return result;
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 5a5b7c127..cde5a05fe 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -87,7 +87,7 @@ public void combine(File outputDirectory) throws Exception {
 
 	/** Scans for annotations files in every resource on the classpath. */
 	public Set<String> getAnnotationFiles() throws IOException {
-		final HashSet<String> files = new HashSet<String>();
+		final HashSet<String> files = new HashSet<>();
 
 		for (final String prefix : new String[] { PREFIX, LEGACY_PREFIX }) {
 			final Enumeration<URL> directories =
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 70a54e3e1..3940bc3f7 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -111,7 +111,7 @@ public boolean process(final Set<? extends TypeElement> elements,
 	private class Writer extends AbstractIndexWriter implements StreamFactory {
 
 		private final Map<String, List<Element>> originatingElements =
-			new HashMap<String, List<Element>>();
+			new HashMap<>();
 		private final Filer filer = processingEnv.getFiler();
 		private final Elements utils = processingEnv.getElementUtils();
 		private final Types typeUtils = processingEnv.getTypeUtils();
@@ -124,7 +124,7 @@ public void add(final TypeElement element) {
 				// remember originating elements
 				List<Element> originating = originatingElements.get(annotationName);
 				if (originating == null) {
-					originating = new ArrayList<Element>();
+					originating = new ArrayList<>();
 					originatingElements.put(annotationName, originating);
 				}
 
@@ -159,7 +159,7 @@ private Map<String, Object> adapt(
 			final List<? extends AnnotationMirror> mirrors,
 			final TypeMirror annotationType)
 		{
-			final Map<String, Object> result = new TreeMap<String, Object>();
+			final Map<String, Object> result = new TreeMap<>();
 			for (final AnnotationMirror mirror : mirrors) {
 				if (typeUtils.isSameType(mirror.getAnnotationType(), annotationType)) {
 					return (Map<String, Object>) adapt(mirror);
@@ -172,7 +172,7 @@ private Map<String, Object> adapt(
 		protected Object adapt(final Object o) {
 			if (o instanceof AnnotationMirror) {
 				final AnnotationMirror mirror = (AnnotationMirror) o;
-				final Map<String, Object> result = new TreeMap<String, Object>();
+				final Map<String, Object> result = new TreeMap<>();
 				for (final Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : mirror
 					.getElementValues().entrySet())
 				{
@@ -184,7 +184,7 @@ protected Object adapt(final Object o) {
 			}
 			else if (o instanceof List) {
 				final List<?> list = (List<?>) o;
-				final List<Object> result = new ArrayList<Object>(list.size());
+				final List<Object> result = new ArrayList<>(list.size());
 				for (final Object item : list) {
 					result.add(adapt(item));
 				}
@@ -197,7 +197,7 @@ else if (o instanceof TypeMirror) {
 			}
 			else if (o instanceof VariableElement) {
 				final VariableElement element = (VariableElement) o;
-				final Map<String, Object> result = new TreeMap<String, Object>();
+				final Map<String, Object> result = new TreeMap<>();
 				final String enumName =
 					utils.getBinaryName((TypeElement) element.getEnclosingElement())
 						.toString();
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 4f752d324..c7b5b13bf 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -204,7 +204,7 @@ private String getName() {
 
 	private Map<String, Map<String, Object>> getAnnotations() {
 		final Map<String, Map<String, Object>> annotations =
-			new TreeMap<String, Map<String, Object>>();
+			new TreeMap<>();
 		for (final Attribute attr : attributes) {
 			if ("RuntimeVisibleAnnotations".equals(attr.getName())) {
 				final byte[] buf = attr.attribute;
@@ -215,7 +215,7 @@ private Map<String, Map<String, Object>> getAnnotations() {
 						raw2className(getStringConstant(getU2(buf, offset)));
 					offset += 2;
 					final Map<String, Object> values =
-						new TreeMap<String, Object>();
+						new TreeMap<>();
 					annotations.put(className, values);
 					offset = parseAnnotationValues(buf, offset, values);
 				}
@@ -297,7 +297,7 @@ private int parseAnnotationValue(byte[] buf, int offset,
 			}
 			case 'e': {
 				final Map<String, Object> enumValue =
-					new TreeMap<String, Object>();
+					new TreeMap<>();
 				enumValue.put("enum", raw2className(getStringConstant(getU2(buf,
 					offset))));
 				offset += 2;
@@ -309,7 +309,7 @@ private int parseAnnotationValue(byte[] buf, int offset,
 			case '@': {
 				// skipping annotation type
 				offset += 2;
-				final Map<String, Object> values = new TreeMap<String, Object>();
+				final Map<String, Object> values = new TreeMap<>();
 				offset = parseAnnotationValues(buf, offset, values);
 				value = values;
 				break;
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index b2f78d7e3..d9a8dbb91 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -98,7 +98,7 @@
 public class EclipseHelper extends DirectoryIndexer {
 
 	private static final String FORCE_ANNOTATION_INDEX_PROPERTY = "force.annotation.index";
-	static Set<URL> indexed = new HashSet<URL>();
+	static Set<URL> indexed = new HashSet<>();
 	private boolean bannerShown;
 
 	private static boolean debug =
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index a6231532f..e30dc7cf7 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -86,7 +86,7 @@ public static <A extends Annotation> Index<A> load(final Class<A> annotation,
 		final ClassLoader loader)
 	{
 		EclipseHelper.updateAnnotationIndex(loader);
-		return new Index<A>(annotation, loader);
+		return new Index<>(annotation, loader);
 	}
 
 	static final String INDEX_PREFIX = "META-INF/json/";
@@ -110,9 +110,9 @@ private class IndexItemIterator implements Iterator<IndexItem<A>> {
 		private Map<String, URL> legacyURLs;
 
 		public IndexItemIterator(final Class<A> annotation) {
-			seen = new HashSet<URL>();
+			seen = new HashSet<>();
 			try {
-				legacyURLs = new LinkedHashMap<String, URL>();
+				legacyURLs = new LinkedHashMap<>();
 				final Enumeration<URL> legacy =
 					loader.getResources(LEGACY_INDEX_PREFIX + annotation.getName());
 				final int legacySuffixLength =
@@ -160,7 +160,7 @@ private void readNext() throws IOException {
 					@SuppressWarnings("unchecked")
 					final Map<Object, Object> values =
 						(Map<Object, Object>) map.get("values");
-					next = new IndexItem<A>(annotation, loader, className, values);
+					next = new IndexItem<>(annotation, loader, className, values);
 					return;
 				}
 				indexReader.close();
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index 5c613748e..aa3069feb 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -84,7 +84,7 @@ public Object next() throws IOException {
 			return null;
 		}
 		if (c == '{') {
-			Map<String, Object> map = new LinkedHashMap<String, Object>();
+			Map<String, Object> map = new LinkedHashMap<>();
 			for (;;) {
 				if (expect('"', '}') == 1) {
 					return map;
@@ -99,7 +99,7 @@ public Object next() throws IOException {
 			}
 		}
 		if (c == '[') {
-			List<Object> list = new ArrayList<Object>();
+			List<Object> list = new ArrayList<>();
 			c = in.read();
 			if (c == ']') {
 				return list;
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 5bf17928d..8deee7f31 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -83,7 +83,7 @@ public LegacyReader(final InputStream in) throws IOException {
 		if (version != STREAM_VERSION) {
 			throw new IOException("Unsupported version: " + version);
 		}
-		references = new ArrayList<Object>();
+		references = new ArrayList<>();
 	}
 
 	public void close() throws IOException {
@@ -260,7 +260,7 @@ protected NonPrimitiveClassDesc(final String className,
 			if ((fields.length % 2) != 0) {
 				throw new RuntimeException("That's odd: " + fields.length);
 			}
-			this.fields = new LinkedHashMap<String, ClassDesc>();
+			this.fields = new LinkedHashMap<>();
 			for (int i = 0; i < fields.length; i += 2) {
 				String name = (String) fields[i];
 				ClassDesc classDesc;
@@ -300,7 +300,7 @@ else if (c != TC_OBJECT) {
 
 		@Override
 		protected final Object readWithoutClassDesc() throws IOException {
-			final Map<String, Object> map = new LinkedHashMap<String, Object>();
+			final Map<String, Object> map = new LinkedHashMap<>();
 			int index = references.size();
 			references.add(map);
 			for (final String fieldName : order) {
@@ -357,7 +357,7 @@ public static String toSimpleName(Class<?> clazz) {
 	}
 
 	private final Map<String, ClassDesc> classDescs =
-		new HashMap<String, ClassDesc>();
+		new HashMap<>();
 
 	{
 		new ClassDesc("B") {
@@ -477,7 +477,7 @@ public Object readExtra(final Map<String, Object> map) throws IOException
 				expectToken(TC_BLOCKDATA);
 				expectToken(4);
 				int capacity = read32();
-				final List<Object> list = new ArrayList<Object>(capacity);
+				final List<Object> list = new ArrayList<>(capacity);
 				for (int i = 0; i < size; i++) {
 					list.add(readObject());
 				}
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 903e9d283..9a1ae4125 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -121,7 +121,7 @@ private Map<String, App> apps() {
 	/** Initializes {@link #apps}. */
 	private synchronized void initApps() {
 		if (apps != null) return; // already initialized
-		final HashMap<String, App> map = new HashMap<String, App>();
+		final HashMap<String, App> map = new HashMap<>();
 
 		for (final App app : getInstances()) {
 			final String name = app.getInfo().getName();
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index b1b305273..f78f93686 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -73,6 +73,6 @@ public <V> V get(final Object key, final Callable<V> valueLoader)
 
 	@Override
 	public void initialize() {
-		map = new WeakHashMap<Object, Object>();
+		map = new WeakHashMap<>();
 	}
 }
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 49bfdb488..8947db7a6 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -94,21 +94,21 @@ public class CommandInfo extends PluginInfo<Command> implements ModuleInfo {
 
 	/** List of problems detected when parsing command parameters. */
 	private final List<ValidityProblem> problems =
-		new ArrayList<ValidityProblem>();
+		new ArrayList<>();
 
 	/** Table of inputs, keyed on name. */
 	private final Map<String, ModuleItem<?>> inputMap =
-		new HashMap<String, ModuleItem<?>>();
+		new HashMap<>();
 
 	/** Table of outputs, keyed on name. */
 	private final Map<String, ModuleItem<?>> outputMap =
-		new HashMap<String, ModuleItem<?>>();
+		new HashMap<>();
 
 	/** Ordered list of input items. */
-	private final List<ModuleItem<?>> inputList = new ArrayList<ModuleItem<?>>();
+	private final List<ModuleItem<?>> inputList = new ArrayList<>();
 
 	/** Ordered list of output items. */
-	private final List<ModuleItem<?>> outputList = new ArrayList<ModuleItem<?>>();
+	private final List<ModuleItem<?>> outputList = new ArrayList<>();
 
 	// -- Constructors --
 
@@ -179,7 +179,7 @@ protected CommandInfo(final PluginInfo<Command> info, final String className,
 	/** Sets the table of items with fixed, preset values. */
 	public void setPresets(final Map<String, Object> presets) {
 		if (presets == null) {
-			this.presets = new HashMap<String, Object>();
+			this.presets = new HashMap<>();
 		}
 		else {
 			this.presets = presets;
@@ -495,7 +495,7 @@ private void checkFields(final Class<?> type) {
 
 			// add item to the relevant list (inputs or outputs)
 			final CommandModuleItem<Object> item =
-				new CommandModuleItem<Object>(this, f);
+				new CommandModuleItem<>(this, f);
 			if (item.isInput()) {
 				inputMap.put(name, item);
 				if (!isPreset) inputList.add(item);
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 4844db92d..aff1ecda3 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -166,7 +166,7 @@ public List<T> getChoices() {
 		final String[] choices = getParameter().choices();
 		if (choices.length == 0) return super.getChoices();
 
-		final ArrayList<T> choiceList = new ArrayList<T>();
+		final ArrayList<T> choiceList = new ArrayList<>();
 		for (final String choice : choices) {
 			choiceList.add(tValue(choice));
 		}
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index 71a4054fd..d33cbaf97 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -208,7 +208,7 @@ public Class<Command> getPluginType() {
 
 	@Override
 	public void initialize() {
-		commandMap = new HashMap<PluginInfo<?>, CommandInfo>();
+		commandMap = new HashMap<>();
 
 		// inform the module service of available commands
 		final List<PluginInfo<Command>> plugins =
@@ -226,7 +226,7 @@ protected void onEvent(final PluginsRemovedEvent event) {
 	@EventHandler
 	protected void onEvent(final PluginsAddedEvent event) {
 		final ArrayList<PluginInfo<Command>> commands =
-			new ArrayList<PluginInfo<Command>>();
+			new ArrayList<>();
 		findCommandPlugins(event.getItems(), commands);
 		addCommands(commands);
 	}
@@ -258,7 +258,7 @@ private <C extends Command> CommandInfo getOrCreate(
 	/** Adds new commands to the module service. */
 	private void addCommands(final List<PluginInfo<Command>> plugins) {
 		// extract commands from the list of plugins
-		final List<CommandInfo> commands = new ArrayList<CommandInfo>();
+		final List<CommandInfo> commands = new ArrayList<>();
 		for (final PluginInfo<Command> info : plugins) {
 			final CommandInfo commandInfo = wrapAsCommand(info);
 			commands.add(commandInfo);
@@ -291,7 +291,7 @@ private void removeCommands(final List<PluginInfo<?>> plugins) {
 	private List<CommandInfo> getCommandsUnknown(
 		final List<PluginInfo<?>> plugins)
 	{
-		final List<CommandInfo> commands = new ArrayList<CommandInfo>();
+		final List<CommandInfo> commands = new ArrayList<>();
 		for (final PluginInfo<?> info : plugins) {
 			final CommandInfo commandInfo = commandMap.get(info);
 			if (commandInfo == null) continue;
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index a6b9cc507..d3c1552fd 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -310,7 +310,7 @@ private void populateItems() {
 
 	/** Creates a mutable copy of the given module item. */
 	private <T> DefaultMutableModuleItem<T> copy(final ModuleItem<T> item) {
-		return new DefaultMutableModuleItem<T>(this, item);
+		return new DefaultMutableModuleItem<>(this, item);
 	}
 
 }
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 8c48af157..ffab5502d 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -58,7 +58,7 @@ public AbstractConsoleArgument(final String... flags) {
 	
 	public AbstractConsoleArgument(final int requiredArgs, final String... flags) {
 		numArgs = requiredArgs;
-		this.flags = new HashSet<String>();
+		this.flags = new HashSet<>();
 		for (final String s : flags) this.flags.add(s);
 	}
 
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 8c078fde4..b3ac60dbc 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -66,7 +66,7 @@ public static Map<String, Object> parseParameterString(final String parameterStr
 	/** @deprecated Use {@link ParseService} instead. */
 	@Deprecated
 	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info, final LogService log) {
-		final Map<String, Object> inputMap = new HashMap<String, Object>();
+		final Map<String, Object> inputMap = new HashMap<>();
 
 		if (!parameterString.isEmpty()) {
 			Iterator<ModuleItem<?>> inputs = null;
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 22483a459..6d53557b1 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -76,7 +76,7 @@ public class DefaultConsoleService extends
 	@Override
 	public void processArgs(final String... args) {
 		log.debug("Received command line arguments:");
-		final LinkedList<String> argList = new LinkedList<String>();
+		final LinkedList<String> argList = new LinkedList<>();
 		for (final String arg : args) {
 			log.debug("\t" + arg);
 			argList.add(arg);
@@ -159,7 +159,7 @@ private synchronized void initListeners() {
 		err = new OutputStreamReporter(Source.STDERR);
 		syserr.getParent().addOutputStream(err);
 
-		listeners = new ArrayList<OutputListener>();
+		listeners = new ArrayList<>();
 		cachedListeners = listeners.toArray(new OutputListener[0]);
 	}
 
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 0b596af93..0f1cda471 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -58,7 +58,7 @@ public class MultiOutputStream extends OutputStream {
 	 * @param os Output streams which will receive this stream's output.
 	 */
 	public MultiOutputStream(final OutputStream... os) {
-		streams = new ArrayList<OutputStream>(os.length);
+		streams = new ArrayList<>(os.length);
 		for (int i = 0; i < os.length; i++) {
 			streams.add(os[i]);
 		}
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index a0b46cd94..5faf2f9ab 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -103,7 +103,7 @@ public boolean supports(final Class<?> src, final Type dest) {
 
 	@Override
 	public Collection<Object> getCompatibleInputs(final Class<?> dest) {
-		final Set<Object> objects = new LinkedHashSet<Object>();
+		final Set<Object> objects = new LinkedHashSet<>();
 
 		for (final Converter<?, ?> c : getInstances()) {
 			if (dest.isAssignableFrom(c.getOutputType())) {
@@ -135,7 +135,7 @@ public Object convert(final ConversionRequest request) {
 
 	@Override
 	public Collection<Class<?>> getCompatibleInputClasses(final Class<?> dest) {
-		final Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
+		final Set<Class<?>> compatibleClasses = new HashSet<>();
 
 		for (final Converter<?, ?> converter : getInstances()) {
 			addIfMatches(dest, converter.getOutputType(), converter.getInputType(), compatibleClasses);
@@ -146,7 +146,7 @@ public Collection<Class<?>> getCompatibleInputClasses(final Class<?> dest) {
 
 	@Override
 	public Collection<Class<?>> getCompatibleOutputClasses(final Class<?> source) {
-		final Set<Class<?>> compatibleClasses = new HashSet<Class<?>>();
+		final Set<Class<?>> compatibleClasses = new HashSet<>();
 
 		for (final Converter<?, ?> converter : getInstances()) {
 			addIfMatches(source, converter.getInputType(), converter.getOutputType(), compatibleClasses);
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 803483dc3..262a55249 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -259,8 +259,8 @@ private Collection<Object> createCollection(final Class<?> type) {
 		if (type.isInterface() || Modifier.isAbstract(type.getModifiers())) {
 			// We don't have a concrete class. If it's a set or a list, we use
 			// the typical default implementation. Otherwise we won't convert.
-			if (ConversionUtils.canCast(type, List.class)) return new ArrayList<Object>();
-			if (ConversionUtils.canCast(type, Set.class)) return new HashSet<Object>();
+			if (ConversionUtils.canCast(type, List.class)) return new ArrayList<>();
+			if (ConversionUtils.canCast(type, Set.class)) return new HashSet<>();
 			return null;
 		}
 
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index 1b84f07b9..534c5d31e 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -75,7 +75,7 @@ public abstract class AbstractDisplay<T> extends AbstractRichPlugin implements
 
 	public AbstractDisplay(final Class<T> type) {
 		this.type = type;
-		objects = new ArrayList<T>();
+		objects = new ArrayList<>();
 	}
 
 	// -- AbstractDisplay methods --
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index 40f94b786..ac441a0f3 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -80,7 +80,7 @@ public final class DefaultDisplayService extends AbstractService implements
 	// -- instance variables --
 
 	private final LinkedList<Display<?>> displayList =
-		new LinkedList<Display<?>>();
+		new LinkedList<>();
 
 	// -- DisplayService methods --
 
@@ -183,7 +183,7 @@ public Display<?> getDisplay(final String name) {
 
 	@Override
 	public List<Display<?>> getDisplays(final Object o) {
-		final ArrayList<Display<?>> displays = new ArrayList<Display<?>>();
+		final ArrayList<Display<?>> displays = new ArrayList<>();
 		for (final Display<?> display : getDisplays()) {
 			if (display.isDisplaying(o)) displays.add(display);
 		}
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 4d43d0aa5..d14f0777e 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -96,7 +96,7 @@ private void handleOutput(final String defaultName, final Object output) {
 		}
 
 		final boolean addToExisting = addToExisting(output);
-		final ArrayList<Display<?>> displays = new ArrayList<Display<?>>();
+		final ArrayList<Display<?>> displays = new ArrayList<>();
 
 		// get list of existing displays currently visualizing this output
 		final List<Display<?>> existingDisplays =
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 541528fcd..9cc78716d 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -53,10 +53,10 @@ public class DefaultEventHistory extends AbstractService implements
 	private EventService eventService;
 
 	/** Event details that have been recorded. */
-	private ArrayList<EventDetails> history = new ArrayList<EventDetails>();
+	private ArrayList<EventDetails> history = new ArrayList<>();
 
 	private ArrayList<EventHistoryListener> listeners =
-		new ArrayList<EventHistoryListener>();
+		new ArrayList<>();
 
 	private boolean active;
 
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 3e41c1023..8a26e0c23 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -87,13 +87,13 @@ public class DefaultEventService extends AbstractService implements
 	 * A cache for mapping {@link Method}s to the {@link SciJavaEvent} class taken
 	 * as parameters. Only methods with event parameters will cached here.
 	 */
-	private final Map<Method, Class<?>> eventClasses = new HashMap<Method, Class<?>>();
+	private final Map<Method, Class<?>> eventClasses = new HashMap<>();
 
 	/**
 	 * Set of claimed {@link EventHandler#key()}s. Additional event handlers
 	 * specifying the same key will be ignored rather than subscribed.
 	 */
-	private final HashSet<String> keys = new HashSet<String>();
+	private final HashSet<String> keys = new HashSet<>();
 
 	// -- EventService methods --
 
@@ -118,7 +118,7 @@ public List<EventSubscriber<?>> subscribe(final Object o) {
 			ClassUtils.getAnnotatedMethods(o.getClass(), EventHandler.class);
 
 		if (!eventHandlers.isEmpty()) {
-			subscribers = new ArrayList<EventSubscriber<?>>();
+			subscribers = new ArrayList<>();
 			for (final Method m : eventHandlers) {
 				// verify that the event handler method is valid
 				final Class<? extends SciJavaEvent> eventClass = getEventClass(m);
@@ -203,7 +203,7 @@ private <E extends SciJavaEvent> void unsubscribe(final Class<E> c,
 	private <E extends SciJavaEvent> EventSubscriber<E> subscribe(
 		final Class<E> c, final Object o, final Method m)
 	{
-		final ProxySubscriber<E> subscriber = new ProxySubscriber<E>(c, o, m);
+		final ProxySubscriber<E> subscriber = new ProxySubscriber<>(c, o, m);
 		subscribe(c, subscriber);
 		return subscriber;
 	}
@@ -233,7 +233,7 @@ private Class<? extends SciJavaEvent> getEventClass(final Method m) {
 	// -- Event handlers garbage collection preventer --
 
 	private WeakHashMap<Object, List<ProxySubscriber<?>>> keepEm =
-			new WeakHashMap<Object, List<ProxySubscriber<?>>>();
+			new WeakHashMap<>();
 
 	/**
 	 * Prevents {@link ProxySubscriber} instances from being garbage collected
@@ -255,7 +255,7 @@ private Class<? extends SciJavaEvent> getEventClass(final Method m) {
 	private synchronized void keepIt(final Object o, final ProxySubscriber<?> subscriber) {
 		List<ProxySubscriber<?>> list = keepEm.get(o);
 		if (list == null) {
-			list = new ArrayList<ProxySubscriber<?>>();
+			list = new ArrayList<>();
 			keepEm.put(o, list);
 		}
 		list.add(subscriber);
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index d806b9042..ebb23aec3 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -69,9 +69,9 @@ public class DefaultInputService extends AbstractService implements
 	private boolean metaDown = false;
 	private boolean shiftDown = false;
 
-	private HashSet<KeyCode> pressedKeys = new HashSet<KeyCode>();
+	private HashSet<KeyCode> pressedKeys = new HashSet<>();
 
-	private HashSet<Integer> buttonsDown = new HashSet<Integer>();
+	private HashSet<Integer> buttonsDown = new HashSet<>();
 
 	private Display<?> display;
 	private int lastX = -1, lastY = -1;
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index a01ff8663..613b87fb8 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -601,10 +601,10 @@ public enum KeyCode {
 	UNDEFINED(0x0);
 
 	private static final Map<Integer, KeyCode> CODES =
-		new HashMap<Integer, KeyCode>();
+		new HashMap<>();
 
 	private static final Map<String, KeyCode> NAMES =
-		new HashMap<String, KeyCode>();
+		new HashMap<>();
 
 	static {
 		for (final KeyCode keyCode : values()) {
diff --git a/src/main/java/org/scijava/io/AbstractDataHandle.java b/src/main/java/org/scijava/io/AbstractDataHandle.java
index 64ac47c77..ec1977163 100644
--- a/src/main/java/org/scijava/io/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/AbstractDataHandle.java
@@ -200,7 +200,7 @@ public String findString(final boolean saveString, final int blockSize,
 
 		@SuppressWarnings("resource")
 		final InputStreamReader in =
-			new InputStreamReader(new DataHandleInputStream<L>(this), getEncoding());
+			new InputStreamReader(new DataHandleInputStream<>(this), getEncoding());
 		final char[] buf = new char[blockSize];
 		long loc = 0;
 		while (loc < maxLen && offset() < length() - 1) {
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 90a5b0198..1f7cd3c03 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -165,7 +165,7 @@ public List<String> getRecentFiles() {
 	@Override
 	public void initialize() {
 		loadList();
-		recentModules = new HashMap<String, ModuleInfo>();
+		recentModules = new HashMap<>();
 		for (final String path : recentFiles) {
 			recentModules.put(path, createInfo(path));
 		}
@@ -201,7 +201,7 @@ private ModuleInfo createInfo(final String path) {
 		final CommandInfo info = new CommandInfo(commandClassName);
 
 		// hard code path to open as a preset
-		final HashMap<String, Object> presets = new HashMap<String, Object>();
+		final HashMap<String, Object> presets = new HashMap<>();
 		presets.put("inputFile", path);
 		info.setPresets(presets);
 
diff --git a/src/main/java/org/scijava/io/URILocation.java b/src/main/java/org/scijava/io/URILocation.java
index cb2d2022c..fb22b0e68 100644
--- a/src/main/java/org/scijava/io/URILocation.java
+++ b/src/main/java/org/scijava/io/URILocation.java
@@ -92,7 +92,7 @@ public URI getURI() {
 	 * @return A map of the decoded key/value pairs.
 	 */
 	private Map<String, String> decodeQuery(final String query) {
-		final Map<String, String> map = new LinkedHashMap<String, String>();
+		final Map<String, String> map = new LinkedHashMap<>();
 		if (query == null) return map;
 		for (final String param : query.split("&")) {
 			final int equals = param.indexOf("=");
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 135c90dd3..f183c77da 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -47,7 +47,7 @@ public abstract class AbstractLogService extends AbstractService implements LogS
 	private int currentLevel = System.getenv("DEBUG") == null ? INFO : DEBUG;
 
 	private Map<String, Integer> classAndPackageLevels =
-		new HashMap<String, Integer>();
+		new HashMap<>();
 
 	// -- abstract methods --
 
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 725eaaa09..7511ea501 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -54,7 +54,7 @@ public class DefaultMainService extends AbstractService implements MainService {
 	@Parameter(required = false)
 	private LogService log;
 
-	private final List<Main> mains = new ArrayList<Main>();
+	private final List<Main> mains = new ArrayList<>();
 
 	@Override
 	public int execMains() {
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 1311008a7..c7608b37b 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -72,7 +72,7 @@ public void handle(final LinkedList<String> args) {
 		args.removeFirst(); // --main / --main-class
 		final String className = args.removeFirst();
 
-		final List<String> argList = new ArrayList<String>();
+		final List<String> argList = new ArrayList<>();
 		while (!args.isEmpty() && !isFlag(args) && !isSeparator(args)) {
 			argList.add(args.removeFirst());
 		}
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index d128cca83..39dc744d4 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -145,12 +145,12 @@ private synchronized void addModules(final Collection<ModuleInfo> items,
 	{
 		// categorize modules by menu root
 		final HashMap<String, ArrayList<ModuleInfo>> modulesByMenuRoot =
-			new HashMap<String, ArrayList<ModuleInfo>>();
+			new HashMap<>();
 		for (final ModuleInfo info : items) {
 			final String menuRoot = info.getMenuRoot();
 			ArrayList<ModuleInfo> modules = modulesByMenuRoot.get(menuRoot);
 			if (modules == null) {
-				modules = new ArrayList<ModuleInfo>();
+				modules = new ArrayList<>();
 				modulesByMenuRoot.put(menuRoot, modules);
 			}
 			modules.add(info);
@@ -192,7 +192,7 @@ private HashMap<String, ShadowMenu> rootMenus() {
 	/** Initializes {@link #rootMenus}. */
 	private synchronized void initRootMenus() {
 		if (rootMenus != null) return;
-		final HashMap<String, ShadowMenu> map = new HashMap<String, ShadowMenu>();
+		final HashMap<String, ShadowMenu> map = new HashMap<>();
 
 		final List<ModuleInfo> allModules = moduleService.getModules();
 		addModules(allModules, map);
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index ec9b90b28..13745d286 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -135,7 +135,7 @@ private ShadowMenu(final Context context, final ModuleInfo moduleInfo,
 		}
 		this.menuDepth = menuDepth;
 		this.parent = parent;
-		children = new HashMap<String, ShadowMenu>();
+		children = new HashMap<>();
 	}
 
 	// -- ShadowMenu methods --
@@ -187,7 +187,7 @@ public ShadowMenu getParent() {
 	public List<ShadowMenu> getChildren() {
 		// copy the children table into an ordered list
 		final List<ShadowMenu> childList =
-			new ArrayList<ShadowMenu>(children.values());
+			new ArrayList<>(children.values());
 		// sort the list by weight then alphabetically
 		Collections.sort(childList);
 		return childList;
@@ -270,7 +270,7 @@ public boolean update(final ModuleInfo module) {
 	 * @return true if at least one module was successfully updated
 	 */
 	public boolean updateAll(final Collection<? extends ModuleInfo> c) {
-		final HashSet<ShadowMenu> nodes = new HashSet<ShadowMenu>();
+		final HashSet<ShadowMenu> nodes = new HashSet<>();
 		for (final ModuleInfo info : c) {
 			final ShadowMenu removed = removeInternal(info);
 			if (removed == null) continue; // was not in menu structure
@@ -361,7 +361,7 @@ public boolean add(final ModuleInfo o) {
 	 */
 	@Override
 	public boolean addAll(final Collection<? extends ModuleInfo> c) {
-		final HashSet<ShadowMenu> nodes = new HashSet<ShadowMenu>();
+		final HashSet<ShadowMenu> nodes = new HashSet<>();
 		for (final ModuleInfo info : c) {
 			if (!info.isVisible()) continue;
 			final ShadowMenu node = addInternal(info);
@@ -416,7 +416,7 @@ public boolean remove(final Object o) {
 
 	@Override
 	public boolean removeAll(final Collection<?> c) {
-		final HashSet<ShadowMenu> nodes = new HashSet<ShadowMenu>();
+		final HashSet<ShadowMenu> nodes = new HashSet<>();
 		for (final Object o : c) {
 			if (!(o instanceof ModuleInfo)) continue;
 			final ModuleInfo info = (ModuleInfo) o;
@@ -430,7 +430,7 @@ public boolean removeAll(final Collection<?> c) {
 
 	@Override
 	public boolean retainAll(final Collection<?> c) {
-		final ArrayList<Object> toRemove = new ArrayList<Object>();
+		final ArrayList<Object> toRemove = new ArrayList<>();
 		for (final ModuleInfo info : this) {
 			if (!c.contains(info)) toRemove.add(info);
 		}
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index 884cd5ab5..7b13e3f23 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -52,7 +52,7 @@ public class ShadowMenuIterator implements Iterator<ModuleInfo> {
 	public ShadowMenuIterator(final ShadowMenu node) {
 		this.node = node;
 		final List<ShadowMenu> children = node.getChildren();
-		childIterators = new ArrayList<ShadowMenuIterator>();
+		childIterators = new ArrayList<>();
 		for (final ShadowMenu child : children) {
 			childIterators.add(new ShadowMenuIterator(child));
 		}
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 0406bdb71..d8c0433e2 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -54,9 +54,9 @@ public abstract class AbstractModule implements Module {
 	private MethodRef initializerRef;
 
 	public AbstractModule() {
-		inputs = new HashMap<String, Object>();
-		outputs = new HashMap<String, Object>();
-		resolvedInputs = new HashSet<String>();
+		inputs = new HashMap<>();
+		outputs = new HashMap<>();
+		resolvedInputs = new HashSet<>();
 	}
 
 	// -- Module methods --
@@ -152,7 +152,7 @@ public void setResolved(final String name, final boolean resolved) {
 	private Map<String, Object> createMap(final Iterable<ModuleItem<?>> items,
 		final boolean outputMap)
 	{
-		final Map<String, Object> map = new HashMap<String, Object>();
+		final Map<String, Object> map = new HashMap<>();
 		for (final ModuleItem<?> item : items) {
 			final String name = item.getName();
 			final Object value = outputMap ? getOutput(name) : getInput(name);
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 1b6461b6b..581eb4ec5 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -287,10 +287,10 @@ private <T> ModuleItem<T> castItem(final ModuleItem<?> item,
 	private synchronized void initParameters() {
 		if (initialized) return; // already initialized
 
-		inputMap = new HashMap<String, ModuleItem<?>>();
-		outputMap = new HashMap<String, ModuleItem<?>>();
-		inputList = new ArrayList<ModuleItem<?>>();
-		outputList = new ArrayList<ModuleItem<?>>();
+		inputMap = new HashMap<>();
+		outputMap = new HashMap<>();
+		inputList = new ArrayList<>();
+		outputList = new ArrayList<>();
 
 		parseParameters();
 
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 67b1a1907..0d1e26106 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -410,7 +410,7 @@ private Module getRegisteredModuleInstance(final ModuleInfo info) {
 	private Map<String, Object> createMap(final Object[] values) {
 		if (values == null || values.length == 0) return null;
 
-		final HashMap<String, Object> inputMap = new HashMap<String, Object>();
+		final HashMap<String, Object> inputMap = new HashMap<>();
 
 		if (values.length % 2 != 0) {
 			log.error("Ignoring extraneous argument: " + values[values.length - 1]);
@@ -466,7 +466,7 @@ private void assignInputs(final Module module,
 	private <T> ModuleItem<T> getTypedSingleItem(final Module module,
 		final Class<T> type, final Iterable<ModuleItem<?>> items)
 	{
-		Set<Class<?>> types = new HashSet<Class<?>>();
+		Set<Class<?>> types = new HashSet<>();
 		types.add(type);
 		@SuppressWarnings("unchecked")
 		ModuleItem<T> result = (ModuleItem<T>) getSingleItem(module, types, items);
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index e40f54498..d2fe1b1c1 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -59,7 +59,7 @@ public <T> MutableModuleItem<T> addInput(final String name,
 		final Class<T> type)
 	{
 		final DefaultMutableModuleItem<T> item =
-			new DefaultMutableModuleItem<T>(this, name, type);
+			new DefaultMutableModuleItem<>(this, name, type);
 		addInput(item);
 		return item;
 	}
@@ -74,7 +74,7 @@ public <T> MutableModuleItem<T> addOutput(final String name,
 		final Class<T> type)
 	{
 		final DefaultMutableModuleItem<T> item =
-			new DefaultMutableModuleItem<T>(this, name, type);
+			new DefaultMutableModuleItem<>(this, name, type);
 		addOutput(item);
 		return item;
 	}
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index b833cb34f..4d95ed91e 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -66,7 +66,7 @@ public class DefaultMutableModuleItem<T> extends AbstractModuleItem<T>
 	private T softMaximum;
 	private Number stepSize;
 	private int columnCount;
-	private final List<T> choices = new ArrayList<T>();
+	private final List<T> choices = new ArrayList<>();
 	private String name;
 	private String label;
 	private String description;
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index aaca5bbd2..45706d786 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -51,7 +51,7 @@ public class MethodRef implements Validated {
 
 	/** List of problems when initializing the method reference. */
 	private final List<ValidityProblem> problems =
-		new ArrayList<ValidityProblem>();
+		new ArrayList<>();
 
 	public MethodRef(final Class<?> clazz, final String methodName,
 		final Class<?>... params)
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index a9d560980..3c0f98780 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -105,7 +105,7 @@ public void removeObject(final Object obj) {
 
 	@Override
 	public void initialize() {
-		objectIndex = new ObjectIndex<Object>(Object.class);
+		objectIndex = new ObjectIndex<>(Object.class);
 	}
 
 	// -- Event handlers --
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index a953dbe22..7dafa1831 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -80,13 +80,13 @@ public class ObjectIndex<E> implements Collection<E> {
 	 * &mdash;Russell Hoban, <em>Riddley Walker</em>
 	 */
 	protected final Map<Class<?>, List<E>> hoard =
-		new ConcurrentHashMap<Class<?>, List<E>>();
+		new ConcurrentHashMap<>();
 
 	private final Class<E> baseClass;
 
 	/** List of objects to add later as needed (i.e., lazily). */
 	private final List<LazyObjects<? extends E>> pending =
-		new LinkedList<LazyObjects<? extends E>>();
+		new LinkedList<>();
 
 	public ObjectIndex(final Class<E> baseClass) {
 		this.baseClass = baseClass;
@@ -133,7 +133,7 @@ public List<E> get(final Class<?> type) {
 
 		List<E> list = retrieveList(type);
 		// NB: Return a copy of the data, to facilitate thread safety.
-		list = new ArrayList<E>(list);
+		list = new ArrayList<>(list);
 		return list;
 	}
 
@@ -237,7 +237,7 @@ public void clear() {
 
 	@Override
 	public String toString() {
-		final List<Class<?>> classes = new ArrayList<Class<?>>(hoard.keySet());
+		final List<Class<?>> classes = new ArrayList<>(hoard.keySet());
 		Collections.sort(classes, new Comparator<Class<?>>() {
 
 			@Override
@@ -285,13 +285,13 @@ protected boolean remove(final Object o, final boolean batch) {
 	}
 
 	private Map<Class<?>, List<E>[]> type2Lists =
-		new HashMap<Class<?>, List<E>[]>();
+		new HashMap<>();
 
 	protected synchronized List<E>[] retrieveListsForType(final Class<?> type) {
 		final List<E>[] lists = type2Lists.get(type);
 		if (lists != null) return lists;
 
-		final ArrayList<List<E>> listOfLists = new ArrayList<List<E>>();
+		final ArrayList<List<E>> listOfLists = new ArrayList<>();
 		for (final Class<?> c : getTypes(type)) {
 			listOfLists.add(retrieveList(c));
 		}
@@ -342,13 +342,13 @@ protected boolean removeFromList(final Object obj, final List<E> list,
 	// -- Helper methods --
 
 	private static Map<Class<?>, Class<?>[]> typeMap =
-		new HashMap<Class<?>, Class<?>[]>();
+		new HashMap<>();
 
 	/** Gets a new set containing the type and all its supertypes. */
 	protected static synchronized Class<?>[] getTypes(final Class<?> type) {
 		Class<?>[] types = typeMap.get(type);
 		if (types != null) return types;
-		final Set<Class<?>>set = new LinkedHashSet<Class<?>>();
+		final Set<Class<?>>set = new LinkedHashSet<>();
 		set.add(All.class); // NB: Always include the "All" class.
 		getTypes(type, set);
 		types = set.toArray(new Class[set.size()]);
@@ -374,7 +374,7 @@ private static synchronized void getTypes(final Class<?> type,
 	protected List<E> retrieveList(final Class<?> type) {
 		List<E> list = hoard.get(type);
 		if (list == null) {
-			list = new ArrayList<E>();
+			list = new ArrayList<>();
 			hoard.put(type, list);
 		}
 		return list;
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 2a1bd99db..c5270529d 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -93,15 +93,15 @@ public boolean addAll(final Collection<? extends E> c) {
 	}
 
 	private void mergeAfterSorting(final Collection<? extends E> c) {
-		final List<E> listToMerge = new ArrayList<E>(c);
+		final List<E> listToMerge = new ArrayList<>(c);
 		Collections.sort(listToMerge);
-		final Map<Class<?>, List<E>> map = new HashMap<Class<?>, List<E>>();
+		final Map<Class<?>, List<E>> map = new HashMap<>();
 		for (final E e : listToMerge) {
 			for (final Class<?> clazz : getTypes(getType(e))) {
 				final List<E> list = retrieveList(clazz);
 				List<E> list2 = map.get(clazz);
 				if (list2 == null) {
-					list2 = list.size() == 0 ? (List<E>)list : new ArrayList<E>();
+					list2 = list.size() == 0 ? (List<E>)list : new ArrayList<>();
 					map.put(clazz, list2);
 				}
 				list2.add(e);
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index 753a9a5fa..037941db7 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -45,7 +45,7 @@
  */
 public abstract class ListEvent<T> extends SciJavaEvent {
 
-	private final List<T> items = new ArrayList<T>();
+	private final List<T> items = new ArrayList<>();
 
 	public ListEvent(final T o) {
 		items.add(o);
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 4ea6fbaf2..8142ae59c 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -75,7 +75,7 @@ public ItemsList(final String arg) {
 		@Override
 		public Map<String, Object> asMap() {
 			final LinkedHashMap<String, Object> map =
-				new LinkedHashMap<String, Object>();
+				new LinkedHashMap<>();
 			for (final Item item : this) {
 				map.put(item.name(), item.value());
 			}
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index f60c76c77..16183e03e 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -98,7 +98,7 @@ public void initialize() {
 
 			@Override
 			public ArrayList<Object> get() {
-				return new ArrayList<Object>(getInstances());
+				return new ArrayList<>(getInstances());
 			}
 		});
 	}
@@ -125,7 +125,7 @@ private synchronized void initInstances() {
 				.createInstancesOfType(getPluginType())));
 
 		final HashMap<Class<? extends PT>, PT> map =
-			new HashMap<Class<? extends PT>, PT>();
+			new HashMap<>();
 
 		for (final PT plugin : list) {
 			@SuppressWarnings("unchecked")
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 9f2c22424..10b646715 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -74,7 +74,7 @@ public HashMap<String, Throwable> findPlugins(
 		final List<PluginInfo<?>> plugins)
 	{
 		final HashMap<String, Throwable> exceptions =
-			new HashMap<String, Throwable>();
+			new HashMap<>();
 
 		// load the annotation indexes
 		final ClassLoader classLoader = getClassLoader();
@@ -108,7 +108,7 @@ private PluginInfo<SciJavaPlugin> createInfo(
 		final Class<SciJavaPlugin> pluginType =
 			(Class<SciJavaPlugin>) plugin.type();
 
-		return new PluginInfo<SciJavaPlugin>(className, pluginType, plugin, classLoader);
+		return new PluginInfo<>(className, pluginType, plugin, classLoader);
 	}
 
 	private ClassLoader getClassLoader() {
@@ -137,7 +137,7 @@ public SysPropBlacklist() {
 			final String sysProp = System.getProperty("scijava.plugin.blacklist");
 			final String[] regexes = //
 				sysProp == null ? new String[0] : sysProp.split(":");
-			patterns = new ArrayList<Pattern>(regexes.length);
+			patterns = new ArrayList<>(regexes.length);
 			for (final String regex : regexes) {
 				try {
 					patterns.add(Pattern.compile(regex));
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 796870681..923d644da 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -183,7 +183,7 @@ public <PT extends SciJavaPlugin> List<PluginInfo<PT>> getPluginsOfType(
 	public <PT extends SciJavaPlugin, P extends PT> List<PluginInfo<PT>>
 		getPluginsOfClass(final Class<P> pluginClass, final Class<PT> type)
 	{
-		final ArrayList<PluginInfo<PT>> result = new ArrayList<PluginInfo<PT>>();
+		final ArrayList<PluginInfo<PT>> result = new ArrayList<>();
 		findPluginsOfClass(pluginClass, getPluginsOfType(type), result);
 		filterNonmatchingClasses(pluginClass, result);
 		return result;
@@ -203,7 +203,7 @@ public List<PluginInfo<SciJavaPlugin>> getPluginsOfClass(
 		getPluginsOfClass(final String className, final Class<PT> type)
 	{
 		final ArrayList<PluginInfo<SciJavaPlugin>> result =
-			new ArrayList<PluginInfo<SciJavaPlugin>>();
+			new ArrayList<>();
 		findPluginsOfClass(className, getPluginsOfType(type), result);
 		return result;
 	}
@@ -220,7 +220,7 @@ public <PT extends SciJavaPlugin> List<PT> createInstancesOfType(
 	public <PT extends SciJavaPlugin> List<PT> createInstances(
 		final List<PluginInfo<PT>> infos)
 	{
-		final ArrayList<PT> list = new ArrayList<PT>();
+		final ArrayList<PT> list = new ArrayList<>();
 		for (final PluginInfo<? extends PT> info : infos) {
 			final PT p = createInstance(info);
 			if (p != null) list.add(p);
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 629aa52b5..38ffa36e6 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -103,7 +103,7 @@ public PluginIndex(final PluginFinder pluginFinder) {
 	 */
 	public void discover() {
 		if (pluginFinder == null) return;
-		final ArrayList<PluginInfo<?>> plugins = new ArrayList<PluginInfo<?>>();
+		final ArrayList<PluginInfo<?>> plugins = new ArrayList<>();
 		exceptions = pluginFinder.findPlugins(plugins);
 		addAll(plugins);
 	}
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 327706198..681fa3e50 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -431,7 +431,7 @@ public void putMap(final Map<String, String> map) {
 		}
 
 		public Map<String, String> getMap() {
-			final Map<String, String> map = new HashMap<String, String>();
+			final Map<String, String> map = new HashMap<>();
 			final String[] keys = keys();
 			for (int index = 0; index < keys.length; index++) {
 				map.put(keys[index], get(keys[index]));
@@ -447,7 +447,7 @@ public void putList(final List<String> list) {
 		}
 
 		public List<String> getList() {
-			final List<String> list = new ArrayList<String>();
+			final List<String> list = new ArrayList<>();
 			for (int index = 0; index < 1000; index++) {
 				final String value = get("" + index);
 				if (value == null) {
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 35b145dbc..fcc9ed717 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -121,7 +121,7 @@ public ScriptLanguageIndex getIndex() {
 
 	@Override
 	public List<ScriptLanguage> getLanguages() {
-		return new ArrayList<ScriptLanguage>(getIndex());
+		return new ArrayList<>(getIndex());
 	}
 
 	@Override
@@ -359,7 +359,7 @@ private synchronized void initScriptLanguageIndex() {
 	private synchronized void initScriptDirs() {
 		if (scriptDirs != null) return;
 
-		final ArrayList<File> dirs = new ArrayList<File>();
+		final ArrayList<File> dirs = new ArrayList<>();
 
 		// append default script directories
 		final File baseDir = AppUtils.getBaseDirectory(getClass()); //FIXME
@@ -379,16 +379,16 @@ private synchronized void initScriptDirs() {
 	/** Initializes {@link #menuPrefixes}. */
 	private synchronized void initMenuPrefixes() {
 		if (menuPrefixes != null) return;
-		menuPrefixes = new HashMap<File, MenuPath>();
+		menuPrefixes = new HashMap<>();
 	}
 
 	/** Initializes {@link #scripts}. */
 	private synchronized void initScripts() {
 		if (scripts != null) return; // already initialized
 
-		final HashMap<File, ScriptInfo> map = new HashMap<File, ScriptInfo>();
+		final HashMap<File, ScriptInfo> map = new HashMap<>();
 
-		final ArrayList<ScriptInfo> scriptList = new ArrayList<ScriptInfo>();
+		final ArrayList<ScriptInfo> scriptList = new ArrayList<>();
 		new ScriptFinder(this).findScripts(scriptList);
 
 		for (final ScriptInfo info : scriptList) {
@@ -402,7 +402,7 @@ private synchronized void initScripts() {
 	private synchronized void initAliasMap() {
 		if (aliasMap != null) return; // already initialized
 
-		final HashMap<String, Class<?>> map = new HashMap<String, Class<?>>();
+		final HashMap<String, Class<?>> map = new HashMap<>();
 
 		// primitives
 		addAliases(map, boolean.class, byte.class, char.class, double.class,
diff --git a/src/main/java/org/scijava/script/History.java b/src/main/java/org/scijava/script/History.java
index c2fe584bb..22208d189 100644
--- a/src/main/java/org/scijava/script/History.java
+++ b/src/main/java/org/scijava/script/History.java
@@ -48,7 +48,7 @@ class History {
 
 	private final PrefService prefs;
 	private final String name;
-	private final LastRecentlyUsed<String> entries = new LastRecentlyUsed<String>(MAX_ENTRIES);
+	private final LastRecentlyUsed<String> entries = new LastRecentlyUsed<>(MAX_ENTRIES);
 	private String currentCommand = "";
 	private int position = -1;
 
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 44591f9ec..5d5b96b59 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -43,7 +43,7 @@ public class InvocationObject {
 
 	public String moduleCalled;
 	public ArrayList<ParameterObject> parameterObjects =
-		new ArrayList<ParameterObject>();
+		new ArrayList<>();
 
 	public InvocationObject(final String moduleCalled) {
 		this.moduleCalled = moduleCalled;
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index f0deabdd9..8e75e2ed1 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -81,7 +81,7 @@ public void findScripts(final List<ScriptInfo> scripts) {
 
 		int scriptCount = 0;
 
-		final HashSet<File> scriptFiles = new HashSet<File>();
+		final HashSet<File> scriptFiles = new HashSet<>();
 		for (final File directory : directories) {
 			if (!directory.exists()) {
 				log.debug("Ignoring non-existent scripts directory: " +
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index d23134478..7f68d3aa2 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -393,7 +393,7 @@ private void checkValid(final boolean valid, final String param)
 
 	/** Adds an output for the value returned by the script itself. */
 	private void addReturnValue() throws ScriptException {
-		final HashMap<String, Object> attrs = new HashMap<String, Object>();
+		final HashMap<String, Object> attrs = new HashMap<>();
 		attrs.put("type", "OUTPUT");
 		addItem(ScriptModule.RETURN_VALUE, Object.class, attrs);
 	}
@@ -402,7 +402,7 @@ private <T> void addItem(final String name, final Class<T> type,
 		final Map<String, Object> attrs)
 	{
 		final DefaultMutableModuleItem<T> item =
-			new DefaultMutableModuleItem<T>(this, name, type);
+			new DefaultMutableModuleItem<>(this, name, type);
 		for (final String key : attrs.keySet()) {
 			final Object value = attrs.get(key);
 			assignAttribute(item, key, value);
@@ -449,7 +449,7 @@ private <T> T as(final Object v, final Class<T> type) {
 	}
 
 	private <T> List<T> asList(final Object v, final Class<T> type) {
-		final ArrayList<T> result = new ArrayList<T>();
+		final ArrayList<T> result = new ArrayList<>();
 		final List<?> list = as(v, List.class);
 		for (final Object item : list) {
 			result.add(as(item, type));
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index f05329780..229bd55d9 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -53,10 +53,10 @@ public class ScriptLanguageIndex extends ArrayList<ScriptLanguage> {
 	private static final long serialVersionUID = 1L;
 
 	private final Map<String, ScriptLanguage> byExtension =
-		new HashMap<String, ScriptLanguage>();
+		new HashMap<>();
 
 	private final Map<String, ScriptLanguage> byName =
-		new HashMap<String, ScriptLanguage>();
+		new HashMap<>();
 
 	private final LogService log;
 
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 8e85ad77f..639b11a92 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -204,8 +204,8 @@ public void help() {
 	public void vars() {
 		if (interpreter == null) return; // no active script language
 
-		final List<String> keys = new ArrayList<String>();
-		final List<Object> types = new ArrayList<Object>();
+		final List<String> keys = new ArrayList<>();
+		final List<Object> types = new ArrayList<>();
 		final Bindings bindings = interpreter.getBindings();
 		for (final String key : bindings.keySet()) {
 			final Object value = bindings.get(key);
@@ -241,9 +241,9 @@ public void lang(final String langName) {
 	}
 
 	public void langs() {
-		final List<String> names = new ArrayList<String>();
-		final List<String> versions = new ArrayList<String>();
-		final List<Object> aliases = new ArrayList<Object>();
+		final List<String> names = new ArrayList<>();
+		final List<String> versions = new ArrayList<>();
+		final List<Object> aliases = new ArrayList<>();
 		for (final ScriptLanguage lang : scriptService.getLanguages()) {
 			names.add(lang.getLanguageName());
 			versions.add(lang.getLanguageVersion());
@@ -297,7 +297,7 @@ private void copyBindings(final ScriptInterpreter src,
 	}
 
 	private List<Gateway> gateways() {
-		final ArrayList<Gateway> gateways = new ArrayList<Gateway>();
+		final ArrayList<Gateway> gateways = new ArrayList<>();
 		if (pluginService == null) return gateways;
 		// HACK: Instantiating a Gateway with the noargs constructor spins
 		// up a second Context, which is not what we want. Perhaps SJC should
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index f239f811b..52c6583fb 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -115,13 +115,13 @@ public ServiceHelper(final Context context,
 		setContext(context);
 		log = context.getService(LogService.class);
 		if (log == null) log = new StderrLogService();
-		classPoolMap = new HashMap<Class<? extends Service>, Double>();
-		classPoolList = new ArrayList<Class<? extends Service>>();
+		classPoolMap = new HashMap<>();
+		classPoolList = new ArrayList<>();
 		findServiceClasses(classPoolMap, classPoolList);
 		if (classPoolList.isEmpty()) {
 			log.warn("Class pool is empty: forgot to call Thread#setClassLoader?");
 		}
-		this.serviceClasses = new ArrayList<Class<? extends Service>>();
+		this.serviceClasses = new ArrayList<>();
 		if (serviceClasses == null) {
 			// load all discovered services
 			this.serviceClasses.addAll(classPoolList);
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 36b29c72d..ec3667ba4 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -215,7 +215,7 @@ public static Map.Entry<Class<?>, String> getCallingCodeLocation(final Class<?>
 					loader + ")!");
 			}
 			final String suffix = element.getMethodName() + "-L" + element.getLineNumber();
-			return new AbstractMap.SimpleEntry<Class<?>, String>(clazz, suffix);
+			return new AbstractMap.SimpleEntry<>(clazz, suffix);
 		}
 		throw new UnsupportedOperationException("No calling class outside " + thisClassName + " found!");
 	}
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index ae136e921..c63016cc7 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -58,7 +58,7 @@ public final class DefaultThreadService extends AbstractService implements
 	private static final String SCIJAVA_THREAD_PREFIX = "SciJava-";
 
 	private static WeakHashMap<Thread, Thread> parents =
-		new WeakHashMap<Thread, Thread>();
+		new WeakHashMap<>();
 
 	@Parameter
 	private LogService log;
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index 15cc3fdee..76061a22f 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -344,7 +344,7 @@ private Tool activeTool() {
 	private synchronized void initAlwaysActiveTools() {
 		if (alwaysActiveTools != null) return; // already initialized
 
-		final HashMap<String, Tool> map = new HashMap<String, Tool>();
+		final HashMap<String, Tool> map = new HashMap<>();
 		for (final Tool tool : alwaysActiveToolList()) {
 			map.put(tool.getInfo().getName(), tool);
 		}
@@ -356,7 +356,7 @@ private synchronized void initAlwaysActiveTools() {
 	private synchronized void initAlwaysActiveToolList() {
 		if (alwaysActiveToolList != null) return; // already initialized
 
-		final ArrayList<Tool> list = new ArrayList<Tool>();
+		final ArrayList<Tool> list = new ArrayList<>();
 		for (final Tool tool : getInstances()) {
 			if (!tool.isAlwaysActive()) continue;
 			list.add(tool);
@@ -369,7 +369,7 @@ private synchronized void initAlwaysActiveToolList() {
 	private synchronized void initTools() {
 		if (tools != null) return; // already initialized
 
-		final HashMap<String, Tool> map = new HashMap<String, Tool>();
+		final HashMap<String, Tool> map = new HashMap<>();
 		for (final Tool tool : toolList()) {
 			map.put(tool.getInfo().getName(), tool);
 		}
@@ -381,7 +381,7 @@ private synchronized void initTools() {
 	private synchronized void initToolList() {
 		if (toolList != null) return; // already initialized
 
-		final ArrayList<Tool> list = new ArrayList<Tool>();
+		final ArrayList<Tool> list = new ArrayList<>();
 		for (final Tool tool : getInstances()) {
 			if (tool.isAlwaysActive()) continue;
 			list.add(tool);
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 7f8907dbb..8a38fb33b 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -240,7 +240,7 @@ public List<UserInterface> getAvailableUIs() {
 
 	@Override
 	public List<UserInterface> getVisibleUIs() {
-		final ArrayList<UserInterface> uis = new ArrayList<UserInterface>();
+		final ArrayList<UserInterface> uis = new ArrayList<>();
 		for (final UserInterface ui : uiList()) {
 			if (ui.isVisible()) uis.add(ui);
 		}
@@ -366,7 +366,7 @@ public String getStatusMessage(final StatusEvent statusEvent) {
 	public synchronized void dispose() {
 		// dispose active display viewers
 		// NB - copy list to avoid ConcurrentModificationExceptions
-		final List<DisplayViewer<?>> viewers = new ArrayList<DisplayViewer<?>>();
+		final List<DisplayViewer<?>> viewers = new ArrayList<>();
 		viewers.addAll(displayViewers());
 		for (final DisplayViewer<?> viewer : viewers) {
 			viewer.dispose();
@@ -505,9 +505,9 @@ private Map<String, UserInterface> uiMap() {
 	private synchronized void discoverUIs() {
 		if (initialized) return;
 
-		displayViewers = new ArrayList<DisplayViewer<?>>();
-		uiList = new ArrayList<UserInterface>();
-		uiMap = new HashMap<String, UserInterface>();
+		displayViewers = new ArrayList<>();
+		uiList = new ArrayList<>();
+		uiMap = new HashMap<>();
 
 		final List<PluginInfo<UserInterface>> infos =
 			pluginService.getPluginsOfType(UserInterface.class);
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 7cef9096f..71618b2b4 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -90,8 +90,8 @@ public MIMEType(final String mimeType, final Class<?> javaType) {
 		base = st.nextToken().trim();
 
 		// parse parameters
-		final ArrayList<String> names = new ArrayList<String>();
-		final HashMap<String, String> map = new HashMap<String, String>();
+		final ArrayList<String> names = new ArrayList<>();
+		final HashMap<String, String> map = new HashMap<>();
 		while (st.hasMoreTokens()) {
 			final String param = st.nextToken();
 			final int equals = param.indexOf("=");
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 5e415caae..34e6169bf 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -114,11 +114,11 @@ public static Collection<?> toCollection(final Object value) {
 			return new DoubleArray((double[]) value);
 		}
 		if (value instanceof Object[]) {
-			return new ObjectArray<Object>((Object[]) value);
+			return new ObjectArray<>((Object[]) value);
 		}
 		// This object is neither an array nor a collection.
 		// So we wrap it in a list and return.
-		final List<Object> list = new ObjectArray<Object>(Object.class);
+		final List<Object> list = new ObjectArray<>(Object.class);
 		list.add(value);
 		return list;
 	}
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 2ef416612..70631e038 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -372,7 +372,7 @@ public static <A extends Annotation> List<Method> getAnnotatedMethods(
 		List<Method> methods = methodCache.getList(c, annotationClass);
 
 		if (methods == null) {
-			methods = new ArrayList<Method>();
+			methods = new ArrayList<>();
 			getAnnotatedMethods(c, annotationClass, methods);
 		}
 
@@ -425,7 +425,7 @@ public static <A extends Annotation> List<Field> getAnnotatedFields(
 		List<Field> fields = fieldCache.getList(c, annotationClass);
 
 		if (fields == null) {
-			fields = new ArrayList<Field>();
+			fields = new ArrayList<>();
 			getAnnotatedFields(c, annotationClass, fields);
 		}
 
@@ -506,7 +506,7 @@ public static void cacheAnnotatedObjects(final Class<?> scannedClass,
 
 			// Initialize step - determine which queries are solved
 			final Set<Class<? extends Annotation>> keysToDrop =
-				new HashSet<Class<? extends Annotation>>();
+				new HashSet<>();
 			for (final Class<? extends Annotation> annotationClass : query.keySet()) {
 				// Fields
 				if (fieldCache.getList(scannedClass, annotationClass) != null) {
@@ -525,7 +525,7 @@ else if (methodCache.getList(scannedClass, annotationClass) != null) {
 			// Stop now if we know all requested information is cached
 			if (query.isEmpty()) return;
 
-			final List<Class<?>> inherited = new ArrayList<Class<?>>();
+			final List<Class<?>> inherited = new ArrayList<>();
 
 			// cache all parents recursively
 			final Class<?> superClass = scannedClass.getSuperclass();
@@ -882,7 +882,7 @@ public void putList(final Class<?> c,
 		{
 			Map<Class<? extends Annotation>, List<T>> map = get(c);
 			if (map == null) {
-				map = new HashMap<Class<? extends Annotation>, List<T>>();
+				map = new HashMap<>();
 				put(c, map);
 			}
 
@@ -904,7 +904,7 @@ public List<T> makeList(final Class<?> c,
 		{
 			List<T> elements = getList(c, annotationClass);
 			if (elements == null) {
-				elements = new ArrayList<T>();
+				elements = new ArrayList<>();
 				putList(c, annotationClass, elements);
 			}
 			return elements;
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index 64eafd8e3..409ad5975 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -197,7 +197,7 @@ public final class Colors {
 	public static final ColorRGB YELLOWGREEN = new ColorRGB(154, 205, 50);
 
 	private static final Map<String, ColorRGB> COLORS =
-		new HashMap<String, ColorRGB>();
+		new HashMap<>();
 
 	static {
 		for (final Field f : Colors.class.getDeclaredFields()) {
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 869dd34a8..8f199a165 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -80,7 +80,7 @@ public static String getStackDump() {
 
 		// sort list of threads by name
 		final ArrayList<Thread> threads =
-			new ArrayList<Thread>(stackTraces.keySet());
+			new ArrayList<>(stackTraces.keySet());
 		Collections.sort(threads, new Comparator<Thread>() {
 
 			@Override
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 06bf48e56..bd2d16910 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -574,7 +574,7 @@ else if (protocol.equals("jar")) {
 				final JarURLConnection connection =
 					(JarURLConnection) new URL(baseURL).openConnection();
 				final JarFile jar = connection.getJarFile();
-				for (final JarEntry entry : new IteratorPlus<JarEntry>(jar.entries())) {
+				for (final JarEntry entry : new IteratorPlus<>(jar.entries())) {
 					final String urlEncoded =
 						new URI(null, null, entry.getName(), null).toString();
 					if (urlEncoded.length() > prefix.length() && // omit directory itself
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index dc587ecd9..cb706c90a 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -73,7 +73,7 @@ public IteratorPlus(final Iterable<E> iterable) {
 	}
 
 	public IteratorPlus(final Enumeration<E> enumeration) {
-		this(new EnumerationIterator<E>(enumeration));
+		this(new EnumerationIterator<>(enumeration));
 	}
 
 	public IteratorPlus(final Iterator<E> iterator) {
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 88057c527..684bc4701 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -70,7 +70,7 @@ public LastRecentlyUsed(int size) {
 		entries = new Object[2 * size];
 		next = new int[2 * size];
 		previous = new int[2 * size];
-		map = new HashMap<T, Integer>();
+		map = new HashMap<>();
 	}
 
 	/**
@@ -364,7 +364,7 @@ protected void assertConsistency() {
 			return;
 		}
 		assert(bottom != 0);
-		final Set<Integer> indices = new HashSet<Integer>(map.values());
+		final Set<Integer> indices = new HashSet<>(map.values());
 		assert(indices.size() == map.size());
 		for (int i = 0; i < entries.length; i++) {
 			if (indices.contains(i)) {
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index 1c1138a4f..47a31b43f 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -71,8 +71,8 @@ public class MirrorWebsite {
 	private String baseURL;
 	private String basePath; // the local directory for file:// baseURL, otherwise null
 	private File localDirectory;
-	private Map<String, String> linkMap = new HashMap<String, String>();
-	private Set<String> missingLinks = new LinkedHashSet<String>();
+	private Map<String, String> linkMap = new HashMap<>();
+	private Set<String> missingLinks = new LinkedHashSet<>();
 	private ExecutorService executorService;
 	private Map<String, MirrorJob> jobs;
 	private Set<String> done;
@@ -94,8 +94,8 @@ public void run() throws InterruptedException {
 				throw new RuntimeException("Mirroring already in progress!");
 
 			executorService = Executors.newFixedThreadPool(threadCount);
-			done = new TreeSet<String>();
-			jobs = new LinkedHashMap<String, MirrorJob>();
+			done = new TreeSet<>();
+			jobs = new LinkedHashMap<>();
 
 			mirror("index.html");
 		}
@@ -182,7 +182,7 @@ else if ((" " + previous + " ").indexOf(" " + sourceURL + " ") < 0)
 	}
 
 	private List<String> getLinks(String relativePath, String path, String html) {
-		List<String> result = new ArrayList<String>();
+		List<String> result = new ArrayList<>();
 
 		int offset = -1;
 		for (;;) {
@@ -262,7 +262,7 @@ private List<String> ensureUptodate(String path) throws IOException {
 			final String directory = path.substring(0, path.length() - 10);
 			final File[] list = new File(basePath + directory).listFiles();
 			if (list == null) return Collections.emptyList();
-			final List<String> result = new ArrayList<String>();
+			final List<String> result = new ArrayList<>();
 			for (final File item : list) {
 				if (item.isDirectory()) result.add(directory + item.getName() + "/index.html");
 				else result.add(directory + item.getName());
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 7dc50d507..99a57c6da 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -268,10 +268,10 @@ public static List<POM> getAllPOMs() {
 			return null;
 		}
 
-		final ArrayList<POM> poms = new ArrayList<POM>();
+		final ArrayList<POM> poms = new ArrayList<>();
 
 		// recursively list contents of META-INF/maven/ directories
-		for (final URL resource : new IteratorPlus<URL>(resources)) {
+		for (final URL resource : new IteratorPlus<>(resources)) {
 			for (final URL url : FileUtils.listContents(resource)) {
 				// look for pom.xml files amongst the contents
 				if (url.getPath().endsWith("/pom.xml")) {
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 968212bfd..a0027b628 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -86,7 +86,7 @@ public ReflectedUniverse(final URL[] urls) {
 
 	/** Constructs a new reflected universe that uses the given class loader. */
 	public ReflectedUniverse(final ClassLoader loader) {
-		variables = new HashMap<String, Object>();
+		variables = new HashMap<>();
 		this.loader = loader == null ? getClass().getClassLoader() : loader;
 	}
 
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index f91e182d9..2c6f63d33 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -58,7 +58,7 @@ public class ServiceCombiner implements Combiner {
 	public void combine(final File outputDirectory) throws IOException {
 
 		final Map<String, StringBuilder> files =
-			new HashMap<String, StringBuilder>();
+			new HashMap<>();
 		final Enumeration<URL> directories =
 			Thread.currentThread().getContextClassLoader().getResources(
 				SERVICES_PREFIX);
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 98f350688..52e54d352 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -69,7 +69,7 @@
  */
 public class Timing {
 	private long total = 0, start = System.nanoTime(), tick = start;
-	private List<Entry<Long, String>> list = new ArrayList<Entry<Long, String>>();
+	private List<Entry<Long, String>> list = new ArrayList<>();
 
 	public void reset() {
 		tick = System.nanoTime();
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 79f0cd741..c195967e9 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -242,7 +242,7 @@ public static String cdata(final Element el, final String child) {
 
 	/** Gets the element nodes from the given node list. */
 	public static ArrayList<Element> elements(final NodeList nodes) {
-		final ArrayList<Element> elements = new ArrayList<Element>();
+		final ArrayList<Element> elements = new ArrayList<>();
 		if (nodes != null) {
 			for (int i=0; i<nodes.getLength(); i++) {
 				final Node node = nodes.item(i);
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index e3968a1f2..2003ec523 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -92,7 +92,7 @@ public void harvest(final Module module) throws ModuleException {
 	{
 		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
 
-		final ArrayList<WidgetModel> models = new ArrayList<WidgetModel>();
+		final ArrayList<WidgetModel> models = new ArrayList<>();
 
 		for (final ModuleItem<?> item : inputs) {
 			final WidgetModel model = addInput(inputPanel, module, item);
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index e9155aa85..37513ce9e 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -45,7 +45,7 @@ public abstract class AbstractInputPanel<P, W> implements InputPanel<P, W> {
 
 	/** Table of widgets. */
 	protected Map<String, InputWidget<?, W>> widgets =
-		new HashMap<String, InputWidget<?, W>>();
+		new HashMap<>();
 
 	// -- InputPanel methods --
 
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 4f5052fb1..14db291d5 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -87,7 +87,7 @@ public DefaultWidgetModel(final Context context, final InputPanel<?, ?> inputPan
 		this.module = module;
 		this.item = item;
 		this.objectPool = objectPool;
-		convertedObjects = new WeakHashMap<Object, Object>();
+		convertedObjects = new WeakHashMap<>();
 
 		if (item.getValue(module) == null) {
 			// assign the item's default value as the current value
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index abbab3c9b..5b6ca51a0 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -343,7 +343,7 @@ public void testNoServicesCtor() {
 		// create a 2-service context
 		final PluginIndex index = pluginIndex(BaseImpl.class, ExtensionImpl.class);
 		// Add another service, that is not indexed under Service.class
-		index.add(new PluginInfo<SciJavaPlugin>(ThreadService.class.getName(),
+		index.add(new PluginInfo<>(ThreadService.class.getName(),
 			SciJavaPlugin.class));
 		final Context c =
 			new Context(pluginIndex(BaseImpl.class, ExtensionImpl.class));
@@ -440,7 +440,7 @@ private Class<? extends Service>[] services(
 	private PluginIndex pluginIndex(final Class<?>... plugins) {
 		final PluginIndex index = new PluginIndex(null);
 		for (final Class<?> c : plugins) {
-			index.add(new PluginInfo<Service>(c.getName(), Service.class));
+			index.add(new PluginInfo<>(c.getName(), Service.class));
 		}
 		return index;
 	}
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 848eec71a..35c1bc7ed 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -115,7 +115,7 @@ public void testRepeatedClassPathElements() throws Exception {
 		final ClassLoader loader = new URLClassLoader(new URL[] {
 			classPathURL, classPathURL
 		});
-		final Set<String> seen = new HashSet<String>();
+		final Set<String> seen = new HashSet<>();
 		for (final IndexItem<Simple> item :
 				Index.load(Simple.class, loader)) {
 			final String name = item.className();
@@ -172,7 +172,7 @@ public static <A extends Annotation> Map<String, IndexItem<A>> readIndex(
 			public final Enumeration<URL> getResources(final String path)
 				throws IOException
 			{
-				final List<URL> urls = new ArrayList<URL>();
+				final List<URL> urls = new ArrayList<>();
 				for (final URL directory : directories) {
 					final URL url = new URL(directory, path);
 					final URLConnection connection = url.openConnection();
@@ -190,7 +190,7 @@ public static <A extends Annotation> Map<String, IndexItem<A>> readIndex(
 		final Class<A> annotationClass, final ClassLoader loader)
 	{
 		// read the index
-		final Map<String, IndexItem<A>> map = new TreeMap<String, IndexItem<A>>();
+		final Map<String, IndexItem<A>> map = new TreeMap<>();
 		for (final IndexItem<A> item : Index.load(annotationClass, loader)) {
 			map.put(item.className(), item);
 		}
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 58a049138..7c4320864 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -81,7 +81,7 @@ private void eventHandler(final StatusEvent e) {
 	@Before
 	public void setUp() throws Exception {
 		context = new Context();
-		queue = new ArrayBlockingQueue<StatusEvent>(10);
+		queue = new ArrayBlockingQueue<>(10);
 		statusListener = new StatusListener();
 		statusListener.setContext(context);
 		ss = statusListener.statusService;
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index 8a1ed203b..43277d036 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -89,7 +89,7 @@ public void testRunList() throws InvocationTargetException {
 	public void testRunMap() throws InvocationTargetException {
 		final StringBuilder buffer = new StringBuilder();
 
-		final Map<String, Object> inputMap = new HashMap<String, Object>();
+		final Map<String, Object> inputMap = new HashMap<>();
 		inputMap.put("buffer", buffer);
 
 		runner.run(OpenSesame.class, inputMap);
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 992723f8d..d67f20ebf 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -100,7 +100,7 @@ public void testOutputListeners() throws InterruptedException,
 		final String stdoutAfter = "ave";
 		final String stderrAfter = "rs-";
 
-		final ArrayList<OutputEvent> events = new ArrayList<OutputEvent>();
+		final ArrayList<OutputEvent> events = new ArrayList<>();
 		final OutputListener outputListener = new OutputTracker(events);
 
 		final Runnable r = new Printer(stdoutLocal, stderrLocal);
@@ -145,9 +145,9 @@ public void testMultipleContextOutput() throws InterruptedException,
 		final ThreadService ts1 = c1.service(ThreadService.class);
 		final ThreadService ts2 = c2.service(ThreadService.class);
 
-		final ArrayList<OutputEvent> events1 = new ArrayList<OutputEvent>();
+		final ArrayList<OutputEvent> events1 = new ArrayList<>();
 		cs1.addOutputListener(new OutputTracker(events1));
-		final ArrayList<OutputEvent> events2 = new ArrayList<OutputEvent>();
+		final ArrayList<OutputEvent> events2 = new ArrayList<>();
 		cs2.addOutputListener(new OutputTracker(events2));
 
 		final String globalOut = "and";
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index 03e05e503..f0042394b 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -60,7 +60,7 @@ public void testSystemProperties() {
 
 	private void assertPropertySet(final String key, final String value) {
 		final SystemPropertyArgument spa = new SystemPropertyArgument();
-		final LinkedList<String> args = new LinkedList<String>();
+		final LinkedList<String> args = new LinkedList<>();
 		args.add(value == null ? "-D" + key : "-D" + key + "=" + value);
 		assertTrue(spa.supports(args));
 		assertNull(System.getProperty(key));
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index b2d5fd7fd..8f106da8a 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -148,7 +148,7 @@ public void testArrays() {
 		assertFalse(convertService.supports(int[].class, LongArray.class));
 
 		// Test that lists can be converted to any primitive []
-		final List<Integer> list = new ArrayList<Integer>();
+		final List<Integer> list = new ArrayList<>();
 		for (int i=0; i<100; i++) list.add((int) (10000 * Math.random()));
 
 		assertTrue(convertService.supports(list, int[].class));
@@ -222,7 +222,7 @@ public void testConvert() {
 		assertSame(string, stringToObject);
 
 		// check "conversion" (i.e., casting) to interface
-		final ArrayList<?> arrayList = new ArrayList<Object>();
+		final ArrayList<?> arrayList = new ArrayList<>();
 		final Collection<?> arrayListToCollection =
 			convertService.convert(arrayList, Collection.class);
 		assertSame(arrayList, arrayListToCollection);
@@ -266,7 +266,7 @@ public void testConvert() {
 		assertEquals(8.7, stringToDouble, 0.0);
 
 		// check conversion via constructor: HashSet to ArrayList
-		final HashSet<String> set = new HashSet<String>();
+		final HashSet<String> set = new HashSet<>();
 		set.add("Foo");
 		set.add("Bar");
 		@SuppressWarnings("unchecked")
@@ -406,7 +406,7 @@ class Struct {
 		final Struct struct = new Struct();
 
 		// Verify behavior setting a nesting of multi-elements (Set of Array)
-		final Set<char[]> nestedSetValues = new HashSet<char[]>();
+		final Set<char[]> nestedSetValues = new HashSet<>();
 		final char[] chars = { 'a', 'b', 'c' };
 		nestedSetValues.add(chars);
 
@@ -539,7 +539,7 @@ class Struct {
 	@Test
 	public void testGetCompatibleInputs() {
 		final List<Object> compatibleInputs =
-			new ArrayList<Object>(convertService.getCompatibleInputs(HisList.class));
+			new ArrayList<>(convertService.getCompatibleInputs(HisList.class));
 
 		assertEquals(4, compatibleInputs.size());
 		assertEquals(StringHisListConverter.S1, compatibleInputs.get(0));
@@ -564,7 +564,7 @@ private void setFieldValue(final Object o, final String fieldName,
 	 * Convenience method to convert an array of values to a collection.
 	 */
 	private <T> List<T> getValueList(final T... values) {
-		final List<T> list = new ArrayList<T>();
+		final List<T> list = new ArrayList<>();
 		for (final T value : values)
 			list.add(value);
 		return list;
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index ceff9f097..a76dced38 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -53,7 +53,7 @@ public class EventServiceTest {
 	public void testWeakEventHandlers() {
 		// verify that the garbage collector collects weak references
 		final WeakReference<MyEventHandler> reference =
-				new WeakReference<MyEventHandler>(new MyEventHandler());
+				new WeakReference<>(new MyEventHandler());
 		gc();
 		assertNull(reference.get());
 
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 458d41387..479531083 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -136,7 +136,7 @@ public void testGetMenu() {
 	private ShadowMenu createShadowMenu() {
 		final Context context = new Context(true);
 
-		final ArrayList<ModuleInfo> modules = new ArrayList<ModuleInfo>();
+		final ArrayList<ModuleInfo> modules = new ArrayList<>();
 		modules.add(createModuleInfo("Edit>Copy"));
 		modules.add(createModuleInfo("Edit>Cut"));
 		modules.add(createModuleInfo("Edit>Paste"));
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index 99dec327f..05bcd6957 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -83,7 +83,7 @@ public void testRunList() throws InvocationTargetException {
 	@Test
 	public void testRunMap() throws InvocationTargetException {
 		final StringBuilder sb = new StringBuilder();
-		final Map<String, Object> inputMap = new HashMap<String, Object>();
+		final Map<String, Object> inputMap = new HashMap<>();
 		inputMap.put("buffer", sb);
 		inputMap.put("length", 4);
 		runner.run("module:" + AlphabetModule.class.getName(), inputMap);
@@ -124,11 +124,11 @@ public AlphabetModuleInfo() {
 			// So much fun to construct modules by hand! Who needs commands?
 			setModuleClass(AlphabetModule.class);
 			final DefaultMutableModuleItem<StringBuilder> bufferItem =
-				new DefaultMutableModuleItem<StringBuilder>(this, "buffer",
+				new DefaultMutableModuleItem<>(this, "buffer",
 					StringBuilder.class);
 			bufferItem.setIOType(ItemIO.BOTH);
 			addInput(bufferItem);
-			addInput(new DefaultMutableModuleItem<Integer>(this, "length",
+			addInput(new DefaultMutableModuleItem<>(this, "length",
 				int.class));
 		}
 
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 6d6d33b62..659db41ae 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -53,7 +53,7 @@ public class ObjectIndexTest {
 	@Test
 	public void testGetAll() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		final Object o1 = new Integer(5);
 		final Object o2 = new Float(2.5f);
 		final Object o3 = new Integer(3);
@@ -70,7 +70,7 @@ public void testGetAll() {
 	@Test
 	public void testGet() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		final Object o1 = new Integer(5);
 		final Object o2 = new Float(2.5f);
 		final Object o3 = new Integer(3);
@@ -91,7 +91,7 @@ public void testGet() {
 	@Test
 	public void testIsEmpty() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		assertTrue(objectIndex.isEmpty());
 		final Object o1 = new Integer(5);
 		objectIndex.add(o1);
@@ -103,7 +103,7 @@ public void testIsEmpty() {
 	@Test
 	public void testContains() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		final Object o1 = new Integer(5);
 		assertFalse(objectIndex.contains(o1));
 		objectIndex.add(o1);
@@ -115,7 +115,7 @@ public void testContains() {
 	@Test
 	public void testIterator() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		final Object[] objects =
 			{ new Integer(5), new Float(2.5f), new Integer(3) };
 		for (final Object o : objects)
@@ -132,7 +132,7 @@ public void testIterator() {
 	@Test
 	public void testToArray() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		final Object[] objects =
 			{ new Integer(5), new Float(2.5f), new Integer(3) };
 		for (final Object o : objects)
@@ -144,12 +144,12 @@ public void testToArray() {
 	@Test
 	public void testContainsAll() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
-		assertTrue(objectIndex.containsAll(new ArrayList<Object>()));
+			new ObjectIndex<>(Object.class);
+		assertTrue(objectIndex.containsAll(new ArrayList<>()));
 		final Object o1 = new Integer(5);
 		final Object o2 = new Float(2.5f);
 		final Object o3 = new Integer(3);
-		final ArrayList<Object> objects = new ArrayList<Object>();
+		final ArrayList<Object> objects = new ArrayList<>();
 		objects.add(o1);
 		objects.add(o2);
 		objects.add(o3);
@@ -163,8 +163,8 @@ public void testContainsAll() {
 	@Test
 	public void testAddAll() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
-		final ArrayList<Object> objects = new ArrayList<Object>();
+			new ObjectIndex<>(Object.class);
+		final ArrayList<Object> objects = new ArrayList<>();
 		objects.add(new Integer(5));
 		objects.add(new Float(2.5f));
 		objects.add(new Integer(3));
@@ -176,11 +176,11 @@ public void testAddAll() {
 	@Test
 	public void testRemoveAll() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		final Object o1 = new Integer(5);
 		final Object o2 = new Float(2.5f);
 		final Object o3 = new Integer(3);
-		final ArrayList<Object> objects = new ArrayList<Object>();
+		final ArrayList<Object> objects = new ArrayList<>();
 		objects.add(o1);
 		objects.add(o2);
 		objects.add(o3);
@@ -195,7 +195,7 @@ public void testRemoveAll() {
 	@Test
 	public void testClear() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		objectIndex.clear();
 		assertTrue(objectIndex.isEmpty());
 		objectIndex.add(new Integer(5));
@@ -207,7 +207,7 @@ public void testClear() {
 	@Test
 	public void testToString() {
 		final ObjectIndex<Object> objectIndex =
-			new ObjectIndex<Object>(Object.class);
+			new ObjectIndex<>(Object.class);
 		objectIndex.add(new Integer(5));
 		objectIndex.add(new Float(2.5f));
 		objectIndex.add(new Integer(3));
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 906915352..2606115e8 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -48,7 +48,7 @@ public class SortedObjectIndexTest {
 	@Test
 	public void testGetAllSorted() {
 		final SortedObjectIndex<String> objectIndex =
-			new SortedObjectIndex<String>(String.class);
+			new SortedObjectIndex<>(String.class);
 		final String o1 = "quick";
 		final String o2 = "brown";
 		final String o3 = "fox";
@@ -65,7 +65,7 @@ public void testGetAllSorted() {
 	@Test
 	public void testDuplicates() {
 		final SortedObjectIndex<String> objectIndex =
-			new SortedObjectIndex<String>(String.class);
+			new SortedObjectIndex<>(String.class);
 		final String o1 = "quick";
 		final String o2 = "brown";
 		final String o3 = "fox";
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 04c01667c..8433da024 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -57,7 +57,7 @@ private OptionsService createOptionsService() {
 		// add FooOptions to the list of available plugins
 		final PluginService pluginService = context.getService(PluginService.class);
 		final PluginInfo<OptionsPlugin> info =
-			new PluginInfo<OptionsPlugin>(FooOptions.class, OptionsPlugin.class);
+			new PluginInfo<>(FooOptions.class, OptionsPlugin.class);
 		pluginService.addPlugin(info);
 
 		return context.getService(OptionsService.class);
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index a29df6309..6508facfa 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -59,7 +59,7 @@ public void testGetPluginsOfClass() {
 
 		// add a plugin to the index
 		final PluginInfo<SciJavaPlugin> testPlugin =
-			new PluginInfo<SciJavaPlugin>(FooBar.class.getName(), SciJavaPlugin.class);
+			new PluginInfo<>(FooBar.class.getName(), SciJavaPlugin.class);
 		pluginIndex.add(testPlugin);
 
 		// retrieve the plugin from the index, by class
@@ -91,7 +91,7 @@ public void testGetPluginsOfClassString() {
 		// add a fake plugin to the index
 		final String fakeClass = "foo.bar.FooBar";
 		final PluginInfo<SciJavaPlugin> testPlugin =
-			new PluginInfo<SciJavaPlugin>(fakeClass, SciJavaPlugin.class);
+			new PluginInfo<>(fakeClass, SciJavaPlugin.class);
 		pluginIndex.add(testPlugin);
 
 		// retrieve the fake plugin from the index, by class name
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index 660acbcfe..a4e1f22ed 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -146,7 +146,7 @@ public void testLong() {
 	 */
 	@Test
 	public void testMap() {
-		final Map<String, String> map = new HashMap<String, String>();
+		final Map<String, String> map = new HashMap<>();
 		map.put("0", "A");
 		map.put("1", "B");
 		map.put("2", "C");
@@ -165,7 +165,7 @@ public void testMap() {
 	@Test
 	public void testList() {
 		final String recentFilesKey = "RecentFiles";
-		final List<String> recentFiles = new ArrayList<String>();
+		final List<String> recentFiles = new ArrayList<>();
 		recentFiles.add("some/path1");
 		recentFiles.add("some/path2");
 		recentFiles.add("some/path3");
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index 228eacb37..80c6ca809 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -74,7 +74,7 @@ public void testRunList() throws InvocationTargetException {
 	@Test
 	public void testRunMap() throws InvocationTargetException {
 		final StringBuilder sb = new StringBuilder();
-		final Map<String, Object> inputMap = new LinkedHashMap<String, Object>();
+		final Map<String, Object> inputMap = new LinkedHashMap<>();
 		inputMap.put("foo", "bar");
 		inputMap.put("animal", "quick brown fox");
 		inputMap.put("number", 33);
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 122da260f..bc8c6f62a 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -193,7 +193,7 @@ private ScriptService createScriptService() {
 
 	private ArrayList<ScriptInfo> findScripts(final ScriptService scriptService) {
 		final ScriptFinder scriptFinder = new ScriptFinder(scriptService);
-		final ArrayList<ScriptInfo> scripts = new ArrayList<ScriptInfo>();
+		final ArrayList<ScriptInfo> scripts = new ArrayList<>();
 		scriptFinder.findScripts(scripts);
 		Collections.sort(scripts);
 		return scripts;
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index 713fe4f42..8468c911f 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -326,7 +326,7 @@ public void testContainsAll() {
 		final boolean[] raw = { true, true };
 		final BoolArray array = new BoolArray(raw.clone());
 
-		final ArrayList<Boolean> list = new ArrayList<Boolean>();
+		final ArrayList<Boolean> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add(true);
 		assertTrue(array.containsAll(list));
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index 2540fe5dd..70d3cbcd7 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -358,7 +358,7 @@ public void testContainsAll() {
 		final byte[] raw = { 3, 5, 8, 13, 21 };
 		final ByteArray array = new ByteArray(raw.clone());
 
-		final ArrayList<Byte> list = new ArrayList<Byte>();
+		final ArrayList<Byte> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add((byte) 13);
 		assertTrue(array.containsAll(list));
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index f8ba039ea..0947b9ce0 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -354,7 +354,7 @@ public void testContainsAll() {
 		final char[] raw = { 3, 5, 8, 13, 21 };
 		final CharArray array = new CharArray(raw.clone());
 
-		final ArrayList<Character> list = new ArrayList<Character>();
+		final ArrayList<Character> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add((char) 13);
 		assertTrue(array.containsAll(list));
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 68d7ced59..6a1bed171 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -101,7 +101,7 @@ public void testCast() {
 		assertSame(string, stringToObject);
 
 		// check casting to interface
-		final ArrayList<?> arrayList = new ArrayList<Object>();
+		final ArrayList<?> arrayList = new ArrayList<>();
 		final Collection<?> arrayListToCollection =
 			ConversionUtils.cast(arrayList, Collection.class);
 		assertSame(arrayList, arrayListToCollection);
@@ -395,7 +395,7 @@ class Struct {
 		final Struct struct = new Struct();
 
 		// Verify behavior setting a nesting of multi-elements (Set of Array)
-		final Set<char[]> nestedSetValues = new HashSet<char[]>();
+		final Set<char[]> nestedSetValues = new HashSet<>();
 		final char[] chars = { 'a', 'b', 'c' };
 		nestedSetValues.add(chars);
 
@@ -535,7 +535,7 @@ private void setFieldValue(final Object o, final String fieldName,
 	 * Convenience method to convert an array of values to a collection.
 	 */
 	private <T> List<T> getValueList(final T... values) {
-		final List<T> list = new ArrayList<T>();
+		final List<T> list = new ArrayList<>();
 		for (final T value : values)
 			list.add(value);
 		return list;
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index 717f997a1..1430a530a 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -364,7 +364,7 @@ public void testContainsAll() {
 		final double[] raw = { 3, 5, 8, 13, 21 };
 		final DoubleArray array = new DoubleArray(raw.clone());
 
-		final ArrayList<Double> list = new ArrayList<Double>();
+		final ArrayList<Double> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add(13d);
 		assertTrue(array.containsAll(list));
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index b5d62c5ce..0b7947657 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -364,7 +364,7 @@ public void testContainsAll() {
 		final float[] raw = { 3, 5, 8, 13, 21 };
 		final FloatArray array = new FloatArray(raw.clone());
 
-		final ArrayList<Float> list = new ArrayList<Float>();
+		final ArrayList<Float> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add(13f);
 		assertTrue(array.containsAll(list));
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index badb7112e..30f97a709 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -358,7 +358,7 @@ public void testContainsAll() {
 		final int[] raw = { 3, 5, 8, 13, 21 };
 		final IntArray array = new IntArray(raw.clone());
 
-		final ArrayList<Integer> list = new ArrayList<Integer>();
+		final ArrayList<Integer> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add(13);
 		assertTrue(array.containsAll(list));
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index c93cd1875..553be9b92 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -48,7 +48,7 @@ public class LastRecentlyUsedTest {
 	@Test
 	public void test() {
 		int count = 3;
-		final LastRecentlyUsed<String> lru = new LastRecentlyUsed<String>(count);
+		final LastRecentlyUsed<String> lru = new LastRecentlyUsed<>(count);
 
 		for (int i = 1; i <= count; i++) {
 			lru.add("" + i);
@@ -72,7 +72,7 @@ public void test() {
 
 	@Test
 	public void testRemove() {
-		final LastRecentlyUsed<String> lru = new LastRecentlyUsed<String>(3);
+		final LastRecentlyUsed<String> lru = new LastRecentlyUsed<>(3);
 		lru.add("a");
 		lru.add("b");
 		lru.add("c");
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index c6f6e9237..17b5294cc 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -358,7 +358,7 @@ public void testContainsAll() {
 		final long[] raw = { 3, 5, 8, 13, 21 };
 		final LongArray array = new LongArray(raw.clone());
 
-		final ArrayList<Long> list = new ArrayList<Long>();
+		final ArrayList<Long> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add(13L);
 		assertTrue(array.containsAll(list));
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index b7d651dc6..d3ef289f1 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -53,7 +53,7 @@ public class ObjectArrayTest extends PrimitiveArrayTest {
 	/** Tests {@link ObjectArray#ObjectArray(Class)}. */
 	@Test
 	public void testConstructorNoArgs() {
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(Integer.class);
+		final ObjectArray<Integer> array = new ObjectArray<>(Integer.class);
 		assertEquals(0, array.size());
 		assertEquals(0, array.copyArray().length);
 	}
@@ -63,7 +63,7 @@ public void testConstructorNoArgs() {
 	public void testConstructorSize() {
 		final int size = 24;
 		final ObjectArray<Integer> array =
-			new ObjectArray<Integer>(Integer.class, size);
+			new ObjectArray<>(Integer.class, size);
 		assertEquals(size, array.size());
 		assertEquals(size, array.copyArray().length);
 	}
@@ -72,7 +72,7 @@ public void testConstructorSize() {
 	@Test
 	public void testConstructorArray() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw);
+		final ObjectArray<Integer> array = new ObjectArray<>(raw);
 		assertSame(raw, array.getArray());
 		assertEquals(raw.length, array.size());
 		for (int i = 0; i < raw.length; i++) {
@@ -85,7 +85,7 @@ public void testConstructorArray() {
 	@Test
 	public void testAddValue() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		final Integer e6 = 1, e7 = 2;
 		array.addValue(e6);
 		array.addValue(e7);
@@ -100,7 +100,7 @@ public void testAddValue() {
 	/** Tests {@link ObjectArray#removeValue(Object)}. */
 	public void testRemoveValue() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		assertEquals(raw.length, array.size());
 		array.removeValue(raw[0]);
 		assertEquals(raw.length - 1, array.size());
@@ -115,7 +115,7 @@ public void testRemoveValue() {
 	/** Tests {@link ObjectArray#getValue(int)}. */
 	public void testGetValue() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertEquals("@" + i, raw[i], array.getValue(i));
 		}
@@ -125,7 +125,7 @@ public void testGetValue() {
 	@Test
 	public void testSetValue() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		final Integer e0 = 7, e2 = 1, e4 = 2;
 		array.setValue(0, e0);
 		array.setValue(2, e2);
@@ -142,7 +142,7 @@ public void testSetValue() {
 	@Test
 	public void testAddValueIndex() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		final Integer e0 = 7, e4 = 1, e7 = 2;
 		array.addValue(0, e0);
 		array.addValue(4, e4);
@@ -161,7 +161,7 @@ public void testAddValueIndex() {
 	/** Tests {@link ObjectArray#remove(int)}. */
 	public void testRemoveIndex() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		assertEquals(raw.length, array.size());
 		array.remove(0);
 		assertEquals(raw.length - 1, array.size());
@@ -177,7 +177,7 @@ public void testRemoveIndex() {
 	@Test
 	public void testIndexOf() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertEquals("@" + i, i, array.indexOf(raw[i]));
 		}
@@ -192,7 +192,7 @@ public void testIndexOf() {
 	@Test
 	public void testLastIndexOf() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertEquals("@" + i, i, array.lastIndexOf(raw[i]));
 		}
@@ -207,7 +207,7 @@ public void testLastIndexOf() {
 	@Test
 	public void testContains() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertTrue("@" + i, array.contains(raw[i]));
 		}
@@ -224,7 +224,7 @@ public void testContains() {
 	 */
 	@Test
 	public void testSetArray() {
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(Integer.class);
+		final ObjectArray<Integer> array = new ObjectArray<>(Integer.class);
 		final Integer[] raw = { 1, 2, 3, 5, 8, 13, 21 };
 		array.setArray(raw);
 		assertSame(raw, array.getArray());
@@ -234,21 +234,21 @@ public void testSetArray() {
 	@Test
 	public void testInsert() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		testInsert(new ObjectArray<Integer>(raw));
+		testInsert(new ObjectArray<>(raw));
 	}
 
 	/** Tests {@link ObjectArray#delete(int, int)}. */
 	@Test
 	public void testDelete() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		testDelete(new ObjectArray<Integer>(raw));
+		testDelete(new ObjectArray<>(raw));
 	}
 
 	/** Tests {@link ObjectArray#get(int)}. */
 	@Test
 	public void testGet() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertEquals("@" + i, raw[i].intValue(), array.get(i).intValue());
 		}
@@ -258,7 +258,7 @@ public void testGet() {
 	@Test
 	public void testSet() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		final Integer e0 = 7, e2 = 1, e4 = 2;
 		array.set(0, e0);
 		array.set(2, e2);
@@ -275,7 +275,7 @@ public void testSet() {
 	@Test
 	public void testAdd() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		final Integer e6 = 1, e7 = 2;
 		array.add(e6);
 		array.add(e7);
@@ -291,7 +291,7 @@ public void testAdd() {
 	@Test
 	public void testIndexOfBoxed() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertEquals("@" + i, i, array.indexOf(new Integer(raw[i])));
 		}
@@ -308,7 +308,7 @@ public void testIndexOfBoxed() {
 	@Test
 	public void testLastIndexOfBoxed() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertEquals("@" + i, i, array.lastIndexOf(new Integer(raw[i])));
 		}
@@ -325,7 +325,7 @@ public void testLastIndexOfBoxed() {
 	@Test
 	public void testContainsBoxed() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		for (int i = 0; i < raw.length; i++) {
 			assertTrue("@" + i, array.contains(new Integer(raw[i])));
 		}
@@ -342,7 +342,7 @@ public void testContainsBoxed() {
 	@Test
 	public void testRemove() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		assertEquals(raw.length, array.size());
 		array.remove(new Integer(raw[0]));
 		assertEquals(raw.length - 1, array.size());
@@ -358,9 +358,9 @@ public void testRemove() {
 	@Test
 	public void testContainsAll() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 
-		final ArrayList<Integer> list = new ArrayList<Integer>();
+		final ArrayList<Integer> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add(13);
 		assertTrue(array.containsAll(list));
@@ -368,11 +368,11 @@ public void testContainsAll() {
 		assertFalse(array.containsAll(list));
 
 		final ObjectArray<Integer> yes =
-			new ObjectArray<Integer>(new Integer[] { 3, 8, 21 });
+			new ObjectArray<>(new Integer[] { 3, 8, 21 });
 		assertTrue(array.containsAll(yes));
 
 		final ObjectArray<Integer> no =
-			new ObjectArray<Integer>(new Integer[] { 5, 13, 1 });
+			new ObjectArray<>(new Integer[] { 5, 13, 1 });
 		assertFalse(array.containsAll(no));
 	}
 
@@ -380,9 +380,9 @@ public void testContainsAll() {
 	@Test
 	public void testAddAll() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		final Integer[] add = { 1, 7 };
-		final ObjectArray<Integer> toAdd = new ObjectArray<Integer>(add.clone());
+		final ObjectArray<Integer> toAdd = new ObjectArray<>(add.clone());
 		final int index = 3;
 		array.addAll(index, toAdd);
 		for (int i = 0; i < index; i++) {
@@ -400,9 +400,9 @@ public void testAddAll() {
 	@Test
 	public void testRemoveAll() {
 		final Integer[] raw = { 3, 5, 8, 13, 21 };
-		final ObjectArray<Integer> array = new ObjectArray<Integer>(raw.clone());
+		final ObjectArray<Integer> array = new ObjectArray<>(raw.clone());
 		final ObjectArray<Integer> toRemove =
-			new ObjectArray<Integer>(new Integer[] { 3, 8, 21 });
+			new ObjectArray<>(new Integer[] { 3, 8, 21 });
 		assertEquals(raw.length, array.size());
 		array.removeAll(toRemove);
 		assertEquals(raw.length - 3, array.size());
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index a24e9e90b..26ed7c378 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -358,7 +358,7 @@ public void testContainsAll() {
 		final short[] raw = { 3, 5, 8, 13, 21 };
 		final ShortArray array = new ShortArray(raw.clone());
 
-		final ArrayList<Short> list = new ArrayList<Short>();
+		final ArrayList<Short> list = new ArrayList<>();
 		assertTrue(array.containsAll(list));
 		list.add((short) 13);
 		assertTrue(array.containsAll(list));

From 250cb8ff0f441923b4e0a21ac2b23a01ecbce072 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 16:21:44 -0400
Subject: [PATCH 0229/1208] AbstractDataHandle: use accessor instead of field

---
 src/main/java/org/scijava/io/AbstractDataHandle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/AbstractDataHandle.java b/src/main/java/org/scijava/io/AbstractDataHandle.java
index ec1977163..1c12135a2 100644
--- a/src/main/java/org/scijava/io/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/AbstractDataHandle.java
@@ -148,7 +148,7 @@ public String readString(int n) throws IOException {
 		if (n > avail) n = (int) avail;
 		final byte[] b = new byte[n];
 		readFully(b);
-		return new String(b, encoding);
+		return new String(b, getEncoding());
 	}
 
 	@Override

From cb147308801b1f253d9436c530865bc452b1a8f5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 16:29:39 -0400
Subject: [PATCH 0230/1208] DataHandle: move default methods into interface

---
 .../org/scijava/io/AbstractDataHandle.java    | 201 ------------------
 src/main/java/org/scijava/io/DataHandle.java  | 181 ++++++++++++++--
 2 files changed, 164 insertions(+), 218 deletions(-)

diff --git a/src/main/java/org/scijava/io/AbstractDataHandle.java b/src/main/java/org/scijava/io/AbstractDataHandle.java
index 1c12135a2..f6d02f82a 100644
--- a/src/main/java/org/scijava/io/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/AbstractDataHandle.java
@@ -31,9 +31,6 @@
 
 package org.scijava.io;
 
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import org.scijava.plugin.AbstractWrapperPlugin;
@@ -47,14 +44,6 @@ public abstract class AbstractDataHandle<L extends Location> extends
 	AbstractWrapperPlugin<L> implements DataHandle<L>
 {
 
-	// -- Constants --
-
-	/** Block size to use when searching through the stream. */
-	private static final int DEFAULT_BLOCK_SIZE = 256 * 1024; // 256 KB
-
-	/** Maximum number of bytes to search when searching through the stream. */
-	private static final int MAX_SEARCH_SIZE = 512 * 1024 * 1024; // 512 MB
-
 	// -- Fields --
 
 	private ByteOrder order = ByteOrder.BIG_ENDIAN;
@@ -67,21 +56,11 @@ public ByteOrder getOrder() {
 		return order;
 	}
 
-	@Override
-	public boolean isLittleEndian() {
-		return getOrder() == ByteOrder.LITTLE_ENDIAN;
-	}
-
 	@Override
 	public void setOrder(final ByteOrder order) {
 		this.order = order;
 	}
 
-	@Override
-	public void setOrder(final boolean little) {
-		setOrder(little ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
-	}
-
 	@Override
 	public String getEncoding() {
 		return encoding;
@@ -92,184 +71,4 @@ public void setEncoding(final String encoding) {
 		this.encoding = encoding;
 	}
 
-	@Override
-	public int read(final ByteBuffer buf) throws IOException {
-		return read(buf, buf.remaining());
-	}
-
-	@Override
-	public int read(final ByteBuffer buf, final int len)
-		throws IOException
-	{
-		final int n;
-		if (buf.hasArray()) {
-			// read directly into the array
-			n = read(buf.array(), buf.arrayOffset(), len);
-		}
-		else {
-			// read into a temporary array, then copy
-			final byte[] b = new byte[len];
-			n = read(b);
-			buf.put(b, 0, n);
-		}
-		return n;
-	}
-
-	@Override
-	public void write(final ByteBuffer buf) throws IOException {
-		write(buf, buf.remaining());
-	}
-
-	@Override
-	public void write(final ByteBuffer buf, final int len)
-		throws IOException
-	{
-		if (buf.hasArray()) {
-			// write directly from the buffer's array
-			write(buf.array(), buf.arrayOffset(), len);
-		}
-		else {
-			// copy into a temporary array, then write
-			final byte[] b = new byte[len];
-			buf.get(b);
-			write(b);
-		}
-	}
-
-	@Override
-	public String readCString() throws IOException {
-		final String line = findString("\0");
-		return line.length() == 0 ? null : line;
-	}
-
-	@Override
-	public String readString(int n) throws IOException {
-		final long avail = length() - offset();
-		if (n > avail) n = (int) avail;
-		final byte[] b = new byte[n];
-		readFully(b);
-		return new String(b, getEncoding());
-	}
-
-	@Override
-	public String readString(final String lastChars) throws IOException {
-		if (lastChars.length() == 1) return findString(lastChars);
-		final String[] terminators = new String[lastChars.length()];
-		for (int i = 0; i < terminators.length; i++) {
-			terminators[i] = lastChars.substring(i, i + 1);
-		}
-		return findString(terminators);
-	}
-
-	@Override
-	public String findString(final String... terminators) throws IOException {
-		return findString(true, DEFAULT_BLOCK_SIZE, terminators);
-	}
-
-	@Override
-	public String findString(final boolean saveString,
-		final String... terminators) throws IOException
-	{
-		return findString(saveString, DEFAULT_BLOCK_SIZE, terminators);
-	}
-
-	@Override
-	public String findString(final int blockSize, final String... terminators)
-		throws IOException
-	{
-		return findString(true, blockSize, terminators);
-	}
-
-	@Override
-	public String findString(final boolean saveString, final int blockSize,
-		final String... terminators) throws IOException
-	{
-		final StringBuilder out = new StringBuilder();
-		final long startPos = offset();
-		long bytesDropped = 0;
-		final long inputLen = length();
-		long maxLen = inputLen - startPos;
-		final boolean tooLong = saveString && maxLen > MAX_SEARCH_SIZE;
-		if (tooLong) maxLen = MAX_SEARCH_SIZE;
-		boolean match = false;
-		int maxTermLen = 0;
-		for (final String term : terminators) {
-			final int len = term.length();
-			if (len > maxTermLen) maxTermLen = len;
-		}
-
-		@SuppressWarnings("resource")
-		final InputStreamReader in =
-			new InputStreamReader(new DataHandleInputStream<>(this), getEncoding());
-		final char[] buf = new char[blockSize];
-		long loc = 0;
-		while (loc < maxLen && offset() < length() - 1) {
-			// if we're not saving the string, drop any old, unnecessary output
-			if (!saveString) {
-				final int outLen = out.length();
-				if (outLen >= maxTermLen) {
-					final int dropIndex = outLen - maxTermLen + 1;
-					final String last = out.substring(dropIndex, outLen);
-					out.setLength(0);
-					out.append(last);
-					bytesDropped += dropIndex;
-				}
-			}
-
-			// read block from stream
-			final int r = in.read(buf, 0, blockSize);
-			if (r <= 0) throw new IOException("Cannot read from stream: " + r);
-
-			// append block to output
-			out.append(buf, 0, r);
-
-			// check output, returning smallest possible string
-			int min = Integer.MAX_VALUE, tagLen = 0;
-			for (final String t : terminators) {
-				final int len = t.length();
-				final int start = (int) (loc - bytesDropped - len);
-				final int value = out.indexOf(t, start < 0 ? 0 : start);
-				if (value >= 0 && value < min) {
-					match = true;
-					min = value;
-					tagLen = len;
-				}
-			}
-
-			if (match) {
-				// reset stream to proper location
-				seek(startPos + bytesDropped + min + tagLen);
-
-				// trim output string
-				if (saveString) {
-					out.setLength(min + tagLen);
-					return out.toString();
-				}
-				return null;
-			}
-
-			loc += r;
-		}
-
-		// no match
-		if (tooLong) throw new IOException("Maximum search length reached.");
-		return saveString ? out.toString() : null;
-	}
-
-	// -- InputStream look-alikes --
-
-	@Override
-	public int read(byte[] b) throws IOException {
-		return read(b, 0, b.length);
-	}
-
-	@Override
-	public long skip(final long n) throws IOException {
-		if (n < 0) return 0;
-		final long remain = length() - offset();
-		final long num = n < remain ? n : remain;
-		seek(offset() + num);
-		return num;
-	}
-
 }
diff --git a/src/main/java/org/scijava/io/DataHandle.java b/src/main/java/org/scijava/io/DataHandle.java
index d70be75dd..ea6417fa1 100644
--- a/src/main/java/org/scijava/io/DataHandle.java
+++ b/src/main/java/org/scijava/io/DataHandle.java
@@ -35,6 +35,7 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
@@ -52,6 +53,12 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	DataInput, DataOutput, Closeable
 {
 
+	/** Default block size to use when searching through the stream. */
+	int DEFAULT_BLOCK_SIZE = 256 * 1024; // 256 KB
+
+	/** Default bound on bytes to search when searching through the stream. */
+	int MAX_SEARCH_SIZE = 512 * 1024 * 1024; // 512 MB
+
 	/** Returns the current offset in the stream. */
 	long offset() throws IOException;
 
@@ -66,7 +73,9 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	ByteOrder getOrder();
 
 	/** Gets the endianness of the stream. */
-	boolean isLittleEndian();
+	default boolean isLittleEndian() {
+		return getOrder() == ByteOrder.LITTLE_ENDIAN;
+	}
 
 	/**
 	 * Sets the byte order of the stream.
@@ -76,7 +85,9 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	void setOrder(ByteOrder order);
 
 	/** Sets the endianness of the stream. */
-	void setOrder(final boolean little);
+	default void setOrder(final boolean little) {
+		setOrder(little ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
+	}
 
 	/** Gets the native encoding of the stream. */
 	String getEncoding();
@@ -88,7 +99,9 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 * Reads up to {@code buf.remaining()} bytes of data from the stream into a
 	 * {@link ByteBuffer}.
 	 */
-	int read(ByteBuffer buf) throws IOException;
+	default int read(final ByteBuffer buf) throws IOException {
+		return read(buf, buf.remaining());
+	}
 
 	/**
 	 * Reads up to {@code len} bytes of data from the stream into a
@@ -96,7 +109,20 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 * 
 	 * @return the total number of bytes read into the buffer.
 	 */
-	int read(ByteBuffer buf, int len) throws IOException;
+	default int read(final ByteBuffer buf, final int len) throws IOException {
+		final int n;
+		if (buf.hasArray()) {
+			// read directly into the array
+			n = read(buf.array(), buf.arrayOffset(), len);
+		}
+		else {
+			// read into a temporary array, then copy
+			final byte[] b = new byte[len];
+			n = read(b);
+			buf.put(b, 0, n);
+		}
+		return n;
+	}
 
 	/**
 	 * Sets the stream pointer offset, measured from the beginning of the stream,
@@ -108,25 +134,57 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 * Writes up to {@code buf.remaining()} bytes of data from the given
 	 * {@link ByteBuffer} to the stream.
 	 */
-	void write(ByteBuffer buf) throws IOException;
+	default void write(final ByteBuffer buf) throws IOException {
+		write(buf, buf.remaining());
+	}
 
 	/**
 	 * Writes up to len bytes of data from the given ByteBuffer to the stream.
 	 */
-	void write(ByteBuffer buf, int len) throws IOException;
+	default void write(final ByteBuffer buf, final int len)
+		throws IOException
+	{
+		if (buf.hasArray()) {
+			// write directly from the buffer's array
+			write(buf.array(), buf.arrayOffset(), len);
+		}
+		else {
+			// copy into a temporary array, then write
+			final byte[] b = new byte[len];
+			buf.get(b);
+			write(b);
+		}
+	}
+
 
 	/** Reads a string of arbitrary length, terminated by a null char. */
-	String readCString() throws IOException;
+	default String readCString() throws IOException {
+		final String line = findString("\0");
+		return line.length() == 0 ? null : line;
+	}
 
 	/** Reads a string of up to length n. */
-	String readString(int n) throws IOException;
+	default String readString(int n) throws IOException {
+		final long avail = length() - offset();
+		if (n > avail) n = (int) avail;
+		final byte[] b = new byte[n];
+		readFully(b);
+		return new String(b, getEncoding());
+	}
 
 	/**
 	 * Reads a string ending with one of the characters in the given string.
 	 * 
 	 * @see #findString(String...)
 	 */
-	String readString(String lastChars) throws IOException;
+	default String readString(final String lastChars) throws IOException {
+		if (lastChars.length() == 1) return findString(lastChars);
+		final String[] terminators = new String[lastChars.length()];
+		for (int i = 0; i < terminators.length; i++) {
+			terminators[i] = lastChars.substring(i, i + 1);
+		}
+		return findString(terminators);
+	}
 
 	/**
 	 * Reads a string ending with one of the given terminating substrings.
@@ -136,7 +194,9 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 *         terminating sequence, or through the end of the stream if no
 	 *         terminating sequence is found.
 	 */
-	String findString(String... terminators) throws IOException;
+	default String findString(final String... terminators) throws IOException {
+		return findString(true, DEFAULT_BLOCK_SIZE, terminators);
+	}
 
 	/**
 	 * Reads or skips a string ending with one of the given terminating
@@ -152,8 +212,11 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 *         terminating sequence, or through the end of the stream if no
 	 *         terminating sequence is found, or null if saveString flag is unset.
 	 */
-	String findString(boolean saveString, String... terminators)
-		throws IOException;
+	default String findString(final boolean saveString,
+		final String... terminators) throws IOException
+	{
+		return findString(saveString, DEFAULT_BLOCK_SIZE, terminators);
+	}
 
 	/**
 	 * Reads a string ending with one of the given terminating substrings, using
@@ -165,7 +228,11 @@ String findString(boolean saveString, String... terminators)
 	 *         terminating sequence, or through the end of the stream if no
 	 *         terminating sequence is found.
 	 */
-	String findString(int blockSize, String... terminators) throws IOException;
+	default String findString(final int blockSize, final String... terminators)
+		throws IOException
+	{
+		return findString(true, blockSize, terminators);
+	}
 
 	/**
 	 * Reads or skips a string ending with one of the given terminating
@@ -182,8 +249,80 @@ String findString(boolean saveString, String... terminators)
 	 *         terminating sequence, or through the end of the stream if no
 	 *         terminating sequence is found, or null if saveString flag is unset.
 	 */
-	String findString(boolean saveString, int blockSize, String... terminators)
-		throws IOException;
+	default String findString(final boolean saveString, final int blockSize,
+		final String... terminators) throws IOException
+	{
+		final StringBuilder out = new StringBuilder();
+		final long startPos = offset();
+		long bytesDropped = 0;
+		final long inputLen = length();
+		long maxLen = inputLen - startPos;
+		final boolean tooLong = saveString && maxLen > MAX_SEARCH_SIZE;
+		if (tooLong) maxLen = MAX_SEARCH_SIZE;
+		boolean match = false;
+		int maxTermLen = 0;
+		for (final String term : terminators) {
+			final int len = term.length();
+			if (len > maxTermLen) maxTermLen = len;
+		}
+
+		@SuppressWarnings("resource")
+		final InputStreamReader in =
+			new InputStreamReader(new DataHandleInputStream<>(this), getEncoding());
+		final char[] buf = new char[blockSize];
+		long loc = 0;
+		while (loc < maxLen && offset() < length() - 1) {
+			// if we're not saving the string, drop any old, unnecessary output
+			if (!saveString) {
+				final int outLen = out.length();
+				if (outLen >= maxTermLen) {
+					final int dropIndex = outLen - maxTermLen + 1;
+					final String last = out.substring(dropIndex, outLen);
+					out.setLength(0);
+					out.append(last);
+					bytesDropped += dropIndex;
+				}
+			}
+
+			// read block from stream
+			final int r = in.read(buf, 0, blockSize);
+			if (r <= 0) throw new IOException("Cannot read from stream: " + r);
+
+			// append block to output
+			out.append(buf, 0, r);
+
+			// check output, returning smallest possible string
+			int min = Integer.MAX_VALUE, tagLen = 0;
+			for (final String t : terminators) {
+				final int len = t.length();
+				final int start = (int) (loc - bytesDropped - len);
+				final int value = out.indexOf(t, start < 0 ? 0 : start);
+				if (value >= 0 && value < min) {
+					match = true;
+					min = value;
+					tagLen = len;
+				}
+			}
+
+			if (match) {
+				// reset stream to proper location
+				seek(startPos + bytesDropped + min + tagLen);
+
+				// trim output string
+				if (saveString) {
+					out.setLength(min + tagLen);
+					return out.toString();
+				}
+				return null;
+			}
+
+			loc += r;
+		}
+
+		// no match
+		if (tooLong) throw new IOException("Maximum search length reached.");
+		return saveString ? out.toString() : null;
+	}
 
 	// -- InputStream look-alikes --
 
@@ -200,7 +339,9 @@ String findString(boolean saveString, int blockSize, String... terminators)
 	 * 
 	 * @return the total number of bytes read into the buffer.
 	 */
-	int read(byte[] b) throws IOException;
+	default int read(byte[] b) throws IOException {
+		return read(b, 0, b.length);
+	}
 
 	/**
 	 * Reads up to len bytes of data from the stream into an array of bytes.
@@ -221,6 +362,12 @@ String findString(boolean saveString, int blockSize, String... terminators)
 	 * @return the actual number of bytes skipped.
 	 * @throws IOException - if an I/O error occurs.
 	 */
-	long skip(long n) throws IOException;
+	default long skip(final long n) throws IOException {
+		if (n < 0) return 0;
+		final long remain = length() - offset();
+		final long num = n < remain ? n : remain;
+		seek(offset() + num);
+		return num;
+	}
 
 }

From b52332e0c5f1103567f98fbd161ef0e5ec744042 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 16:30:39 -0400
Subject: [PATCH 0231/1208] Location: move default methods into interface

---
 src/main/java/org/scijava/io/AbstractLocation.java | 11 +----------
 src/main/java/org/scijava/io/Location.java         |  4 +++-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/io/AbstractLocation.java b/src/main/java/org/scijava/io/AbstractLocation.java
index fe40a36d8..046b3c569 100644
--- a/src/main/java/org/scijava/io/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/AbstractLocation.java
@@ -31,20 +31,11 @@
 
 package org.scijava.io;
 
-import java.net.URI;
-
 /**
  * Abstract base class for {@link Location} implementations.
  * 
  * @author Curtis Rueden
  */
 public abstract class AbstractLocation implements Location {
-
-	// -- Location methods --
-
-	@Override
-	public URI getURI() {
-		return null;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/io/Location.java b/src/main/java/org/scijava/io/Location.java
index a02abbf25..a2e509fcc 100644
--- a/src/main/java/org/scijava/io/Location.java
+++ b/src/main/java/org/scijava/io/Location.java
@@ -53,6 +53,8 @@ public interface Location {
 	 * Gets the location expressed as a {@link URI}, or null if the location
 	 * cannot be expressed as such.
 	 */
-	URI getURI();
+	default URI getURI() {
+		return null;
+	}
 
 }

From eaa0eb4d96ce33fb15ddc63a217f3a47cfd1bdc4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Jun 2016 16:34:27 -0400
Subject: [PATCH 0232/1208] DataHandleTest: use try-with-resources

---
 src/test/java/org/scijava/io/DataHandleTest.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/scijava/io/DataHandleTest.java b/src/test/java/org/scijava/io/DataHandleTest.java
index a9d0db06b..d496a665b 100644
--- a/src/test/java/org/scijava/io/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/DataHandleTest.java
@@ -64,12 +64,14 @@ public void testDataHandle() throws IOException {
 			context.service(DataHandleService.class);
 
 		final Location loc = createLocation();
-		final DataHandle<? extends Location> handle = dataHandleService.create(loc);
-		assertEquals(getExpectedHandleType(), handle.getClass());
+		try (final DataHandle<? extends Location> handle = //
+			dataHandleService.create(loc))
+		{
+			assertEquals(getExpectedHandleType(), handle.getClass());
 
-		checkReads(handle);
-		checkWrites(handle);
-		handle.close();
+			checkReads(handle);
+			checkWrites(handle);
+		}
 	}
 
 	// -- DataHandleTest methods --

From a7f49c6793b3e345873d61c05d6ca411c9b6d70e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 15:59:44 -0500
Subject: [PATCH 0233/1208] ScriptInfo: do not mix datestamp into the version

At the time I wrote that code, I was mainly concerned with ensuring that
generated version strings do not clash. However, there are compelling
reasons to avoid "false negatives" as well (two scripts which are
actually the same, but end up with differing version strings).

When mixing in the datestamp with the hash, a false negative will happen
if the script's last modified date is not preserved when copied between
systems. This makes data provenance more difficult, because two systems
may have identical installations content-wise, but different version
strings due to timestamp skew.

So, let's keep it simpler: use the content hash if available (i.e.:
if the script contents can be read), and the datestamp only if not.
---
 src/main/java/org/scijava/script/ScriptInfo.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 7f68d3aa2..6d4657be6 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -322,16 +322,15 @@ public String getLocation() {
 	public String getVersion() {
 		final File file = new File(path);
 		if (!file.exists()) return null; // no version for non-existent script
-		final Date lastModified = FileUtils.getModifiedTime(file);
-		final String datestamp =
-			new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss").format(lastModified);
 		try {
-			final String hash = DigestUtils.bestHex(FileUtils.readFile(file));
-			return datestamp + "-" + hash;
+			return DigestUtils.bestHex(FileUtils.readFile(file));
 		}
 		catch (final IOException exc) {
 			log.error(exc);
 		}
+		final Date lastModified = FileUtils.getModifiedTime(file);
+		final String datestamp =
+			new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss").format(lastModified);
 		return datestamp;
 	}
 

From 43407c19200dcce584adcd7c73a878d168370c3d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 16:11:04 -0500
Subject: [PATCH 0234/1208] Manifest: implement the Versioned interface

This migrates the version determination logic from VersionUtils
into the org.scijava.util.Manifest class directly.
And updates VersionUtils to lean on it.
---
 src/main/java/org/scijava/util/Manifest.java  | 24 ++++++++++++++++++-
 .../java/org/scijava/util/VersionUtils.java   | 21 ++--------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 3fffeb861..8d40cc80c 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -40,12 +40,14 @@
 import java.util.Map;
 import java.util.jar.Attributes;
 
+import org.scijava.Versioned;
+
 /**
  * Helper class for working with JAR manifests.
  * 
  * @author Curtis Rueden
  */
-public class Manifest {
+public class Manifest implements Versioned {
 
 	/** The JAR manifest backing this object. */
 	private final java.util.jar.Manifest manifest;
@@ -165,4 +167,24 @@ private static Manifest getManifest(final URL jarURL) throws IOException {
 		return new Manifest(conn.getManifest());
 	}
 
+	// -- Versioned methods --
+
+	@Override
+	public String getVersion() {
+		final String v = getBaseVersion();
+		if (v == null || !v.endsWith("-SNAPSHOT")) return v;
+
+		// append commit hash to differentiate between development versions
+		final String buildNumber = getImplementationBuild();
+		return buildNumber == null ? v : v + "-" + buildNumber;
+	}
+
+	// -- Helper methods --
+
+	private String getBaseVersion() {
+		final String manifestVersion = getImplementationVersion();
+		if (manifestVersion != null) return manifestVersion;
+		return getSpecificationVersion();
+	}
+
 }
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index b78201336..4e1fe115f 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -80,13 +80,7 @@ public static String getVersion(final Class<?> c, final String groupId,
 	 */
 	public static String getVersionFromManifest(final Class<?> c) {
 		final Manifest m = Manifest.getManifest(c);
-		if (m == null) return null;
-		final String version = getVersionFromManifest(m);
-		if (version == null || !version.endsWith("-SNAPSHOT")) return version;
-
-		// append commit hash to differentiate between development versions
-		final String buildNumber = getBuildNumber(m);
-		return buildNumber == null ? version : version + "-" + buildNumber;
+		return m == null ? null : m.getVersion();
 	}
 
 	/**
@@ -115,18 +109,7 @@ public static String getVersionFromPOM(final Class<?> c,
 	 * @return Build number of specified {@link Class} or null if not found.
 	 */
 	public static String getBuildNumber(final Class<?> c) {
-		return getBuildNumber(Manifest.getManifest(c));
-	}
-
-	// -- Helper methods --
-
-	private static String getVersionFromManifest(final Manifest m) {
-		final String manifestVersion = m.getImplementationVersion();
-		if (manifestVersion != null) return manifestVersion;
-		return m.getSpecificationVersion();
-	}
-
-	private static String getBuildNumber(final Manifest m) {
+		final Manifest m = Manifest.getManifest(c);
 		return m == null ? null : m.getImplementationBuild();
 	}
 

From f60925d7e0cb1cc2823faa640f2f3357cd5287c0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 16:33:21 -0500
Subject: [PATCH 0235/1208] AbstractApp: improve version detection

Let's use the manifest if available, since it might have the build
number. This also adds an explanation for why we don't use
VersionUtils.getVersion here.
---
 .../java/org/scijava/app/AbstractApp.java     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index ff26c35dc..4e40d3604 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -63,7 +63,24 @@ public String getTitle() {
 
 	@Override
 	public String getVersion() {
-		return getPOM() == null ? "Unknown" : getPOM().getVersion();
+		// NB: We do not use VersionUtils.getVersion(c, groupId, artifactId)
+		// because that method does not cache the parsed Manifest and/or POM.
+		// We might have them already parsed here, and if not, we want to
+		// parse then cache locally, rather than discarding them afterwards.
+
+		// try the manifest first, since it might know its build number
+		final Manifest m = getManifest();
+		if (m != null) {
+			final String v = m.getVersion();
+			if (v != null) return v;
+		}
+		// try the POM
+		final POM p = getPOM();
+		if (p != null) {
+			final String v = p.getVersion();
+			if (v != null) return v;
+		}
+		return "Unknown";
 	}
 
 	@Override

From ba4a4f782e35098058ebef11503379a9c724b1c0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 9 Jun 2016 16:56:48 -0500
Subject: [PATCH 0236/1208] POM: goodbye Mark!

---
 pom.xml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9414cc57e..5830f4e85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,21 +38,14 @@
 				<role>maintainer</role>
 			</roles>
 		</developer>
-		<developer>
-			<id>hinerm</id>
-			<name>Mark Hiner</name>
-			<url>http://imagej.net/User:Hinerm</url>
-			<roles>
-				<role>lead</role>
-				<role>developer</role>
-				<role>debugger</role>
-				<role>reviewer</role>
-				<role>support</role>
-				<role>maintainer</role>
-			</roles>
-		</developer>
 	</developers>
 	<contributors>
+		<contributor>
+			<name>Mark Hiner</name>
+			<url>http://imagej.net/User:Hinerm</url>
+			<roles><role>founder</role></roles>
+			<properties><id>hinerm</id></properties>
+		</contributor>
 		<contributor>
 			<name>Johannes Schindelin</name>
 			<url>http://imagej.net/User:Schindelin</url>

From d2791e03b618982c10e21cbc0bf7b46be2438206 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 22:27:23 -0500
Subject: [PATCH 0237/1208] POMTest: the bus factor is now 1 :'-(

---
 src/test/java/org/scijava/util/POMTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index e8ad4071c..9964478e4 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -137,9 +137,8 @@ public void testElements() throws ParserConfigurationException,
 		final POM pom = new POM(new File("pom.xml"));
 		final ArrayList<Element> developers =
 			pom.elements("//project/developers/developer");
-		assertEquals(2, developers.size());
+		assertEquals(1, developers.size());
 		assertEquals("ctrueden", XML.cdata(developers.get(0), "id"));
-		assertEquals("hinerm", XML.cdata(developers.get(1), "id"));
 	}
 
 }

From 16b68aff659fccb176485497d6180b5078606994 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 22:28:39 -0500
Subject: [PATCH 0238/1208] ScriptInfoTest: adjust for new version strings

The behavior changed with a7f49c6793b3e345873d61c05d6ca411c9b6d70e.
We no longer prepend the datestamp. This changes the test accordingly.
---
 src/test/java/org/scijava/script/ScriptInfoTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 664ea358c..53f9ed659 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -122,9 +122,8 @@ public void testVersion() throws IOException {
 		// verify that the version is correct
 		final ScriptInfo info = new ScriptInfo(context, scriptFile);
 		final String version = info.getVersion();
-		final String timestampPattern = "\\d{4}-\\d{2}-\\d{2}-\\d{2}:\\d{2}:\\d{2}";
 		final String sha1 = "28f4a2880d604774ac5d604d35f431047a087c9e";
-		assertTrue(version.matches("^" + timestampPattern + "-" + sha1 + "$"));
+		assertTrue(version.matches("^" + sha1 + "$"));
 
 		// clean up the temporary directory
 		FileUtils.deleteRecursively(tmpDir);

From d389ff0a40f487822ebe0ac5a2d448bc6a719921 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 May 2016 05:59:15 -0500
Subject: [PATCH 0239/1208] ScriptService: generalize the javadoc

The service is for working with scripts in general,
not only the ScriptLanguage plugins.
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 2 +-
 src/main/java/org/scijava/script/ScriptService.java        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index fcc9ed717..a21759de4 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -72,7 +72,7 @@
 import org.scijava.util.ColorRGBA;
 
 /**
- * Default service for working with scripting languages.
+ * Default service for working with scripts.
  * 
  * @author Johannes Schindelin
  * @author Curtis Rueden
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index dfdb08115..d90945551 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -49,9 +49,8 @@
 import org.scijava.service.SciJavaService;
 
 /**
- * Interface for service that works with scripting languages. This service
- * discovers available scripting languages, and provides convenience methods to
- * interact with them.
+ * Interface for service that works with scripts. This service discovers
+ * available scripts, and provides convenience methods to interact with them.
  * 
  * @author Johannes Schindelin
  */

From 179de87ec761c127e0797dfbb60b74efafb63353 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 May 2016 07:40:13 -0500
Subject: [PATCH 0240/1208] FileUtils: add findResources methods

They will be useful for finding scripts inside JARs on the classpath.

These methods were migrated from imagej-ui-swing; see:
https://github.com/imagej/imagej-ui-swing/blob/imagej-ui-swing-0.18.0/src/main/java/net/imagej/ui/swing/script/FileFunctions.java
---
 src/main/java/org/scijava/util/FileUtils.java | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index bd2d16910..16b6a0916 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -48,7 +48,10 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
@@ -607,6 +610,82 @@ else if (protocol.equals("jar")) {
 		return result;
 	}
 
+	/**
+	 * Finds {@link URL}s of available resources. Both JAR files and files on disk
+	 * are searched, according to the following mechanism:
+	 * <ol>
+	 * <li>Resources at the given {@code pathPrefix} are discovered using
+	 * {@link ClassLoader#getResources(String)} with the current thread's context
+	 * class loader. In particular, this invocation discovers resources in JAR
+	 * files beneath the given {@code pathPrefix}.</li>
+	 * <li>The directory named {@code pathPrefix} beneath the given
+	 * {@code baseDirectory} is scanned last, so that users can more easily
+	 * override resources provided inside JAR files by placing a resource of the
+	 * same name within that directory.</li>
+	 * </ol>
+	 * <p>
+	 * In both cases, resources are then recursively scanned using
+	 * {@link #listContents(URL)}, and anything matching the given {@code regex}
+	 * pattern is added to the output map.
+	 * </p>
+	 *
+	 * @param regex The regex to use when matching resources, or null to match
+	 *          everything.
+	 * @param pathPrefix The path to search for resources.
+	 * @param baseDirectory The {@code baseDirectory/pathPrefix} directory to scan
+	 *          <em>after</em> the URL resources.
+	 * @return A map of URLs referencing the matched resources.
+	 * @see AppUtils#getBaseDirectory
+	 */
+	public static Map<String, URL> findResources(final String regex,
+		final String pathPrefix, final File baseDirectory)
+	{
+		// scan URL resource paths first
+		final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+		final ArrayList<URL> urls = new ArrayList<>();
+		try {
+			urls.addAll(Collections.list(loader.getResources(pathPrefix + "/")));
+		}
+		catch (final IOException exc) {
+			// error loading resources; proceed with an empty list
+		}
+
+		// scan directory second; user can thus override resources from JARs
+		if (baseDirectory != null) {
+			try {
+				urls.add(new File(baseDirectory, pathPrefix).toURI().toURL());
+			}
+			catch (final MalformedURLException exc) {
+				// error adding directory; proceed without it
+			}
+		}
+
+		return findResources(regex, urls);
+	}
+
+	/**
+	 * Finds {@link URL}s of resources known to ImageJ.
+	 * <p>
+	 * Each of the given {@link URL}s is recursively scanned using
+	 * {@link #listContents(URL)}, and anything matching the given {@code regex}
+	 * pattern is added to the output map.</li>
+	 *
+	 * @param regex The regex to use when matching resources, or null to match
+	 *          everything.
+	 * @param urls Paths to search for resources.
+	 * @return A map of URLs referencing the matched resources.
+	 */
+	public static Map<String, URL> findResources(final String regex,
+		final Iterable<URL> urls)
+	{
+		final HashMap<String, URL> result = new HashMap<>();
+		final Pattern pattern = regex == null ? null : Pattern.compile(regex);
+		for (final URL url : urls) {
+			getResources(pattern, result, url);
+		}
+		return result;
+	}
+
 	// -- Helper methods --
 
 	/** Builds the {@link #VERSION_PATTERN} constant. */
@@ -639,6 +718,45 @@ private static String classifiers() {
 		return sb.toString();
 	}
 
+	/** Helper method of {@link #findResources(String, Iterable)}. */
+	private static void getResources(final Pattern pattern,
+		final Map<String, URL> result, final URL base)
+	{
+		final String prefix = urlPath(base);
+		if (prefix == null) return; // unsupported base URL
+
+		for (final URL url : FileUtils.listContents(base)) {
+			final String s = urlPath(url);
+			if (s == null || !s.startsWith(prefix)) continue;
+
+			if (pattern == null || pattern.matcher(s).matches()) {
+				// this resource matches the pattern
+				final String key = urlPath(s.substring(prefix.length()));
+				if (key != null) result.put(key, url);
+			}
+		}
+	}
+
+	/** Helper method of {@link #getResources(Pattern, Map, URL)}. */
+	private static String urlPath(final URL url) {
+		try {
+			return url.toURI().toString();
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
+	}
+
+	/** Helper method of {@link #getResources(Pattern, Map, URL)}. */
+	private static String urlPath(final String path) {
+		try {
+			return new URI(path).getPath();
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
+	}
+
 	// -- Deprecated methods --
 
 	/**

From 7540fa6af7555cb540fb34ba68c8737223c8ec14 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 May 2016 09:39:03 -0500
Subject: [PATCH 0241/1208] ScriptService: index scripts by path, not file

If two scripts exist at the same menu path, but exist as separate files
on disk (due to being at two different script directory prefixes), then
one script should override the other.

Furthermore, we will soon be discovering URL-based scripts from
classpath resources, which do not fit the files-on-disk assumption.
---
 .../scijava/script/DefaultScriptService.java  | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index a21759de4..ecb168123 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -32,7 +32,6 @@
 package org.scijava.script;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.math.BigDecimal;
@@ -106,8 +105,8 @@ public class DefaultScriptService extends
 	/** Menu prefix to use for each script directory, if any. */
 	private HashMap<File, MenuPath> menuPrefixes;
 
-	/** Index of available scripts, by script <em>file</em>. */
-	private HashMap<File, ScriptInfo> scripts;
+	/** Index of available scripts, by script path. */
+	private HashMap<String, ScriptInfo> scripts;
 
 	/** Table of short type names to associated {@link Class}. */
 	private HashMap<String, Class<?>> aliasMap;
@@ -330,7 +329,7 @@ private HashMap<File, MenuPath> menuPrefixes() {
 	}
 
 	/** Gets {@link #scripts}, initializing if needed. */
-	private HashMap<File, ScriptInfo> scripts() {
+	private HashMap<String, ScriptInfo> scripts() {
 		if (scripts == null) initScripts();
 		return scripts;
 	}
@@ -386,13 +385,13 @@ private synchronized void initMenuPrefixes() {
 	private synchronized void initScripts() {
 		if (scripts != null) return; // already initialized
 
-		final HashMap<File, ScriptInfo> map = new HashMap<>();
+		final HashMap<String, ScriptInfo> map = new HashMap<>();
 
 		final ArrayList<ScriptInfo> scriptList = new ArrayList<>();
 		new ScriptFinder(this).findScripts(scriptList);
 
 		for (final ScriptInfo info : scriptList) {
-			map.put(asFile(info.getPath()), info);
+			map.put(info.getPath(), info);
 		}
 
 		scripts = map;
@@ -461,17 +460,6 @@ private ScriptInfo getOrCreate(final File file) {
 		return new ScriptInfo(getContext(), file);
 	}
 
-	private File asFile(final String path) {
-		final File file = new File(path);
-		try {
-			return file.getCanonicalFile();
-		}
-		catch (final IOException exc) {
-			log.warn(exc);
-			return file.getAbsoluteFile();
-		}
-	}
-
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private Future<ScriptModule> cast(final Future<Module> future) {
 		return (Future) future;

From c7412b8f65b06727b69d5145842453af792583b8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 May 2016 09:43:38 -0500
Subject: [PATCH 0242/1208] ScriptService: fix the base directory FIXME

We should ask the AppService's primary app for its base directory,
rather than calling a static method.
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index ecb168123..d0adb48ba 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -51,6 +51,7 @@
 import org.scijava.InstantiableException;
 import org.scijava.MenuPath;
 import org.scijava.Priority;
+import org.scijava.app.AppService;
 import org.scijava.command.CommandService;
 import org.scijava.event.EventHandler;
 import org.scijava.log.LogService;
@@ -65,7 +66,6 @@
 import org.scijava.plugin.PluginService;
 import org.scijava.service.Service;
 import org.scijava.service.event.ServicesLoadedEvent;
-import org.scijava.util.AppUtils;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ColorRGB;
 import org.scijava.util.ColorRGBA;
@@ -90,6 +90,9 @@ public class DefaultScriptService extends
 	@Parameter
 	private CommandService commandService;
 
+	@Parameter
+	private AppService appService;
+
 	@Parameter
 	private ParseService parser;
 
@@ -361,7 +364,7 @@ private synchronized void initScriptDirs() {
 		final ArrayList<File> dirs = new ArrayList<>();
 
 		// append default script directories
-		final File baseDir = AppUtils.getBaseDirectory(getClass()); //FIXME
+		final File baseDir = appService.getApp().getBaseDirectory();
 		dirs.add(new File(baseDir, "scripts"));
 
 		// append additional script directories from system property

From 846937a7dcbfa35c4ba83ce3399a08544aef29a1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 May 2016 11:04:48 -0400
Subject: [PATCH 0243/1208] ScriptService: declare "scripts" as a constant

---
 src/main/java/org/scijava/script/DefaultScriptService.java | 2 +-
 src/main/java/org/scijava/script/ScriptService.java        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index d0adb48ba..0a4147187 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -365,7 +365,7 @@ private synchronized void initScriptDirs() {
 
 		// append default script directories
 		final File baseDir = appService.getApp().getBaseDirectory();
-		dirs.add(new File(baseDir, "scripts"));
+		dirs.add(new File(baseDir, SCRIPTS_RESOURCE_DIR));
 
 		// append additional script directories from system property
 		final String scriptsPath = System.getProperty(SCRIPTS_PATH_PROPERTY);
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index d90945551..4e3e9be30 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -53,6 +53,7 @@
  * available scripts, and provides convenience methods to interact with them.
  * 
  * @author Johannes Schindelin
+ * @author Curtis Rueden
  */
 public interface ScriptService extends SingletonService<ScriptLanguage>,
 	SciJavaService
@@ -65,6 +66,12 @@ public interface ScriptService extends SingletonService<ScriptLanguage>,
 	 */
 	String SCRIPTS_PATH_PROPERTY = "scijava.scripts.path";
 
+	/**
+	 * Base directory for discovering scripts, including within classpath
+	 * resources as well as beneath the application base directory.
+	 */
+	String SCRIPTS_RESOURCE_DIR = "scripts";
+
 	// -- Scripting languages --
 
 	/** Gets the index of available scripting languages. */

From 9b7c6bbb0d63e5cc29483727eb88effe76846022 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 May 2016 10:03:09 -0500
Subject: [PATCH 0244/1208] MenuPath: handle null collection more nicely

---
 src/main/java/org/scijava/MenuPath.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 09b1677c7..8b22c74e7 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -56,7 +56,7 @@ public MenuPath() {
 	 * the argument will make a copy.
 	 */
 	public MenuPath(final Collection<? extends MenuEntry> menuEntries) {
-		addAll(menuEntries);
+		if (menuEntries != null) addAll(menuEntries);
 	}
 
 	/**

From f544fc19b0b2edb6a67afbab747e7c21acff94f3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 May 2016 10:03:25 -0500
Subject: [PATCH 0245/1208] MenuPath: support alternative path separators

---
 src/main/java/org/scijava/MenuPath.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 8b22c74e7..ebd245ff6 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -66,8 +66,16 @@ public MenuPath(final Collection<? extends MenuEntry> menuEntries) {
 	 * @see #PATH_SEPARATOR
 	 */
 	public MenuPath(final String path) {
+		this(path, PATH_SEPARATOR);
+	}
+
+	/**
+	 * Creates a menu path with entries parsed from the given string, splitting on
+	 * the specified separator.
+	 */
+	public MenuPath(final String path, final String separator) {
 		if (path != null && !path.isEmpty()) {
-			final String[] tokens = path.split(PATH_SEPARATOR);
+			final String[] tokens = path.split(separator);
 			for (final String token : tokens) {
 				add(new MenuEntry(token.trim()));
 			}

From f94e26d39b46ef1b26e963a2f9feae20a1114fd2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 May 2016 13:03:33 -0500
Subject: [PATCH 0246/1208] ScriptFinder: let the ctor take a Context instead

This is more flexible: if we need to require additional services later,
we will not have to modify the constructor signature again.
---
 .../scijava/script/DefaultScriptService.java    |  2 +-
 .../java/org/scijava/script/ScriptFinder.java   | 17 +++++++++++++----
 .../org/scijava/script/ScriptFinderTest.java    |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 0a4147187..be695cb89 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -391,7 +391,7 @@ private synchronized void initScripts() {
 		final HashMap<String, ScriptInfo> map = new HashMap<>();
 
 		final ArrayList<ScriptInfo> scriptList = new ArrayList<>();
-		new ScriptFinder(this).findScripts(scriptList);
+		new ScriptFinder(context()).findScripts(scriptList);
 
 		for (final ScriptInfo info : scriptList) {
 			map.put(info.getPath(), info);
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 8e75e2ed1..33d7cf7f8 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -38,6 +38,7 @@
 import java.util.Set;
 
 import org.scijava.AbstractContextual;
+import org.scijava.Context;
 import org.scijava.MenuEntry;
 import org.scijava.MenuPath;
 import org.scijava.log.LogService;
@@ -59,14 +60,14 @@ public class ScriptFinder extends AbstractContextual {
 
 	private static final String SCRIPT_ICON = "/icons/script_code.png";
 
-	private final ScriptService scriptService;
+	@Parameter
+	private ScriptService scriptService;
 
 	@Parameter
 	private LogService log;
 
-	public ScriptFinder(final ScriptService scriptService) {
-		this.scriptService = scriptService;
-		setContext(scriptService.getContext());
+	public ScriptFinder(final Context context) {
+		setContext(context);
 	}
 
 	// -- ScriptFinder methods --
@@ -161,4 +162,12 @@ else if (scriptService.canHandleFile(file)) {
 		return info;
 	}
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #ScriptFinder(Context)} instead. */
+	@Deprecated
+	public ScriptFinder(final ScriptService scriptService) {
+		this(scriptService.context());
+	}
+
 }
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index bc8c6f62a..0f52f5a9e 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -192,7 +192,7 @@ private ScriptService createScriptService() {
 	}
 
 	private ArrayList<ScriptInfo> findScripts(final ScriptService scriptService) {
-		final ScriptFinder scriptFinder = new ScriptFinder(scriptService);
+		final ScriptFinder scriptFinder = new ScriptFinder(scriptService.context());
 		final ArrayList<ScriptInfo> scripts = new ArrayList<>();
 		scriptFinder.findScripts(scripts);
 		Collections.sort(scripts);

From affde428099e773e98098acd751436a805b0539d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 20:47:44 -0500
Subject: [PATCH 0247/1208] FileUtils: remove ImageJ-ism in javadoc

---
 src/main/java/org/scijava/util/FileUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 16b6a0916..c41a4e101 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -664,7 +664,7 @@ public static Map<String, URL> findResources(final String regex,
 	}
 
 	/**
-	 * Finds {@link URL}s of resources known to ImageJ.
+	 * Finds {@link URL}s of resources known to the system.
 	 * <p>
 	 * Each of the given {@link URL}s is recursively scanned using
 	 * {@link #listContents(URL)}, and anything matching the given {@code regex}

From d691f00b9eeb231e54c02d4b127fc61763311aa7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 21:37:20 -0500
Subject: [PATCH 0248/1208] ScriptFinder: add javadoc to the constructor

---
 src/main/java/org/scijava/script/ScriptFinder.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 33d7cf7f8..7c5a6a90d 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -66,6 +66,11 @@ public class ScriptFinder extends AbstractContextual {
 	@Parameter
 	private LogService log;
 
+	/**
+	 * Creates a new script finder.
+	 * 
+	 * @param context The SciJava application context housing needed services.
+	 */
 	public ScriptFinder(final Context context) {
 		setContext(context);
 	}

From ff73f88a96f5d06a8565adfb633c3fe1ce8ef218 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 22:13:30 -0500
Subject: [PATCH 0249/1208] ScriptFinder: add support for scripts inside JARs

This is a near-total rewrite of the script detection logic to use
FileUtils.findResources instead of recursive directory listings.
This change offers (at least) two major advantages:

1. Support for non-file resources, particularly scripts within JARs.
2. Built-in recursive resource scanning, instead of doing it ourselves.

The new logic splits the script detection into two steps: 1) scan
classpath resources beneath a given path prefix (default "scripts");
and 2) scan directories given by ScriptService#getScriptDirectories().
---
 .../java/org/scijava/script/ScriptFinder.java | 166 +++++++++++-------
 1 file changed, 104 insertions(+), 62 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 7c5a6a90d..48d66e6aa 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -32,17 +32,22 @@
 package org.scijava.script;
 
 import java.io.File;
-import java.util.Arrays;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.scijava.AbstractContextual;
 import org.scijava.Context;
-import org.scijava.MenuEntry;
 import org.scijava.MenuPath;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
+import org.scijava.util.FileUtils;
 
 /**
  * Discovers scripts.
@@ -66,13 +71,27 @@ public class ScriptFinder extends AbstractContextual {
 	@Parameter
 	private LogService log;
 
+	private final String pathPrefix;
+
 	/**
 	 * Creates a new script finder.
 	 * 
 	 * @param context The SciJava application context housing needed services.
 	 */
 	public ScriptFinder(final Context context) {
+		this(context, ScriptService.SCRIPTS_RESOURCE_DIR);
+	}
+
+	/**
+	 * Creates a new script finder.
+	 * 
+	 * @param context The SciJava application context housing needed services.
+	 * @param pathPrefix the path prefix beneath which to scan classpath
+	 *          resources, or null to skip classpath scanning.
+	 */
+	public ScriptFinder(final Context context, final String pathPrefix) {
 		setContext(context);
+		this.pathPrefix = pathPrefix;
 	}
 
 	// -- ScriptFinder methods --
@@ -85,19 +104,16 @@ public ScriptFinder(final Context context) {
 	public void findScripts(final List<ScriptInfo> scripts) {
 		final List<File> directories = scriptService.getScriptDirectories();
 
+		final Set<URL> urls = new HashSet<>();
 		int scriptCount = 0;
 
-		final HashSet<File> scriptFiles = new HashSet<>();
-		for (final File directory : directories) {
-			if (!directory.exists()) {
-				log.debug("Ignoring non-existent scripts directory: " +
-					directory.getAbsolutePath());
-				continue;
-			}
-			final MenuPath prefix = scriptService.getMenuPrefix(directory);
-			final MenuPath menuPath = prefix == null ? new MenuPath() : prefix;
-			scriptCount +=
-				discoverScripts(scripts, scriptFiles, directory, menuPath);
+		scriptCount += scanResources(scripts, urls);
+
+		// NB: We use a separate call to findResources for each directory so that
+		// we can distinguish which URLs came from each directory, because each
+		// directory may have a different menu prefix.
+		for (final File dir : directories) {
+			scriptCount += scanDirectory(scripts, urls, dir);
 		}
 
 		log.debug("Found " + scriptCount + " scripts");
@@ -105,66 +121,92 @@ public void findScripts(final List<ScriptInfo> scripts) {
 
 	// -- Helper methods --
 
-	/**
-	 * Looks through a directory, discovering and adding scripts.
-	 * 
-	 * @param scripts The collection to which the discovered scripts are added.
-	 * @param directory The directory in which to look for scripts recursively.
-	 * @param menuPath The menu path, which must not be {@code null}.
-	 */
-	private int discoverScripts(final List<ScriptInfo> scripts,
-		final Set<File> scriptFiles, final File directory, final MenuPath menuPath)
-	{
-		final File[] fileList = directory.listFiles();
-		if (fileList == null) return 0; // directory does not exist
-		Arrays.sort(fileList);
+	/** Scans classpath resources for scripts (e.g., inside JAR files). */
+	private int scanResources(final List<ScriptInfo> scripts, final Set<URL> urls) {
+		if (pathPrefix == null) return 0;
 
-		int scriptCount = 0;
-		final boolean isTopLevel = menuPath.size() == 0;
+		// NB: We leave the baseDirectory argument null, because scripts on disk
+		// will be picked up in the subsequent logic, which handles multiple
+		// script directories rather than being limited to a single one.
+		final Map<String, URL> scriptMap = //
+			FileUtils.findResources(null, pathPrefix, null);
 
-		for (final File file : fileList) {
-			if (scriptFiles.contains(file)) continue; // script already added
+		return createInfos(scripts, urls, scriptMap, null);
+	}
 
-			final String name = file.getName().replace('_', ' ');
-			if (file.isDirectory()) {
-				// recurse into subdirectory
-				discoverScripts(scripts, scriptFiles, file, subMenuPath(menuPath, name));
-			}
-			else if (isTopLevel) {
-				// ignore scripts in toplevel script directories
-				continue;
-			}
-			else if (scriptService.canHandleFile(file)) {
-				// found a script!
-				final int dot = name.lastIndexOf('.');
-				final String noExt = dot <= 0 ? name : name.substring(0, dot);
-				scripts.add(createEntry(file, subMenuPath(menuPath, noExt)));
-				scriptFiles.add(file);
-				scriptCount++;
-			}
+	/** Scans a directory for scripts. */
+	private int scanDirectory(final List<ScriptInfo> scripts, final Set<URL> urls,
+		final File dir)
+	{
+		if (!dir.exists()) {
+			final String path = dir.getAbsolutePath();
+			log.debug("Ignoring non-existent scripts directory: " + path);
+			return 0;
 		}
+		final MenuPath menuPrefix = scriptService.getMenuPrefix(dir);
 
-		return scriptCount;
-	}
+		try {
+			final Set<URL> dirURL = Collections.singleton(dir.toURI().toURL());
+			final Map<String, URL> scriptMap = //
+				FileUtils.findResources(null, dirURL);
 
-	private MenuPath
-		subMenuPath(final MenuPath menuPath, final String subMenuName)
-	{
-		final MenuPath result = new MenuPath(menuPath);
-		result.add(new MenuEntry(subMenuName));
-		return result;
+			return createInfos(scripts, urls, scriptMap, menuPrefix);
+		}
+		catch (final MalformedURLException exc) {
+			log.error("Invalid script directory: " + dir, exc);
+			return 0;
+		}
 	}
 
-	private ScriptInfo
-		createEntry(final File scriptFile, final MenuPath menuPath)
+	private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
+		final Map<String, URL> scriptMap, final MenuPath menuPrefix)
 	{
-		final ScriptInfo info = new ScriptInfo(getContext(), scriptFile);
-		info.setMenuPath(menuPath);
+		int scriptCount = 0;
+		for (final String path : scriptMap.keySet()) {
+			if (!scriptService.canHandleFile(path)) {
+				log.warn("Ignoring unsupported script: " + path);
+				continue;
+			}
+
+			final int dot = path.lastIndexOf('.');
+			final String basePath = dot <= 0 ? path : path.substring(0, dot);
+			final String friendlyPath = basePath.replace('_', ' ');
+
+			final MenuPath menuPath = new MenuPath(menuPrefix);
+			menuPath.addAll(new MenuPath(friendlyPath, "/"));
 
-		// flag script with special icon
-		menuPath.getLeaf().setIconPath(SCRIPT_ICON);
+			// E.g.:
+			// path = "File/Import/Movie_File....groovy"
+			// basePath = "File/Import/Movie_File..."
+			// friendlyPath = "File/Import/Movie File..."
+			// menuPath = File > Import > Movie File...
 
-		return info;
+			// NB: Ignore base-level scripts (not nested in any menu).
+			if (menuPath.size() == 1) continue;
+
+			final URL url = scriptMap.get(path);
+
+			// NB: Skip scripts whose URLs have already been added.
+			if (urls.contains(url)) continue;
+			urls.add(url);
+
+			try {
+				final ScriptInfo info = new ScriptInfo(getContext(), //
+					path, new InputStreamReader(url.openStream()));
+
+				info.setMenuPath(menuPath);
+
+				// flag script with special icon
+				menuPath.getLeaf().setIconPath(SCRIPT_ICON);
+
+				scripts.add(info);
+				scriptCount++;
+			}
+			catch (final IOException exc) {
+				log.error("Invalid script URL: " + url, exc);
+			}
+		}
+		return scriptCount;
 	}
 
 	// -- Deprecated methods --

From 225b419a900034e9e0bae493470aa177ebffd11a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 29 Jun 2016 22:22:53 -0500
Subject: [PATCH 0250/1208] ScriptFinderTest: verify scripts on the classpath

This tests that scripts present on the classpath, but not any of the
directories explicitly given by ScriptService#getScriptDirectories(),
are still found.
---
 .../org/scijava/script/ScriptFinderTest.java     |   3 +++
 src/test/resources/scripts/Math/pow.foo          | Bin 0 -> 2059 bytes
 2 files changed, 3 insertions(+)
 create mode 100644 src/test/resources/scripts/Math/pow.foo

diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 0f52f5a9e..a860dde8c 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -107,6 +107,7 @@ public void testFindScripts() {
 			"Math > divide", //
 			"Scripts > fox", //
 			"Math > multiply", //
+			"Math > pow", //
 			"Scripts > quick", //
 			"Math > Trig > sin", //
 			"Math > subtract", //
@@ -140,6 +141,7 @@ public void testMenuPrefixes() {
 			"Foo > Bar > Scripts > fox", //
 			"Foo > Bar > ignored", //
 			"Foo > Bar > Math > multiply", //
+			"Math > pow", //
 			"Foo > Bar > Scripts > quick", //
 			"Foo > Bar > Math > Trig > sin", //
 			"Foo > Bar > Math > subtract", //
@@ -172,6 +174,7 @@ public void testOverlappingDirectories() {
 			"Math > divide", //
 			"Plugins > fox", //
 			"Math > multiply", //
+			"Math > pow", //
 			"Plugins > quick", //
 			"Math > Trig > sin", //
 			"Math > subtract", //
diff --git a/src/test/resources/scripts/Math/pow.foo b/src/test/resources/scripts/Math/pow.foo
new file mode 100644
index 0000000000000000000000000000000000000000..dc5577bfcfbc134e74b5ada3ea738e815452cf26
GIT binary patch
literal 2059
zcmb_d&1(};5PwawwI5Qo1rK6Mt5x)1YN4o55t_8smNbYd2tD;Bc}=$6yj|bEwA&n{
z1<^wfdeDPVLBwNk{sUGJ5%r)@#ClLv1i@A>exQdq^YR@@3&zdmWp;iuzxmC~+vRnl
z*@7J6O!}ti4E5P8ZJBAGp0o^Kn2CPQO-Ut-4H_)TxFp%9&P6=qq(QewnM|0mAZd&m
z)V4!3$s}nFVx(?^@_2Vx3Z2LMf}|<Qk`X4*;{v%z>Vl+xh8ihmOVXD0Pf6YA9utg>
zQmfCgh$Q<=5%<|qT@j;MCc4ROUx8J?0`j}mdxZOP@a-$#PaQch_0f%anxbaXqJm0O
zNV2;mSD;{rbk?i~N^6lsqe9R*2-{W++mEK8ZcAt3h4<zodJ6&%6OXN@84xAJt-x*o
zb!;MJ0H~J;=n4`K|4R-O$K_a(v{x%WjJ;ttI%-+gb&_nemC!wsxJ}L+^|rZ&Aad5M
zIfy0`&`rmYq+V&-qgXY9ULK{Fr_ehb72hzIEY3vhyW4kvEL=I^LWwmsBaR?DRWp=d
zD20P`dHII7`TE;M7a@+7$z)bla4(#m7fw$Kr-wj7i<qWyv^=LDOpNkp9b$fU>DLD2
z9M9*pKvgX=CmBLois}7eS_(~E+Bo}dFZlcO{@9Q9FMx?As6b41eiY>Zm}pco(Ytv1
z)%2c&4gdprpp|)vD1)Zcfa<I^Kx1<jtC%1d?&1XD%#@@YbfV0Xuq`kfF*6l0R2?NU
z4k+XNy$2(Qr+<5Z&_JG$s^q?Z9vVep3+pEhlS-^;M^S|#w5_c_zVrIz*UtbRDg&?l
zM4&b)Qo7u%ra_)cR@4Mr(HO-=DY+>c82A<bW1;na%Hb!8x7wBrVQxu0ItS`l5st<u
zAZ3_5UeVGZnEDn!Tzh(T{~M@fq^uTz;qxAn+6lNqDuf85Eirn$t#@MW9Du{+;B|x*
z7q*6#)Xp%&Fmai(s}7}vsF>``t|{uh^>x{ADJgQ-h8sd;FFVu+_tK^I(xsegr&@EE
z^QJIjcz@(p7io6kME<j)#3{;ktlH=lzAnR@GZDZKTUYT|CL!Dr|A)-hz4QOS#AV-$
I+*~=<AKI*-umAu6

literal 0
HcmV?d00001


From 1aea390b9bb3b575f7f28bc15c6e3a9f24bdfdaa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 19 Jun 2016 16:01:48 -0400
Subject: [PATCH 0251/1208] ScriptInfo: remove unthrown exception clause

---
 src/main/java/org/scijava/script/ScriptInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 6d4657be6..73356e07e 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -391,7 +391,7 @@ private void checkValid(final boolean valid, final String param)
 	}
 
 	/** Adds an output for the value returned by the script itself. */
-	private void addReturnValue() throws ScriptException {
+	private void addReturnValue() {
 		final HashMap<String, Object> attrs = new HashMap<>();
 		attrs.put("type", "OUTPUT");
 		addItem(ScriptModule.RETURN_VALUE, Object.class, attrs);

From 77e09424607aa2d3ed902ad13e389ea1326772d9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 19 Jun 2016 16:11:38 -0400
Subject: [PATCH 0252/1208] Invert + generalize script return value logic

There may be other reasons affecting the decision to append the
script's return value as an extra output. Let's be flexible.
---
 .../java/org/scijava/script/ScriptInfo.java   | 29 ++++++++++++++-----
 .../java/org/scijava/script/ScriptModule.java |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 73356e07e..c0c8a65d2 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -94,8 +94,8 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	@Parameter
 	private ConvertService convertService;
 
-	/** True iff the return value is explicitly declared as an output. */
-	private boolean returnValueDeclared;
+	/** True iff the return value should be appended as an output. */
+	private boolean appendReturnValue;
 
 	/**
 	 * Creates a script metadata object which describes the given script file.
@@ -229,7 +229,7 @@ public BufferedReader getReader() {
 	@Override
 	public void parseParameters() {
 		clearParameters();
-		returnValueDeclared = false;
+		appendReturnValue = true;
 
 		try {
 			final BufferedReader in;
@@ -254,7 +254,7 @@ public void parseParameters() {
 			}
 			in.close();
 
-			if (!returnValueDeclared) addReturnValue();
+			if (appendReturnValue) addReturnValue();
 		}
 		catch (final IOException exc) {
 			log.error("Error reading script: " + path, exc);
@@ -264,9 +264,9 @@ public void parseParameters() {
 		}
 	}
 
-	/** Gets whether the return value is explicitly declared as an output. */
-	public boolean isReturnValueDeclared() {
-		return returnValueDeclared;
+	/** Gets whether the return value is appended as an additional output. */
+	public boolean isReturnValueAppended() {
+		return appendReturnValue;
 	}
 
 	// -- ModuleInfo methods --
@@ -372,7 +372,12 @@ private void parseParam(final String param,
 		}
 		final Class<?> type = scriptService.lookupClass(typeName);
 		addItem(varName, type, attrs);
-		if (ScriptModule.RETURN_VALUE.equals(varName)) returnValueDeclared = true;
+
+		if (ScriptModule.RETURN_VALUE.equals(varName)) {
+			// NB: The return value variable is declared as an explicit OUTPUT.
+			// So we should not append the return value as an extra output.
+			appendReturnValue = false;
+		}
 	}
 
 	/** Parses a comma-delimited list of {@code key=value} pairs into a map. */
@@ -479,4 +484,12 @@ private static String getReaderContentsAsString(final Reader reader)
 		return builder.toString();
 	}
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #isReturnValueAppended()} instead. */
+	@Deprecated
+	public boolean isReturnValueDeclared() {
+		return !isReturnValueAppended();
+	}
+
 }
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 602545ebe..ae06eb9d7 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -190,7 +190,7 @@ public void run() {
 			final String name = item.getName();
 			if (isResolved(name)) continue;
 			final Object value;
-			if (RETURN_VALUE.equals(name) && !getInfo().isReturnValueDeclared()) {
+			if (RETURN_VALUE.equals(name) && getInfo().isReturnValueAppended()) {
 				// NB: This is the special implicit return value output!
 				value = returnValue;
 			}

From 230c267177babaa35e82794e787a8916bac565fc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 19 Jun 2016 16:18:50 -0400
Subject: [PATCH 0253/1208] ScriptModule: track return value explicitly

Rather than relying on the return value being stored as an extra output,
let's save the return value as its own reference. That way, in cases
where the return value does _not_ get appended as an extra output,
we still have a handle on it.
---
 src/main/java/org/scijava/script/ScriptModule.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index ae06eb9d7..45d2028db 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -88,6 +88,8 @@ public class ScriptModule extends AbstractModule implements Contextual {
 	/** Destination for standard error during script execution. */
 	private Writer error;
 
+	private Object returnValue;
+
 	public ScriptModule(final ScriptInfo info) {
 		this.info = info;
 	}
@@ -130,7 +132,7 @@ public ScriptEngine getEngine() {
 
 	/** Gets the return value of the script. */
 	public Object getReturnValue() {
-		return getOutput(RETURN_VALUE);
+		return returnValue;
 	}
 
 	// -- Module methods --
@@ -167,7 +169,7 @@ public void run() {
 		}
 
 		// execute script!
-		Object returnValue = null;
+		returnValue = null;
 		try {
 			final Reader reader = getInfo().getReader();
 			if (reader == null) returnValue = engine.eval(new FileReader(path));

From 2eb86fb5688b32a35dc1bc8483dc1393c1d493d7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 19 Jun 2016 16:21:52 -0400
Subject: [PATCH 0254/1208] ScriptInfo: append return value if no outputs

We want the return value to be an easy way to return a single, untyped
(Object) output. This is quite useful for the "lazy" (I mean "elegant")
script writer. But for those consuming scripts, it is annoying to always
have to deal with this extra "result" output.

As a compromise, let's only append the "result" output if:
A) no other outputs were declared; and
B) "result" was not declared as an input either.
---
 src/main/java/org/scijava/script/ScriptInfo.java     | 7 ++++++-
 src/test/java/org/scijava/script/ScriptInfoTest.java | 8 ++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index c0c8a65d2..efb1b26cf 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -412,7 +412,12 @@ private <T> void addItem(final String name, final Class<T> type,
 			assignAttribute(item, key, value);
 		}
 		if (item.isInput()) registerInput(item);
-		if (item.isOutput()) registerOutput(item);
+		if (item.isOutput()) {
+			registerOutput(item);
+			// NB: Only append the return value as an extra
+			// output when no explicit outputs are declared.
+			appendReturnValue = false;
+		}
 	}
 
 	private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 53f9ed659..6073a8d1a 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -97,7 +97,7 @@ public void testNoisyParameters() throws Exception {
 		final ScriptModule scriptModule =
 			scriptService.run("hello.bsizes", script, true).get();
 
-		final Object output = scriptModule.getOutput("result");
+		final Object output = scriptModule.getReturnValue();
 
 		if (output == null) fail("null result");
 		else if (!(output instanceof Integer)) {
@@ -169,10 +169,6 @@ public void testParameters() {
 		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,
 			null, null, null, null, null, null, null, null, noChoices, buffer);
 
-		final ModuleItem<?> result = info.getOutput("result");
-		assertItem("result", Object.class, null, ItemIO.OUTPUT, true, true, null,
-			null, null, null, null, null, null, null, noChoices, result);
-
 		int inputCount = 0;
 		final ModuleItem<?>[] inputs = { log, sliderValue, animal, buffer };
 		for (final ModuleItem<?> inItem : info.inputs()) {
@@ -180,7 +176,7 @@ public void testParameters() {
 		}
 
 		int outputCount = 0;
-		final ModuleItem<?>[] outputs = { buffer, result };
+		final ModuleItem<?>[] outputs = { buffer };
 		for (final ModuleItem<?> outItem : info.outputs()) {
 			assertSame(outputs[outputCount++], outItem);
 		}

From 1e1020437a9d9a014de23d906f7ed9bbcaf2bb18 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 19 Jun 2016 16:30:15 -0400
Subject: [PATCH 0255/1208] Test the improved script return value behavior

When _no_ explicit @OUTPUT is given, the return value _is_ appended.
When an explicit @OUTPUT _is_ given, the return value is _not_ appended.
---
 .../org/scijava/script/ScriptInfoTest.java    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 6073a8d1a..37b85214c 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -32,6 +32,7 @@
 package org.scijava.script;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -45,6 +46,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.script.Bindings;
 import javax.script.ScriptContext;
@@ -84,6 +86,42 @@ public static void tearDown() {
 
 	// -- Tests --
 
+	/**
+	 * Tests that the return value <em>is</em> appended as an extra output when no
+	 * explicit outputs were declared.
+	 */
+	@Test
+	public void testReturnValueAppended() throws Exception {
+		final String script = "" + //
+			"% @LogService log\n" + //
+			"% @int value\n";
+		final ScriptModule scriptModule =
+			scriptService.run("include-return-value.bsizes", script, true).get();
+
+		final Map<String, Object> outputs = scriptModule.getOutputs();
+		assertEquals(1, outputs.size());
+		assertTrue(outputs.containsKey(ScriptModule.RETURN_VALUE));
+	}
+
+	/**
+	 * Tests that the return value is <em>not</em> appended as an extra output
+	 * when explicit outputs were declared.
+	 */
+	@Test
+	public void testReturnValueExcluded() throws Exception {
+		final String script = "" + //
+			"% @LogService log\n" + //
+			"% @OUTPUT int value\n";
+		final ScriptModule scriptModule =
+			scriptService.run("exclude-return-value.bsizes", script, true).get();
+
+		final Map<String, Object> outputs = scriptModule.getOutputs();
+		assertEquals(1, outputs.size());
+		assertTrue(outputs.containsKey("value"));
+		assertFalse(outputs.containsKey(ScriptModule.RETURN_VALUE));
+	}
+
+
 	/**
 	 * Ensures parameters are parsed correctly from scripts, even in the presence
 	 * of noise like e-mail addresses.

From b9ad5941f3f0b464da5f6b45de789854b89cefbe Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 7 Jul 2016 12:34:07 +0200
Subject: [PATCH 0256/1208] ScriptREPL: add javadoc

---
 src/main/java/org/scijava/script/ScriptREPL.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 639b11a92..f62a7618e 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -75,6 +75,7 @@ public class ScriptREPL {
 
 	private final PrintStream out;
 
+	/** The currently active interpreter. */
 	private ScriptInterpreter interpreter;
 
 	public ScriptREPL(final Context context) {

From f4c47e073ba42ce17d3c11b5dc57f3773129d39c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 7 Jul 2016 12:34:24 +0200
Subject: [PATCH 0257/1208] ScriptREPL: only include the interpreted languages

Compiled languages (e.g., the JavaScriptLanguage)
will not work as desired within the intepreter.
---
 .../java/org/scijava/script/ScriptREPL.java   | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index f62a7618e..931f8fb8d 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -75,6 +75,9 @@ public class ScriptREPL {
 
 	private final PrintStream out;
 
+	/** List of interpreter-friendly script languages. */
+	private List<ScriptLanguage> languages;
+
 	/** The currently active interpreter. */
 	private ScriptInterpreter interpreter;
 
@@ -88,6 +91,19 @@ public ScriptREPL(final Context context, final OutputStream out) {
 			(PrintStream) out : new PrintStream(out);
 	}
 
+	/**
+	 * Gets the list of languages compatible with the REPL.
+	 * <p>
+	 * This list will match those given by {@link ScriptService#getLanguages()},
+	 * but filtered to exclude any who report {@code true} for
+	 * {@link ScriptLanguage#isCompiledLanguage()}.
+	 * </p>
+	 */
+	public List<ScriptLanguage> getInterpretedLanguages() {
+		if (languages == null) initLanguages();
+		return languages;
+	}
+
 	/** Gets the script interpreter for the currently active language. */
 	public ScriptInterpreter getInterpreter() {
 		return interpreter;
@@ -123,7 +139,7 @@ public void initialize() {
 		out.println("Welcome to the SciJava REPL!");
 		out.println();
 		help();
-		final List<ScriptLanguage> langs = scriptService.getLanguages();
+		final List<ScriptLanguage> langs = getInterpretedLanguages();
 		if (langs.isEmpty()) {
 			out.println("--------------------------------------------------------------");
 			out.println("Uh oh! There are no SciJava script languages available!");
@@ -245,7 +261,7 @@ public void langs() {
 		final List<String> names = new ArrayList<>();
 		final List<String> versions = new ArrayList<>();
 		final List<Object> aliases = new ArrayList<>();
-		for (final ScriptLanguage lang : scriptService.getLanguages()) {
+		for (final ScriptLanguage lang : getInterpretedLanguages()) {
 			names.add(lang.getLanguageName());
 			versions.add(lang.getLanguageVersion());
 			aliases.add(lang.getNames());
@@ -272,6 +288,16 @@ public static void main(final String... args) throws Exception {
 
 	// -- Helper methods --
 
+	/** Initializes {@link #languages}. */
+	private synchronized void initLanguages() {
+		if (languages != null) return;
+		final List<ScriptLanguage> langs = new ArrayList<>();
+		for (final ScriptLanguage lang : scriptService.getLanguages()) {
+			if (!lang.isCompiledLanguage()) langs.add(lang);
+		}
+		languages = langs;
+	}
+
 	/** Populates the bindings with the context + services + gateways. */
 	private void populateBindings(final Bindings bindings) {
 		bindings.put("ctx", context);

From 74cdce192c2568cbed099fb65f404cccb72db87d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Jul 2016 10:19:59 +0200
Subject: [PATCH 0258/1208] Add a base class for SciJava-based unit tests

This eases creation + disposal of a unique Context for each test method.
---
 .../org/scijava/test/AbstractSciJavaTest.java | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 src/test/java/org/scijava/test/AbstractSciJavaTest.java

diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
new file mode 100644
index 000000000..c6cc2167a
--- /dev/null
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.test;
+
+import java.awt.Cursor;
+import java.util.Random;
+
+import org.junit.After;
+import org.junit.Before;
+import org.scijava.Context;
+import org.scijava.plugin.Parameter;
+import org.scijava.service.Service;
+import org.scijava.util.ByteArray;
+import org.scijava.util.FloatArray;
+
+/**
+ * Base class for unit testing of SciJava components.
+ * <p>
+ * Many SciJava-based unit tests need to have a {@link Context} with relevant
+ * services. Following the
+ * <a href="https://en.wikipedia.org/wiki/Don%27t_repeat_yourself">DRY
+ * principle</a>, we should implement it only once. Here.
+ * </p>
+ * 
+ * @author Johannes Schindelin
+ * @author Curtis Rueden
+ */
+public abstract class AbstractSciJavaTest {
+
+	@Parameter
+	protected Context context;
+
+	/** Subclasses can override to create a differently configured context. */
+	protected Context createContext() {
+		return new Context(serviceClasses());
+	}
+
+	/** Subclasses must override to define the services the context will have. */
+	protected abstract Class<? extends Service>[] serviceClasses();
+
+	/** Sets up a SciJava context and injects needed services. */
+	@Before
+	public void setUp() {
+		createContext().inject(this);
+	}
+
+	/**
+	 * Disposes of the {@link Context} that was initialized in {@link #setUp()}.
+	 */
+	@After
+	public synchronized void cleanUp() {
+		if (context != null) {
+			context.dispose();
+			context = null;
+		}
+	}
+
+}

From 2a2d8e2d505ef0dcd15d73472be3cece96373c1e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Jul 2016 18:46:34 +0200
Subject: [PATCH 0259/1208] CommandModuleItem: implement getDefaultValue()

The fact that commands could not report their default parameter values
was an oversight. Unfortunately, to actually do it, we must instantiate
a dummy instance of the Command class. But for the vast majority of
cases, this approach will work just fine.
---
 .../scijava/command/CommandModuleItem.java    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index aff1ecda3..9752fad33 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -143,6 +143,38 @@ public T getMaximumValue() {
 		return tValue(getParameter().max());
 	}
 
+	@Override
+	public T getDefaultValue() {
+		// NB: The default value for a command is the initial field value.
+		// E.g.:
+		//
+		//   @Parameter
+		//   private int weekdays = 5;
+		//
+		// To obtain this information, we need to instantiate the module, then
+		// extract the value of the associated field.
+		//
+		// Of course, the command might do evil things like:
+		//
+		//   @Parameter
+		//   private long time = System.currentTimeMillis();
+		//
+		// In which case the default value will vary by instance. But there is
+		// nothing we can really do about that. This is only a best effort.
+
+		try {
+			final Object dummy = getInfo().loadDelegateClass().newInstance();
+			@SuppressWarnings("unchecked")
+			final T value = (T) getField().get(dummy);
+			return value;
+		}
+		catch (final InstantiationException | IllegalAccessException
+				| ClassNotFoundException exc)
+		{
+			throw new IllegalStateException(exc);
+		}
+	}
+
 	@Override
 	public Number getStepSize() {
 		// FIXME: stepSize should be typed on T, not Number!

From cde0f427e0201ced9469f84bb600b4b537c2f41f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 8 Jul 2016 18:48:21 +0200
Subject: [PATCH 0260/1208] CommandModuleTest: test getDefaultValue()

---
 .../scijava/command/CommandModuleTest.java    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index d19a9d86f..931c17c13 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -43,6 +43,7 @@
 import org.scijava.module.Module;
 import org.scijava.module.process.AbstractPreprocessorPlugin;
 import org.scijava.module.process.PreprocessorPlugin;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
 /** Regression tests for {@link CommandModule}. */
@@ -76,6 +77,25 @@ public void testNotCancelable() throws InterruptedException,
 		assertEquals("NO SINGING!", fire.getCancelReason());
 	}
 
+	@Test
+	public void testDefaultValues() {
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+		final CommandInfo info = //
+			commandService.getCommand(CommandWithDefaultValues.class);
+
+		assertEquals(5, info.getInput("weekdays").getDefaultValue());
+
+		final long defaultTime = (Long) info.getInput("time").getDefaultValue();
+		final long timeDiff = System.currentTimeMillis() - defaultTime;
+		assertTrue(timeDiff >= 0 && timeDiff < 50); // 50 ms should be enough ;-)
+
+		final String defaultName = (String) info.getInput("name").getDefaultValue();
+		assertEquals("John Jacob Jingleheimer Schmidt", defaultName);
+
+		assertEquals(null, info.getInput("thing").getDefaultValue());
+	}
+
 	// -- Helper classes --
 
 	/** A command which implements {@link Cancelable}. */
@@ -125,4 +145,27 @@ public void process(final Module module) {
 			}
 		}
 	}
+
+	/** A command which assigns default values to its parameters. */
+	@Plugin(type = Command.class)
+	public static class CommandWithDefaultValues extends ContextCommand {
+
+		@Parameter
+		private int weekdays = 5;
+
+		@Parameter
+		private long time = System.currentTimeMillis();
+
+		@Parameter
+		private String name = "John Jacob Jingleheimer Schmidt";
+
+		@Parameter
+		private Object thing;
+
+		@Override
+		public void run() {
+			weekdays = 0;
+			time = 0;
+		}
+	}
 }

From 72aa4839111920ee606f92b1f71f30dfe2e5cc39 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 Mar 2015 14:02:09 -0500
Subject: [PATCH 0261/1208] AbstractLogService: tweak javadoc

---
 src/main/java/org/scijava/log/AbstractLogService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index f183c77da..9b7d5b0c7 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -38,7 +38,7 @@
 import org.scijava.service.AbstractService;
 
 /**
- * Base implementation of an abstract {@link LogService}.
+ * Base class for {@link LogService} implementations.
  * 
  * @author Johannes Schindelin
  */

From 75d7b6a9d27345c482c1f05eb9a6c7ced4c7d1ee Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 Mar 2015 14:03:11 -0500
Subject: [PATCH 0262/1208] AbstractLogService: format code style

---
 .../org/scijava/log/AbstractLogService.java   | 81 ++++++++++---------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 9b7d5b0c7..fdc3aed1d 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.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
@@ -38,29 +38,31 @@
 import org.scijava.service.AbstractService;
 
 /**
- * Base class for {@link LogService} implementations.
- * 
+ * Base class for {@link LogService} implementationst.
+ *
  * @author Johannes Schindelin
  */
-public abstract class AbstractLogService extends AbstractService implements LogService {
+public abstract class AbstractLogService extends AbstractService implements
+	LogService
+{
 
 	private int currentLevel = System.getenv("DEBUG") == null ? INFO : DEBUG;
 
-	private Map<String, Integer> classAndPackageLevels =
+	private final Map<String, Integer> classAndPackageLevels =
 		new HashMap<>();
 
 	// -- abstract methods --
 
 	/**
 	 * Displays a message.
-	 * 
+	 *
 	 * @param msg the message to display.
 	 */
 	protected abstract void log(final String msg);
 
 	/**
 	 * Displays an exception.
-	 * 
+	 *
 	 * @param t the exception to display.
 	 */
 	protected abstract void log(final Throwable t);
@@ -87,7 +89,8 @@ public AbstractLogService() {
 			if (!(propKey instanceof String)) continue;
 			final String propName = (String) propKey;
 			if (!propName.startsWith(logLevelPrefix)) continue;
-			final String classOrPackageName = propName.substring(logLevelPrefix.length());
+			final String classOrPackageName =
+				propName.substring(logLevelPrefix.length());
 			setLevel(classOrPackageName, level(props.getProperty(propName)));
 		}
 
@@ -109,97 +112,97 @@ protected void log(final int level, final Object msg) {
 		log((prefix == null ? "" : prefix + " ") + msg);
 	}
 
-	protected String getPrefix(int level) {
+	protected String getPrefix(final int level) {
 		switch (level) {
-		case ERROR:
-			return "[ERROR]";
-		case WARN:
-			return "[WARNING]";
-		case INFO:
-			return "[INFO]";
-		case DEBUG:
-			return "[DEBUG]";
-		case TRACE:
-			return "[TRACE]";
-		default:
-			return null;
+			case ERROR:
+				return "[ERROR]";
+			case WARN:
+				return "[WARNING]";
+			case INFO:
+				return "[INFO]";
+			case DEBUG:
+				return "[DEBUG]";
+			case TRACE:
+				return "[TRACE]";
+			default:
+				return null;
 		}
 	}
 
 	// -- LogService methods --
 
 	@Override
-	public void debug(Object msg) {
+	public void debug(final Object msg) {
 		log(DEBUG, msg, null);
 	}
 
 	@Override
-	public void debug(Throwable t) {
+	public void debug(final Throwable t) {
 		log(DEBUG, null, t);
 	}
 
 	@Override
-	public void debug(Object msg, Throwable t) {
+	public void debug(final Object msg, final Throwable t) {
 		log(DEBUG, msg, t);
 	}
 
 	@Override
-	public void error(Object msg) {
+	public void error(final Object msg) {
 		log(ERROR, msg, null);
 	}
 
 	@Override
-	public void error(Throwable t) {
+	public void error(final Throwable t) {
 		log(ERROR, null, t);
 	}
 
 	@Override
-	public void error(Object msg, Throwable t) {
+	public void error(final Object msg, final Throwable t) {
 		log(ERROR, msg, t);
 	}
 
 	@Override
-	public void info(Object msg) {
+	public void info(final Object msg) {
 		log(INFO, msg, null);
 	}
 
 	@Override
-	public void info(Throwable t) {
+	public void info(final Throwable t) {
 		log(INFO, null, t);
 	}
 
 	@Override
-	public void info(Object msg, Throwable t) {
+	public void info(final Object msg, final Throwable t) {
 		log(INFO, msg, t);
 	}
 
 	@Override
-	public void trace(Object msg) {
+	public void trace(final Object msg) {
 		log(TRACE, msg, null);
 	}
 
 	@Override
-	public void trace(Throwable t) {
+	public void trace(final Throwable t) {
 		log(TRACE, null, t);
 	}
 
 	@Override
-	public void trace(Object msg, Throwable t) {
+	public void trace(final Object msg, final Throwable t) {
 		log(TRACE, msg, t);
 	}
 
 	@Override
-	public void warn(Object msg) {
+	public void warn(final Object msg) {
 		log(WARN, msg, null);
 	}
 
 	@Override
-	public void warn(Throwable t) {
+	public void warn(final Throwable t) {
 		log(WARN, null, t);
 	}
 
 	@Override
-	public void warn(Object msg, Throwable t) {
+	public void warn(final Object msg, final Throwable t) {
 		log(WARN, msg, t);
 	}
 
@@ -248,7 +251,7 @@ public void setLevel(final int level) {
 		currentLevel = level;
 	}
 
-	//@Override
+//	@Override
 	public void setLevel(final String classOrPackageName, final int level) {
 		classAndPackageLevels.put(classOrPackageName, level);
 	}
@@ -289,7 +292,7 @@ private String callingClass() {
 	}
 
 	private String parentPackage(final String classOrPackageName) {
-		int dot = classOrPackageName.lastIndexOf(".");
+		final int dot = classOrPackageName.lastIndexOf(".");
 		if (dot < 0) return null;
 		return classOrPackageName.substring(0, dot);
 	}

From 460a601160339493ea76aef2bed06028b3c37102 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 Mar 2015 14:03:42 -0500
Subject: [PATCH 0263/1208] LogService: add setLevel method to public API

Specifically, the setLevel(String classOrPackageName, int level) method
was public in AbstractLogService, but not part of the LogService API.
---
 src/main/java/org/scijava/log/AbstractLogService.java | 2 +-
 src/main/java/org/scijava/log/LogService.java         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index fdc3aed1d..f84aad31d 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -251,7 +251,7 @@ public void setLevel(final int level) {
 		currentLevel = level;
 	}
 
-//	@Override
+	@Override
 	public void setLevel(final String classOrPackageName, final int level) {
 		classAndPackageLevels.put(classOrPackageName, level);
 	}
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index e1fae2013..35cb1720a 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -100,4 +100,6 @@ public interface LogService extends SciJavaService {
 
 	void setLevel(int level);
 
+	void setLevel(String classOrPackageName, int level);
+
 }

From a2310cca7a65f570bc0bb967e0f9849c42896330 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 11 Jul 2016 12:53:24 +0200
Subject: [PATCH 0264/1208] MiscUtils: deprecate equal(Object, Object) method

The standard library has this built-in now.
---
 src/main/java/org/scijava/util/MiscUtils.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 47f3e2794..15ed2b596 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -31,6 +31,8 @@
 
 package org.scijava.util;
 
+import java.util.Objects;
+
 /**
  * Miscellaneous utility methods. Every project needs a class like this, right?
  * 
@@ -83,13 +85,9 @@ public static <T extends Comparable<? super T>> int compare(final T o1,
 	}
 
 	/**
-	 * Compares two objects for equality, even if one or both of them are null.
-	 * 
-	 * @param o1 The first object to compare.
-	 * @param o2 The second object to compare.
-	 * @return True if the two objects are both null, or both are non-null and
-	 *         {@code o1.equals(o2)} holds.
+	 * @deprecated Use {@link Objects#equals(Object, Object)} instead.
 	 */
+	@Deprecated
 	public static boolean equal(final Object o1, final Object o2) {
 		return o1 == null ? o2 == null : o1.equals(o2);
 	}

From ff3caa8594784075912f81154142b6a765204041 Mon Sep 17 00:00:00 2001
From: dietzc <dietzc85@googlemail.com>
Date: Tue, 12 Jul 2016 17:30:22 +0200
Subject: [PATCH 0265/1208] Add method to get InputWidget from InputPanel

---
 src/main/java/org/scijava/widget/AbstractInputPanel.java | 5 +++++
 src/main/java/org/scijava/widget/InputPanel.java         | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index 37513ce9e..a4d1cbf6a 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -61,6 +61,11 @@ public boolean supports(final InputWidget<?, ?> widget) {
 	public void addWidget(final InputWidget<?, W> widget) {
 		widgets.put(widget.get().getItem().getName(), widget);
 	}
+	
+	@Override
+	public InputWidget<?, W> getWidget(final String name) {
+		return widgets.get(name);
+	}
 
 	@Override
 	public Object getValue(final String name) {
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 2ce25cfa9..4a6e17dda 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -70,5 +70,8 @@ public interface InputPanel<P, W> extends UIComponent<P> {
 
 	/** Gets the type of the UI component housing the panel's widgets. */
 	Class<W> getWidgetComponentType();
+	
+	/** Gets the widget with the provided name. */
+	InputWidget<?, W> getWidget(String name);
 
 }

From ee718f3d568815f357d5fda9e799b0e92a72695e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 18 Jul 2016 14:48:07 -0500
Subject: [PATCH 0266/1208] AbstractConverter: do not require an ObjectService

We can fail gracefully if the ObjectService is not present.
---
 src/main/java/org/scijava/convert/AbstractConverter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 00a827aa1..10478e841 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -72,7 +72,7 @@ public abstract class AbstractConverter<I, O> extends
 
 	// -- Parameters --
 
-	@Parameter
+	@Parameter(required = false)
 	private ObjectService objectService;
 
 	// -- ConversionHandler methods --
@@ -131,6 +131,7 @@ public Object convert(final ConversionRequest request) {
 
 	@Override
 	public void populateInputCandidates(final Collection<Object> objects) {
+		if (objectService == null) return;
 		for (final Object candidate : objectService.getObjects(getInputType())) {
 			if (canConvert(candidate, getOutputType())) objects.add(candidate);
 		}

From 0daddfb318275aa66ddba8d7ea37cdbc720840c5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 18 Jul 2016 14:48:38 -0500
Subject: [PATCH 0267/1208] DefaultEventService: reduce indentation nesting

---
 .../scijava/event/DefaultEventService.java    | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 8a26e0c23..f297a6bc3 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -113,32 +113,30 @@ public <E extends SciJavaEvent> void publishLater(final E e) {
 
 	@Override
 	public List<EventSubscriber<?>> subscribe(final Object o) {
-		List<EventSubscriber<?>> subscribers = Collections.emptyList();
 		final List<Method> eventHandlers =
 			ClassUtils.getAnnotatedMethods(o.getClass(), EventHandler.class);
+		if (eventHandlers.isEmpty()) return Collections.emptyList();
+
+		final ArrayList<EventSubscriber<?>> subscribers = new ArrayList<>();
+		for (final Method m : eventHandlers) {
+			// verify that the event handler method is valid
+			final Class<? extends SciJavaEvent> eventClass = getEventClass(m);
+			if (eventClass == null) {
+				log.warn("Invalid EventHandler method: " + m);
+				continue;
+			}
 
-		if (!eventHandlers.isEmpty()) {
-			subscribers = new ArrayList<>();
-			for (final Method m : eventHandlers) {
-				// verify that the event handler method is valid
-				final Class<? extends SciJavaEvent> eventClass = getEventClass(m);
-				if (eventClass == null) {
-					log.warn("Invalid EventHandler method: " + m);
-					continue;
-				}
-
-				// verify that the event handler key isn't already claimed
-				final String key = m.getAnnotation(EventHandler.class).key();
-				if (!key.isEmpty()) {
-					synchronized (keys) {
-						if (keys.contains(key)) continue;
-						keys.add(key);
-					}
+			// verify that the event handler key isn't already claimed
+			final String key = m.getAnnotation(EventHandler.class).key();
+			if (!key.isEmpty()) {
+				synchronized (keys) {
+					if (keys.contains(key)) continue;
+					keys.add(key);
 				}
-
-				// subscribe the event handler
-				subscribers.add(subscribe(eventClass, o, m));
 			}
+
+			// subscribe the event handler
+			subscribers.add(subscribe(eventClass, o, m));
 		}
 		return subscribers;
 	}

From 906e6442b8cec6798813783a02c5fbc7e008a3a5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Aug 2014 10:49:50 -0500
Subject: [PATCH 0268/1208] Clean up method ordering and section headers

See:
http://imagej.net/Coding_style#Ordering_of_code_blocks
---
 .../java/org/scijava/AbstractGateway.java     | 10 ++--
 .../java/org/scijava/app/AbstractApp.java     | 48 ++++++++++---------
 .../java/org/scijava/script/ScriptInfo.java   |  2 +
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 202cab0f1..9db79f09e 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -274,13 +274,15 @@ public String getTitle() {
 	}
 
 	@Override
-	public String getVersion() {
-		return getApp().getVersion();
+	public String getInfo(final boolean mem) {
+		return getApp().getInfo(mem);
 	}
 
+	// -- Versioned methods --
+
 	@Override
-	public String getInfo(final boolean mem) {
-		return getApp().getInfo(mem);
+	public String getVersion() {
+		return getApp().getVersion();
 	}
 
 }
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 4e40d3604..66e86db9d 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -56,33 +56,13 @@ public abstract class AbstractApp extends AbstractRichPlugin implements App {
 	/** JAR manifest with metadata about the application. */
 	private Manifest manifest;
 
+	// -- App methods --
+
 	@Override
 	public String getTitle() {
 		return getInfo().getName();
 	}
 
-	@Override
-	public String getVersion() {
-		// NB: We do not use VersionUtils.getVersion(c, groupId, artifactId)
-		// because that method does not cache the parsed Manifest and/or POM.
-		// We might have them already parsed here, and if not, we want to
-		// parse then cache locally, rather than discarding them afterwards.
-
-		// try the manifest first, since it might know its build number
-		final Manifest m = getManifest();
-		if (m != null) {
-			final String v = m.getVersion();
-			if (v != null) return v;
-		}
-		// try the POM
-		final POM p = getPOM();
-		if (p != null) {
-			final String v = p.getVersion();
-			if (v != null) return v;
-		}
-		return "Unknown";
-	}
-
 	@Override
 	public POM getPOM() {
 		if (pom == null) {
@@ -145,4 +125,28 @@ public void quit() {
 		getContext().dispose();
 	}
 
+	// -- Versioned methods --
+
+	@Override
+	public String getVersion() {
+		// NB: We do not use VersionUtils.getVersion(c, groupId, artifactId)
+		// because that method does not cache the parsed Manifest and/or POM.
+		// We might have them already parsed here, and if not, we want to
+		// parse then cache locally, rather than discarding them afterwards.
+
+		// try the manifest first, since it might know its build number
+		final Manifest m = getManifest();
+		if (m != null) {
+			final String v = m.getVersion();
+			if (v != null) return v;
+		}
+		// try the POM
+		final POM p = getPOM();
+		if (p != null) {
+			final String v = p.getVersion();
+			if (v != null) return v;
+		}
+		return "Unknown";
+	}
+
 }
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 6d4657be6..bd17bfc34 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -318,6 +318,8 @@ public String getLocation() {
 		return new File(path).toURI().normalize().toString();
 	}
 
+	// -- Versioned methods --
+
 	@Override
 	public String getVersion() {
 		final File file = new File(path);

From 5a3f01141f6cf8e67daa185351daf27a8ddeee15 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jul 2016 14:10:28 -0500
Subject: [PATCH 0269/1208] Locatable: add default behavior for getLocation

---
 src/main/java/org/scijava/Locatable.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index 3073a9266..9d4d73bf5 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -31,6 +31,10 @@
 
 package org.scijava;
 
+import java.net.URL;
+
+import org.scijava.util.ClassUtils;
+
 /**
  * An object whose location is defined by a URL string.
  * 
@@ -39,6 +43,9 @@
 public interface Locatable {
 
 	/** Gets the URL string defining the object's location. */
-	String getLocation();
+	default String getLocation() {
+		final URL location = ClassUtils.getLocation(getClass());
+		return location == null ? null : location.toExternalForm();
+	}
 
 }

From bc0b7c6c5d7c5807b6ca89b52b0dbb2c215c1aab Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jul 2016 14:10:52 -0500
Subject: [PATCH 0270/1208] Versioned: add default behavior for getVersion

---
 src/main/java/org/scijava/Versioned.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index 793c0fc9d..03379bead 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -31,6 +31,8 @@
 
 package org.scijava;
 
+import org.scijava.util.VersionUtils;
+
 /**
  * An object that knows its version.
  * 
@@ -39,6 +41,9 @@
 public interface Versioned {
 
 	/** Gets the version of the object. */
-	String getVersion();
+	default String getVersion() {
+		return VersionUtils.getVersion(getClass());
+	}
+
 
 }

From 0d1f357932b9a6049831143a09aacebc888dd8be Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jul 2016 14:12:07 -0500
Subject: [PATCH 0271/1208] Prioritized: add default behavior for compareTo

---
 src/main/java/org/scijava/Prioritized.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 4aafbeb13..de544e2bf 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -31,6 +31,8 @@
 
 package org.scijava;
 
+import org.scijava.util.ClassUtils;
+
 /**
  * An object that can be sorted according to priority.
  * 
@@ -52,4 +54,18 @@ public interface Prioritized extends Comparable<Prioritized> {
 	 */
 	void setPriority(double priority);
 
+	// -- Comparable methods --
+
+	@Override
+	default int compareTo(final Prioritized that) {
+		if (that == null) return 1;
+
+		// compare priorities
+		final int priorityCompare = Priority.compare(this, that);
+		if (priorityCompare != 0) return priorityCompare;
+
+		// compare classes
+		return ClassUtils.compare(getClass(), that.getClass());
+	}
+
 }

From 3ff7c91d23015001edaaf5edc8be4d21825f6a6c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jul 2016 14:15:52 -0500
Subject: [PATCH 0272/1208] AbstractRichPlugin: remove compareTo behavior

It is now inherited from the Prioritized interface.
---
 .../org/scijava/plugin/AbstractRichPlugin.java   | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 11f88620b..3ef02bcff 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -32,9 +32,7 @@
 package org.scijava.plugin;
 
 import org.scijava.AbstractContextual;
-import org.scijava.Prioritized;
 import org.scijava.Priority;
-import org.scijava.util.ClassUtils;
 
 /**
  * Abstract base class for {@link RichPlugin} implementations.
@@ -83,18 +81,4 @@ public void setInfo(final PluginInfo<?> info) {
 		this.info = info;
 	}
 
-	// -- Comparable methods --
-
-	@Override
-	public int compareTo(final Prioritized that) {
-		if (that == null) return 1;
-
-		// compare priorities
-		final int priorityCompare = Priority.compare(this, that);
-		if (priorityCompare != 0) return priorityCompare;
-
-		// compare classes
-		return ClassUtils.compare(getClass(), that.getClass());
-	}
-
 }

From c3d560a3e009b098c16ad56453acb83bc0fe6e00 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Aug 2014 10:17:54 -0500
Subject: [PATCH 0273/1208] Make RichPlugin implement more useful interfaces

Now, all rich plugins are Identifiable, Locatable and Versioned.
---
 src/main/java/org/scijava/plugin/RichPlugin.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index bbe7a304f..faec2240c 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -32,7 +32,10 @@
 package org.scijava.plugin;
 
 import org.scijava.Contextual;
+import org.scijava.Identifiable;
+import org.scijava.Locatable;
 import org.scijava.Prioritized;
+import org.scijava.Versioned;
 
 /**
  * Base interface for {@link Contextual}, {@link Prioritized} plugins that
@@ -42,8 +45,15 @@
  * 
  * @author Curtis Rueden
  */
-public interface RichPlugin extends Contextual, Prioritized, HasPluginInfo,
-	SciJavaPlugin
+public interface RichPlugin extends SciJavaPlugin, Contextual, Prioritized,
+	HasPluginInfo, Identifiable, Locatable, Versioned
 {
-	// NB: Marker interface.
+
+	// -- Identifiable methods --
+
+	@Override
+	default String getIdentifier() {
+		return "plugin:" + getClass().getName();
+	}
+
 }

From e485a090764759244392167c48dea90bc56d5600 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Aug 2014 10:48:57 -0500
Subject: [PATCH 0274/1208] Gateway: remove superfluous Versioned inheritance

All RichPlugins are now versioned.
---
 src/main/java/org/scijava/Gateway.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 6ef437ea5..50eaaf9be 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -118,7 +118,7 @@
  * @author Mark Hiner
  * @author Curtis Rueden
  */
-public interface Gateway extends RichPlugin, Versioned {
+public interface Gateway extends RichPlugin {
 
 	/**
 	 * Perform launch operations associated with this gateway.
@@ -362,10 +362,4 @@ public interface Gateway extends RichPlugin, Versioned {
 	/** @see org.scijava.app.App#getInfo(boolean) */
 	String getInfo(boolean mem);
 
-	// -- Versioned methods --
-
-	/** @see org.scijava.app.App#getVersion() */
-	@Override
-	String getVersion();
-
 }

From 4b37eedd36d057f92e480f243d62152d9930aa0b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 1 Aug 2016 12:41:53 -0500
Subject: [PATCH 0275/1208] SortedObjectIndex: fix order of method blocks

See:
http://imagej.net/Coding_style#Ordering_of_code_blocks
---
 .../org/scijava/object/SortedObjectIndex.java | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index c5270529d..1cd3120d6 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -92,6 +92,49 @@ public boolean addAll(final Collection<? extends E> c) {
 		return changed;
 	}
 
+	// -- Internal methods --
+
+	@Override
+	protected boolean addToList(final E obj, final List<E> list,
+		final boolean batch)
+	{
+		if (batch) {
+			// adding multiple values; append to end of list, and sort afterward
+			return super.addToList(obj, list, batch);
+		}
+
+		// search for the correct location to insert the object
+		final int result = Collections.binarySearch(list, obj);
+		// NB: The objects' natural ordering may not be consistent with equals.
+		// Hence, the index reported may indicate a match with an unequal object
+		// (i.e., obj.compareTo(match) == 0 but !obj.equals(match)).
+		// But since we allow duplicate items in the index, this situation is fine;
+		// either way, we want to insert the object at the given point.
+		final int index = result < 0 ? -result - 1 : result;
+
+		// insert object at the appropriate location
+		list.add(index, obj);
+		return true;
+	}
+
+	// -- Helper methods --
+
+	private void sort() {
+		for (final List<E> list : hoard.values()) {
+			Collections.sort(list);
+		}
+	}
+
+	private int findInList(final Object o, final List<E> list) {
+		if (!getBaseClass().isAssignableFrom(o.getClass())) {
+			// wrong type
+			return list.size();
+		}
+		@SuppressWarnings("unchecked")
+		final E typedObj = (E) o;
+		return Collections.binarySearch(list, typedObj);
+	}
+
 	private void mergeAfterSorting(final Collection<? extends E> c) {
 		final List<E> listToMerge = new ArrayList<>(c);
 		Collections.sort(listToMerge);
@@ -145,47 +188,4 @@ private void mergeInto(final List<? extends E> sorted, final List<E> into) {
 		}
 	}
 
-	// -- Internal methods --
-
-	@Override
-	protected boolean addToList(final E obj, final List<E> list,
-		final boolean batch)
-	{
-		if (batch) {
-			// adding multiple values; append to end of list, and sort afterward
-			return super.addToList(obj, list, batch);
-		}
-
-		// search for the correct location to insert the object
-		final int result = Collections.binarySearch(list, obj);
-		// NB: The objects' natural ordering may not be consistent with equals.
-		// Hence, the index reported may indicate a match with an unequal object
-		// (i.e., obj.compareTo(match) == 0 but !obj.equals(match)).
-		// But since we allow duplicate items in the index, this situation is fine;
-		// either way, we want to insert the object at the given point.
-		final int index = result < 0 ? -result - 1 : result;
-
-		// insert object at the appropriate location
-		list.add(index, obj);
-		return true;
-	}
-
-	// -- Helper methods --
-
-	private void sort() {
-		for (final List<E> list : hoard.values()) {
-			Collections.sort(list);
-		}
-	}
-
-	private int findInList(final Object o, final List<E> list) {
-		if (!getBaseClass().isAssignableFrom(o.getClass())) {
-			// wrong type
-			return list.size();
-		}
-		@SuppressWarnings("unchecked")
-		final E typedObj = (E) o;
-		return Collections.binarySearch(list, typedObj);
-	}
-
 }

From 212d8277cef1c5cb02eb778d0988371a9370981a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 1 Aug 2016 12:52:51 -0500
Subject: [PATCH 0276/1208] RecentFileService: index recent files properly

When invoking the PrefService, we should give a class, not leave
it undefined. Otherwise, the recent files list gets stored under
the global preferences node, rather than the RecentFileService.
---
 src/main/java/org/scijava/io/DefaultRecentFileService.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 1f7cd3c03..7c699f846 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -147,7 +147,7 @@ public boolean remove(final String path) {
 	@Override
 	public void clear() {
 		recentFiles.clear();
-		prefService.clear(RECENT_FILES_KEY);
+		prefService.clear(RecentFileService.class, RECENT_FILES_KEY);
 
 		// unregister the modules with the module service
 		moduleService.removeModules(recentModules.values());
@@ -185,12 +185,13 @@ protected void onEvent(final IOEvent event) {
 
 	/** Loads the list of recent files from persistent storage. */
 	private void loadList() {
-		recentFiles = prefService.getList(RECENT_FILES_KEY);
+		recentFiles = prefService.getList(RecentFileService.class,
+			RECENT_FILES_KEY);
 	}
 
 	/** Saves the list of recent files to persistent storage. */
 	private void saveList() {
-		prefService.putList(recentFiles, RECENT_FILES_KEY);
+		prefService.putList(RecentFileService.class, recentFiles, RECENT_FILES_KEY);
 	}
 
 	/** Creates a {@link ModuleInfo} to reopen data at the given path. */

From 6dcda87b813149355940fa10258c842f11a44214 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 Aug 2016 14:42:19 -0500
Subject: [PATCH 0277/1208] POM: bump parent to pom-scijava 11.0.0

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5830f4e85..8462de89a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>10.5.0</version>
+		<version>11.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -102,7 +102,6 @@
 	</ciManagement>
 
 	<properties>
-		<scijava.jvm.version>1.8</scijava.jvm.version>
 		<scijava-expression-parser.version>3.0.0</scijava-expression-parser.version>
 	</properties>
 

From a2dc49649dad601cc86f56958041da3903200d37 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 Aug 2016 14:42:59 -0500
Subject: [PATCH 0278/1208] POM: stop pinning scijava-expression-parser

It was now outdated.
---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8462de89a..315ebc6b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,10 +101,6 @@
 		<url>http://jenkins.imagej.net/job/SciJava-common/</url>
 	</ciManagement>
 
-	<properties>
-		<scijava-expression-parser.version>3.0.0</scijava-expression-parser.version>
-	</properties>
-
 	<dependencies>
 		<!-- SciJava dependencies -->
 		<dependency>

From eb2ca6f908422b847a5c0a575f0f4e3e85bd4ef0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 Aug 2016 14:45:43 -0500
Subject: [PATCH 0279/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 315ebc6b0..6abefec34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.57.0-SNAPSHOT</version>
+	<version>2.57.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From b32b4af1a844a5ba1d97b7b08e8b697f7d8a0948 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 10:22:40 -0500
Subject: [PATCH 0280/1208] PlatformService: deprecate getAppEventService()

This service is long-deprecated in favor of the AppService.
---
 src/main/java/org/scijava/platform/PlatformService.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 3cb305b25..4154cae30 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -35,6 +35,8 @@
 import java.net.URL;
 import java.util.List;
 
+import org.scijava.app.App;
+import org.scijava.app.AppService;
 import org.scijava.command.CommandService;
 import org.scijava.event.EventService;
 import org.scijava.plugin.SingletonService;
@@ -54,8 +56,6 @@ public interface PlatformService extends SingletonService<Platform>,
 
 	CommandService getCommandService();
 
-	AppEventService getAppEventService();
-
 	/** Gets the platform handlers applicable to this platform. */
 	List<Platform> getTargetPlatforms();
 
@@ -85,4 +85,9 @@ public interface PlatformService extends SingletonService<Platform>,
 	 */
 	boolean registerAppMenus(Object menus);
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link AppService} and {@link App} instead. */
+	@Deprecated
+	AppEventService getAppEventService();
 }

From 075f96dc2902e6e926bd7a30d43c367ca866c3b1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 08:47:37 -0500
Subject: [PATCH 0281/1208] Rename get*Service() methods of services

As we move toward SJC3, I decided to drop the "get" prefix from service
dependency accessors. This is arguably inconsistent with the rest of
SJC, and certainly it is inconsistent with the Java standard library.
However, it has some nice consequences:

* When browsing available service functionality via autocomplete,
  service accessors do not clutter the accessors method list.
* It makes chaining service accessors more streamlined and readable.

I debated dropping the "Service" suffix too, in the same manner as the
Gateways do, but decided that would be confusing at the lower level of
the API where services reside: services have other API mixed in, so a
method called e.g. object() might be confused for something which
returns relevant objects, rather than an ObjectService instance.
The Gateways do not have this issue because their primary accessors
are in fact all services, so the naming is less confusing there.
---
 .../org/scijava/command/CommandService.java   | 17 +++++++++++--
 .../command/DefaultCommandService.java        |  6 ++---
 .../display/DefaultDisplayService.java        |  6 ++---
 .../org/scijava/display/DisplayService.java   | 25 ++++++++++++++++---
 .../scijava/input/DefaultInputService.java    |  2 +-
 .../java/org/scijava/input/InputService.java  |  9 ++++++-
 .../scijava/object/DefaultObjectService.java  |  2 +-
 .../org/scijava/object/ObjectService.java     |  9 ++++++-
 .../platform/DefaultPlatformService.java      |  4 +--
 .../org/scijava/platform/PlatformService.java | 16 ++++++++++--
 .../org/scijava/plugin/AbstractPTService.java |  2 +-
 .../plugin/AbstractSingletonService.java      |  5 ++--
 .../plugin/AbstractWrapperService.java        |  2 +-
 .../java/org/scijava/plugin/PTService.java    |  9 ++++++-
 14 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 1659b088e..3f0e0da8e 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -64,9 +64,9 @@
  */
 public interface CommandService extends PTService<Command>, SciJavaService {
 
-	EventService getEventService();
+	EventService eventService();
 
-	ModuleService getModuleService();
+	ModuleService moduleService();
 
 	/** Gets the list of all available {@link Command}s). */
 	List<CommandInfo> getCommands();
@@ -257,4 +257,17 @@ <C extends Command> Future<CommandModule> run(Class<C> commandClass,
 	Future<CommandModule> run(CommandInfo info, boolean process,
 		Map<String, Object> inputMap);
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #eventService()} instead. */
+	@Deprecated
+	default EventService getEventService() {
+		return eventService();
+	}
+
+	/** @deprecated Use {@link #moduleService()} instead. */
+	@Deprecated
+	default ModuleService getModuleService() {
+		return moduleService();
+	}
 }
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index d33cbaf97..b4f74e32e 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -83,17 +83,17 @@ public class DefaultCommandService extends AbstractPTService<Command> implements
 	// -- CommandService methods --
 
 	@Override
-	public EventService getEventService() {
+	public EventService eventService() {
 		return eventService;
 	}
 
 	@Override
-	public PluginService getPluginService() {
+	public PluginService pluginService() {
 		return pluginService;
 	}
 
 	@Override
-	public ModuleService getModuleService() {
+	public ModuleService moduleService() {
 		return moduleService;
 	}
 
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index ac441a0f3..018b73c69 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -85,17 +85,17 @@ public final class DefaultDisplayService extends AbstractService implements
 	// -- DisplayService methods --
 
 	@Override
-	public EventService getEventService() {
+	public EventService eventService() {
 		return eventService;
 	}
 
 	@Override
-	public ObjectService getObjectService() {
+	public ObjectService objectService() {
 		return objectService;
 	}
 
 	@Override
-	public PluginService getPluginService() {
+	public PluginService pluginService() {
 		return pluginService;
 	}
 
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 20f0d33e6..204de8f74 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -50,11 +50,11 @@
  */
 public interface DisplayService extends SciJavaService {
 
-	EventService getEventService();
+	EventService eventService();
 
-	ObjectService getObjectService();
+	ObjectService objectService();
 
-	PluginService getPluginService();
+	PluginService pluginService();
 
 	/** Gets the currently active display (of any Display type). */
 	Display<?> getActiveDisplay();
@@ -183,4 +183,23 @@ <DT extends Display<?>> List<PluginInfo<DT>> getDisplayPluginsOfType(
 	 */
 	Display<?> createDisplayQuietly(Object o);
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #eventService()} instead. */
+	@Deprecated
+	default EventService getEventService() {
+		return eventService();
+	}
+
+	/** @deprecated Use {@link #objectService()} instead. */
+	@Deprecated
+	default ObjectService getObjectService() {
+		return objectService();
+	}
+
+	/** @deprecated Use {@link #pluginService()} instead. */
+	@Deprecated
+	default PluginService getPluginService() {
+		return pluginService();
+	}
 }
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index ebb23aec3..ca0f8ee75 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -79,7 +79,7 @@ public class DefaultInputService extends AbstractService implements
 	// -- InputService methods --
 
 	@Override
-	public EventService getEventService() {
+	public EventService eventService() {
 		return eventService;
 	}
 
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index 467788e0e..b4ecdd249 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -45,7 +45,7 @@
  */
 public interface InputService extends SciJavaService {
 
-	EventService getEventService();
+	EventService eventService();
 
 	InputModifiers getModifiers();
 
@@ -98,4 +98,11 @@ public interface InputService extends SciJavaService {
 	 */
 	boolean isButtonDown(int button);
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #eventService()} instead. */
+	@Deprecated
+	default EventService getEventService() {
+		return eventService();
+	}
 }
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 3c0f98780..1b25c787d 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -72,7 +72,7 @@ public final class DefaultObjectService extends AbstractService implements
 	// -- ObjectService methods --
 
 	@Override
-	public EventService getEventService() {
+	public EventService eventService() {
 		return eventService;
 	}
 
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index fd4bf23f5..a3b880997 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -43,7 +43,7 @@
  */
 public interface ObjectService extends SciJavaService {
 
-	EventService getEventService();
+	EventService eventService();
 
 	/** Gets the index of available objects. */
 	ObjectIndex<Object> getIndex();
@@ -57,4 +57,11 @@ public interface ObjectService extends SciJavaService {
 	/** Deregisters an object with the object service. */
 	void removeObject(Object obj);
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #eventService()} instead. */
+	@Deprecated
+	default EventService getEventService() {
+		return eventService();
+	}
 }
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index aabd65a1c..5b64ed8c4 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -75,12 +75,12 @@ public final class DefaultPlatformService extends
 	// -- PlatformService methods --
 
 	@Override
-	public EventService getEventService() {
+	public EventService eventService() {
 		return eventService;
 	}
 
 	@Override
-	public CommandService getCommandService() {
+	public CommandService commandService() {
 		return commandService;
 	}
 
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 4154cae30..1e1f0b783 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -52,9 +52,9 @@ public interface PlatformService extends SingletonService<Platform>,
 	SciJavaService
 {
 
-	EventService getEventService();
+	EventService eventService();
 
-	CommandService getCommandService();
+	CommandService commandService();
 
 	/** Gets the platform handlers applicable to this platform. */
 	List<Platform> getTargetPlatforms();
@@ -90,4 +90,16 @@ public interface PlatformService extends SingletonService<Platform>,
 	/** @deprecated Use {@link AppService} and {@link App} instead. */
 	@Deprecated
 	AppEventService getAppEventService();
+
+	/** @deprecated Use {@link #eventService()} instead. */
+	@Deprecated
+	default EventService getEventService() {
+		return eventService();
+	}
+
+	/** @deprecated Use {@link #commandService()} instead. */
+	@Deprecated
+	default CommandService getCommandService() {
+		return commandService();
+	}
 }
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 4c77c451e..35cb019ca 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -51,7 +51,7 @@ public abstract class AbstractPTService<PT extends SciJavaPlugin> extends
 	// -- PTService methods --
 
 	@Override
-	public PluginService getPluginService() {
+	public PluginService pluginService() {
 		return pluginService;
 	}
 
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index 16183e03e..eb18761c2 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -120,9 +120,8 @@ protected List<? extends PT> filterInstances(final List<PT> list) {
 	private synchronized void initInstances() {
 		if (instances != null) return;
 
-		final List<PT> list =
-			Collections.unmodifiableList(filterInstances(getPluginService()
-				.createInstancesOfType(getPluginType())));
+		final List<PT> list = Collections.unmodifiableList(filterInstances(
+			pluginService().createInstancesOfType(getPluginType())));
 
 		final HashMap<Class<? extends PT>, PT> map =
 			new HashMap<>();
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 5254a5a12..a4f2e5959 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -77,7 +77,7 @@ public boolean supports(final DT data) {
 
 	private <D extends DT> PT findWrapper(final D data) {
 		for (final PluginInfo<PT> plugin : getPlugins()) {
-			final PT instance = getPluginService().createInstance(plugin);
+			final PT instance = pluginService().createInstance(plugin);
 			if (instance != null && instance.supports(data)) return instance;
 		}
 		return null;
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 1f3caf9df..ed7249c3d 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -87,7 +87,7 @@ public interface PTService<PT extends SciJavaPlugin> extends Service {
 	 * Gets the service responsible for discovering and managing this service's
 	 * plugins.
 	 */
-	PluginService getPluginService();
+	PluginService pluginService();
 
 	/** Gets the plugins managed by this service. */
 	List<PluginInfo<PT>> getPlugins();
@@ -98,4 +98,11 @@ public interface PTService<PT extends SciJavaPlugin> extends Service {
 	/** Creates an instance of the given plugin class. */
 	<P extends PT> P create(final Class<P> pluginClass);
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #pluginService()} instead. */
+	@Deprecated
+	default PluginService getPluginService() {
+		return pluginService();
+	}
 }

From c2d607a1e499ef89d34b266b4326d92c9d1cfca2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 08:36:15 -0500
Subject: [PATCH 0282/1208] Push default Service method behavior to interface

Thanks, Java 8.
---
 .../org/scijava/service/AbstractService.java    | 17 -----------------
 src/main/java/org/scijava/service/Service.java  | 13 +++++++++++--
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index 88f036f21..bc95cdf4a 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -32,7 +32,6 @@
 package org.scijava.service;
 
 import org.scijava.Context;
-import org.scijava.event.EventService;
 import org.scijava.plugin.AbstractRichPlugin;
 
 /**
@@ -59,22 +58,6 @@ public abstract class AbstractService extends AbstractRichPlugin implements
 	 */
 	private Context context;
 
-	// -- Service methods --
-
-	@Override
-	public void initialize() {
-		// NB: Do nothing by default.
-	}
-
-	@Override
-	public void registerEventHandlers() {
-		// TODO: Consider removing this method in scijava-common 3.0.0.
-		// Instead, the ServiceHelper could just invoke the lines below directly,
-		// and there would be one less boilerplate Service method to implement.
-		final EventService eventService = context().getService(EventService.class);
-		if (eventService != null) eventService.subscribe(this);
-	}
-
 	// -- Contextual methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index 140d1377f..0118f93f1 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -32,6 +32,7 @@
 package org.scijava.service;
 
 import org.scijava.Disposable;
+import org.scijava.event.EventService;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 
@@ -58,7 +59,9 @@ public interface Service extends RichPlugin, Disposable {
 	 * when initializing the service. It should not be called a second time.
 	 * </p>
 	 */
-	void initialize();
+	default void initialize() {
+		// NB: Do nothing by default.
+	}
 
 	/**
 	 * Registers the service's event handler methods.
@@ -68,6 +71,12 @@ public interface Service extends RichPlugin, Disposable {
 	 * when initializing the service. It should not be called a second time.
 	 * </p>
 	 */
-	void registerEventHandlers();
+	default void registerEventHandlers() {
+		// TODO: Consider removing this method in scijava-common 3.0.0.
+		// Instead, the ServiceHelper could just invoke the lines below directly,
+		// and there would be one less boilerplate Service method to implement.
+		final EventService eventService = context().getService(EventService.class);
+		if (eventService != null) eventService.subscribe(this);
+	}
 
 }

From bbb2a5a8fdf40c7103dcae7e6d076f612044b82b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 08:37:28 -0500
Subject: [PATCH 0283/1208] SingletonService: add ObjectService accessor

This will be handy to add default method behavior to the interface.
---
 .../java/org/scijava/plugin/AbstractSingletonService.java    | 5 +++++
 src/main/java/org/scijava/plugin/SingletonService.java       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index eb18761c2..d7d793a8f 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -67,6 +67,11 @@ public abstract class AbstractSingletonService<PT extends SingletonPlugin>
 
 	// -- SingletonService methods --
 
+	@Override
+	public ObjectService objectService() {
+		return objectService;
+	}
+
 	@Override
 	public List<PT> getInstances() {
 		if (instances == null) initInstances();
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 5f22897a2..0efbae764 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -33,6 +33,8 @@
 
 import java.util.List;
 
+import org.scijava.object.ObjectService;
+
 /**
  * A service for managing {@link SingletonPlugin}s of a particular type. The
  * {@code SingletonService} creates and maintain a list of singleton instances.
@@ -52,6 +54,9 @@ public interface SingletonService<PT extends SingletonPlugin> extends
 	PTService<PT>
 {
 
+	/** Gets the {@link ObjectService} upon which this service depends. */
+	ObjectService objectService();
+
 	/**
 	 * Gets the list of plugin instances. There will be one singleton instance for
 	 * each available plugin.

From 78f12f37507e26297432cd82f5111cf254068679 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 08:38:04 -0500
Subject: [PATCH 0284/1208] Push default SingletonService behavior to iface

Thanks, Java 8.
---
 .../plugin/AbstractSingletonService.java      | 37 -------------------
 .../org/scijava/plugin/SingletonService.java  | 35 ++++++++++++++++++
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index d7d793a8f..14b2eeab4 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -31,14 +31,12 @@
 
 package org.scijava.plugin;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.scijava.log.LogService;
-import org.scijava.object.LazyObjects;
 import org.scijava.object.ObjectService;
 
 /**
@@ -85,41 +83,6 @@ public <P extends PT> P getInstance(final Class<P> pluginClass) {
 		return (P) instanceMap.get(pluginClass);
 	}
 
-	// -- PTService methods --
-
-	@Override
-	public <P extends PT> P create(final Class<P> pluginClass) {
-		throw new UnsupportedOperationException(
-			"Cannot create singleton plugin instance. "
-				+ "Use getInstance(Class) instead.");
-	}
-
-	// -- Service methods --
-
-	@Override
-	public void initialize() {
-		// add singleton instances to the object index... IN THE FUTURE!
-		objectService.getIndex().addLater(new LazyObjects<Object>() {
-
-			@Override
-			public ArrayList<Object> get() {
-				return new ArrayList<>(getInstances());
-			}
-		});
-	}
-
-	// -- Internal methods --
-
-	/**
-	 * Allows subclasses to exclude instances.
-	 * 
-	 * @param list the initial list of instances
-	 * @return the filtered list of instances
-	 */
-	protected List<? extends PT> filterInstances(final List<PT> list) {
-		return list;
-	}
-
 	// -- Helper methods --
 
 	private synchronized void initInstances() {
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 0efbae764..e2f0d06d2 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -31,8 +31,10 @@
 
 package org.scijava.plugin;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.scijava.object.LazyObjects;
 import org.scijava.object.ObjectService;
 
 /**
@@ -66,4 +68,37 @@ public interface SingletonService<PT extends SingletonPlugin> extends
 	/** Gets the singleton plugin instance of the given class. */
 	<P extends PT> P getInstance(Class<P> pluginClass);
 
+	/**
+	 * Filters the given list of instances by this service's inclusion criteria.
+	 * 
+	 * @param list the initial list of instances
+	 * @return the filtered list of instances
+	 */
+	default List<? extends PT> filterInstances(final List<PT> list) {
+		return list;
+	}
+
+	// -- PTService methods --
+
+	@Override
+	default <P extends PT> P create(final Class<P> pluginClass) {
+		throw new UnsupportedOperationException(
+			"Cannot create singleton plugin instance. "
+				+ "Use getInstance(Class) instead.");
+	}
+
+	// -- Service methods --
+
+	@Override
+	default void initialize() {
+		// add singleton instances to the object index... IN THE FUTURE!
+		objectService().getIndex().addLater(new LazyObjects<Object>() {
+
+			@Override
+			public ArrayList<Object> get() {
+				return new ArrayList<>(getInstances());
+			}
+		});
+	}
+
 }

From ab3f350597c87ba9b9024058fafbf9263044d2e2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 08:42:10 -0500
Subject: [PATCH 0285/1208] AbstractPTService: use accessor method, not field

This will allow us to push the behavior into the interface momentarily.
---
 src/main/java/org/scijava/plugin/AbstractPTService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 35cb019ca..9e00e481f 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -57,15 +57,15 @@ public PluginService pluginService() {
 
 	@Override
 	public List<PluginInfo<PT>> getPlugins() {
-		return pluginService.getPluginsOfType(getPluginType());
+		return pluginService().getPluginsOfType(getPluginType());
 	}
 
 	@Override
 	public <P extends PT> P create(final Class<P> pluginClass) {
 		final PluginInfo<PT> info =
-			pluginService.getPlugin(pluginClass, getPluginType());
+			pluginService().getPlugin(pluginClass, getPluginType());
 		@SuppressWarnings("unchecked")
-		final P plugin = (P) pluginService.createInstance(info);
+		final P plugin = (P) pluginService().createInstance(info);
 		return plugin;
 	}
 

From c7e578e89b453f5a232b5092ec104a43dfd926e9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 08:55:07 -0500
Subject: [PATCH 0286/1208] Push default PTService behavior to iface

Thanks, Java 8.
---
 .../org/scijava/plugin/AbstractPTService.java   | 17 -----------------
 src/main/java/org/scijava/plugin/PTService.java | 12 ++++++++++--
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 9e00e481f..201f06738 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -31,8 +31,6 @@
 
 package org.scijava.plugin;
 
-import java.util.List;
-
 import org.scijava.service.AbstractService;
 
 /**
@@ -54,19 +52,4 @@ public abstract class AbstractPTService<PT extends SciJavaPlugin> extends
 	public PluginService pluginService() {
 		return pluginService;
 	}
-
-	@Override
-	public List<PluginInfo<PT>> getPlugins() {
-		return pluginService().getPluginsOfType(getPluginType());
-	}
-
-	@Override
-	public <P extends PT> P create(final Class<P> pluginClass) {
-		final PluginInfo<PT> info =
-			pluginService().getPlugin(pluginClass, getPluginType());
-		@SuppressWarnings("unchecked")
-		final P plugin = (P) pluginService().createInstance(info);
-		return plugin;
-	}
-
 }
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index ed7249c3d..7239493de 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -90,13 +90,21 @@ public interface PTService<PT extends SciJavaPlugin> extends Service {
 	PluginService pluginService();
 
 	/** Gets the plugins managed by this service. */
-	List<PluginInfo<PT>> getPlugins();
+	default List<PluginInfo<PT>> getPlugins() {
+		return pluginService().getPluginsOfType(getPluginType());
+	}
 
 	/** Gets the type of plugins managed by this service. */
 	Class<PT> getPluginType();
 
 	/** Creates an instance of the given plugin class. */
-	<P extends PT> P create(final Class<P> pluginClass);
+	default <P extends PT> P create(final Class<P> pluginClass) {
+		final PluginInfo<PT> info =
+			pluginService().getPlugin(pluginClass, getPluginType());
+		@SuppressWarnings("unchecked")
+		final P plugin = (P) pluginService().createInstance(info);
+		return plugin;
+	}
 
 	// -- Deprecated methods --
 

From b11491de4117e7f7ceeccc190283ed1b6ab5cd39 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 08:55:26 -0500
Subject: [PATCH 0287/1208] PTService: put unimplemented methods first

---
 src/main/java/org/scijava/plugin/PTService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 7239493de..3b2e3435c 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -89,14 +89,14 @@ public interface PTService<PT extends SciJavaPlugin> extends Service {
 	 */
 	PluginService pluginService();
 
+	/** Gets the type of plugins managed by this service. */
+	Class<PT> getPluginType();
+
 	/** Gets the plugins managed by this service. */
 	default List<PluginInfo<PT>> getPlugins() {
 		return pluginService().getPluginsOfType(getPluginType());
 	}
 
-	/** Gets the type of plugins managed by this service. */
-	Class<PT> getPluginType();
-
 	/** Creates an instance of the given plugin class. */
 	default <P extends PT> P create(final Class<P> pluginClass) {
 		final PluginInfo<PT> info =

From f208fed6d1d58d4f8de76009b098f17c982f97b0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 10:46:23 -0500
Subject: [PATCH 0288/1208] Add a common interface for objects that do logging

---
 src/main/java/org/scijava/log/Logged.java | 43 +++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 src/main/java/org/scijava/log/Logged.java

diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
new file mode 100644
index 000000000..54707a4e3
--- /dev/null
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+/**
+ * Interface for the objects which want to log their activities.
+ * 
+ * @author Curtis Rueden
+ */
+public interface Logged {
+
+	/** Gets the {@link LogService} to use when logging activities. */
+	LogService log();
+}

From 23aada3eec762cb72eb40365c54b2377e4086b59 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2016 10:54:32 -0500
Subject: [PATCH 0289/1208] Implement the Logged interface as appropriate

---
 src/main/java/org/scijava/Gateway.java             |  1 +
 .../org/scijava/command/InteractiveCommand.java    | 14 +++++++++-----
 src/main/java/org/scijava/plugin/RichPlugin.java   | 10 +++++++++-
 .../org/scijava/script/AbstractScriptEngine.java   |  4 +++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 50eaaf9be..052f9d54e 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -244,6 +244,7 @@ public interface Gateway extends RichPlugin {
 	 *
 	 * @return The {@link LogService} of this application context.
 	 */
+	@Override
 	LogService log();
 
 	/**
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index a1b465ab7..c080ce0fa 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -37,6 +37,7 @@
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.log.LogService;
+import org.scijava.log.Logged;
 import org.scijava.module.MethodCallException;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
@@ -60,7 +61,7 @@
  * @author Curtis Rueden
  */
 public abstract class InteractiveCommand extends DynamicCommand implements
-	Interactive, Previewable
+	Interactive, Previewable, Logged
 {
 
 	@Parameter
@@ -102,6 +103,13 @@ public void cancel() {
 		// That is, closing the non-modal dialog does nothing.
 	}
 
+	// -- Logged methods --
+
+	@Override
+	public LogService log() {
+		return log;
+	}
+
 	// -- Internal methods --
 
 	protected void updateInput(final ModuleItem<?> item) {
@@ -137,10 +145,6 @@ protected <T> void update(final ModuleItem<T> item, final T newValue) {
 		}
 	}
 
-	protected LogService log() {
-		return log;
-	}
-
 	// -- Event handlers --
 
 	@EventHandler
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index faec2240c..a1a37dd42 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -36,6 +36,8 @@
 import org.scijava.Locatable;
 import org.scijava.Prioritized;
 import org.scijava.Versioned;
+import org.scijava.log.LogService;
+import org.scijava.log.Logged;
 
 /**
  * Base interface for {@link Contextual}, {@link Prioritized} plugins that
@@ -46,7 +48,7 @@
  * @author Curtis Rueden
  */
 public interface RichPlugin extends SciJavaPlugin, Contextual, Prioritized,
-	HasPluginInfo, Identifiable, Locatable, Versioned
+	HasPluginInfo, Logged, Identifiable, Locatable, Versioned
 {
 
 	// -- Identifiable methods --
@@ -56,4 +58,10 @@ default String getIdentifier() {
 		return "plugin:" + getClass().getName();
 	}
 
+	// -- Logged methods --
+
+	@Override
+	default LogService log() {
+		return context().getService(LogService.class);
+	}
 }
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index 46382835d..61ff5a4d8 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -40,6 +40,7 @@
 import javax.script.ScriptException;
 
 import org.scijava.log.LogService;
+import org.scijava.log.Logged;
 import org.scijava.log.StderrLogService;
 
 /**
@@ -48,7 +49,7 @@
  * 
  * @author Johannes Schindelin
  */
-public abstract class AbstractScriptEngine implements ScriptEngine {
+public abstract class AbstractScriptEngine implements ScriptEngine, Logged {
 
 	// Abstract methods
 
@@ -68,6 +69,7 @@ public abstract class AbstractScriptEngine implements ScriptEngine {
 
 	// log service
 
+	@Override
 	public synchronized LogService log() {
 		if (log == null) {
 			log = new StderrLogService();

From 2c50d024bba04818fe3bec973cae687f4011ec0f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 Aug 2016 13:55:42 -0500
Subject: [PATCH 0290/1208] TypedService: add a way to find the best plugin

---
 .../java/org/scijava/plugin/TypedService.java | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 86983ddbf..ff118ea0c 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -52,5 +52,24 @@
 public interface TypedService<DT, PT extends TypedPlugin<DT>> extends
 	PTService<PT>, Typed<DT>
 {
-	// NB: Marker interface.
+
+	/**
+	 * Gets a new instance of the highest priority plugin managed by this service
+	 * which supports the given data object according to the {@link Typed}
+	 * interface.
+	 * <p>
+	 * Note that this newly created plugin instance will <em>not</em> actually be
+	 * injected with the given data object!
+	 * </p>
+	 * 
+	 * @see HandlerService#getHandler(Object)
+	 * @see WrapperService#create(Object)
+	 */
+	default PT find(final DT data) {
+		for (final PluginInfo<PT> plugin : getPlugins()) {
+			final PT instance = pluginService().createInstance(plugin);
+			if (instance != null && instance.supports(data)) return instance;
+		}
+		return null;
+	}
 }

From 54e4fb39df8a3754fd3cec436a831967abf760ca Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 Aug 2016 15:21:38 -0500
Subject: [PATCH 0291/1208] Push default WrapperService behavior to iface

Thanks, Java 8.
---
 .../plugin/AbstractWrapperService.java        | 43 +------------------
 .../org/scijava/plugin/WrapperService.java    | 22 +++++++++-
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index a4f2e5959..ab5cf266a 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -31,8 +31,6 @@
 
 package org.scijava.plugin;
 
-import org.scijava.log.LogService;
-
 /**
  * Abstract base class for {@link WrapperService}s.
  * 
@@ -43,44 +41,5 @@
 public abstract class AbstractWrapperService<DT, PT extends WrapperPlugin<DT>>
 	extends AbstractTypedService<DT, PT> implements WrapperService<DT, PT>
 {
-
-	@Parameter(required = false)
-	private LogService log;
-
-	// -- WrapperService methods --
-
-	@Override
-	public <D extends DT> PT create(final D data) {
-		final PT instance = findWrapper(data);
-		if (instance != null) instance.set(data);
-		return instance;
-	}
-
-	// -- Service methods --
-
-	@Override
-	public void initialize() {
-		if (log != null) {
-			log.debug("Found " + getPlugins().size() + " " +
-				getPluginType().getSimpleName() + " plugins.");
-		}
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final DT data) {
-		return findWrapper(data) != null;
-	}
-
-	// -- Helper methods --
-
-	private <D extends DT> PT findWrapper(final D data) {
-		for (final PluginInfo<PT> plugin : getPlugins()) {
-			final PT instance = pluginService().createInstance(plugin);
-			if (instance != null && instance.supports(data)) return instance;
-		}
-		return null;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index 0664c95a8..d174ca149 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -62,6 +62,26 @@ public interface WrapperService<DT, PT extends WrapperPlugin<DT>> extends
 	 * @return An appropriate plugin instance, or null if the data is not
 	 *         compatible with any available plugin.
 	 */
-	<D extends DT> PT create(D data);
+	default <D extends DT> PT create(final D data) {
+		final PT instance = find(data);
+		if (instance != null) instance.set(data);
+		return instance;
+	}
 
+	// -- Service methods --
+
+	@Override
+	default void initialize() {
+		if (log() != null) {
+			log().debug("Found " + getPlugins().size() + " " +
+				getPluginType().getSimpleName() + " plugins.");
+		}
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default boolean supports(final DT data) {
+		return find(data) != null;
+	}
 }

From 132157b36b58f173c6daa6dde0c95510b4345f13 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 Aug 2016 15:22:44 -0500
Subject: [PATCH 0292/1208] Push default TypedPlugin behavior to iface

Thanks, Java 8.
---
 src/main/java/org/scijava/Typed.java                     | 4 +++-
 .../java/org/scijava/plugin/AbstractTypedPlugin.java     | 9 +--------
 src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java | 4 +++-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index be50d652d..20d877557 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -47,7 +47,9 @@ public interface Typed<T> {
 	 * requirements beyond class assignability.
 	 * </p>
 	 */
-	boolean supports(T data);
+	default boolean supports(@SuppressWarnings("unused") T data) {
+		return true;
+	}
 
 	/** Gets the type associated with the object. */
 	Class<T> getType();
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index cda3c8e3b..9493deced 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -43,12 +43,5 @@
 public abstract class AbstractTypedPlugin<D> extends AbstractRichPlugin
 	implements TypedPlugin<D>
 {
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final D data) {
-		return true;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 3fbf71803..d02c25e44 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -143,6 +143,8 @@ public interface DragAndDropHandler<D> extends HandlerPlugin<D> {
 	 * compatible display.
 	 */
 	@Override
-	boolean supports(final D dataObject);
+	default boolean supports(final D dataObject) {
+		return true;
+	}
 
 }

From 3b6e3a0d84c87464c9a429aa949aaa25ab49b761 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 14:31:00 -0500
Subject: [PATCH 0293/1208] ScriptInfo: use try-with-resources block

---
 src/main/java/org/scijava/script/ScriptInfo.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index e7e74c2ec..3b82405c1 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -231,14 +231,9 @@ public void parseParameters() {
 		clearParameters();
 		appendReturnValue = true;
 
-		try {
-			final BufferedReader in;
-			if (script == null) {
-				in = new BufferedReader(new FileReader(getPath()));
-			}
-			else {
-				in = getReader();
-			}
+		try (final BufferedReader in = script == null ? //
+			new BufferedReader(new FileReader(getPath())) : getReader()) //
+		{
 			while (true) {
 				final String line = in.readLine();
 				if (line == null) break;
@@ -252,7 +247,6 @@ public void parseParameters() {
 				}
 				else if (line.matches(".*\\w.*")) break;
 			}
-			in.close();
 
 			if (appendReturnValue) addReturnValue();
 		}

From 2757138268d44b43bf7dc10cae669b4ee234dacd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 14:46:24 -0500
Subject: [PATCH 0294/1208] ScriptInfo: fix warning about field shadowing

---
 src/main/java/org/scijava/script/ScriptInfo.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 3b82405c1..d89917930 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -136,16 +136,16 @@ public ScriptInfo(final Context context, final String path,
 		setContext(context);
 		this.path = path;
 
-		String script = null;
+		String contents = null;
 		if (reader != null) {
 			try {
-				script = getReaderContentsAsString(reader);
+				contents = getReaderContentsAsString(reader);
 			}
 			catch (final IOException exc) {
 				log.error("Error reading script: " + path, exc);
 			}
 		}
-		this.script = script;
+		script = contents;
 	}
 
 	// -- ScriptInfo methods --

From 01fc1ffd213f55949f3a3e29783e4956ad3f7d4a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 14:58:44 -0500
Subject: [PATCH 0295/1208] ParseService: add a non-strict parsing mode

This is based off of the new non-strict evaluation mode of SJEP.
But the API does not explicitly guarantee exactly what "non-strict"
means at this layer. We just want to make a best effort.
---
 pom.xml                                           |  1 +
 .../org/scijava/parse/DefaultParseService.java    | 14 ++++++++++----
 src/main/java/org/scijava/parse/ParseService.java | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6abefec34..f6c8e7a27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-expression-parser</artifactId>
+			<version>3.1.0</version>
 		</dependency>
 
 		<!-- Third-party dependencies -->
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 8142ae59c..84db28d9b 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -55,7 +55,12 @@ public class DefaultParseService extends AbstractService implements
 
 	@Override
 	public Items parse(final String arg) {
-		return new ItemsList(arg);
+		return parse(arg, true);
+	}
+
+	@Override
+	public Items parse(final String arg, final boolean strict) {
+		return new ItemsList(arg, strict);
 	}
 
 	// -- Helper classes --
@@ -67,9 +72,9 @@ public Items parse(final String arg) {
 	 */
 	private static class ItemsList extends ObjectArray<Item> implements Items {
 
-		public ItemsList(final String arg) {
+		public ItemsList(final String arg, final boolean strict) {
 			super(Item.class);
-			parseItems(arg);
+			parseItems(arg, strict);
 		}
 
 		@Override
@@ -98,8 +103,9 @@ public boolean isList() {
 			return true;
 		}
 
-		private void parseItems(final String arg) {
+		private void parseItems(final String arg, final boolean strict) {
 			final DefaultEvaluator e = new DefaultEvaluator();
+			e.setStrict(strict);
 			final Object result = e.evaluate("(" + arg + ")");
 			if (result == null) {
 				throw new IllegalStateException("Error parsing string: '" + arg + "'");
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 31e63d5c6..102719442 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -54,4 +54,19 @@ public interface ParseService extends SciJavaService {
 	 */
 	Items parse(String arg);
 
+	/**
+	 * Parses a comma-delimited list of data elements.
+	 * <p>
+	 * Some data elements might be {@code key=value} pairs, while others might be
+	 * raw values (i.e., no equals sign).
+	 * </p>
+	 * 
+	 * @param arg The string to parse.
+	 * @param strict Whether to fail fast when encountering an unassigned variable
+	 *          token.
+	 * @return A parsed list of {@link Item}s.
+	 * @throws IllegalArgumentException If the string does not conform to expected
+	 *           syntax.
+	 */
+	Items parse(String arg, boolean strict);
 }

From b700de66e226af61ef8f9c2ce7214dfd32d831ab Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 15:00:26 -0500
Subject: [PATCH 0296/1208] ScriptInfo: parse attributes in non-strict mode

This gets us one step closer to supporting things like:

    // @String(visibility=MESSAGE) text
---
 src/main/java/org/scijava/script/ScriptInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index d89917930..08bec72dc 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -378,7 +378,7 @@ private void parseParam(final String param,
 
 	/** Parses a comma-delimited list of {@code key=value} pairs into a map. */
 	private Map<String, Object> parseAttrs(final String attrs) {
-		return parser.parse(attrs).asMap();
+		return parser.parse(attrs, false).asMap();
 	}
 
 	private boolean isIOType(final String token) {

From c677ea109cf81cc653de7c12c788474a282b1c1e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 15:01:15 -0500
Subject: [PATCH 0297/1208] ScriptInfo: try harder when converting types

If we cannot convert directly from source to target type,
try converting through String before giving up.

With this change, the following now works as desired:

    // @String(visibility=MESSAGE) text

The reason this change fixes the above is that the expression
"visibility=MESSAGE" evaluates to the map:

    visibility -> new org.scijava.sjep.eval.Unresolved("MESSAGE")

That is, the variable "visibility" contains an object of type
org.scijava.sjep.eval.Unresolved, with a token value of "MESSAGE".
We cannot convert from an org.scijava.sjep.eval.Unresolved to an
org.scijava.ItemVisibility, but we _can_ convert from Unresolved to
String (the toString() method is called, resulting in "MESSAGE"),
followed by String to ItemVisibility (the string value is
considered to be naming one of the enumeration's values).

This heuristic avoids an explicit assumption in the scripting
framework of the ParseService being backed by SJEP (it might not
be -- someone might be using their own higher priority ParseService).
---
 src/main/java/org/scijava/script/ScriptInfo.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 08bec72dc..10c4dd07d 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -450,7 +450,13 @@ private boolean is(final String key, final String desired) {
 
 	/** Super terse conversion helper method. */
 	private <T> T as(final Object v, final Class<T> type) {
-		return convertService.convert(v, type);
+		final T converted = convertService.convert(v, type);
+		if (converted != null) return converted;
+		// NB: Attempt to convert via string.
+		// This is useful in cases where a weird type of object came back
+		// (e.g., org.scijava.sjep.eval.Unresolved), but which happens to have a
+		// nice string representation which ultimately is expressible as the type.
+		return convertService.convert(v.toString(), type);
 	}
 
 	private <T> List<T> asList(final Object v, final Class<T> type) {

From 632d975ae50ea897efec3d2b53e21f267a244f26 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 15:06:37 -0500
Subject: [PATCH 0298/1208] ScriptInfoTest: test that enums are now evaluated

As discussed in the previous commit, the following now works:

    // @String(visibility=MESSAGE) text
---
 src/test/java/org/scijava/script/ScriptInfoTest.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 37b85214c..eb384c03a 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -58,6 +58,7 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.ItemIO;
+import org.scijava.ItemVisibility;
 import org.scijava.log.LogService;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Plugin;
@@ -181,6 +182,7 @@ public void testParameters() {
 			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
 			"% @String(persist = false, family='Carnivora', " + //
 			"choices={'quick brown fox', 'lazy dog'}) animal\n" + //
+			"% @String(visibility=MESSAGE) msg\n" + //
 			"% @BOTH java.lang.StringBuilder buffer";
 
 		final ScriptInfo info =
@@ -203,12 +205,15 @@ public void testParameters() {
 			null, null, null, null, null, null, null, null, animalChoices, animal);
 		assertEquals(animal.get("family"), "Carnivora"); // test custom attribute
 
+		final ModuleItem<?> msg = info.getInput("msg");
+		assertSame(ItemVisibility.MESSAGE, msg.getVisibility());
+
 		final ModuleItem<?> buffer = info.getOutput("buffer");
 		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,
 			null, null, null, null, null, null, null, null, noChoices, buffer);
 
 		int inputCount = 0;
-		final ModuleItem<?>[] inputs = { log, sliderValue, animal, buffer };
+		final ModuleItem<?>[] inputs = { log, sliderValue, animal, msg, buffer };
 		for (final ModuleItem<?> inItem : info.inputs()) {
 			assertSame(inputs[inputCount++], inItem);
 		}

From 58f37727d4aed3aa0d74b495c162833be913e07f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 17:03:23 -0500
Subject: [PATCH 0299/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f6c8e7a27..82a9a3b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.57.1-SNAPSHOT</version>
+	<version>2.58.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 4aa8556da5071f4ab93fad74586798cc2313292f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 Aug 2016 21:53:37 -0500
Subject: [PATCH 0300/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 82a9a3b32..e4e4b2a7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.58.1-SNAPSHOT</version>
+	<version>2.58.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From ece9a5ceee43ca816550e82d48221587b607fff7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 25 Aug 2016 12:08:35 -0500
Subject: [PATCH 0301/1208] DefaultScriptService: also alias java.util.Date

This was an oversight, since this type is on the same
level as java.io.File and org.scijava.util.ColorRGB(A).

See:
http://forum.imagej.net/t/parameter-date-in-imagej-macro/2577
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index be695cb89..1d228997a 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -39,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -416,7 +417,7 @@ private synchronized void initAliasMap() {
 
 		// built-in types
 		addAliases(map, Context.class, BigDecimal.class, BigInteger.class,
-			ColorRGB.class, ColorRGBA.class, File.class, String.class);
+			ColorRGB.class, ColorRGBA.class, Date.class, File.class, String.class);
 
 		// gateway types
 		final List<PluginInfo<Gateway>> gatewayPlugins =

From 66f6eee89d458031bfbff1ee579937c76289b340 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 25 Aug 2016 12:13:05 -0500
Subject: [PATCH 0302/1208] ScriptServiceTest: add a test for built-in aliases

---
 .../org/scijava/script/ScriptServiceTest.java | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index a7c5a075a..ec40e4790 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -35,6 +35,9 @@
 import static org.junit.Assert.assertSame;
 
 import java.io.File;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
 import java.util.List;
 
 import javax.script.ScriptException;
@@ -42,6 +45,8 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.util.AppUtils;
+import org.scijava.util.ColorRGB;
+import org.scijava.util.ColorRGBA;
 
 /**
  * Tests the {@link DefaultScriptService}.
@@ -75,6 +80,26 @@ public void testSystemProperty() {
 		assertEquals(dir2, scriptDirs.get(2).getAbsolutePath());
 	}
 
+	@Test
+	public void testBuiltInAliases() throws ScriptException {
+		final Context ctx = new Context(ScriptService.class);
+		final ScriptService ss = ctx.service(ScriptService.class);
+
+		final Class<?>[] builtIns = { boolean.class, byte.class, char.class,
+			double.class, float.class, int.class, long.class, short.class,
+			Boolean.class, Byte.class, Character.class, Double.class, Float.class,
+			Integer.class, Long.class, Short.class, Context.class, BigDecimal.class,
+			BigInteger.class, ColorRGB.class, ColorRGBA.class, Date.class, File.class,
+			String.class };
+
+		for (final Class<?> builtIn : builtIns) {
+			final Class<?> c = ss.lookupClass(builtIn.getSimpleName());
+			assertSame(builtIn, c);
+		}
+
+		ctx.dispose();
+	}
+
 	@Test
 	public void testArrayAliases() throws ScriptException {
 		final Context ctx = new Context(ScriptService.class);

From f990ad54597f9895f3443a942c6b685c330e7c46 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 25 Aug 2016 12:53:51 -0500
Subject: [PATCH 0303/1208] Fix race condition in alias initialization

The ServicesLoadedEvent fires asynchronously. Hence, it was
possible that the service aliases did not get added in time for
subsequent alias lookups. This was most likely in the unit tests,
where a context is spun up and then immediately queried for
aliases, before things had time to settle.

Of course, it was totally bogus to initialize the service classes
this way. We now employ a better, more consistent solution:
rather than querying the ServiceIndex, we ask the PluginIndex for
all PluginInfo<Service> objects and load their classes. This is
fine because we do not need actual Service instances to exist yet
-- we only need the Class objects to create the aliases.

This fixes a long-standing race condition which caused the
SciJava Common Jenkins build to occasionally fail.
---
 .../scijava/script/DefaultScriptService.java  | 76 +++++++++----------
 1 file changed, 34 insertions(+), 42 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 1d228997a..9f3410734 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -54,7 +54,6 @@
 import org.scijava.Priority;
 import org.scijava.app.AppService;
 import org.scijava.command.CommandService;
-import org.scijava.event.EventHandler;
 import org.scijava.log.LogService;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleService;
@@ -63,10 +62,9 @@
 import org.scijava.plugin.AbstractSingletonService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
+import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.service.Service;
-import org.scijava.service.event.ServicesLoadedEvent;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ColorRGB;
 import org.scijava.util.ColorRGBA;
@@ -300,18 +298,6 @@ public Collection<ScriptInfo> get() {
 		});
 	}
 
-	// -- Event handlers --
-
-	@EventHandler
-	private void
-		onEvent(@SuppressWarnings("unused") final ServicesLoadedEvent evt)
-	{
-		// NB: Add service type aliases after all services have joined the context.
-		for (final Service service : getContext().getServiceIndex()) {
-			addAliases(aliasMap(), service.getClass());
-		}
-	}
-
 	// -- Helper methods - lazy initialization --
 
 	/** Gets {@link #scriptLanguageIndex}, initializing if needed. */
@@ -419,21 +405,34 @@ private synchronized void initAliasMap() {
 		addAliases(map, Context.class, BigDecimal.class, BigInteger.class,
 			ColorRGB.class, ColorRGBA.class, Date.class, File.class, String.class);
 
+		// service types
+		addAliases(map, pluginClasses(Service.class));
+
 		// gateway types
-		final List<PluginInfo<Gateway>> gatewayPlugins =
-			pluginService.getPluginsOfType(Gateway.class);
-		for (final PluginInfo<Gateway> info : gatewayPlugins) {
-			try {
-				addAliases(map, info.loadClass());
-			}
-			catch (final InstantiableException exc) {
-				log.warn("Ignoring invalid gateway: " + info.getClassName(), exc);
-			}
-		}
+		addAliases(map, pluginClasses(Gateway.class));
 
 		aliasMap = map;
 	}
 
+	// -- Helper methods - run --
+
+	/**
+	 * Gets a {@link ScriptInfo} for the given file, creating a new one if none
+	 * are registered with the service.
+	 */
+	private ScriptInfo getOrCreate(final File file) {
+		final ScriptInfo info = scripts().get(file);
+		if (info != null) return info;
+		return new ScriptInfo(getContext(), file);
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private Future<ScriptModule> cast(final Future<Module> future) {
+		return (Future) future;
+	}
+
+	// -- Helper methods - aliases --
+
 	private void addAliases(final HashMap<String, Class<?>> map,
 		final Class<?>... types)
 	{
@@ -452,25 +451,18 @@ private void addAliases(final HashMap<String, Class<?>> map,
 		addAliases(map, type.getInterfaces());
 	}
 
-	// -- Helper methods - run --
-
-	/**
-	 * Gets a {@link ScriptInfo} for the given file, creating a new one if none
-	 * are registered with the service.
-	 */
-	private ScriptInfo getOrCreate(final File file) {
-		final ScriptInfo info = scripts().get(file);
-		if (info != null) return info;
-		return new ScriptInfo(getContext(), file);
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private Future<ScriptModule> cast(final Future<Module> future) {
-		return (Future) future;
+	private Class<?>[] pluginClasses(final Class<? extends SciJavaPlugin> type) {
+		return pluginService.getPluginsOfType(type).stream().map(info -> {
+			try {
+				return info.loadClass();
+			}
+			catch (final InstantiableException exc) {
+				log.warn("Invalid class: " + info.getClassName(), exc);
+				return null;
+			}
+		}).toArray(Class<?>[]::new);
 	}
 
-	// -- Helper methods - aliases --
-
 	private String stripArrayNotation(final String alias) {
 		if (!alias.endsWith("[]")) return alias;
 		return stripArrayNotation(alias.substring(0, alias.length() - 2));

From fd0a289d21a913c4fc941cbd4c151f4aa34deccf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 25 Aug 2016 16:11:04 -0500
Subject: [PATCH 0304/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e4e4b2a7d..b72d8a983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.58.2-SNAPSHOT</version>
+	<version>2.58.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 2cb16a62fbdda8941c13b32958115192396c521a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 26 Aug 2016 03:09:49 -0500
Subject: [PATCH 0305/1208] Add default behavior for service accessors

It is easy and reasonable to fall back to asking the context directly
for the service. However, there is a downside: services which do not
override these methods to return their injected field values may have
subtle bugs relating to service dependencies and initialization order.

For example, InputService has a method EventService, which is intended
to never return null. In other words: it is intended that InputService
implementations (at least by default) _depend_ on the EventService.
If you write:

    Context ctx = new Context(InputService.class);

When DefaultInputService is on the classpath, it will be instantiated,
its @Parameter EventService field will be noted, and the
highest-priority concrete EventService implementation (i.e.,
DefaultEventService) will then be recursively instantiated and
initialized, and so forth. So you will end up with a Context containing
a DefaultInputService _and_ all of its service dependencies.

But if DefaultInputService neglects to declare an @Parameter
EventService, the way the service loader is coded right now, the
EventService dependency will not be noticed, and the Context will
contain only a DefaultInputService, whose eventService() method will
return null, resulting in NPE when calling other methods which use it.

There is one vital reason to define these default method behaviors
anyway, though: to avoid breaking SPI compatibility with downstream
components. For example, the net.imagej:imagej-legacy component
implements a LegacyConsoleService (ConsoleService is a
SingletonService), which was forced to implement the new
objectService() method when upgrading its version of scijava-common.
Unfortunately, the ImageJ Updater (net.imagej:imagej-updater) has a
serious design flaw whereby it updates itself and its dependencies
(including scijava-common) first, without updating any downstream
libraries (e.g., imagej-legacy). So we end up with a situation where
scijava-common is at 2.58.2, after the addition of the newly required
objectService() method, while imagej-legacy remains at its old version
which does not implement that method. And the Context fails to spin up.
Adding these default method behaviors is a simple way around the issue.

We should consider whether to remove these default implementations in
SJC3. And we should definitely consider how best to fix SciJava Common
so that downstream JAR skew cannot taint the Context startup so easily.
But for now, it is safest to provide these methods, in case of JAR skew.
---
 .../java/org/scijava/command/CommandService.java     |  8 ++++++--
 .../java/org/scijava/display/DisplayService.java     | 12 +++++++++---
 src/main/java/org/scijava/input/InputService.java    |  4 +++-
 src/main/java/org/scijava/object/ObjectService.java  |  4 +++-
 .../java/org/scijava/platform/PlatformService.java   |  8 ++++++--
 src/main/java/org/scijava/plugin/PTService.java      |  4 +++-
 .../java/org/scijava/plugin/SingletonService.java    |  4 +++-
 7 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 3f0e0da8e..3d0a4f80a 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -64,9 +64,13 @@
  */
 public interface CommandService extends PTService<Command>, SciJavaService {
 
-	EventService eventService();
+	default EventService eventService() {
+		return context().getService(EventService.class);
+	}
 
-	ModuleService moduleService();
+	default ModuleService moduleService() {
+		return context().getService(ModuleService.class);
+	}
 
 	/** Gets the list of all available {@link Command}s). */
 	List<CommandInfo> getCommands();
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 204de8f74..92bb6e725 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -50,11 +50,17 @@
  */
 public interface DisplayService extends SciJavaService {
 
-	EventService eventService();
+	default EventService eventService() {
+		return context().getService(EventService.class);
+	}
 
-	ObjectService objectService();
+	default ObjectService objectService() {
+		return context().getService(ObjectService.class);
+	}
 
-	PluginService pluginService();
+	default PluginService pluginService() {
+		return context().getService(PluginService.class);
+	}
 
 	/** Gets the currently active display (of any Display type). */
 	Display<?> getActiveDisplay();
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index b4ecdd249..261aab401 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -45,7 +45,9 @@
  */
 public interface InputService extends SciJavaService {
 
-	EventService eventService();
+	default EventService eventService() {
+		return context().getService(EventService.class);
+	}
 
 	InputModifiers getModifiers();
 
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index a3b880997..ef5ce9692 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -43,7 +43,9 @@
  */
 public interface ObjectService extends SciJavaService {
 
-	EventService eventService();
+	default EventService eventService() {
+		return context().getService(EventService.class);
+	}
 
 	/** Gets the index of available objects. */
 	ObjectIndex<Object> getIndex();
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 1e1f0b783..267881bc8 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -52,9 +52,13 @@ public interface PlatformService extends SingletonService<Platform>,
 	SciJavaService
 {
 
-	EventService eventService();
+	default EventService eventService() {
+		return context().getService(EventService.class);
+	}
 
-	CommandService commandService();
+	default CommandService commandService() {
+		return context().getService(CommandService.class);
+	}
 
 	/** Gets the platform handlers applicable to this platform. */
 	List<Platform> getTargetPlatforms();
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 3b2e3435c..9951e8478 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -87,7 +87,9 @@ public interface PTService<PT extends SciJavaPlugin> extends Service {
 	 * Gets the service responsible for discovering and managing this service's
 	 * plugins.
 	 */
-	PluginService pluginService();
+	default PluginService pluginService() {
+		return context().getService(PluginService.class);
+	}
 
 	/** Gets the type of plugins managed by this service. */
 	Class<PT> getPluginType();
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index e2f0d06d2..343033112 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -57,7 +57,9 @@ public interface SingletonService<PT extends SingletonPlugin> extends
 {
 
 	/** Gets the {@link ObjectService} upon which this service depends. */
-	ObjectService objectService();
+	default ObjectService objectService() {
+		return context().getService(ObjectService.class);
+	}
 
 	/**
 	 * Gets the list of plugin instances. There will be one singleton instance for

From c29a6c9bce83a8480e72e2202c5f158031224df9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 26 Aug 2016 03:32:06 -0500
Subject: [PATCH 0306/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b72d8a983..87d4aaa18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.58.3-SNAPSHOT</version>
+	<version>2.58.4-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>

From 331e5843514ad70f052f3a849b428c3c8687ef29 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 31 Aug 2016 19:51:57 -0500
Subject: [PATCH 0307/1208] AbstractGateway: fix bug in getShortName behavior

The default short name should be the class's _simple_ name (sans
package) in lower case... not the fully qualified name in lower case.
---
 src/main/java/org/scijava/AbstractGateway.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 9db79f09e..0b55b646d 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -108,7 +108,7 @@ public void launch(final String... args) {
 
 	@Override
 	public String getShortName() {
-		return getClass().getName().toLowerCase();
+		return getClass().getSimpleName().toLowerCase();
 	}
 
 	@Override

From 34e2800ee0fec9eb9e57f4c787f2249fbaf7be5d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 1 Sep 2016 13:37:52 -0500
Subject: [PATCH 0308/1208] ScriptFinder: quelch unsupported script message

If you have a script directory prefix with a mixture of scripts and
non-scripts such as JAR files (which is what Fiji has, for example),
the ScriptFinder was issuing a warning message for each and every
JAR file. This is normal and expected, so let's not warn about it,
but rather mention it only when debug logging is enabled.
---
 src/main/java/org/scijava/script/ScriptFinder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 48d66e6aa..5766b2086 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -164,7 +164,7 @@ private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
 		int scriptCount = 0;
 		for (final String path : scriptMap.keySet()) {
 			if (!scriptService.canHandleFile(path)) {
-				log.warn("Ignoring unsupported script: " + path);
+				log.debug("Ignoring unsupported script: " + path);
 				continue;
 			}
 

From 37dbcadfacdfc3496f62063ab54986846e202db3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 08:23:42 -0500
Subject: [PATCH 0309/1208] Tweak description text

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 87d4aaa18..a6b72b5aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<version>2.58.4-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
-	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
+	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
 	<url>http://scijava.org/</url>
 	<inceptionYear>2009</inceptionYear>
 	<licenses>

From 8a3ec325bc9f591a583ee1e26c8d030e3236aeb0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 31 Aug 2016 20:08:15 -0500
Subject: [PATCH 0310/1208] POM: bump pom-scijava parent to 11.2.1

Aside from the usual managed component version updates, this reduces
boilerplate for the maven-jar-plugin and license-maven-plugin, and
avoids an annoying Eclipse warning.
---
 pom.xml | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6b72b5aa..5414f69ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>11.0.0</version>
+		<version>11.2.1</version>
 		<relativePath />
 	</parent>
 
@@ -101,12 +101,21 @@
 		<url>http://jenkins.imagej.net/job/SciJava-common/</url>
 	</ciManagement>
 
+	<properties>
+		<package-name>org.scijava</package-name>
+
+		<license.licenseName>bsd_2</license.licenseName>
+		<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>
+		<license.copyrightOwners>Board of Regents of the University of
+Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+Institute of Molecular Cell Biology and Genetics.</license.copyrightOwners>
+	</properties>
+
 	<dependencies>
 		<!-- SciJava dependencies -->
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-expression-parser</artifactId>
-			<version>3.1.0</version>
 		</dependency>
 
 		<!-- Third-party dependencies -->
@@ -131,27 +140,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<packageName>org.scijava</packageName>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<configuration>
-					<licenseName>bsd_2</licenseName>
-					<organizationName>Board of Regents of the University of
-Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
-Institute of Molecular Cell Biology and Genetics.</organizationName>
-					<projectName>SciJava Common shared library for SciJava software.</projectName>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>

From ae5f1cf705cfb24084fe28a16f80f1525d172a42 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 10:34:43 -0500
Subject: [PATCH 0311/1208] DisplayPostprocessor: flag when output is handled

In some cases, the handleOutput method handles an output; in others,
it skips the output for various reasons. This commit changes the
method to return a boolean flag indicating which scenario took place.
---
 .../scijava/display/DisplayPostprocessor.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index d14f0777e..659f63533 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -82,17 +82,14 @@ public void process(final Module module) {
 	 * @param defaultName The default name for the display, if not already set.
 	 * @param output The object to display.
 	 */
-	private void handleOutput(final String defaultName, final Object output) {
-		if (output == null) {
-			// ignore null outputs
-			return;
-		}
+	private boolean handleOutput(final String defaultName, final Object output) {
+		if (output == null) return false; // ignore null outputs
 
 		if (output instanceof Display) {
 			// output is itself a display; just update it
 			final Display<?> display = (Display<?>) output;
 			display.update();
-			return;
+			return true;
 		}
 
 		final boolean addToExisting = addToExisting(output);
@@ -133,7 +130,7 @@ private void handleOutput(final String defaultName, final Object output) {
 			for (final Display<?> display : displays) {
 				display.update();
 			}
-			return;
+			return true;
 		}
 
 		if (output instanceof Map) {
@@ -144,7 +141,7 @@ private void handleOutput(final String defaultName, final Object output) {
 				final Object itemValue = map.get(key);
 				handleOutput(itemName, itemValue);
 			}
-			return;
+			return true;
 		}
 
 		if (output instanceof Collection) {
@@ -153,7 +150,7 @@ private void handleOutput(final String defaultName, final Object output) {
 			for (final Object item : collection) {
 				handleOutput(defaultName, item);
 			}
-			return;
+			return true;
 		}
 
 		// no available displays for this type of output
@@ -162,6 +159,7 @@ private void handleOutput(final String defaultName, final Object output) {
 			log.warn("Ignoring unsupported output: " + defaultName + " [" +
 				valueClass + "]");
 		}
+		return false;
 	}
 
 	private boolean addToExisting(final Object output) {

From cf8aaee565128aae5cbe9d4d36f7bbf6ace1cd0b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 10:36:49 -0500
Subject: [PATCH 0312/1208] ScriptModule: do not resolve outputs

The module item resolution API is for inputs only. It makes no
sense to resolve the outputs here. (Actually, we are about to
change that API to allow resolution of outputs as well... but it
will still not make sense to do so here in the ScriptModule.)
---
 src/main/java/org/scijava/script/ScriptModule.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 45d2028db..558eec7b6 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -190,7 +190,6 @@ public void run() {
 		final ScriptLanguage language = getLanguage();
 		for (final ModuleItem<?> item : getInfo().outputs()) {
 			final String name = item.getName();
-			if (isResolved(name)) continue;
 			final Object value;
 			if (RETURN_VALUE.equals(name) && getInfo().isReturnValueAppended()) {
 				// NB: This is the special implicit return value output!
@@ -200,7 +199,6 @@ public void run() {
 			final Object decoded = language.decode(value);
 			final Object typed = conversionService.convert(decoded, item.getType());
 			setOutput(name, typed);
-			setResolved(name, true);
 		}
 
 		// flush output and error streams

From 071dc89c84d882ca88ac3dab8f813d03b46f8286 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 10:33:14 -0500
Subject: [PATCH 0313/1208] Module: revamp item resolution

Previously, only inputs could be marked resolved or not.
But it is useful also to be able to resolve outputs, so that the
postprocessing chain can be more intelligent about its actions.
So now the API allows resolution of both inputs and outputs.
---
 pom.xml                                       |  2 +-
 .../org/scijava/module/AbstractModule.java    | 30 ++++++--
 src/main/java/org/scijava/module/Module.java  | 73 +++++++++++++++++--
 3 files changed, 93 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 91a54bfbb..cfaf505af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.58.4-SNAPSHOT</version>
+	<version>2.59.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index d8c0433e2..77948a285 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -48,8 +48,8 @@ public abstract class AbstractModule implements Module {
 	private final HashMap<String, Object> inputs;
 	private final HashMap<String, Object> outputs;
 
-	/** Table indicating resolved inputs. */
 	private final HashSet<String> resolvedInputs;
+	private final HashSet<String> resolvedOutputs;
 
 	private MethodRef initializerRef;
 
@@ -57,6 +57,7 @@ public AbstractModule() {
 		inputs = new HashMap<>();
 		outputs = new HashMap<>();
 		resolvedInputs = new HashSet<>();
+		resolvedOutputs = new HashSet<>();
 	}
 
 	// -- Module methods --
@@ -137,14 +138,33 @@ public void setOutputs(final Map<String, Object> outputs) {
 	}
 
 	@Override
-	public boolean isResolved(final String name) {
+	public boolean isInputResolved(final String name) {
 		return resolvedInputs.contains(name);
 	}
 
 	@Override
-	public void setResolved(final String name, final boolean resolved) {
-		if (resolved) resolvedInputs.add(name);
-		else resolvedInputs.remove(name);
+	public boolean isOutputResolved(final String name) {
+		return resolvedOutputs.contains(name);
+	}
+
+	@Override
+	public void resolveInput(final String name) {
+		resolvedInputs.add(name);
+	}
+
+	@Override
+	public void resolveOutput(final String name) {
+		resolvedOutputs.add(name);
+	}
+
+	@Override
+	public void unresolveInput(final String name) {
+		resolvedInputs.remove(name);
+	}
+
+	@Override
+	public void unresolveOutput(final String name) {
+		resolvedOutputs.remove(name);
 	}
 
 	// -- Helper methods --
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 275f0d904..068b91e2c 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -33,6 +33,11 @@
 
 import java.util.Map;
 
+import org.scijava.display.DisplayPostprocessor;
+import org.scijava.module.process.ModulePostprocessor;
+import org.scijava.module.process.ModulePreprocessor;
+import org.scijava.widget.InputHarvester;
+
 /**
  * A module is an encapsulated piece of functionality with inputs and outputs.
  * <p>
@@ -126,15 +131,71 @@ public interface Module extends Runnable {
 	void setOutputs(Map<String, Object> outputs);
 
 	/**
-	 * Gets the resolution status of the input with the given name. A "resolved"
-	 * input is known to have a final, valid value for use with the module.
+	 * Gets the resolution status of the input with the given name.
+	 * 
+	 * @see #resolveInput(String)
+	 */
+	boolean isInputResolved(String name);
+
+	/**
+	 * Gets the resolution status of the output with the given name.
+	 * 
+	 * @see #resolveOutput(String)
+	 */
+	boolean isOutputResolved(String name);
+
+	/**
+	 * Marks the input with the given name as resolved. A "resolved" input is
+	 * known to have a final, valid value for use with the module.
+	 * <p>
+	 * {@link ModulePreprocessor}s in the module execution chain that populate
+	 * input values (e.g. {@link InputHarvester} plugins) will typically skip over
+	 * inputs which have already been resolved.
+	 * </p>
+	 */
+	void resolveInput(String name);
+
+	/**
+	 * Marks the output with the given name as resolved. A "resolved" output has
+	 * been handled by the framework somehow, typically displayed to the user.
+	 * <p>
+	 * {@link ModulePostprocessor}s in the module execution chain that handle
+	 * output values (e.g. the {@link DisplayPostprocessor}) will typically skip
+	 * over outputs which have already been resolved.
+	 * </p>
+	 */
+	void resolveOutput(String name);
+
+	/**
+	 * Marks the input with the given name as unresolved.
+	 * 
+	 * @see #resolveInput(String)
 	 */
-	boolean isResolved(String name);
+	void unresolveInput(String name);
+
+	/**
+	 * Marks the output with the given name as unresolved.
+	 * 
+	 * @see #resolveOutput(String)
+	 */
+	void unresolveOutput(String name);
+
+	// -- Deprecated --
+
+	/** @deprecated Use {@link #isInputResolved(String)} instead. */
+	@Deprecated
+	default boolean isResolved(final String name) {
+		return isInputResolved(name);
+	}
 
 	/**
-	 * Sets the resolution status of the input with the given name. A "resolved"
-	 * input is known to have a final, valid value for use with the module.
+	 * @deprecated Use {@link #resolveInput(String)} and
+	 *             {@link #unresolveInput(String)} instead.
 	 */
-	void setResolved(String name, boolean resolved);
+	@Deprecated
+	default void setResolved(final String name, final boolean resolved) {
+		if (resolved) resolveInput(name);
+		else unresolveInput(name);
+	}
 
 }

From cfb0659e3136d5bbb9be7cd6806fe622a0c6909e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 10:44:55 -0500
Subject: [PATCH 0314/1208] Stop using old module input resolution methods

---
 src/main/java/org/scijava/command/CommandModule.java          | 2 +-
 .../java/org/scijava/display/ActiveDisplayPreprocessor.java   | 2 +-
 src/main/java/org/scijava/module/DefaultModuleService.java    | 4 ++--
 .../org/scijava/module/process/DefaultValuePreprocessor.java  | 2 +-
 .../java/org/scijava/module/process/GatewayPreprocessor.java  | 2 +-
 .../org/scijava/module/process/LoadInputsPreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ServicePreprocessor.java  | 4 ++--
 src/main/java/org/scijava/options/OptionsPlugin.java          | 2 +-
 src/main/java/org/scijava/ui/FilePreprocessor.java            | 4 ++--
 src/main/java/org/scijava/ui/UIPreprocessor.java              | 2 +-
 src/main/java/org/scijava/widget/AbstractInputHarvester.java  | 4 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 793fde188..01afe55ef 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -266,7 +266,7 @@ private void assignPresets() {
 		for (final String name : presets.keySet()) {
 			final Object value = presets.get(name);
 			setInput(name, value);
-			setResolved(name, true);
+			resolveInput(name);
 		}
 	}
 
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 916bc2d0a..b49596826 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -82,7 +82,7 @@ public void process(final Module module) {
 
 		final String name = displayInput.getName();
 		module.setInput(name, activeDisplay);
-		module.setResolved(name, true);
+		module.resolveInput(name);
 	}
 
 }
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index ad1eea492..1d96526c5 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -459,7 +459,7 @@ private void assignInputs(final Module module,
 				}
 			}
 			module.setInput(name, converted);
-			module.setResolved(name, true);
+			module.resolveInput(name);
 		}
 	}
 
@@ -480,7 +480,7 @@ private ModuleItem<?> getSingleItem(final Module module,
 
 		for (final ModuleItem<?> item : items) {
 			final String name = item.getName();
-			final boolean resolved = module.isResolved(name);
+			final boolean resolved = module.isInputResolved(name);
 			if (resolved) continue; // skip resolved inputs
 			if (!item.isAutoFill()) continue; // skip unfillable inputs
 			final Class<?> itemType = item.getType();
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 3ea3863f6..2bf08354e 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -72,7 +72,7 @@ public void process(final Module module) {
 	private <T> void assignDefaultValue(final Module module,
 		final ModuleItem<T> item)
 	{
-		if (module.isResolved(item.getName())) return;
+		if (module.isInputResolved(item.getName())) return;
 		final T nullValue = ConversionUtils.getNullValue(item.getType());
 		if (Objects.equals(item.getValue(module), nullValue)) return;
 		final T defaultValue = moduleService.getDefaultValue(item);
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 6f0ed52c8..745c0464a 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -110,7 +110,7 @@ private <G extends Gateway> void setGatewayValue(final Context context,
 			return;
 		}
 		input.setValue(module, gateway);
-		module.setResolved(input.getName(), true);
+		module.resolveInput(input.getName());
 	}
 
 }
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index 17d1b736f..4c158d688 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -76,7 +76,7 @@ public void process(final Module module) {
 	/** Loads the value of the given module item from persistent storage. */
 	private <T> void loadValue(final Module module, final ModuleItem<T> item) {
 		// skip input that has already been resolved
-		if (module.isResolved(item.getName())) return;
+		if (module.isInputResolved(item.getName())) return;
 
 		final T prefValue = moduleService.load(item);
 		final Class<T> type = item.getType();
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 69e8f4500..f1d111d4f 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -83,7 +83,7 @@ public void process(final Module module) {
 				// input is a compatible context
 				final String name = input.getName();
 				module.setInput(name, getContext());
-				module.setResolved(name, true);
+				module.resolveInput(name);
 			}
 		}
 	}
@@ -95,7 +95,7 @@ private <S extends Service> void setServiceValue(final Context context,
 	{
 		final S service = context.getService(input.getType());
 		input.setValue(module, service);
-		module.setResolved(input.getName(), true);
+		module.resolveInput(input.getName());
 	}
 
 }
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 783cf3161..47420f0b0 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -116,7 +116,7 @@ public void run() {
 		// NB: Clear "resolved" status of all inputs.
 		// Otherwise, no inputs are harvested on next run.
 		for (final ModuleItem<?> input : getInfo().inputs()) {
-			setResolved(input.getName(), false);
+			unresolveInput(input.getName());
 		}
 
 		eventService.publish(new OptionsEvent(this));
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index 68ce98c6c..f82d624ee 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -74,7 +74,7 @@ public void process(final Module module) {
 		}
 
 		fileInput.setValue(module, result);
-		module.setResolved(fileInput.getName(), true);
+		module.resolveInput(fileInput.getName());
 	}
 
 	// -- Helper methods --
@@ -87,7 +87,7 @@ public void process(final Module module) {
 	private ModuleItem<File> getFileInput(final Module module) {
 		ModuleItem<File> result = null;
 		for (final ModuleItem<?> input : module.getInfo().inputs()) {
-			if (module.isResolved(input.getName())) continue;
+			if (module.isInputResolved(input.getName())) continue;
 			final Class<?> type = input.getType();
 			if (!File.class.isAssignableFrom(type)) {
 				// not a File parameter; abort
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index 44da9289c..bfd11993e 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -67,7 +67,7 @@ public void process(final Module module) {
 				// input is a compatible UI
 				final String name = input.getName();
 				module.setInput(name, ui);
-				module.setResolved(name, true);
+				module.resolveInput(name);
 			}
 		}
 	}
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 2003ec523..a437389c3 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -115,7 +115,7 @@ public void processResults(final InputPanel<P, W> inputPanel,
 
 		for (final ModuleItem<?> item : inputs) {
 			final String name = item.getName();
-			module.setResolved(name, true);
+			module.resolveInput(name);
 		}
 	}
 
@@ -125,7 +125,7 @@ private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,
 		final Module module, final ModuleItem<T> item) throws ModuleException
 	{
 		final String name = item.getName();
-		final boolean resolved = module.isResolved(name);
+		final boolean resolved = module.isInputResolved(name);
 		if (resolved) return null; // skip resolved inputs
 
 		final Class<T> type = item.getType();

From a55f1b048f34af79877920449b7e1c4b69bfb3cd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 08:31:33 -0500
Subject: [PATCH 0315/1208] POM: add an explanation for the <build> section

---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5414f69ec..91a54bfbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,17 @@ Institute of Molecular Cell Biology and Genetics.</license.copyrightOwners>
 	</dependencies>
 
 	<build>
+		<!--
+		SciJava Common provides a plugin indexer which handles its
+		@Plugin annotations, in the form of a compile-time annotation
+		processor. SJC also provides plugins of various sorts, such
+		as the core Service plugin implementations.
+
+		In order for these to be processed correctly and avoid a
+		chicken-and-egg problem with annotation processing here, we
+		disable annotation processing during compilation, and instead
+		run the plugin indexer manually in the process-classes phase.
+		-->
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

From a6bf3cfacb89caa9f497f90fbdb737d86cbc9e1f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 10:38:30 -0500
Subject: [PATCH 0316/1208] DisplayPostprocessor: resolve displayed outputs

When a module output is successfully displayed, we mark it resolved,
so that any downstream postprocessors know the output was handled.
---
 src/main/java/org/scijava/display/DisplayPostprocessor.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 659f63533..48987e637 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -68,9 +68,11 @@ public void process(final Module module) {
 		if (displayService == null) return;
 
 		for (final ModuleItem<?> outputItem : module.getInfo().outputs()) {
+			if (module.isOutputResolved(outputItem.getName())) continue;
 			final Object value = outputItem.getValue(module);
 			final String name = defaultName(outputItem);
-			handleOutput(name, value);
+			final boolean resolved = handleOutput(name, value);
+			if (resolved) module.resolveOutput(name);
 		}
 	}
 

From bd51228082f4e1f49d5ebae0fc1e2261a73e3620 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 10:44:29 -0500
Subject: [PATCH 0317/1208] Stop using deprecated MiscUtils.equal method

---
 src/main/java/org/scijava/module/DefaultModuleService.java  | 4 ++--
 .../scijava/module/process/DefaultValuePreprocessor.java    | 5 +++--
 src/main/java/org/scijava/widget/DefaultWidgetModel.java    | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 0d1e26106..ad1eea492 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -36,6 +36,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -63,7 +64,6 @@
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.ClassUtils;
-import org.scijava.util.MiscUtils;
 
 /**
  * Default service for keeping track of and executing available modules.
@@ -291,7 +291,7 @@ public ModuleItem<?> getSingleOutput(Module module, Collection<Class<?>> types)
 	public <T> void save(final ModuleItem<T> item, final T value) {
 		if (!item.isPersisted()) return;
 
-		if (MiscUtils.equal(item.getDefaultValue(), value)) {
+		if (Objects.equals(item.getDefaultValue(), value)) {
 			// NB: Do not persist the value if it is the default.
 			// This is nice if the default value might change later,
 			// such as when iteratively developing a script.
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 1422b9422..3ea3863f6 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -31,6 +31,8 @@
 
 package org.scijava.module.process;
 
+import java.util.Objects;
+
 import org.scijava.Priority;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
@@ -38,7 +40,6 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.MiscUtils;
 
 /**
  * A preprocessor plugin that populates default parameter values.
@@ -73,7 +74,7 @@ private <T> void assignDefaultValue(final Module module,
 	{
 		if (module.isResolved(item.getName())) return;
 		final T nullValue = ConversionUtils.getNullValue(item.getType());
-		if (MiscUtils.equal(item.getValue(module), nullValue)) return;
+		if (Objects.equals(item.getValue(module), nullValue)) return;
 		final T defaultValue = moduleService.getDefaultValue(item);
 		if (defaultValue == null) return;
 		item.setValue(module, defaultValue);
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 14db291d5..26305ee9d 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -34,6 +34,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.WeakHashMap;
 
 import org.scijava.AbstractContextual;
@@ -49,7 +50,6 @@
 import org.scijava.thread.ThreadService;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.MiscUtils;
 import org.scijava.util.NumberUtils;
 
 /**
@@ -148,12 +148,12 @@ public Object getValue() {
 	@Override
 	public void setValue(final Object value) {
 		final String name = item.getName();
-		if (MiscUtils.equal(item.getValue(module), value)) return; // no change
+		if (Objects.equals(item.getValue(module), value)) return; // no change
 
 		// Check if a converted value is present
 		Object convertedInput = convertedObjects.get(value);
 		if (convertedInput != null &&
-			MiscUtils.equal(item.getValue(module), convertedInput))
+			Objects.equals(item.getValue(module), convertedInput))
 		{
 			return; // no change
 		}

From 2bd51a34a1d3f3d9ebff529a75c4dd03fad874b4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 11:04:00 -0500
Subject: [PATCH 0318/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cfaf505af..7dd28a3b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.59.0-SNAPSHOT</version>
+	<version>2.59.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 8e2d1304f371414e2f4d8a97f6c6a5b64092e665 Mon Sep 17 00:00:00 2001
From: rimadoma <rdomander@rvc.ac.uk>
Date: Mon, 15 Aug 2016 18:24:36 +0100
Subject: [PATCH 0319/1208] gitignore: add rules for IntelliJ

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .gitignore | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 54e060e75..436cdc7f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,13 @@
 *.swp
+
+# Maven #
+/target/
+
+# Eclipse #
 /.classpath
 /.project
 /.settings/
-/target/
+
+# IntelliJ #
+/*.iml
+/.idea/

From 89412f87f585588ad0a315942a11f5ce71232375 Mon Sep 17 00:00:00 2001
From: rimadoma <rdomander@rvc.ac.uk>
Date: Mon, 15 Aug 2016 19:00:11 +0100
Subject: [PATCH 0320/1208] Remove redundant if

---
 src/main/java/org/scijava/ui/DefaultUIService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 8a38fb33b..3ff967c75 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -214,7 +214,6 @@ public boolean isHeadless() {
 	public UserInterface getDefaultUI() {
 		if (defaultUI != null) return defaultUI;
 		if (uiList().isEmpty()) return null;
-		if (defaultUI != null) return defaultUI;
 		return uiList().get(0);
 	}
 

From 7021a0ad7375abf2a422dfd94a19fb8ac4e2620a Mon Sep 17 00:00:00 2001
From: Richard Domander <rdomander@rvc.ac.uk>
Date: Tue, 30 Aug 2016 18:03:55 +0100
Subject: [PATCH 0321/1208] Add a HeadlessUI

Add a null object pattern style is used, for when UIService is running headless.
This avoid NullPointerException and similar issues.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../java/org/scijava/ui/DefaultUIService.java |   2 +
 .../org/scijava/ui/headlessUI/HeadlessUI.java | 192 ++++++++++++++++++
 2 files changed, 194 insertions(+)
 create mode 100644 src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 3ff967c75..7de130b60 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -68,6 +68,7 @@
 import org.scijava.ui.DialogPrompt.OptionType;
 import org.scijava.ui.DialogPrompt.Result;
 import org.scijava.ui.event.UIShownEvent;
+import org.scijava.ui.headlessUI.HeadlessUI;
 import org.scijava.ui.viewer.DisplayViewer;
 
 /**
@@ -212,6 +213,7 @@ public boolean isHeadless() {
 
 	@Override
 	public UserInterface getDefaultUI() {
+		if (isHeadless()) return HeadlessUI.getInstance();
 		if (defaultUI != null) return defaultUI;
 		if (uiList().isEmpty()) return null;
 		return uiList().get(0);
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
new file mode 100644
index 000000000..844d4b77b
--- /dev/null
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -0,0 +1,192 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.ui.headlessUI;
+
+import static org.scijava.Priority.LAST_PRIORITY;
+
+import java.io.File;
+
+import org.scijava.Context;
+import org.scijava.display.Display;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.ui.ApplicationFrame;
+import org.scijava.ui.Desktop;
+import org.scijava.ui.DialogPrompt;
+import org.scijava.ui.StatusBar;
+import org.scijava.ui.SystemClipboard;
+import org.scijava.ui.ToolBar;
+import org.scijava.ui.UserInterface;
+import org.scijava.ui.console.ConsolePane;
+import org.scijava.ui.viewer.DisplayWindow;
+
+/**
+ * A "null object" UI implementation that can be returned when a UIService is
+ * running headless
+ *
+ * @author Richard Domander (Royal Veterinary College, London)
+ */
+public class HeadlessUI implements UserInterface {
+
+	private static HeadlessUI instance;
+
+	private HeadlessUI() {}
+
+	public static HeadlessUI getInstance() {
+		if (instance == null) {
+			instance = new HeadlessUI();
+		}
+
+		return instance;
+	}
+
+	@Override
+	public void show() {}
+
+	@Override
+	public boolean isVisible() {
+		return false;
+	}
+
+	@Override
+	public void show(final Object o) {}
+
+	@Override
+	public void show(final String name, final Object o) {}
+
+	@Override
+	public void show(final Display<?> display) {}
+
+	@Override
+	public Desktop getDesktop() {
+		return null;
+	}
+
+	@Override
+	public ApplicationFrame getApplicationFrame() {
+		return null;
+	}
+
+	@Override
+	public ToolBar getToolBar() {
+		return null;
+	}
+
+	@Override
+	public StatusBar getStatusBar() {
+		return null;
+	}
+
+	@Override
+	public ConsolePane<?> getConsolePane() {
+		return null;
+	}
+
+	@Override
+	public SystemClipboard getSystemClipboard() {
+		return null;
+	}
+
+	@Override
+	public DisplayWindow createDisplayWindow(final Display<?> display) {
+		return null;
+	}
+
+	@Override
+	public DialogPrompt dialogPrompt(final String message, final String title,
+		final DialogPrompt.MessageType messageType,
+		final DialogPrompt.OptionType optionType)
+	{
+		return null;
+	}
+
+	@Override
+	public File chooseFile(final File file, final String style) {
+		return null;
+	}
+
+	@Override
+	public File chooseFile(final String title, final File file,
+		final String style)
+	{
+		return null;
+	}
+
+	@Override
+	public void showContextMenu(final String menuRoot, final Display<?> display,
+		final int x, final int y)
+	{}
+
+	@Override
+	public void saveLocation() {}
+
+	@Override
+	public void restoreLocation() {}
+
+	@Override
+	public boolean requiresEDT() {
+		return false;
+	}
+
+	/** Returns null since this is a contextless null object */
+	@Override
+	public Context context() {
+		return null;
+	}
+
+	/** Returns null since this is a contextless null object */
+	@Override
+	public Context getContext() {
+		return null;
+	}
+
+	@Override
+	public void setContext(final Context context) {}
+
+	@Override
+	public PluginInfo<?> getInfo() {
+		return null;
+	}
+
+	@Override
+	public void setInfo(final PluginInfo<?> info) {}
+
+	@Override
+	public void dispose() {}
+
+	@Override
+	public double getPriority() {
+		return LAST_PRIORITY;
+	}
+
+	@Override
+	public void setPriority(final double priority) {}
+}

From e20e90fed30ad73c5623b1363c999be6bda8679a Mon Sep 17 00:00:00 2001
From: Richard Domander <rdomander@rvc.ac.uk>
Date: Tue, 30 Aug 2016 18:03:55 +0100
Subject: [PATCH 0322/1208] Test that HeadlessUI is the default while headless

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../java/org/scijava/ui/UIServiceTest.java    | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 src/test/java/org/scijava/ui/UIServiceTest.java

diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
new file mode 100644
index 000000000..bcd515739
--- /dev/null
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -0,0 +1,105 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.ui;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.display.Display;
+import org.scijava.ui.headlessUI.HeadlessUI;
+import org.scijava.ui.viewer.DisplayWindow;
+
+/**
+ * Tests for {@link DefaultUIService}.
+ *
+ * @author Richard Domander (Royal Veterinary College, London)
+ */
+public class UIServiceTest {
+
+	@Test
+	public void testHeadlessUI() {
+		final Context context = new Context(UIService.class);
+		final UIService uiService = context.service(UIService.class);
+
+		final MockUserInterface mockUI = new MockUserInterface();
+		uiService.setDefaultUI(mockUI);
+
+		// test non-headless behavior
+		uiService.setHeadless(false);
+		assertFalse(uiService.isHeadless());
+		assertTrue(uiService.getDefaultUI() instanceof MockUserInterface);
+
+		// test headless behavior
+		uiService.setHeadless(true);
+		assertTrue(uiService.isHeadless());
+		assertTrue("UIService should return HeadlessUI when running \"headless\"",
+			uiService.getDefaultUI() instanceof HeadlessUI);
+
+		context.dispose();
+	}
+
+	private static final class MockUserInterface extends AbstractUserInterface {
+
+		@Override
+		public SystemClipboard getSystemClipboard() {
+			return null;
+		}
+
+		@Override
+		public DisplayWindow createDisplayWindow(final Display<?> display) {
+			return null;
+		}
+
+		@Override
+		public DialogPrompt dialogPrompt(final String message, final String title,
+			final DialogPrompt.MessageType messageType,
+			final DialogPrompt.OptionType optionType)
+		{
+			return null;
+		}
+
+		@Override
+		public void showContextMenu(final String menuRoot, final Display<?> display,
+			final int x, final int y)
+		{}
+
+		@Override
+		public boolean requiresEDT() {
+			return false;
+		}
+
+		@Override
+		public void dispose() {}
+	}
+}

From 96655703a58c0e04720f616e548b72095b65356d Mon Sep 17 00:00:00 2001
From: Richard Domander <rdomander@rvc.ac.uk>
Date: Wed, 31 Aug 2016 13:45:45 +0100
Subject: [PATCH 0323/1208] UserInterface: improve javadoc

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../java/org/scijava/ui/UserInterface.java    | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 7eadc1cb2..cfa80b1b7 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -50,7 +50,7 @@
  * implementing this interface, it is encouraged to instead extend
  * {@link AbstractUserInterface}, for convenience.
  * </p>
- * 
+ *
  * @author Curtis Rueden
  * @see Plugin
  * @see UIService
@@ -74,7 +74,7 @@ public interface UserInterface extends RichPlugin, Disposable {
 
 	/**
 	 * Shows the object onscreen using an appropriate UI widget.
-	 * 
+	 *
 	 * @param name The name to use when displaying the object.
 	 * @param o The object to be displayed.
 	 */
@@ -83,7 +83,10 @@ public interface UserInterface extends RichPlugin, Disposable {
 	/** Shows the display onscreen using an appropriate UI widget. */
 	void show(Display<?> display);
 
-	/** Gets the desktop, for use with multi-document interfaces (MDI). */
+	/**
+	 * Gets the desktop, for use with multi-document interfaces (MDI), or null if
+	 * not applicable.
+	 */
 	Desktop getDesktop();
 
 	/** Gets the main SciJava application frame, or null if not applicable. */
@@ -98,15 +101,21 @@ public interface UserInterface extends RichPlugin, Disposable {
 	/** Gets the main SciJava console pane, or null if not applicable. */
 	ConsolePane<?> getConsolePane();
 
-	/** Gets the system clipboard associated with this UI. */
+	/**
+	 * Gets the system clipboard associated with this UI, or null if not
+	 * applicable.
+	 */
 	SystemClipboard getSystemClipboard();
 
-	/** Creates a new display window housing the given display. */
+	/**
+	 * Creates a new display window housing the given display, or null if not
+	 * applicable.
+	 */
 	DisplayWindow createDisplayWindow(Display<?> display);
 
 	/**
 	 * Creates a dialog prompter.
-	 * 
+	 *
 	 * @param message The message in the dialog itself.
 	 * @param title The title of the dialog.
 	 * @param messageType The type of message. This typically is rendered as an
@@ -115,14 +124,14 @@ public interface UserInterface extends RichPlugin, Disposable {
 	 *          as an exclamation point.
 	 * @param optionType The choices available when dismissing the dialog. These
 	 *          choices are typically rendered as buttons for the user to click.
-	 * @return The newly created DialogPrompt object.
+	 * @return The newly created DialogPrompt object, or null if not applicable.
 	 */
 	DialogPrompt dialogPrompt(String message, String title,
 		DialogPrompt.MessageType messageType, DialogPrompt.OptionType optionType);
 
 	/**
 	 * Prompts the user to choose a file.
-	 * 
+	 *
 	 * @param file The initial value displayed in the file chooser prompt.
 	 * @param style The style of chooser to use:
 	 *          <ul>
@@ -130,12 +139,14 @@ DialogPrompt dialogPrompt(String message, String title,
 	 *          <li>{@link FileWidget#SAVE_STYLE}</li>
 	 *          <li>{@link FileWidget#DIRECTORY_STYLE}</li>
 	 *          </ul>
+	 * @return The {@link File} chosen by the user, or null if prompt is not
+	 *         available
 	 */
 	File chooseFile(File file, String style);
 
 	/**
 	 * Prompts the user to choose a file.
-	 * 
+	 *
 	 * @param title Title to use in the file chooser dialog.
 	 * @param file The initial value displayed in the file chooser prompt.
 	 * @param style The style of chooser to use:
@@ -144,6 +155,8 @@ DialogPrompt dialogPrompt(String message, String title,
 	 *          <li>{@link FileWidget#SAVE_STYLE}</li>
 	 *          <li>{@link FileWidget#DIRECTORY_STYLE}</li>
 	 *          </ul>
+	 * @return The {@link File} chosen by the user, or null if prompt is not
+	 *         available
 	 */
 	File chooseFile(String title, File file, String style);
 

From 6464d96eb5014354dcb905631ddbb8fe0c9d97b9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 12:21:45 -0500
Subject: [PATCH 0324/1208] Add Richard Domander as a contributor

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7dd28a3b2..42082ee9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,11 @@
 			<url>http://imagej.net/User:Dietzc</url>
 			<properties><id>dietzc</id></properties>
 		</contributor>
+		<contributor>
+			<name>Richard Domander</name>
+			<url>http://imagej.net/User:Rdom</url>
+			<properties><id>rimadoma</id></properties>
+		</contributor>
 		<contributor>
 			<name>Gabriel Einsdorf</name>
 			<url>http://imagej.net/User:Gab1one</url>

From 838af0af21e5332f10c17375eed3ba56f423c0c9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 12:31:25 -0500
Subject: [PATCH 0325/1208] UserInterface: push default behavior to interface

There is quite a bit of reasonable default behavior which can now,
thanks to Java 8, be expressed in default interface methods.
---
 .../org/scijava/ui/AbstractUserInterface.java | 55 -------------------
 .../java/org/scijava/ui/UserInterface.java    | 42 +++++++++++---
 2 files changed, 33 insertions(+), 64 deletions(-)

diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 22a318808..f2b0ce3cf 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -31,7 +31,6 @@
 
 package org.scijava.ui;
 
-import java.io.File;
 import java.util.List;
 
 import org.scijava.app.StatusService;
@@ -45,10 +44,8 @@
 import org.scijava.plugin.PluginService;
 import org.scijava.prefs.PrefService;
 import org.scijava.thread.ThreadService;
-import org.scijava.ui.console.ConsolePane;
 import org.scijava.ui.viewer.DisplayViewer;
 import org.scijava.ui.viewer.DisplayWindow;
-import org.scijava.widget.FileWidget;
 
 /**
  * Abstract superclass for {@link UserInterface} implementations.
@@ -102,11 +99,6 @@ public boolean isVisible() {
 		return visible;
 	}
 
-	@Override
-	public void show(final Object o) {
-		show(null, o);
-	}
-
 	@Override
 	public void show(final String name, final Object o) {
 		final Display<?> display;
@@ -163,44 +155,6 @@ public void run() {
 		});
 	}
 
-	@Override
-	public Desktop getDesktop() {
-		return null;
-	}
-
-	@Override
-	public ApplicationFrame getApplicationFrame() {
-		return null;
-	}
-
-	@Override
-	public ToolBar getToolBar() {
-		return null;
-	}
-
-	@Override
-	public StatusBar getStatusBar() {
-		return null;
-	}
-
-	@Override
-	public ConsolePane<?> getConsolePane() {
-		return null;
-	}
-
-	@Override
-	public File chooseFile(final File file, final String style) {
-		return chooseFile(fileChooserTitle(style), file, style);
-	}
-
-	@Deprecated
-	@Override
-	public File chooseFile(final String title, final File file,
-		final String style)
-	{
-		throw new UnsupportedOperationException("No default implementation.");
-	}
-
 	@Override
 	public void saveLocation() {
 		final ApplicationFrame appFrame = getApplicationFrame();
@@ -230,13 +184,4 @@ public void restoreLocation() {
 	protected void createUI() {
 		restoreLocation();
 	}
-
-	/** Gets a default file chooser title to use when none is given. */
-	protected String fileChooserTitle(final String style) {
-		if (style.equals(FileWidget.DIRECTORY_STYLE)) return "Choose a directory";
-		if (style.equals(FileWidget.OPEN_STYLE)) return "Open";
-		if (style.equals(FileWidget.SAVE_STYLE)) return "Save";
-		return "Choose a file";
-	}
-
 }
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index cfa80b1b7..f5cf978d0 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -70,7 +70,9 @@ public interface UserInterface extends RichPlugin, Disposable {
 	boolean isVisible();
 
 	/** Shows the object onscreen using an appropriate UI widget. */
-	void show(Object o);
+	default void show(final Object o) {
+		show(null, o);
+	}
 
 	/**
 	 * Shows the object onscreen using an appropriate UI widget.
@@ -87,25 +89,37 @@ public interface UserInterface extends RichPlugin, Disposable {
 	 * Gets the desktop, for use with multi-document interfaces (MDI), or null if
 	 * not applicable.
 	 */
-	Desktop getDesktop();
+	default Desktop getDesktop() {
+		return null;
+	}
 
 	/** Gets the main SciJava application frame, or null if not applicable. */
-	ApplicationFrame getApplicationFrame();
+	default ApplicationFrame getApplicationFrame() {
+		return null;
+	}
 
 	/** Gets the main SciJava toolbar, or null if not applicable. */
-	ToolBar getToolBar();
+	default ToolBar getToolBar() {
+		return null;
+	}
 
 	/** Gets the main SciJava status bar, or null if not applicable. */
-	StatusBar getStatusBar();
+	default StatusBar getStatusBar() {
+		return null;
+	}
 
 	/** Gets the main SciJava console pane, or null if not applicable. */
-	ConsolePane<?> getConsolePane();
+	default ConsolePane<?> getConsolePane() {
+		return null;
+	}
 
 	/**
 	 * Gets the system clipboard associated with this UI, or null if not
 	 * applicable.
 	 */
-	SystemClipboard getSystemClipboard();
+	default SystemClipboard getSystemClipboard() {
+		return null;
+	}
 
 	/**
 	 * Creates a new display window housing the given display, or null if not
@@ -142,7 +156,15 @@ DialogPrompt dialogPrompt(String message, String title,
 	 * @return The {@link File} chosen by the user, or null if prompt is not
 	 *         available
 	 */
-	File chooseFile(File file, String style);
+	default File chooseFile(final File file, final String style) {
+		final String title;
+		if (style.equals(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
+		else if (style.equals(FileWidget.OPEN_STYLE)) title = "Open";
+		else if (style.equals(FileWidget.SAVE_STYLE)) title = "Save";
+		else title = "Choose a file";
+
+		return chooseFile(title, file, style);
+	}
 
 	/**
 	 * Prompts the user to choose a file.
@@ -158,7 +180,9 @@ DialogPrompt dialogPrompt(String message, String title,
 	 * @return The {@link File} chosen by the user, or null if prompt is not
 	 *         available
 	 */
-	File chooseFile(String title, File file, String style);
+	default File chooseFile(String title, File file, String style) {
+		throw new UnsupportedOperationException();
+	}
 
 	/**
 	 * Displays a popup context menu for the given display at the specified

From e17c5fe5877c2cc71c625efbbcd4255ff66864af Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 12:45:42 -0500
Subject: [PATCH 0326/1208] AbstractUserInterface: remove unnecessary services

---
 src/main/java/org/scijava/ui/AbstractUserInterface.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index f2b0ce3cf..7210682f0 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -59,9 +59,6 @@ public abstract class AbstractUserInterface extends AbstractRichPlugin
 	private static final String LAST_X = "lastXLocation";
 	private static final String LAST_Y = "lastYLocation";
 
-	@Parameter
-	private CommandService commandService;
-
 	@Parameter
 	private DisplayService displayService;
 
@@ -71,9 +68,6 @@ public abstract class AbstractUserInterface extends AbstractRichPlugin
 	@Parameter
 	private PluginService pluginService;
 
-	@Parameter
-	private StatusService statusService;
-
 	@Parameter
 	private ThreadService threadService;
 

From 922e72d018cf84a6591ce3be5a1b3fe2ea7701b0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 12:46:24 -0500
Subject: [PATCH 0327/1208] DefaultUIService: remove unnecessary services

I vaguely recall that some of these services were added as hacks to
ensure that service initialization happened in a certain order.
But if so, I didn't flag those particular services with
all-important HACK and/or NB comments. So away they go (for now).
---
 .../java/org/scijava/ui/DefaultUIService.java | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 7de130b60..2c0d51390 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -41,7 +41,6 @@
 import org.scijava.app.AppService;
 import org.scijava.app.StatusService;
 import org.scijava.app.event.StatusEvent;
-import org.scijava.command.CommandService;
 import org.scijava.display.Display;
 import org.scijava.display.DisplayService;
 import org.scijava.display.event.DisplayActivatedEvent;
@@ -51,10 +50,6 @@
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.log.LogService;
-import org.scijava.menu.MenuService;
-import org.scijava.options.OptionsService;
-import org.scijava.platform.AppEventService;
-import org.scijava.platform.PlatformService;
 import org.scijava.platform.event.AppQuitEvent;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -63,7 +58,6 @@
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
-import org.scijava.tool.ToolService;
 import org.scijava.ui.DialogPrompt.MessageType;
 import org.scijava.ui.DialogPrompt.OptionType;
 import org.scijava.ui.DialogPrompt.Result;
@@ -96,30 +90,12 @@ public final class DefaultUIService extends AbstractService implements
 	@Parameter
 	private AppService appService;
 
-	@Parameter
-	private PlatformService platformService;
-
 	@Parameter
 	private PluginService pluginService;
 
-	@Parameter
-	private CommandService commandService;
-
 	@Parameter
 	private DisplayService displayService;
 
-	@Parameter
-	private MenuService menuService;
-
-	@Parameter
-	private ToolService toolService;
-
-	@Parameter
-	private OptionsService optionsService;
-
-	@Parameter
-	private AppEventService appEventService;
-
 	/**
 	 * A list of extant display viewers. It's needed in order to find the viewer
 	 * associated with a display.

From 9f0b8703c23f0d0f7128f04fe89652578cc56237 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 12:50:54 -0500
Subject: [PATCH 0328/1208] DefaultUIService: tweak syntax for conciseness

---
 src/main/java/org/scijava/ui/DefaultUIService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 2c0d51390..aa56bac0f 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -191,8 +191,7 @@ public boolean isHeadless() {
 	public UserInterface getDefaultUI() {
 		if (isHeadless()) return HeadlessUI.getInstance();
 		if (defaultUI != null) return defaultUI;
-		if (uiList().isEmpty()) return null;
-		return uiList().get(0);
+		return uiList().isEmpty() ? null : uiList().get(0);
 	}
 
 	@Override

From 2f20aa30d2da43c09465cf90002491f0423cd563 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 13:06:05 -0500
Subject: [PATCH 0329/1208] UIServiceTest: remove no-longer-needed override

---
 src/test/java/org/scijava/ui/UIServiceTest.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index bcd515739..f81442f36 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -71,11 +71,6 @@ public void testHeadlessUI() {
 
 	private static final class MockUserInterface extends AbstractUserInterface {
 
-		@Override
-		public SystemClipboard getSystemClipboard() {
-			return null;
-		}
-
 		@Override
 		public DisplayWindow createDisplayWindow(final Display<?> display) {
 			return null;

From 9dc359a5316d73e20400cb04e6ca32ae4ef21cc1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 13:40:42 -0500
Subject: [PATCH 0330/1208] StatusServiceTest: simplify exception handling

No need to try/catch and fail... just throw it.
---
 .../org/scijava/app/StatusServiceTest.java    | 94 ++++++-------------
 1 file changed, 29 insertions(+), 65 deletions(-)

diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 7c4320864..66ec12c79 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -88,96 +88,60 @@ public void setUp() throws Exception {
 	}
 
 	@Test
-	public void testShowProgress() {
+	public void testShowProgress() throws InterruptedException {
 		ss.showProgress(15, 45);
-		try {
-			final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
-			assertEquals(event.getProgressValue(), 15);
-			assertEquals(event.getProgressMaximum(), 45);
-			assertFalse(event.isWarning());
-		}
-		catch (final InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
+		final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
+		assertEquals(event.getProgressValue(), 15);
+		assertEquals(event.getProgressMaximum(), 45);
+		assertFalse(event.isWarning());
 	}
 
 	@Test
-	public void testShowStatusString() {
+	public void testShowStatusString() throws InterruptedException {
 		final String text = "Hello, world";
 		ss.showStatus(text);
-		try {
-			final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
-			assertEquals(event.getStatusMessage(), text);
-			assertFalse(event.isWarning());
-		}
-		catch (final InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
+		final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
+		assertEquals(event.getStatusMessage(), text);
+		assertFalse(event.isWarning());
 	}
 
 	@Test
-	public void testShowStatusIntIntString() {
+	public void testShowStatusIntIntString() throws InterruptedException {
 		final String text = "Working...";
 		ss.showStatus(25, 55, text);
-		try {
-			final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
-			assertEquals(event.getProgressValue(), 25);
-			assertEquals(event.getProgressMaximum(), 55);
-			assertEquals(event.getStatusMessage(), text);
-			assertFalse(event.isWarning());
-		}
-		catch (final InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
+		final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
+		assertEquals(event.getProgressValue(), 25);
+		assertEquals(event.getProgressMaximum(), 55);
+		assertEquals(event.getStatusMessage(), text);
+		assertFalse(event.isWarning());
 	}
 
 	@Test
-	public void testWarn() {
+	public void testWarn() throws InterruptedException {
 		final String text = "Totally hosed";
 		ss.warn(text);
-		try {
-			final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
-			assertEquals(event.getStatusMessage(), text);
-			assertTrue(event.isWarning());
-		}
-		catch (final InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
+		final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
+		assertEquals(event.getStatusMessage(), text);
+		assertTrue(event.isWarning());
 	}
 
 	@Test
-	public void testShowStatusIntIntStringBoolean() {
+	public void testShowStatusIntIntStringBoolean() throws InterruptedException {
 		final String text = "Working and hosed...";
 		ss.showStatus(33, 44, text, true);
-		try {
-			final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
-			assertEquals(event.getStatusMessage(), text);
-			assertEquals(event.getProgressValue(), 33);
-			assertEquals(event.getProgressMaximum(), 44);
-			assertTrue(event.isWarning());
-		}
-		catch (final InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
+		final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
+		assertEquals(event.getStatusMessage(), text);
+		assertEquals(event.getProgressValue(), 33);
+		assertEquals(event.getProgressMaximum(), 44);
+		assertTrue(event.isWarning());
 	}
 
 	@Test
-	public void testClearStatus() {
+	public void testClearStatus() throws InterruptedException {
 		ss.clearStatus();
-		try {
-			final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
-			assertEquals(event.getStatusMessage(), "");
-			assertFalse(event.isWarning());
-		}
-		catch (final InterruptedException e) {
-			e.printStackTrace();
-			fail();
-		}
+		final StatusEvent event = queue.poll(10, TimeUnit.SECONDS);
+		assertEquals(event.getStatusMessage(), "");
+		assertFalse(event.isWarning());
 	}
 
 }

From 24790f3db7e0e0b086e98634e8280f87c36b44fa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 13:48:19 -0500
Subject: [PATCH 0331/1208] StatusServiceTest: clean up context setup/teardown

---
 src/test/java/org/scijava/app/StatusServiceTest.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 66ec12c79..674fc5365 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -40,6 +40,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.AbstractContextual;
@@ -79,7 +80,7 @@ private void eventHandler(final StatusEvent e) {
 	}
 
 	@Before
-	public void setUp() throws Exception {
+	public void setUp() {
 		context = new Context();
 		queue = new ArrayBlockingQueue<>(10);
 		statusListener = new StatusListener();
@@ -87,6 +88,11 @@ public void setUp() throws Exception {
 		ss = statusListener.statusService;
 	}
 
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
 	@Test
 	public void testShowProgress() throws InterruptedException {
 		ss.showProgress(15, 45);

From 537fc20e8d83eb73e9a90d52f4703718ff066528 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 30 Aug 2016 10:35:12 -0500
Subject: [PATCH 0332/1208] ArrayUtils: add method for easily creating arrays

I don't know if heap pollution is a potential problem here.
But the method sure is mighty convenient... so here we go.
---
 src/main/java/org/scijava/util/ArrayUtils.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 34e6169bf..b53426756 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -79,6 +79,12 @@ private ArrayUtils() {
 
 	// -- ArrayUtils methods --
 
+	/** Creates an array of the given type, containing the specified values. */
+	@SafeVarargs
+	public static <T> T[] array(final T... values) {
+		return values;
+	}
+
 	/**
 	 * Converts the provided Object to a {@link Collection} implementation. If the
 	 * object is an array type, a {@link PrimitiveArray} wrapper will be created.

From aa8be0f3588fd7d57a30b7282b6bd8c94ced6438 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 14:00:41 -0500
Subject: [PATCH 0333/1208] ContextCreationTest: remove unneeded method

Now that we have the handy ArrayUtils.array method,
we can ditch the less general services helper method.
---
 .../java/org/scijava/ContextCreationTest.java | 49 +++++++------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 5b6ca51a0..97caa7f8c 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -38,6 +38,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.scijava.util.ArrayUtils.array;
 
 import java.util.Arrays;
 import java.util.List;
@@ -285,33 +286,32 @@ public void testNonStrictOptionalMissingTransitive() {
 	 * Verifies that the order plugins appear in the PluginIndex and Service list
 	 * does not affect which services are loaded.
 	 */
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testClassOrder() {
 		final int expectedSize = 2;
 
 		// Same order, Base first
-		Context c =
-			createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services(
-				BaseService.class, ExtensionService.class));
+		Context c = createContext(//
+			pluginIndex(BaseImpl.class, ExtensionImpl.class), //
+			array(BaseService.class, ExtensionService.class));
 		assertEquals(expectedSize, c.getServiceIndex().size());
 
 		// Same order, Extension first
-		c =
-			createContext(pluginIndex(ExtensionImpl.class, BaseImpl.class), services(
-				ExtensionService.class, BaseService.class));
+		c = createContext(//
+			pluginIndex(ExtensionImpl.class, BaseImpl.class), //
+			array(ExtensionService.class, BaseService.class));
 		assertEquals(expectedSize, c.getServiceIndex().size());
 
 		// Different order, Extension first
-		c =
-			createContext(pluginIndex(ExtensionImpl.class, BaseImpl.class), services(
-				BaseService.class, ExtensionService.class));
+		c = createContext(//
+			pluginIndex(ExtensionImpl.class, BaseImpl.class), //
+			array(BaseService.class, ExtensionService.class));
 		assertEquals(expectedSize, c.getServiceIndex().size());
 
 		// Different order, Base first
-		c =
-			createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services(
-				ExtensionService.class, BaseService.class));
+		c = createContext(//
+			pluginIndex(BaseImpl.class, ExtensionImpl.class), //
+			array(ExtensionService.class, BaseService.class));
 		assertEquals(expectedSize, c.getServiceIndex().size());
 	}
 
@@ -319,16 +319,15 @@ public void testClassOrder() {
 	 * Verifies that the Service index created when using Abstract classes is the
 	 * same as for interfaces.
 	 */
-	@SuppressWarnings("unchecked")
 	@Test
 	public void testAbstractClasslist() {
-		final Context cAbstract =
-			createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services(
-				AbstractBase.class, AbstractExtension.class));
+		final Context cAbstract = createContext(//
+			pluginIndex(BaseImpl.class, ExtensionImpl.class), //
+			array(AbstractBase.class, AbstractExtension.class));
 
-		final Context cService =
-			createContext(pluginIndex(BaseImpl.class, ExtensionImpl.class), services(
-				BaseService.class, ExtensionService.class));
+		final Context cService = createContext(//
+			pluginIndex(BaseImpl.class, ExtensionImpl.class), //
+			array(BaseService.class, ExtensionService.class));
 
 		assertEquals(cService.getServiceIndex().size(), cAbstract.getServiceIndex()
 			.size());
@@ -423,16 +422,6 @@ private Context createContext(final PluginIndex index,
 			index);
 	}
 
-	/**
-	 * Convenience method since you can't instantiate a Class<? extends Service>
-	 * array.
-	 */
-	private Class<? extends Service>[] services(
-		final Class<? extends Service>... serviceClasses)
-	{
-		return serviceClasses;
-	}
-
 	/**
 	 * Creates a PluginIndex and adds all the provided classes as plugins, indexed
 	 * under Service.class

From 640782f64278cb87fa926b648e9968d19ed2a14e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 12:35:36 -0500
Subject: [PATCH 0334/1208] Make the HeadlessUI a real boy

The HeadlessUI is now a SciJava UserInterface plugin, just like
any other user interface. This is useful because while we want it
to always be chosen when headless mode is active, it should also
be used in non-headless mode when nothing else is available.
This will help prevent NPEs etc. in UIService method calls.

Consequently, this commit adds some defensive checks to
DefaultUIService. These are needed now with the new HeadlessUI,
because that UI returns null for methods like dialogPrompt --
something that no other UIs did previously. In other words: we
relaxed the postconditions of some UserInterface methods to allow
for null returns, and therefore the DefaultUIService needs to
behave accordingly, handling those nulls.
---
 .../java/org/scijava/ui/DefaultUIService.java | 13 +--
 .../org/scijava/ui/headlessUI/HeadlessUI.java | 99 ++-----------------
 2 files changed, 13 insertions(+), 99 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index aa56bac0f..66f81401c 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -189,7 +189,7 @@ public boolean isHeadless() {
 
 	@Override
 	public UserInterface getDefaultUI() {
-		if (isHeadless()) return HeadlessUI.getInstance();
+		if (isHeadless()) return uiMap().get(HeadlessUI.NAME);
 		if (defaultUI != null) return defaultUI;
 		return uiList().isEmpty() ? null : uiList().get(0);
 	}
@@ -302,14 +302,13 @@ public DialogPrompt.Result showDialog(final String message,
 		if (ui == null) return null;
 		final DialogPrompt dialogPrompt =
 			ui.dialogPrompt(message, title, messageType, optionType);
-		return dialogPrompt.prompt();
+		return dialogPrompt == null ? null : dialogPrompt.prompt();
 	}
 
 	@Override
 	public File chooseFile(final File file, final String style) {
 		final UserInterface ui = getDefaultUI();
-		if (ui == null) return null;
-		return ui.chooseFile(file, style);
+		return ui == null ? null : ui.chooseFile(file, style);
 	}
 
 	@Override
@@ -317,8 +316,7 @@ public File chooseFile(final File file, final String style) {
 		chooseFile(final String title, final File file, final String style)
 	{
 		final UserInterface ui = getDefaultUI();
-		if (ui == null) return null;
-		return ui.chooseFile(title, file, style);
+		return ui == null ? null : ui.chooseFile(title, file, style);
 	}
 
 	@Override
@@ -326,8 +324,7 @@ public void showContextMenu(final String menuRoot, final Display<?> display,
 		final int x, final int y)
 	{
 		final UserInterface ui = getDefaultUI();
-		if (ui == null) return;
-		ui.showContextMenu(menuRoot, display, x, y);
+		if (ui != null) ui.showContextMenu(menuRoot, display, x, y);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 844d4b77b..167e4e5ed 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -31,21 +31,14 @@
 
 package org.scijava.ui.headlessUI;
 
-import static org.scijava.Priority.LAST_PRIORITY;
-
 import java.io.File;
 
-import org.scijava.Context;
+import org.scijava.Priority;
 import org.scijava.display.Display;
-import org.scijava.plugin.PluginInfo;
-import org.scijava.ui.ApplicationFrame;
-import org.scijava.ui.Desktop;
+import org.scijava.plugin.AbstractRichPlugin;
+import org.scijava.plugin.Plugin;
 import org.scijava.ui.DialogPrompt;
-import org.scijava.ui.StatusBar;
-import org.scijava.ui.SystemClipboard;
-import org.scijava.ui.ToolBar;
 import org.scijava.ui.UserInterface;
-import org.scijava.ui.console.ConsolePane;
 import org.scijava.ui.viewer.DisplayWindow;
 
 /**
@@ -53,20 +46,13 @@
  * running headless
  *
  * @author Richard Domander (Royal Veterinary College, London)
+ * @author Curtis Rueden
  */
-public class HeadlessUI implements UserInterface {
-
-	private static HeadlessUI instance;
+@Plugin(type = UserInterface.class, name = HeadlessUI.NAME,
+	priority = Priority.VERY_LOW_PRIORITY)
+public class HeadlessUI extends AbstractRichPlugin implements UserInterface {
 
-	private HeadlessUI() {}
-
-	public static HeadlessUI getInstance() {
-		if (instance == null) {
-			instance = new HeadlessUI();
-		}
-
-		return instance;
-	}
+	public static final String NAME = "headless";
 
 	@Override
 	public void show() {}
@@ -76,45 +62,12 @@ public boolean isVisible() {
 		return false;
 	}
 
-	@Override
-	public void show(final Object o) {}
-
 	@Override
 	public void show(final String name, final Object o) {}
 
 	@Override
 	public void show(final Display<?> display) {}
 
-	@Override
-	public Desktop getDesktop() {
-		return null;
-	}
-
-	@Override
-	public ApplicationFrame getApplicationFrame() {
-		return null;
-	}
-
-	@Override
-	public ToolBar getToolBar() {
-		return null;
-	}
-
-	@Override
-	public StatusBar getStatusBar() {
-		return null;
-	}
-
-	@Override
-	public ConsolePane<?> getConsolePane() {
-		return null;
-	}
-
-	@Override
-	public SystemClipboard getSystemClipboard() {
-		return null;
-	}
-
 	@Override
 	public DisplayWindow createDisplayWindow(final Display<?> display) {
 		return null;
@@ -128,11 +81,6 @@ public DialogPrompt dialogPrompt(final String message, final String title,
 		return null;
 	}
 
-	@Override
-	public File chooseFile(final File file, final String style) {
-		return null;
-	}
-
 	@Override
 	public File chooseFile(final String title, final File file,
 		final String style)
@@ -156,37 +104,6 @@ public boolean requiresEDT() {
 		return false;
 	}
 
-	/** Returns null since this is a contextless null object */
-	@Override
-	public Context context() {
-		return null;
-	}
-
-	/** Returns null since this is a contextless null object */
-	@Override
-	public Context getContext() {
-		return null;
-	}
-
-	@Override
-	public void setContext(final Context context) {}
-
-	@Override
-	public PluginInfo<?> getInfo() {
-		return null;
-	}
-
-	@Override
-	public void setInfo(final PluginInfo<?> info) {}
-
 	@Override
 	public void dispose() {}
-
-	@Override
-	public double getPriority() {
-		return LAST_PRIORITY;
-	}
-
-	@Override
-	public void setPriority(final double priority) {}
 }

From 611eee2494fb93c70ac985a3a1b084cf6158c650 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 13:20:11 -0500
Subject: [PATCH 0335/1208] UIServiceTest: extract context setup/teardown

---
 .../java/org/scijava/ui/UIServiceTest.java    | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index f81442f36..204097876 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -34,6 +34,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.display.Display;
@@ -44,14 +46,26 @@
  * Tests for {@link DefaultUIService}.
  *
  * @author Richard Domander (Royal Veterinary College, London)
+ * @author Curtis Rueden
  */
 public class UIServiceTest {
 
+	private Context context;
+	private UIService uiService;
+
+	@Before
+	public void setUp() {
+		context = new Context(UIService.class);
+		uiService = context.service(UIService.class);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
 	@Test
 	public void testHeadlessUI() {
-		final Context context = new Context(UIService.class);
-		final UIService uiService = context.service(UIService.class);
-
 		final MockUserInterface mockUI = new MockUserInterface();
 		uiService.setDefaultUI(mockUI);
 
@@ -65,8 +79,6 @@ public void testHeadlessUI() {
 		assertTrue(uiService.isHeadless());
 		assertTrue("UIService should return HeadlessUI when running \"headless\"",
 			uiService.getDefaultUI() instanceof HeadlessUI);
-
-		context.dispose();
 	}
 
 	private static final class MockUserInterface extends AbstractUserInterface {

From 57f764ddaae8f2eed5a199b8314866efad67e6d7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 13:23:25 -0500
Subject: [PATCH 0336/1208] UIServiceTest: add a couple more tests

---
 src/test/java/org/scijava/ui/UIServiceTest.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 204097876..aef87bd99 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -31,9 +31,12 @@
 
 package org.scijava.ui;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.util.List;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -64,6 +67,18 @@ public void tearDown() {
 		context.dispose();
 	}
 
+	@Test
+	public void testDefaultUI() {
+		assertTrue(uiService.getDefaultUI() instanceof HeadlessUI);
+	}
+
+	@Test
+	public void testAvailableUIs() {
+		final List<UserInterface> uiList = uiService.getAvailableUIs();
+		assertEquals(1, uiList.size());
+		assertTrue(uiList.get(0) instanceof HeadlessUI);
+	}
+
 	@Test
 	public void testHeadlessUI() {
 		final MockUserInterface mockUI = new MockUserInterface();

From 51bb349c9b909e0e3c9660d358031db99a1127bd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 14:26:52 -0500
Subject: [PATCH 0337/1208] POM: bump version to 2.60.0-SNAPSHOT

The HeadlessUI is new API, so we bump the minor version.
There is also a new ArrayUtils method.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 42082ee9a..d0e1b4e28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.59.1-SNAPSHOT</version>
+	<version>2.60.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From dabb48aeb6b75937ef0d56ea9dd376ae6af2730f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 14:45:42 -0500
Subject: [PATCH 0338/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d0e1b4e28..1fffb5592 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.60.0-SNAPSHOT</version>
+	<version>2.60.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From f485ee35bfd1cf277306e4ebc11e88d1d9996753 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 16:02:34 -0500
Subject: [PATCH 0339/1208] Remove unused imports

---
 src/main/java/org/scijava/ui/AbstractUserInterface.java | 2 --
 src/test/java/org/scijava/test/AbstractSciJavaTest.java | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 7210682f0..2bae5bea8 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -33,8 +33,6 @@
 
 import java.util.List;
 
-import org.scijava.app.StatusService;
-import org.scijava.command.CommandService;
 import org.scijava.display.Display;
 import org.scijava.display.DisplayService;
 import org.scijava.log.LogService;
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index c6cc2167a..1cc567e4c 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -31,16 +31,11 @@
 
 package org.scijava.test;
 
-import java.awt.Cursor;
-import java.util.Random;
-
 import org.junit.After;
 import org.junit.Before;
 import org.scijava.Context;
 import org.scijava.plugin.Parameter;
 import org.scijava.service.Service;
-import org.scijava.util.ByteArray;
-import org.scijava.util.FloatArray;
 
 /**
  * Base class for unit testing of SciJava components.

From a94ff04af66474e25c484378814c8351bb9640fa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Sep 2016 16:03:19 -0500
Subject: [PATCH 0340/1208] App: remove redundant superinterface

---
 src/main/java/org/scijava/app/App.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index 2bfee1844..e5aad2949 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -33,7 +33,6 @@
 
 import java.io.File;
 
-import org.scijava.Versioned;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 import org.scijava.plugin.SingletonPlugin;
@@ -54,7 +53,7 @@
  * @see Plugin
  * @see AppService
  */
-public interface App extends RichPlugin, SingletonPlugin, Versioned {
+public interface App extends RichPlugin, SingletonPlugin {
 
 	/** Gets the title of the application. */
 	String getTitle();

From e3453f26f2be119cbf0a48f812913df89f45321f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 3 Sep 2016 16:29:17 -0500
Subject: [PATCH 0341/1208] StderrLogService: use stdout non-severe messages

The logging page at http://imagej.net/Logging states that severe logging
messages (WARN and ERROR levels) are emitted to stderr, while less
severe ones (INFO and DEBUG levels) are emitted to stdout.

This was not actually true with the default LogService implementation.
This commit addresses the situation.

Originally, I planned to make this change with SciJava Common 3.0.0,
because I thought we would need to break backwards compatibility to
achieve it. But actually, the change was easy to make in a smooth
manner. SJC3 will see a cleanup of the logging API, but that cleanup
is not a prerequisite to fixing the situation with stdout + stderr.

Thanks to Florian Jug for spurring this change.
---
 .../java/org/scijava/log/StderrLogService.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 5d7fc4688..23da68cb6 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -37,6 +37,11 @@
 
 /**
  * Implementation of {@link LogService} using the standard error stream.
+ * <p>
+ * Actually, this service is somewhat misnamed now, since it prints {@code WARN}
+ * and {@code ERROR} messages to stderr, but messages at lesser severities to
+ * stdout.
+ * </p>
  * 
  * @author Johannes Schindelin
  * @author Curtis Rueden
@@ -44,6 +49,15 @@
 @Plugin(type = Service.class, priority = Priority.LOW_PRIORITY)
 public class StderrLogService extends AbstractLogService {
 
+	@Override
+	protected void log(final int level, final Object msg) {
+		final String prefix = getPrefix(level);
+		final String message = (prefix == null ? "" : prefix + " ") + msg;
+		// NB: Emit severe messages to stderr, and less severe ones to stdout.
+		if (level <= WARN) System.err.println(message);
+		else System.out.println(message);
+	}
+
 	/**
 	 * Prints a message to stderr.
 	 * 

From c75c31fa6d1da59e33e19e46eb0fff298213bebc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 4 Sep 2016 09:43:05 -0500
Subject: [PATCH 0342/1208] ScriptModule: tweak style

---
 src/main/java/org/scijava/script/ScriptModule.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 558eec7b6..458a249e0 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -158,7 +158,8 @@ public void run() {
 		if (error != null) {
 			scriptContext.setErrorWriter(error);
 			errorPrinter = new PrintWriter(error);
-		} else {
+		}
+		else {
 			errorPrinter = null;
 		}
 
@@ -179,11 +180,8 @@ public void run() {
 			while (e instanceof ScriptException && e.getCause() != null) {
 				e = e.getCause();
 			}
-			if (error == null) {
-				log.error(e);
-			} else {
-				e.printStackTrace(errorPrinter);
-			}
+			if (error == null) log.error(e);
+			else e.printStackTrace(errorPrinter);
 		}
 
 		// populate output values

From a95a116978482934619ec6652042e3289b365c2e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 4 Sep 2016 09:53:49 -0500
Subject: [PATCH 0343/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1fffb5592..d03ae872d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.60.1-SNAPSHOT</version>
+	<version>2.60.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 6d81fd7c2319d001dba3084579bc45b524ed8850 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 14 Sep 2016 21:59:25 -0700
Subject: [PATCH 0344/1208] Fix population of default values

The logic was inverted since 14aa08f3ddcc845ab6ad89ce6f197d5de90fff54.

Partially fixes #248.
---
 .../org/scijava/module/process/DefaultValuePreprocessor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 2bf08354e..07df44016 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -74,7 +74,7 @@ private <T> void assignDefaultValue(final Module module,
 	{
 		if (module.isInputResolved(item.getName())) return;
 		final T nullValue = ConversionUtils.getNullValue(item.getType());
-		if (Objects.equals(item.getValue(module), nullValue)) return;
+		if (!Objects.equals(item.getValue(module), nullValue)) return;
 		final T defaultValue = moduleService.getDefaultValue(item);
 		if (defaultValue == null) return;
 		item.setValue(module, defaultValue);

From 103b326e6f3c8c54eecd34c85413a18cbd0a1cbd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Sep 2016 13:01:16 -0500
Subject: [PATCH 0345/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d03ae872d..45b9d9c07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.60.2-SNAPSHOT</version>
+	<version>2.60.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 20b4873c0938475b7b36081947b90938e1d533ee Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2016 13:54:56 -0500
Subject: [PATCH 0346/1208] DefaultParseService: be defensive about null args

It is not allowed to attempt to parse a null value. However, previously,
the exception would come from deep inside SJEP. Let's fail fast instead.
---
 src/main/java/org/scijava/parse/DefaultParseService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 84db28d9b..bbc92f3f8 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -60,6 +60,7 @@ public Items parse(final String arg) {
 
 	@Override
 	public Items parse(final String arg, final boolean strict) {
+		if (arg == null) throw new NullPointerException("arg must not be null");
 		return new ItemsList(arg, strict);
 	}
 

From fe807dea47b09540e515af5669577cbb80244fe1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2016 13:53:06 -0500
Subject: [PATCH 0347/1208] RunArgument: fix NPE when no script args are given

The intent was that you could write e.g.:

    myApp --run myScript

Instead of requiring that an empty args list be passed like:

    myApp --run myScript ''

But in practice, the former was generating a NullPointerException.
---
 .../java/org/scijava/run/console/RunArgument.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 729e5e385..ceec173f7 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -76,15 +76,17 @@ public void handle(final LinkedList<String> args) {
 		final String code = args.removeFirst();
 		final String arg = getParam(args);
 
-		final Items items = parser.parse(arg);
 		try {
 			if (arg == null) runService.run(code);
-			else if (items.isMap()) runService.run(code, items.asMap());
-			else if (items.isList()) runService.run(code, items.toArray());
 			else {
-				throw new IllegalArgumentException("Arguments are inconsistent. " +
-					"Please pass either a list of key/value pairs, " +
-					"or a list of values.");
+				final Items items = parser.parse(arg);
+				if (items.isMap()) runService.run(code, items.asMap());
+				else if (items.isList()) runService.run(code, items.toArray());
+				else {
+					throw new IllegalArgumentException("Arguments are inconsistent. " +
+						"Please pass either a list of key/value pairs, " +
+						"or a list of values.");
+				}
 			}
 		}
 		catch (final InvocationTargetException exc) {

From ae5f92663fa5feda7ef5853521495299c9a24135 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2016 13:57:21 -0500
Subject: [PATCH 0348/1208] RunArgument: fix bug when argument list is given

When an argument list is provided, we need to remove it from the list
of pending command line arguments to process.

Otherwise, it will get "double" processed, which can result in
various weirdness. For instance, in ImageJ2 with the legacy layer
active, the class net.imagej.legacy.LegacyCommandline$Filename.handle
would try to handle the empty string as a filename and then barf.
---
 src/main/java/org/scijava/run/console/RunArgument.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index ceec173f7..429addb29 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -75,6 +75,7 @@ public void handle(final LinkedList<String> args) {
 		args.removeFirst(); // --run
 		final String code = args.removeFirst();
 		final String arg = getParam(args);
+		if (arg != null) args.removeFirst(); // argument list was given
 
 		try {
 			if (arg == null) runService.run(code);

From 0ddf72d30e32ebae45d841029f881a2b3d8839d6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 29 Sep 2016 14:20:23 -0500
Subject: [PATCH 0349/1208] ScriptInfo: cache URL source, if given & relevant

These days, the ScriptFinder discovers all scripts via the classpath
as URL resources. Let's remember those in each ScriptInfo object.
---
 pom.xml                                       |  2 +-
 .../java/org/scijava/script/ScriptInfo.java   | 68 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 45b9d9c07..bcc0a33c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.60.3-SNAPSHOT</version>
+	<version>2.61.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 10c4dd07d..155a688bb 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -35,8 +35,11 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -76,6 +79,7 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 
 	private static final int PARAM_CHAR_MAX = 640 * 1024; // should be enough ;-)
 
+	private final URL url;
 	private final String path;
 	private final String script;
 
@@ -105,7 +109,7 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	 * @param file The script file.
 	 */
 	public ScriptInfo(final Context context, final File file) {
-		this(context, file.getPath());
+		this(context, null, file.getPath(), null);
 	}
 
 	/**
@@ -116,7 +120,23 @@ public ScriptInfo(final Context context, final File file) {
 	 * @param path Path to the script file.
 	 */
 	public ScriptInfo(final Context context, final String path) {
-		this(context, path, null);
+		this(context, null, path, null);
+	}
+
+	/**
+	 * Creates a script metadata object which describes a script at the given URL.
+	 * 
+	 * @param context The SciJava application context to use when populating
+	 *          service inputs.
+	 * @param url URL which references the script.
+	 * @param path Pseudo-path to the script file. This file does not actually
+	 *          need to exist, but rather provides a name for the script with file
+	 *          extension.
+	 */
+	public ScriptInfo(final Context context, final URL url, final String path)
+		throws IOException
+	{
+		this(context, url, path, new InputStreamReader(url.openStream()));
 	}
 
 	/**
@@ -132,9 +152,16 @@ public ScriptInfo(final Context context, final String path) {
 	 */
 	public ScriptInfo(final Context context, final String path,
 		final Reader reader)
+	{
+		this(context, null, path, reader);
+	}
+
+	private ScriptInfo(final Context context, final URL url, final String path,
+		final Reader reader)
 	{
 		setContext(context);
-		this.path = path;
+		this.url = url(url, path);
+		this.path = path(url, path);
 
 		String contents = null;
 		if (reader != null) {
@@ -150,6 +177,26 @@ public ScriptInfo(final Context context, final String path,
 
 	// -- ScriptInfo methods --
 
+	/**
+	 * Gets the URL of the script.
+	 * <p>
+	 * If the actual source of the script is a URL (provided via
+	 * {@link #ScriptInfo(Context, URL, String)}), then this will return it.
+	 * </p>
+	 * <p>
+	 * Alternately, if the path (from {@link #getPath()}) is a real file on disk
+	 * (provided via {@link #ScriptInfo(Context, File)} or
+	 * {@link #ScriptInfo(Context, String)}), then the URL returned here will be a
+	 * {@code file://} one reference to it.
+	 * </p>
+	 * <p>
+	 * Otherwise, this method will return null.
+	 * </p>
+	 */
+	public URL getURL() {
+		return url;
+	}
+
 	/**
 	 * Gets the path to the script on disk.
 	 * <p>
@@ -332,6 +379,21 @@ public String getVersion() {
 
 	// -- Helper methods --
 
+	private URL url(final URL u, final String p) {
+		if (u != null) return u;
+		try {
+			return new File(p).toURI().toURL();
+		}
+		catch (final MalformedURLException exc) {
+			log.debug("Cannot glean URL from path: " + p, exc);
+			return null;
+		}
+	}
+
+	private String path(final URL u, final String p) {
+		return p == null ? u.getPath() : p;
+	}
+
 	private void parseParam(final String param) throws ScriptException {
 		final int lParen = param.indexOf("(");
 		final int rParen = param.lastIndexOf(")");

From 76b015635a50cf99ca29d68cb08bcf091d460d8b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 29 Sep 2016 14:22:52 -0500
Subject: [PATCH 0350/1208] ScriptFinder: remember the URL for each script

Previously, we threw away the URL references. It's nicer to keep them.
---
 src/main/java/org/scijava/script/ScriptFinder.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 5766b2086..6e9484b34 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -33,7 +33,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
@@ -191,8 +190,7 @@ private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
 			urls.add(url);
 
 			try {
-				final ScriptInfo info = new ScriptInfo(getContext(), //
-					path, new InputStreamReader(url.openStream()));
+				final ScriptInfo info = new ScriptInfo(getContext(), url, path);
 
 				info.setMenuPath(menuPath);
 

From 5f7d51840e04d94a1d7b24b5e49d63aeb46ae9c3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 29 Sep 2016 14:28:11 -0500
Subject: [PATCH 0351/1208] ScriptFinderTest: test that the URLs are retained

---
 .../java/org/scijava/script/ScriptFinderTest.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index a860dde8c..8f6276f83 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -32,6 +32,7 @@
 package org.scijava.script;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -114,6 +115,7 @@ public void testFindScripts() {
 			"Math > Trig > tan", //
 		};
 		assertMenuPaths(expected, scripts);
+		assertURLsMatch(scripts);
 	}
 
 	/**
@@ -148,6 +150,7 @@ public void testMenuPrefixes() {
 			"Foo > Bar > Math > Trig > tan", //
 		};
 		assertMenuPaths(expected, scripts);
+		assertURLsMatch(scripts);
 	}
 
 	/**
@@ -181,6 +184,7 @@ public void testOverlappingDirectories() {
 			"Math > Trig > tan", //
 		};
 		assertMenuPaths(expected, scripts);
+		assertURLsMatch(scripts);
 	}
 
 	// -- Helper methods --
@@ -212,6 +216,14 @@ private void assertMenuPaths(final String[] expected,
 		}
 	}
 
+	private void assertURLsMatch(final ArrayList<ScriptInfo> scripts) {
+		for (final ScriptInfo info : scripts) {
+			final String urlPath = info.getURL().getPath();
+			final String path = info.getPath();
+			assertTrue(urlPath + " <> " + path, urlPath.endsWith("/" + path));
+		}
+	}
+
 	// -- Helper classes --
 
 	/** "Handles" scripts with .foo extension. */

From 1f41932e1bed748cc6ae34f87990535455fe788f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 24 Oct 2016 13:03:40 -0500
Subject: [PATCH 0352/1208] ScriptREPL: catch exceptions for built-in commands

Previously, we only caught exceptions when evaluating lines of script.
But the built-ins can go wrong, too; e.g., when asking a script engine
to do some operation which it does not support.

So let's just always catch all exceptions when talking to the script
engines, to make a best effort to recover nicely whenever possible.

Note that this patch is mostly indentation changes;
use "git diff -b" to see the true scope of the changes more easily.
---
 .../java/org/scijava/script/ScriptREPL.java   | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 931f8fb8d..b6ed9eb28 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -167,37 +167,37 @@ public void prompt() {
 	 * @return False iff the REPL should exit.
 	 */
 	public boolean evaluate(final String line) {
-		final String tLine = line.trim();
-		if (tLine.equals(":help")) help();
-		else if (tLine.equals(":vars")) vars();
-		else if (tLine.equals(":langs")) langs();
-		else if (tLine.startsWith(":lang ")) lang(line.substring(6).trim());
-		else if (tLine.equals(":quit")) return false;
-		else {
-			// ensure that a script language is active
-			if (interpreter == null) return true;
-
-			// pass the input to the current interpreter for evaluation
-			try {
+		try {
+			final String tLine = line.trim();
+			if (tLine.equals(":help")) help();
+			else if (tLine.equals(":vars")) vars();
+			else if (tLine.equals(":langs")) langs();
+			else if (tLine.startsWith(":lang ")) lang(line.substring(6).trim());
+			else if (tLine.equals(":quit")) return false;
+			else {
+				// ensure that a script language is active
+				if (interpreter == null) return true;
+
+				// pass the input to the current interpreter for evaluation
 				final Object result = interpreter.interpret(line);
 				if (result != ScriptInterpreter.MORE_INPUT_PENDING) {
 					out.println(s(result));
 				}
 			}
-			catch (final ScriptException exc) {
-				// NB: Something went wrong interpreting the line of code.
-				// Let's just display the error message, unless we are in debug mode.
-				if (log.isDebug()) exc.printStackTrace(out);
-				else {
-					final String msg = exc.getMessage();
-					out.println(msg == null ? exc.getClass().getName() : msg);
-				}
-			}
-			catch (final Throwable exc) {
-				// NB: Something unusual went wrong. Dump the whole exception always.
-				exc.printStackTrace(out);
+		}
+		catch (final ScriptException exc) {
+			// NB: Something went wrong interpreting the line of code.
+			// Let's just display the error message, unless we are in debug mode.
+			if (log.isDebug()) exc.printStackTrace(out);
+			else {
+				final String msg = exc.getMessage();
+				out.println(msg == null ? exc.getClass().getName() : msg);
 			}
 		}
+		catch (final Throwable exc) {
+			// NB: Something unusual went wrong. Dump the whole exception always.
+			exc.printStackTrace(out);
+		}
 		return true;
 	}
 

From bee1d56b46d0d84f27d38f5398bc5d7ba6e486ca Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 24 Oct 2016 13:48:01 -0500
Subject: [PATCH 0353/1208] ScriptREPL: dump exceptions to the OutputStream

We don't want to use the log, but rather the designated stream.
---
 src/main/java/org/scijava/script/ScriptREPL.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index b6ed9eb28..f3e409fea 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -341,7 +341,7 @@ private List<Gateway> gateways() {
 				gateways.add(gateway);
 			}
 			catch (final Throwable t) {
-				if (log != null) log.error(t);
+				t.printStackTrace(out);
 			}
 		}
 		return gateways;

From 1aea31a94e34aca71ab69955457427afd1d27b29 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 24 Oct 2016 13:47:15 -0500
Subject: [PATCH 0354/1208] ScriptREPL: implement a local debug mode

Instead of asking the LogService for whether it is in debug mode,
let's just have our own debug flag, which can be toggled via the
REPL itself. This is more convenient for the REPL user.
---
 src/main/java/org/scijava/script/ScriptREPL.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index f3e409fea..399dcec56 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -46,7 +46,6 @@
 
 import org.scijava.Context;
 import org.scijava.Gateway;
-import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
@@ -70,9 +69,6 @@ public class ScriptREPL {
 	@Parameter(required = false)
 	private PluginService pluginService;
 
-	@Parameter(required = false)
-	private LogService log;
-
 	private final PrintStream out;
 
 	/** List of interpreter-friendly script languages. */
@@ -81,6 +77,9 @@ public class ScriptREPL {
 	/** The currently active interpreter. */
 	private ScriptInterpreter interpreter;
 
+	/** Flag for debug mode. */
+	private boolean debug;
+
 	public ScriptREPL(final Context context) {
 		this(context, System.out);
 	}
@@ -172,6 +171,7 @@ public boolean evaluate(final String line) {
 			if (tLine.equals(":help")) help();
 			else if (tLine.equals(":vars")) vars();
 			else if (tLine.equals(":langs")) langs();
+			else if (tLine.equals(":debug")) debug();
 			else if (tLine.startsWith(":lang ")) lang(line.substring(6).trim());
 			else if (tLine.equals(":quit")) return false;
 			else {
@@ -188,7 +188,7 @@ public boolean evaluate(final String line) {
 		catch (final ScriptException exc) {
 			// NB: Something went wrong interpreting the line of code.
 			// Let's just display the error message, unless we are in debug mode.
-			if (log.isDebug()) exc.printStackTrace(out);
+			if (debug) exc.printStackTrace(out);
 			else {
 				final String msg = exc.getMessage();
 				out.println(msg == null ? exc.getClass().getName() : msg);
@@ -211,6 +211,7 @@ public void help() {
 		out.println("  :vars           | dump a list of variables");
 		out.println("  :lang <name>    | switch the active language");
 		out.println("  :langs          | list available languages");
+		out.println("  :debug          | toggle full stack traces");
 		out.println("  :quit           | exit the REPL");
 		out.println();
 		out.println("Or type a statement to evaluate it with the active language.");
@@ -269,6 +270,11 @@ public void langs() {
 		printColumns(names, versions, aliases);
 	}
 
+	public void debug() {
+		debug = !debug;
+		out.println("debug mode -> " + debug);
+	}
+
 	// -- Main method --
 
 	public static void main(final String... args) throws Exception {

From 1215dd8b623e5fc778d92c2b2365266617924210 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 24 Oct 2016 13:48:23 -0500
Subject: [PATCH 0355/1208] ScriptREPL: recover gracefully from failed copy

When copying variables between languages, if something goes wrong,
let's just catch it, dump the error, and try to continue.

Otherwise, the language switch operation will completely fail.
---
 src/main/java/org/scijava/script/ScriptREPL.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 399dcec56..95a7a6a0e 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -252,7 +252,12 @@ public void lang(final String langName) {
 			new DefaultScriptInterpreter(language);
 
 		// preserve state of the previous interpreter
-		copyBindings(interpreter, newInterpreter);
+		try {
+			copyBindings(interpreter, newInterpreter);
+		}
+		catch (final Throwable t) {
+			t.printStackTrace(out);
+		}
 		out.println("language -> " +
 			newInterpreter.getLanguage().getLanguageName());
 		interpreter = newInterpreter;

From 102329f23f92fd57d1af9e659bb0afd0e1f80d56 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Oct 2016 10:56:20 -0500
Subject: [PATCH 0356/1208] MenuPath: add option to trim, or not, as desired

---
 src/main/java/org/scijava/MenuPath.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index ebd245ff6..f53f5cb1a 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -74,10 +74,20 @@ public MenuPath(final String path) {
 	 * the specified separator.
 	 */
 	public MenuPath(final String path, final String separator) {
+		this(path, separator, true);
+	}
+
+	/**
+	 * Creates a menu path with entries parsed from the given string, splitting on
+	 * the specified separator, and trimming whitespace if indicated.
+	 */
+	public MenuPath(final String path, final String separator,
+		final boolean trim)
+	{
 		if (path != null && !path.isEmpty()) {
 			final String[] tokens = path.split(separator);
 			for (final String token : tokens) {
-				add(new MenuEntry(token.trim()));
+				add(new MenuEntry(trim ? token.trim() : token));
 			}
 		}
 	}

From 4202cc9d9e58de2203ea593ebb284cb27a7f4112 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Oct 2016 10:56:48 -0500
Subject: [PATCH 0357/1208] ScriptFinder: do not trim script menu paths

Otherwise, e.g., trailing spaces converted from underscores are lost.
---
 src/main/java/org/scijava/script/ScriptFinder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 6e9484b34..951cda817 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -172,7 +172,7 @@ private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
 			final String friendlyPath = basePath.replace('_', ' ');
 
 			final MenuPath menuPath = new MenuPath(menuPrefix);
-			menuPath.addAll(new MenuPath(friendlyPath, "/"));
+			menuPath.addAll(new MenuPath(friendlyPath, "/", false));
 
 			// E.g.:
 			// path = "File/Import/Movie_File....groovy"

From d17d2cad603b24fe2f0e4490c1c0a71c2102ec3c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Oct 2016 13:54:13 -0500
Subject: [PATCH 0358/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bcc0a33c3..571f9d3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.61.0-SNAPSHOT</version>
+	<version>2.61.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From d52961bd49a3a0155cbc706b830becad870a339c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 19 Nov 2016 22:51:01 -0600
Subject: [PATCH 0359/1208] Update parent to pom-scijava 12.0.0

This version is a major update to the SciJava Bill of Materials; see:
http://forum.imagej.net/t/split-boms-from-parent-configuration/2563
---
 pom.xml                                     | 16 +++++++++++++++-
 src/test/java/org/scijava/util/POMTest.java |  4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 571f9d3e3..edf8dccd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>11.2.1</version>
+		<version>12.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -16,6 +16,10 @@
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
 	<url>http://scijava.org/</url>
 	<inceptionYear>2009</inceptionYear>
+	<organization>
+		<name>SciJava</name>
+		<url>http://www.scijava.org/</url>
+	</organization>
 	<licenses>
 		<license>
 			<name>Simplified BSD License</name>
@@ -91,6 +95,16 @@
 		</contributor>
 	</contributors>
 
+	<mailingLists>
+		<mailingList>
+			<name>SciJava</name>
+			<subscribe>https://groups.google.com/group/scijava</subscribe>
+			<unsubscribe>https://groups.google.com/group/scijava</unsubscribe>
+			<post>scijava@googlegroups.com</post>
+			<archive>https://groups.google.com/group/scijava</archive>
+		</mailingList>
+	</mailingLists>
+
 	<scm>
 		<connection>scm:git:git://github.com/scijava/scijava-common</connection>
 		<developerConnection>scm:git:git@github.com:scijava/scijava-common</developerConnection>
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 9964478e4..f54d3ff7f 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -103,8 +103,8 @@ public void testAccessors() throws ParserConfigurationException,
 		final String issueManagementURL = pom.getIssueManagementURL();
 		assertEquals("https://github.com/scijava/scijava-common/issues",
 			issueManagementURL);
-		assertNull(pom.getOrganizationName());
-		assertNull(pom.getOrganizationURL());
+		assertEquals("SciJava", pom.getOrganizationName());
+		assertEquals("http://www.scijava.org/", pom.getOrganizationURL());
 		assertTrue(pom.getPath().endsWith("pom.xml"));
 		assertTrue(pom.getProjectDescription().startsWith(
 			"SciJava Common is a shared library for SciJava software."));

From 66ed844ee76a264ca83629f0fef50c9b726c8897 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 12 Dec 2016 15:32:23 +0100
Subject: [PATCH 0360/1208] Add a rudimentary input validation mechanism

Now, if you want to validate that the value of an input is
acceptable, you can specify a validater method which will be
called when that input is marked as resolved.

Admittedly, this is a bit late in the module execution process,
and dynamic validation would still be nice in the future (e.g., to
provide feedback as values are updated in input harvester UIs).
But the good thing about this scheme is that regardless of which
preprocessor locks in the parameter value, validation will be
called immediately afterward, before the next preprocessor runs.

Thanks to Richard Domander for the idea and discussion.
---
 .../org/scijava/command/CommandModuleItem.java   |  5 +++++
 .../java/org/scijava/module/AbstractModule.java  | 16 ++++++++++++++++
 .../org/scijava/module/AbstractModuleItem.java   | 15 +++++++++++++++
 .../scijava/module/DefaultMutableModuleItem.java | 11 +++++++++++
 src/main/java/org/scijava/module/ModuleItem.java | 10 ++++++++++
 .../org/scijava/module/MutableModuleItem.java    |  2 ++
 src/main/java/org/scijava/plugin/Parameter.java  |  9 +++++++++
 src/main/java/org/scijava/script/ScriptInfo.java |  1 +
 8 files changed, 69 insertions(+)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 9752fad33..79b9424e8 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -123,6 +123,11 @@ public String getInitializer() {
 		return getParameter().initializer();
 	}
 
+	@Override
+	public String getValidater() {
+		return getParameter().validater();
+	}
+
 	@Override
 	public String getCallback() {
 		return getParameter().callback();
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 77948a285..41ecf2eb9 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -149,6 +149,16 @@ public boolean isOutputResolved(final String name) {
 
 	@Override
 	public void resolveInput(final String name) {
+		final ModuleItem<?> item = getInputItem(name);
+		if (item != null) {
+			try {
+				item.validate(this);
+			}
+			catch (final MethodCallException exc) {
+				// NB: Hacky, but avoids changing the API signature.
+				throw new RuntimeException(exc);
+			}
+		}
 		resolvedInputs.add(name);
 	}
 
@@ -181,4 +191,10 @@ private Map<String, Object> createMap(final Iterable<ModuleItem<?>> items,
 		return map;
 	}
 
+	private ModuleItem<?> getInputItem(final String name) {
+		for (final ModuleItem<?> item : getInfo().inputs()) {
+			if (item.getName().equals(name)) return item;
+		}
+		return null;
+	}
 }
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index c6d84537d..f29453329 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -56,6 +56,7 @@ public abstract class AbstractModuleItem<T> extends AbstractBasicDetails
 	private final ModuleInfo info;
 
 	private MethodRef initializerRef;
+	private MethodRef validaterRef;
 	private MethodRef callbackRef;
 
 	public AbstractModuleItem(final ModuleInfo info) {
@@ -200,6 +201,20 @@ public void initialize(final Module module) throws MethodCallException {
 		initializerRef.execute(module.getDelegateObject());
 	}
 
+	@Override
+	public String getValidater() {
+		return null;
+	}
+
+	@Override
+	public void validate(final Module module) throws MethodCallException {
+		final Object delegateObject = module.getDelegateObject();
+		if (validaterRef == null) {
+			validaterRef = new MethodRef(delegateObject.getClass(), getValidater());
+		}
+		validaterRef.execute(module.getDelegateObject());
+	}
+
 	@Override
 	public String getCallback() {
 		return null;
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 4d95ed91e..a627750a2 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -57,6 +57,7 @@ public class DefaultMutableModuleItem<T> extends AbstractModuleItem<T>
 	private boolean persisted;
 	private String persistKey;
 	private String initializer;
+	private String validater;
 	private String callback;
 	private String widgetStyle;
 	private T defaultValue;
@@ -162,6 +163,11 @@ public void setInitializer(final String initializer) {
 		this.initializer = initializer;
 	}
 
+	@Override
+	public void setValidater(final String validater) {
+		this.validater = validater;
+	}
+
 	@Override
 	public void setCallback(final String callback) {
 		this.callback = callback;
@@ -255,6 +261,11 @@ public String getInitializer() {
 		return initializer;
 	}
 
+	@Override
+	public String getValidater() {
+		return validater;
+	}
+
 	@Override
 	public String getCallback() {
 		return callback;
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 087a03c8a..cdb439e16 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -123,6 +123,16 @@ public interface ModuleItem<T> extends BasicDetails {
 	 */
 	void initialize(Module module) throws MethodCallException;
 
+	/** Gets the function that is called to validate the item's value. */
+	String getValidater();
+
+	/**
+	 * Invokes this item's validation function, if any, on the given module.
+	 * 
+	 * @see #getValidater()
+	 */
+	void validate(Module module) throws MethodCallException;
+
 	/**
 	 * Gets the function that is called whenever this item changes.
 	 * <p>
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 3fd6df99d..3fc9e6d32 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -56,6 +56,8 @@ public interface MutableModuleItem<T> extends ModuleItem<T> {
 
 	void setInitializer(String initializer);
 
+	void setValidater(String validater);
+
 	void setCallback(String callback);
 
 	void setWidgetStyle(String widgetStyle);
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index 84e8eddbf..4fc208a94 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -38,6 +38,7 @@
 
 import org.scijava.ItemIO;
 import org.scijava.ItemVisibility;
+import org.scijava.module.Module;
 
 /**
  * An annotation for indicating a field is an input or output parameter. This
@@ -119,6 +120,14 @@
 	/** Defines a function that is called to initialize the parameter. */
 	String initializer() default "";
 
+	/**
+	 * Defines a function that is called to validate the parameter value after it
+	 * is marked as resolved.
+	 * 
+	 * @see Module#resolveInput(String)
+	 */
+	String validater() default "";
+
 	/**
 	 * Defines a function that is called whenever this parameter changes.
 	 * <p>
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 155a688bb..46194dcfe 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -488,6 +488,7 @@ private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
 		else if (is(k, "columns")) item.setColumnCount(as(v, int.class));
 		else if (is(k, "description")) item.setDescription(as(v, String.class));
 		else if (is(k, "initializer")) item.setInitializer(as(v, String.class));
+		else if (is(k, "validater")) item.setValidater(as(v, String.class));
 		else if (is(k, "type")) item.setIOType(as(v, ItemIO.class));
 		else if (is(k, "label")) item.setLabel(as(v, String.class));
 		else if (is(k, "max")) item.setMaximumValue(as(v, item.getType()));

From 75146d3f6a5f9ec1b3ca572019033016536772fe Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Oct 2016 21:21:33 -0500
Subject: [PATCH 0361/1208] ShadowMenu: reformat string concatenation

---
 src/main/java/org/scijava/menu/ShadowMenu.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 13745d286..ae2d92e5c 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -548,12 +548,14 @@ else if (existingChild != null) {
 				final ModuleInfo childInfo = existingChild.getModuleInfo();
 				if (childInfo != null && info.getPriority() == childInfo.getPriority())
 				{
-					log.warn("ShadowMenu: menu item already exists:\n\texisting: " +
-						childInfo + "\n\t ignored: " + info);
+					log.warn("ShadowMenu: menu item already exists:\n" + //
+						"\texisting: " + childInfo + "\n" + //
+						"\t ignored: " + info);
 				}
 				else {
 					log.debug("ShadowMenu: higher-priority menu item already exists:\n" +
-						"\texisting: " + childInfo + "\n\t ignored: " + info);
+						"\texisting: " + childInfo + "\n" + //
+						"\t ignored: " + info);
 				}
 			}
 		}

From a196883399bab4433466faa47fa26757bc151063 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Oct 2016 21:23:14 -0500
Subject: [PATCH 0362/1208] ShadowMenu: give details on duplicates

In particular, it helps to know which JAR file each entry came from.
---
 .../java/org/scijava/menu/ShadowMenu.java     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index ae2d92e5c..cf0307b00 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -549,13 +549,13 @@ else if (existingChild != null) {
 				if (childInfo != null && info.getPriority() == childInfo.getPriority())
 				{
 					log.warn("ShadowMenu: menu item already exists:\n" + //
-						"\texisting: " + childInfo + "\n" + //
-						"\t ignored: " + info);
+						"\texisting: " + details(childInfo) + "\n" + //
+						"\t ignored: " + details(info));
 				}
 				else {
 					log.debug("ShadowMenu: higher-priority menu item already exists:\n" +
-						"\texisting: " + childInfo + "\n" + //
-						"\t ignored: " + info);
+						"\texisting: " + details(childInfo) + "\n" + //
+						"\t ignored: " + details(info));
 				}
 			}
 		}
@@ -566,6 +566,21 @@ private boolean isLeaf(final int depth, final MenuPath path) {
 		return depth == path.size() - 1;
 	}
 
+	private String details(final ModuleInfo info) {
+		if (info == null) return "<null>";
+		String className, classLocation;
+		try {
+			final Class<?> c = info.loadDelegateClass();
+			className = c.getName();
+			classLocation = ClassUtils.getLocation(c).toString();
+		}
+		catch (final ClassNotFoundException exc) {
+			className = info.getDelegateClassName();
+			classLocation = "<invalid>";
+		}
+		return info.getMenuPath() + " : " + className + " [" + classLocation + "]";
+	}
+
 	private ShadowMenu getMenu(final MenuPath menuPath, final int index) {
 		final MenuEntry entry = menuPath.get(index);
 

From b37942c91f214700e8111fdb305c1ceb77fa37a6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Oct 2016 21:22:44 -0500
Subject: [PATCH 0363/1208] ScriptLanguageIndex: reformat string concatenation

---
 src/main/java/org/scijava/script/ScriptLanguageIndex.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 229bd55d9..33b02bf56 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -173,9 +173,10 @@ private String overwriteMessage(final boolean overwrite, final String type,
 		final String key, final ScriptLanguage proposed,
 		final ScriptLanguage existing)
 	{
-		return (overwrite ? "Overwriting " : "Not overwriting ") + type + //
-			" '" + key + "':\n\tproposed = " + proposed.getClass().getName() +
-			"\n\texisting = " + existing.getClass().getName();
+		return (overwrite ? "Overwriting " : "Not overwriting ") + //
+			type + " '" + key + "':\n" + //
+			"\tproposed = " + proposed.getClass().getName() + "\n" +
+			"\texisting = " + existing.getClass().getName();
 	}
 
 }

From fc37cb2ee31fd7a122940c40c6fdf096312da889 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Oct 2016 21:23:48 -0500
Subject: [PATCH 0364/1208] ScriptLanguageIndex: give details on duplicates

In particular, it helps to know which JAR file each language came from.
---
 .../java/org/scijava/script/ScriptLanguageIndex.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 33b02bf56..4d7e77126 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -40,6 +40,7 @@
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.log.LogService;
+import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
 
 /**
@@ -175,8 +176,13 @@ private String overwriteMessage(final boolean overwrite, final String type,
 	{
 		return (overwrite ? "Overwriting " : "Not overwriting ") + //
 			type + " '" + key + "':\n" + //
-			"\tproposed = " + proposed.getClass().getName() + "\n" +
-			"\texisting = " + existing.getClass().getName();
+			"\tproposed = " + details(proposed) + "\n" +
+			"\texisting = " + details(existing);
 	}
 
+	/** Helper method of {@link #overwriteMessage}. */
+	private String details(final ScriptLanguage language) {
+		final Class<?> c = language.getClass();
+		return c.getName() + " [" + ClassUtils.getLocation(c);
+	}
 }

From e529070e41661384a314e3f0b9f478946cfcda69 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 20:40:20 +0100
Subject: [PATCH 0365/1208] GatewayPreprocessor: add missing final keywords

---
 .../scijava/module/process/GatewayPreprocessor.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 745c0464a..ed71dbdfb 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -87,22 +87,22 @@ private <G extends Gateway> void setGatewayValue(final Context context,
 		try {
 			gateway = type.getConstructor(Context.class).newInstance(context);
 		}
-		catch (IllegalArgumentException exc) {
+		catch (final IllegalArgumentException exc) {
 			exception = exc;
 		}
-		catch (SecurityException exc) {
+		catch (final SecurityException exc) {
 			exception = exc;
 		}
-		catch (InstantiationException exc) {
+		catch (final InstantiationException exc) {
 			exception = exc;
 		}
-		catch (IllegalAccessException exc) {
+		catch (final IllegalAccessException exc) {
 			exception = exc;
 		}
-		catch (InvocationTargetException exc) {
+		catch (final InvocationTargetException exc) {
 			exception = exc;
 		}
-		catch (NoSuchMethodException exc) {
+		catch (final NoSuchMethodException exc) {
 			exception = exc;
 		}
 		if (exception != null) {

From c988ebfc75c502ad5a4243a07bbcab0c8fc01c9c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 21:06:34 +0100
Subject: [PATCH 0366/1208] SaveInputsPreprocessor: fix line wrapping

---
 .../org/scijava/module/process/SaveInputsPreprocessor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 6c81a9c4a..3720d839e 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -43,8 +43,8 @@
  * <p>
  * This preprocessor runs late in the chain, giving other preprocessors every
  * chance to populate the inputs first. In particular, it executes after the
- * {@link org.scijava.widget.InputHarvester} has run, so that user-specified values
- * are persisted for next time.
+ * {@link org.scijava.widget.InputHarvester} has run, so that user-specified
+ * values are persisted for next time.
  * </p>
  * 
  * @author Curtis Rueden

From 85122f6295aeb3684d78eff2696d7809f3dccd4d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 21:08:56 +0100
Subject: [PATCH 0367/1208] Improve order of preprocessor plugins

The validity check should come extremely early.
After that, the Gateway and Service population should happen ASAP.
Only then should we consider others such as single typed inputs.

Without this change, it was possible for parameter validator
methods to fire before services were populated.
---
 .../java/org/scijava/module/process/GatewayPreprocessor.java  | 4 ++--
 .../java/org/scijava/module/process/ServicePreprocessor.java  | 4 ++--
 .../java/org/scijava/module/process/ValidityPreprocessor.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index ed71dbdfb..54591d97f 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -52,8 +52,8 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class,
-	priority = Priority.VERY_HIGH_PRIORITY)
+@Plugin(type = PreprocessorPlugin.class, //
+	priority = 2 * Priority.VERY_HIGH_PRIORITY)
 public class GatewayPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index f1d111d4f..51c70c8ee 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -61,8 +61,8 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class,
-	priority = Priority.VERY_HIGH_PRIORITY)
+@Plugin(type = PreprocessorPlugin.class, //
+	priority = 2 * Priority.VERY_HIGH_PRIORITY)
 public class ServicePreprocessor extends AbstractPreprocessorPlugin {
 
 	// -- ModuleProcessor methods --
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index a18ef8a9c..2beeca9be 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -44,7 +44,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = PreprocessorPlugin.class,
-	priority = Priority.VERY_HIGH_PRIORITY + 1)
+	priority = 3 * Priority.VERY_HIGH_PRIORITY)
 public class ValidityPreprocessor extends AbstractPreprocessorPlugin {
 
 	// -- ModuleProcessor methods --

From c68bf459a9be52c6c4070e2122a4a1dbf9966466 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 21:10:35 +0100
Subject: [PATCH 0368/1208] Do not inject delegate command classes

Instead, let the ServicePreprocessor handle them.

It turns out it is very tricky to inject the context into the Command
instance at the proper time. The best time would be precisely when the
CommandModule instance has its context injected, but unfortunately,
there is no hook to trigger behavior in response to context injection.
It is not guaranteed that Contextual#setContext(Context) be called.
Injecting the context into the Command instance during
ContextModule#initialize() appeared to work on the surface, but actually
deferred population of Service parameters until the InitPreprocessor
was called; such behavior was unintuitive and dare I say bogus.

Furthermore, by suppressing Service and Context parameters from the list
of Command inputs, we made commands behave differently than scripts: the
latter report Service and Context parameters as input parameters,
whereas the former did not. With this change, that discrepancy is fixed.
---
 src/main/java/org/scijava/command/CommandInfo.java   | 7 -------
 src/main/java/org/scijava/command/CommandModule.java | 8 --------
 2 files changed, 15 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 8947db7a6..445a53f2c 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -41,7 +41,6 @@
 import java.util.Map;
 
 import org.scijava.Cancelable;
-import org.scijava.Context;
 import org.scijava.InstantiableException;
 import org.scijava.ItemIO;
 import org.scijava.ItemVisibility;
@@ -55,7 +54,6 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginInfo;
-import org.scijava.service.Service;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.StringMaker;
 
@@ -451,11 +449,6 @@ private void checkFields(final Class<?> type) {
 		for (final Field f : fields) {
 			f.setAccessible(true); // expose private fields
 
-			// NB: Skip types handled by the application framework itself.
-			// I.e., these parameters get injected by Context#inject(Object).
-			if (Service.class.isAssignableFrom(f.getType())) continue;
-			if (Context.class.isAssignableFrom(f.getType())) continue;
-
 			final Parameter param = f.getAnnotation(Parameter.class);
 
 			boolean valid = true;
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 01afe55ef..00740256b 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -39,7 +39,6 @@
 import org.scijava.InstantiableException;
 import org.scijava.NullContextException;
 import org.scijava.module.AbstractModule;
-import org.scijava.module.MethodCallException;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleException;
 import org.scijava.module.ModuleInfo;
@@ -144,13 +143,6 @@ public void cancel() {
 		previewPlugin.cancel();
 	}
 
-	@Override
-	public void initialize() throws MethodCallException {
-		// NB: Inject the context into the command before initializing.
-		getContext().inject(command);
-		super.initialize();
-	}
-
 	@Override
 	public CommandInfo getInfo() {
 		return info;

From 1ada80f2a761c4e5a29f816ce3c95b8b0e9c540d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 21:05:29 +0100
Subject: [PATCH 0369/1208] CommandModuleTest: test validater callbacks

This also tests that Service parameters are injected very early
in the preprocessing chain, before Priority.VERY_HIGH_PRIORITY.
---
 .../scijava/command/CommandModuleTest.java    | 69 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 931c17c13..1773c3d60 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -33,6 +33,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.ExecutionException;
@@ -40,11 +41,16 @@
 import org.junit.Test;
 import org.scijava.Cancelable;
 import org.scijava.Context;
+import org.scijava.ItemIO;
+import org.scijava.Priority;
+import org.scijava.log.LogService;
 import org.scijava.module.Module;
+import org.scijava.module.ModuleItem;
 import org.scijava.module.process.AbstractPreprocessorPlugin;
 import org.scijava.module.process.PreprocessorPlugin;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.service.Service;
 
 /** Regression tests for {@link CommandModule}. */
 public class CommandModuleTest {
@@ -64,7 +70,6 @@ public void testCancelable() throws InterruptedException, ExecutionException {
 		assertFalse(crow.isCanceled());
 	}
 
-
 	@Test
 	public void testNotCancelable() throws InterruptedException,
 		ExecutionException
@@ -96,6 +101,17 @@ public void testDefaultValues() {
 		assertEquals(null, info.getInput("thing").getDefaultValue());
 	}
 
+	@Test
+	public void testValidation() throws InterruptedException, ExecutionException {
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+
+		final CommandModule module = //
+			commandService.run(CommandWithValidation.class, true).get();
+		assertNotNull(module.getInput("stuff"));
+		assertEquals("success", module.getOutput("result"));
+	}
+
 	// -- Helper classes --
 
 	/** A command which implements {@link Cancelable}. */
@@ -168,4 +184,55 @@ public void run() {
 			time = 0;
 		}
 	}
+
+	/** A command which validates an input. */
+	@Plugin(type = Command.class)
+	public static class CommandWithValidation extends ContextCommand {
+
+		@Parameter
+		private LogService log;
+
+		@Parameter(validater = "validateStuff")
+		private Stuff stuff;
+
+		@Parameter(type = ItemIO.OUTPUT)
+		private String result = "default";
+
+		@SuppressWarnings("unused")
+		private void validateStuff() {
+			final StringBuilder sb = new StringBuilder();
+			if (log == null) sb.append("[null-log] ");
+			if (stuff == null) sb.append("[null-stuff] ");
+			result = sb.length() == 0 ? "success" : sb.toString();
+		}
+
+		@Override
+		public void run() {
+			if (!result.equals("success")) result += " failure";
+		}
+	}
+
+	/**
+	 * Preprocessor to inject {@link Stuff} instances very early. But (in theory)
+	 * not as early as {@link Service} and {@link Context} parameters get
+	 * populated.
+	 */
+	@Plugin(type = PreprocessorPlugin.class,
+		priority = Priority.VERY_HIGH_PRIORITY)
+	public static class StuffPreprocessor extends AbstractPreprocessorPlugin {
+
+		@Override
+		public void process(final Module module) {
+			for (final ModuleItem<?> input : module.getInfo().inputs()) {
+				if (Stuff.class.isAssignableFrom(input.getType())) {
+					module.setInput(input.getName(), new Stuff());
+					module.resolveInput(input.getName());
+				}
+			}
+		}
+
+	}
+
+	/** Placeholder class, for type safety. */
+	public static class Stuff {}
 }

From 3c582e3fffcbe32726be960de7b5e96d911a6754 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 20 Dec 2016 13:51:24 -0600
Subject: [PATCH 0370/1208] ClassUtils: fix javadoc for annotated list results

What was written in the javadoc used to be true, but for performance
reasons, we added a cache for situations where the same request is
made multiple times. This commit updates the javadoc to reflect the
new reality.

Closes #252.
---
 src/main/java/org/scijava/util/ClassUtils.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 70631e038..816ee9925 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -364,7 +364,9 @@ public static URL getLocation(final Class<?> c) {
 	 *
 	 * @param c The class to scan for annotated methods.
 	 * @param annotationClass The type of annotation for which to scan.
-	 * @return A new list containing all methods with the requested annotation.
+	 * @return A list containing all methods with the requested annotation. Note
+	 *         that for performance reasons, lists may be cached and reused, so it
+	 *         is best to make a copy of the result if you need to modify it.
 	 */
 	public static <A extends Annotation> List<Method> getAnnotatedMethods(
 		final Class<?> c, final Class<A> annotationClass)
@@ -417,7 +419,9 @@ public static <A extends Annotation> List<Method> getAnnotatedMethods(
 	 *
 	 * @param c The class to scan for annotated fields.
 	 * @param annotationClass The type of annotation for which to scan.
-	 * @return A new list containing all fields with the requested annotation.
+	 * @return A list containing all fields with the requested annotation. Note
+	 *         that for performance reasons, lists may be cached and reused, so it
+	 *         is best to make a copy of the result if you need to modify it.
 	 */
 	public static <A extends Annotation> List<Field> getAnnotatedFields(
 		final Class<?> c, final Class<A> annotationClass)

From 3d158e5e36589e6d944635e6f7f6d05e1ee88128 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 15 Dec 2016 15:12:00 +0100
Subject: [PATCH 0371/1208] Context: remove unnecessary SuppressWarnings

---
 src/main/java/org/scijava/Context.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 1ec38127f..a9d2d2a70 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -533,7 +533,6 @@ private static PluginIndex plugins(final boolean empty) {
 		return empty ? new PluginIndex(null) : null;
 	}
 
-	@SuppressWarnings("unchecked")
 	private static List<Class<? extends Service>> services(final boolean empty) {
 		if (empty) return Collections.<Class<? extends Service>> emptyList();
 		return Arrays.<Class<? extends Service>> asList(Service.class);

From c09937e74564a223eea8a2df5a80068c2a0a33b6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 15 Dec 2016 15:12:12 +0100
Subject: [PATCH 0372/1208] Context: recursively inject the context

For each non-Service, non-Context, non-primitive @Parameter, check
whether it is already assigned a value, and if so, inject the context
into that value.

This makes it much easier to compose a class whose member fields also
need to know the context at the same time as the containing class.

See next commit for an example.
---
 src/main/java/org/scijava/Context.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index a9d2d2a70..5a1a7678f 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -471,6 +471,11 @@ else if (Context.class.isAssignableFrom(type) && type.isInstance(this)) {
 				// populate Context parameter
 				ClassUtils.setValue(f, o, this);
 			}
+			else if (!type.isPrimitive()) {
+				// the parameter is some other object; if it is non-null, we recurse
+				final Object value = ClassUtils.getValue(f, o);
+				if (value != null) inject(value);
+			}
 		}
 		catch (final Throwable t) {
 			handleSafely(t);

From a822f7b23c4009d54bc4a138145202f6f414da2b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 15 Dec 2016 15:14:09 +0100
Subject: [PATCH 0373/1208] CommandModule: make Command instance as a param

Together with the previous commit, this change will make the Command
instance receive a Context injection as part of the CommandModule's
injection -- something which was previously not possible.
---
 src/main/java/org/scijava/command/CommandModule.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 00740256b..6258260b2 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -80,6 +80,7 @@ public class CommandModule extends AbstractModule implements Cancelable,
 	private final CommandInfo info;
 
 	/** The command instance handled by this module. */
+	@Parameter
 	private final Command command;
 
 	@Parameter

From fe04dab85f75e8573ca84c4bf0ae86b3c4bf1af7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 15 Dec 2016 15:16:29 +0100
Subject: [PATCH 0374/1208] CommandModuleTest: test that Command gets injected

When running a Command _without_ preprocessing, the services
should nonetheless be populated, due to Context injection.
---
 .../scijava/command/CommandModuleTest.java    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 1773c3d60..1951fa42a 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -34,6 +34,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.ExecutionException;
@@ -112,6 +113,20 @@ public void testValidation() throws InterruptedException, ExecutionException {
 		assertEquals("success", module.getOutput("result"));
 	}
 
+	@Test
+	public void testCommandInjection() throws InterruptedException,
+		ExecutionException
+	{
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+		final LogService logService = context.service(LogService.class);
+
+		final CommandModule module = //
+			commandService.run(CommandWithService.class, false).get();
+		assertSame(logService, module.getInput("log"));
+		assertTrue((boolean) module.getOutput("success"));
+	}
+
 	// -- Helper classes --
 
 	/** A command which implements {@link Cancelable}. */
@@ -235,4 +250,21 @@ public void process(final Module module) {
 
 	/** Placeholder class, for type safety. */
 	public static class Stuff {}
+
+	/** A command which has a {@link Service} parameter. */
+	@Plugin(type = Command.class)
+	public static class CommandWithService implements Command {
+
+		@Parameter
+		private LogService log;
+
+		@Parameter(type = ItemIO.OUTPUT)
+		private boolean success;
+
+		@Override
+		public void run() {
+			success = log != null;
+		}
+	}
+
 }

From e5d37f042cc6bc3ae58103a610db2b9aa6abf9b2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Dec 2016 13:23:26 -0600
Subject: [PATCH 0375/1208] Add the Initializable interface

Anything with a 'void initialize()' method should implement it,
for improved type safety.
---
 pom.xml                                      |  2 +-
 src/main/java/org/scijava/Initializable.java | 45 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/Initializable.java

diff --git a/pom.xml b/pom.xml
index edf8dccd4..ce204c345 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.61.1-SNAPSHOT</version>
+	<version>2.62.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
new file mode 100644
index 000000000..8c6b05fed
--- /dev/null
+++ b/src/main/java/org/scijava/Initializable.java
@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava;
+
+/**
+ * Interface for objects which can be initialized.
+ * 
+ * @author Curtis Rueden
+ */
+public interface Initializable {
+
+	/** Initializes the object. */
+	default void initialize() {
+		// NB: Do nothing by default.
+	}
+}

From cdf8788f9c1646e249eb63c3f9121063893764ef Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Dec 2016 13:27:00 -0600
Subject: [PATCH 0376/1208] Service: switch method declaration order

We do this mainly so the next commit is cleaner & easier to understand.
---
 .../java/org/scijava/service/Service.java     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index 0118f93f1..cfab56e1c 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -52,31 +52,30 @@
 public interface Service extends RichPlugin, Disposable {
 
 	/**
-	 * Performs any needed initialization when the service is first loaded.
+	 * Registers the service's event handler methods.
 	 * <p>
 	 * NB: This method is not intended to be called directly. It is called by
 	 * the service framework itself (specifically by the {@link ServiceHelper})
 	 * when initializing the service. It should not be called a second time.
 	 * </p>
 	 */
-	default void initialize() {
-		// NB: Do nothing by default.
+	default void registerEventHandlers() {
+		// TODO: Consider removing this method in scijava-common 3.0.0.
+		// Instead, the ServiceHelper could just invoke the lines below directly,
+		// and there would be one less boilerplate Service method to implement.
+		final EventService eventService = context().getService(EventService.class);
+		if (eventService != null) eventService.subscribe(this);
 	}
 
 	/**
-	 * Registers the service's event handler methods.
+	 * Performs any needed initialization when the service is first loaded.
 	 * <p>
 	 * NB: This method is not intended to be called directly. It is called by
 	 * the service framework itself (specifically by the {@link ServiceHelper})
 	 * when initializing the service. It should not be called a second time.
 	 * </p>
 	 */
-	default void registerEventHandlers() {
-		// TODO: Consider removing this method in scijava-common 3.0.0.
-		// Instead, the ServiceHelper could just invoke the lines below directly,
-		// and there would be one less boilerplate Service method to implement.
-		final EventService eventService = context().getService(EventService.class);
-		if (eventService != null) eventService.subscribe(this);
+	default void initialize() {
+		// NB: Do nothing by default.
 	}
-
 }

From a855314fee40dbaed2b3be97ed9f4eadc635a1b6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Dec 2016 13:27:39 -0600
Subject: [PATCH 0377/1208] Service: implement the Initializable interface

---
 src/main/java/org/scijava/service/Service.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index cfab56e1c..e707aee67 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -32,6 +32,7 @@
 package org.scijava.service;
 
 import org.scijava.Disposable;
+import org.scijava.Initializable;
 import org.scijava.event.EventService;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
@@ -49,7 +50,7 @@
  * @author Curtis Rueden
  * @see Plugin
  */
-public interface Service extends RichPlugin, Disposable {
+public interface Service extends RichPlugin, Initializable, Disposable {
 
 	/**
 	 * Registers the service's event handler methods.
@@ -67,6 +68,8 @@ default void registerEventHandlers() {
 		if (eventService != null) eventService.subscribe(this);
 	}
 
+	// -- Initializable methods --
+
 	/**
 	 * Performs any needed initialization when the service is first loaded.
 	 * <p>
@@ -75,6 +78,7 @@ default void registerEventHandlers() {
 	 * when initializing the service. It should not be called a second time.
 	 * </p>
 	 */
+	@Override
 	default void initialize() {
 		// NB: Do nothing by default.
 	}

From 0f3227dfd1998312547f2d6cc86b7b2a7fe8fb2b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Dec 2016 13:34:22 -0600
Subject: [PATCH 0378/1208] Context: clean up style

---
 src/main/java/org/scijava/Context.java | 97 +++++++++++++-------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 5a1a7678f..507570903 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -55,7 +55,7 @@
 /**
  * Top-level SciJava application context, which initializes and maintains a list
  * of services.
- * 
+ *
  * @author Curtis Rueden
  * @see Service
  */
@@ -100,7 +100,7 @@ public class Context implements Disposable {
 
 	/**
 	 * Creates a new SciJava application context with all available services.
-	 * 
+	 *
 	 * @see #Context(Collection, PluginIndex, boolean)
 	 */
 	public Context() {
@@ -109,7 +109,7 @@ public Context() {
 
 	/**
 	 * Creates a new SciJava application context.
-	 * 
+	 *
 	 * @param empty If true, the context will be empty of services; otherwise, it
 	 *          will be initialized with all available services.
 	 * @see #Context(boolean, boolean)
@@ -120,7 +120,7 @@ public Context(final boolean empty) {
 
 	/**
 	 * Creates a new SciJava application context.
-	 * 
+	 *
 	 * @param noServices If true, the context will contain no services; otherwise,
 	 *          it will be initialized with all available services.
 	 * @param noPlugins If true, the context will contain no plugins; otherwise,
@@ -147,11 +147,11 @@ public Context(final boolean noServices, final boolean noPlugins) {
 	 * To avoid this, we have opted to use raw types and suppress the relevant
 	 * warnings here instead.
 	 * </p>
-	 * 
+	 *
 	 * @param serviceClasses A list of types that implement the {@link Service}
 	 *          interface (e.g., {@code DisplayService.class}). Compatible
-	 *          services will be loaded in the order given,
-	 *          <em>regardless of their relative priorities</em>.
+	 *          services will be loaded in the order given, <em>regardless of
+	 *          their relative priorities</em>.
 	 * @see #Context(Collection, PluginIndex, boolean)
 	 * @throws ClassCastException If any of the given arguments do not implement
 	 *           the {@link Service} interface.
@@ -163,7 +163,7 @@ public Context(@SuppressWarnings("rawtypes") final Class... serviceClasses) {
 	/**
 	 * Creates a new SciJava application context with the specified services (and
 	 * any required service dependencies).
-	 * 
+	 *
 	 * @param serviceClasses A collection of types that implement the
 	 *          {@link Service} interface (e.g., {@code DisplayService.class}).
 	 *          Compatible services will be loaded according to the order of the
@@ -177,13 +177,13 @@ public Context(final Collection<Class<? extends Service>> serviceClasses) {
 	/**
 	 * Creates a new SciJava application context with the specified services (and
 	 * any required service dependencies).
-	 * 
+	 *
 	 * @param serviceClasses A collection of types that implement the
 	 *          {@link Service} interface (e.g., {@code DisplayService.class}).
 	 *          Compatible services will be loaded according to the order of the
 	 *          collection, <em>regardless of their relative priorities</em>.
-	 * @param strict Whether context creation will fail fast when there is
-	 *          an error instantiating a required service.
+	 * @param strict Whether context creation will fail fast when there is an
+	 *          error instantiating a required service.
 	 * @see #Context(Collection, PluginIndex, boolean)
 	 */
 	public Context(final Collection<Class<? extends Service>> serviceClasses,
@@ -197,7 +197,7 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 	 * the specified PluginIndex. This allows a base set of available plugins to
 	 * be defined, and is useful when plugins that would not be returned by the
 	 * {@link PluginIndex}'s {@link org.scijava.plugin.PluginFinder} are desired.
-	 * 
+	 *
 	 * @param pluginIndex The plugin index to use when discovering and indexing
 	 *          plugins. If you wish to completely control how services are
 	 *          discovered (i.e., use your own
@@ -215,7 +215,7 @@ public Context(final PluginIndex pluginIndex) {
 	 * any required service dependencies). Service dependency candidates are
 	 * selected from those discovered by the given {@link PluginIndex}'s
 	 * associated {@link org.scijava.plugin.PluginFinder}.
-	 * 
+	 *
 	 * @param serviceClasses A collection of types that implement the
 	 *          {@link Service} interface (e.g., {@code DisplayService.class}).
 	 *          Compatible services will be loaded according to the order of the
@@ -248,7 +248,7 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 	 * those of lower priority). See {@link ServiceHelper#loadServices()} for more
 	 * information.
 	 * </p>
-	 * 
+	 *
 	 * @param serviceClasses A collection of types that implement the
 	 *          {@link Service} interface (e.g., {@code DisplayService.class}).
 	 *          Compatible services will be loaded according to the order of the
@@ -259,8 +259,8 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 	 *          {@link org.scijava.plugin.PluginFinder} implementation), then you
 	 *          can pass a custom {@link PluginIndex} here. Passing null will
 	 *          result in a default plugin index being constructed and used.
-	 * @param strict Whether context creation will fail fast when there is
-	 *          an error instantiating a required service.
+	 * @param strict Whether context creation will fail fast when there is an
+	 *          error instantiating a required service.
 	 */
 	public Context(final Collection<Class<? extends Service>> serviceClasses,
 		final PluginIndex pluginIndex, final boolean strict)
@@ -272,9 +272,9 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 
 		setStrict(strict);
 
-		if (!serviceClasses.isEmpty()){
-			final ServiceHelper serviceHelper =
-					new ServiceHelper(this, serviceClasses, strict);
+		if (!serviceClasses.isEmpty()) {
+			final ServiceHelper serviceHelper = //
+				new ServiceHelper(this, serviceClasses, strict);
 			serviceHelper.loadServices();
 		}
 	}
@@ -299,21 +299,22 @@ public void setStrict(final boolean strict) {
 
 	/**
 	 * Gets the service of the given class.
-	 * 
+	 *
 	 * @throws NoSuchServiceException if the context does not have the requested
 	 *           service.
 	 */
 	public <S extends Service> S service(final Class<S> c) {
 		final S service = getService(c);
 		if (service == null) {
-			throw new NoSuchServiceException("Service " + c.getName() + " not found.");
+			throw new NoSuchServiceException("Service " + c.getName() +
+				" not found.");
 		}
 		return service;
 	}
 
 	/**
 	 * Gets the service of the given class name (useful for scripts).
-	 * 
+	 *
 	 * @throws IllegalArgumentException if the class does not exist, or is not a
 	 *           service class.
 	 * @throws NoSuchServiceException if the context does not have the requested
@@ -352,15 +353,16 @@ public Service getService(final String className) {
 	 * distinct things:
 	 * <ul>
 	 * <li>If the given object has any non-final {@link Context} fields annotated
-	 * with @{@link Parameter}, sets the value of those fields to this context.</li>
+	 * with @{@link Parameter}, sets the value of those fields to this context.
+	 * </li>
 	 * <li>If the given object has any non-final {@link Service} fields annotated
 	 * with @{@link Parameter}, sets the value of those fields to the
 	 * corresponding service available from this context.</li>
 	 * <li>Calls {@link EventService#subscribe(Object)} with the object to
-	 * register any @{@link EventHandler} annotated methods as event subscribers.</li>
-	 * .</li>
+	 * register any @{@link EventHandler} annotated methods as event subscribers.
+	 * </li> .</li>
 	 * </ul>
-	 * 
+	 *
 	 * @param o The object to which the context should be assigned.
 	 * @throws IllegalStateException If the object already has a context.
 	 * @throws IllegalArgumentException If the object has a required
@@ -370,7 +372,7 @@ public Service getService(final String className) {
 	public void inject(final Object o) {
 		// Ensure parameter fields and event handler methods are cached for this
 		// object.
-		Query query = new Query();
+		final Query query = new Query();
 		query.put(Parameter.class, Field.class);
 		query.put(EventHandler.class, Method.class);
 		ClassUtils.cacheAnnotatedObjects(o.getClass(), query);
@@ -412,13 +414,13 @@ public void dispose() {
 	public static List<Class<? extends Service>> serviceClassList(
 		final Class... serviceClasses)
 	{
-		return serviceClasses != null ? (List) Arrays.asList(serviceClasses)
-			: Arrays.asList(Service.class);
+		return serviceClasses != null ? //
+			Arrays.asList(serviceClasses) : Arrays.asList(Service.class);
 	}
 
 	// -- Helper methods --
 
-	private List<Field> getParameterFields(Object o) {
+	private List<Field> getParameterFields(final Object o) {
 		try {
 			return ClassUtils.getAnnotatedFields(o.getClass(), Parameter.class);
 		}
@@ -436,36 +438,36 @@ private void inject(final Field f, final Object o) {
 			if (Service.class.isAssignableFrom(type)) {
 				final Service existingService = (Service) ClassUtils.getValue(f, o);
 				if (strict && existingService != null) {
-					throw new IllegalStateException("Context already injected: " +
-							f.getDeclaringClass().getName() + "#" + f.getName());
+					throw new IllegalStateException("Context already injected: " + //
+						f.getDeclaringClass().getName() + "#" + f.getName());
 				}
 
 				// populate Service parameter
 				@SuppressWarnings("unchecked")
 				final Class<? extends Service> serviceType =
-				(Class<? extends Service>) type;
+					(Class<? extends Service>) type;
 				final Service service = getService(serviceType);
 				if (service == null && f.getAnnotation(Parameter.class).required()) {
-					throw new IllegalArgumentException(
+					throw new IllegalArgumentException(//
 						createMissingServiceMessage(serviceType));
 				}
 				if (existingService != null && existingService != service) {
 					// NB: Can only happen in non-strict mode.
-					throw new IllegalStateException("Mismatched context: " +
-							f.getDeclaringClass().getName() + "#" + f.getName());
+					throw new IllegalStateException("Mismatched context: " + //
+						f.getDeclaringClass().getName() + "#" + f.getName());
 				}
 				ClassUtils.setValue(f, o, service);
 			}
 			else if (Context.class.isAssignableFrom(type) && type.isInstance(this)) {
 				final Context existingContext = (Context) ClassUtils.getValue(f, o);
 				if (strict && existingContext != null) {
-					throw new IllegalStateException("Context already injected: " +
-							f.getDeclaringClass().getName() + "#" + f.getName());
+					throw new IllegalStateException("Context already injected: " + //
+						f.getDeclaringClass().getName() + "#" + f.getName());
 				}
 				if (existingContext != null && existingContext != this) {
 					// NB: Can only happen in non-strict mode.
-					throw new IllegalStateException("Mismatched context: " +
-							f.getDeclaringClass().getName() + "#" + f.getName());
+					throw new IllegalStateException("Mismatched context: " + //
+						f.getDeclaringClass().getName() + "#" + f.getName());
 				}
 
 				// populate Context parameter
@@ -506,11 +508,10 @@ private String createMissingServiceMessage(
 		final Class<? extends Service> serviceType)
 	{
 		final String nl = System.getProperty("line.separator");
-		final ClassLoader classLoader =
+		final ClassLoader classLoader = //
 			Thread.currentThread().getContextClassLoader();
-		final StringBuilder msg =
-			new StringBuilder("Required service is missing: " +
-				serviceType.getName() + nl);
+		final StringBuilder msg = new StringBuilder(
+			"Required service is missing: " + serviceType.getName() + nl);
 		msg.append("Context: " + this + nl);
 		msg.append("ClassLoader: " + classLoader + nl);
 
@@ -528,8 +529,8 @@ private String createMissingServiceMessage(
 			}
 		}
 		else {
-			msg
-				.append("ClassLoader was not a URLClassLoader. Could not print classpath.");
+			msg.append(
+				"ClassLoader was not a URLClassLoader. Could not print classpath.");
 		}
 		return msg.toString();
 	}
@@ -539,8 +540,8 @@ private static PluginIndex plugins(final boolean empty) {
 	}
 
 	private static List<Class<? extends Service>> services(final boolean empty) {
-		if (empty) return Collections.<Class<? extends Service>> emptyList();
-		return Arrays.<Class<? extends Service>> asList(Service.class);
+		if (empty) return Collections.<Class<? extends Service>>emptyList();
+		return Arrays.<Class<? extends Service>>asList(Service.class);
 	}
 
 	private static boolean strict() {

From 2b458fa1392aa52faa56eb0077891fe621680f2c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Dec 2016 13:41:57 -0600
Subject: [PATCH 0379/1208] Context: add isInjectable(Class) method

Now you can ask the context itself whether a particular field type
would have its value assigned by an injection operation, or not.
Previously, you simply had to know (assume, really) that Service
and Context fields would be injected, and others would not.
---
 src/main/java/org/scijava/Context.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 507570903..108ac7240 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -388,6 +388,25 @@ public void inject(final Object o) {
 		subscribeToEvents(o);
 	}
 
+	/**
+	 * Reports whether a parameter of the given type would be assigned a value as
+	 * a consequence of calling {@link #inject(Object)}.
+	 * <p>
+	 * This method is notably useful for downstream code to discern between
+	 * {@link Parameter} fields whose values would be injected, versus those whose
+	 * values would not, without needing to hardcode type comparison checks
+	 * against the {@link Service} and {@link Context} types.
+	 * </p>
+	 * 
+	 * @param type The type of the @{@link Parameter}-annotated field.
+	 * @return True iff a member field of the given type would have its value
+	 *         assigned.
+	 */
+	public boolean isInjectable(final Class<?> type) {
+		if (Service.class.isAssignableFrom(type)) return true;
+		return Context.class.isAssignableFrom(type) && type.isInstance(this);
+	}
+
 	// -- Disposable methods --
 
 	@Override

From 3c7a7deb6c78bdf6a134b5565aac57bd08a8ceef Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Dec 2016 13:45:56 -0600
Subject: [PATCH 0380/1208] ContextInjectionTest: clean up afterwards

---
 .../org/scijava/ContextInjectionTest.java     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index 0e09c8dc4..861d739e8 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -38,6 +38,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.junit.After;
 import org.junit.Test;
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
@@ -55,6 +56,13 @@
  */
 public class ContextInjectionTest {
 
+	private Context context;
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
 	/**
 	 * Tests that the {@link Context} and {@link Service} parameters are properly
 	 * injected when calling {@link Contextual#setContext} on an
@@ -62,7 +70,7 @@ public class ContextInjectionTest {
 	 */
 	@Test
 	public void testAbstractContextualSetContext() {
-		final Context context = new Context(FooService.class);
+		context = new Context(FooService.class);
 
 		final NeedsFooContextual needsFoo = new NeedsFooContextual();
 		assertNull(needsFoo.fooService);
@@ -78,7 +86,7 @@ public void testAbstractContextualSetContext() {
 	 */
 	@Test
 	public void testAbstractContextualContextInject() {
-		final Context context = new Context(FooService.class);
+		context = new Context(FooService.class);
 
 		final NeedsFooContextual needsFoo = new NeedsFooContextual();
 		assertNull(needsFoo.fooService);
@@ -94,7 +102,7 @@ public void testAbstractContextualContextInject() {
 	 */
 	@Test
 	public void testNonContextualServiceParameters() {
-		final Context context = new Context(FooService.class);
+		context = new Context(FooService.class);
 
 		final NeedsFooPlain needsFoo = new NeedsFooPlain();
 		assertNull(needsFoo.fooService);
@@ -113,7 +121,7 @@ public void testNonContextualServiceParameters() {
 	 */
 	@Test
 	public void testNonContextualContextParameters() {
-		final Context context = new Context(true);
+		context = new Context(true);
 
 		final NeedsContext needsContext = new NeedsContext();
 		assertNull(needsContext.context);
@@ -139,13 +147,13 @@ public void testNonContextualContextParameters() {
 	 */
 	@Test
 	public void testContextSubclassInjection() {
-		final Context c = new Context(true);
+		context = new Context(true);
 		final FooContext foo = new FooContext();
 		final BarContext bar = new BarContext();
 
 		final ContextSubclassParameters cspPlain = new ContextSubclassParameters();
-		c.inject(cspPlain);
-		assertSame(c, cspPlain.c);
+		context.inject(cspPlain);
+		assertSame(context, cspPlain.c);
 		assertNull(cspPlain.foo);
 		assertNull(cspPlain.bar);
 
@@ -170,7 +178,7 @@ public void testContextSubclassInjection() {
 	 */
 	@Test
 	public void testAbstractContextualEventSubscription() {
-		final Context context = new Context(EventService.class);
+		context = new Context(EventService.class);
 		final EventService eventService = context.getService(EventService.class);
 
 		final HasEventsContextual hasEvents = new HasEventsContextual();
@@ -191,7 +199,7 @@ public void testAbstractContextualEventSubscription() {
 	 */
 	@Test
 	public void testNonContextualEventSubscription() {
-		final Context context = new Context(EventService.class);
+		context = new Context(EventService.class);
 		final EventService eventService = context.getService(EventService.class);
 
 		final HasEventsPlain hasEvents = new HasEventsPlain();

From 3e3368531be4099afc3f8d54b0f2be8fdc74a892 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Dec 2016 13:47:31 -0600
Subject: [PATCH 0381/1208] ContextInjectionTest: test Context.isInjectable

Pretty braindead, but better safe than sorry, right?
---
 src/test/java/org/scijava/ContextInjectionTest.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index 861d739e8..2ddf1ea5a 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -63,6 +63,19 @@ public void tearDown() {
 		context.dispose();
 	}
 
+	/** Tests {@link Context#isInjectable(Class)}. */
+	public void testInjectable() {
+		context = new Context(true);
+		assertTrue(context.isInjectable(Context.class));
+		assertTrue(context.isInjectable(FooContext.class));
+		assertTrue(context.isInjectable(Service.class));
+		assertTrue(context.isInjectable(FooService.class));
+		assertFalse(context.isInjectable(String.class));
+		assertFalse(context.isInjectable(Integer.class));
+		assertFalse(context.isInjectable(int.class));
+		assertFalse(context.isInjectable(void.class));
+	}
+
 	/**
 	 * Tests that the {@link Context} and {@link Service} parameters are properly
 	 * injected when calling {@link Contextual#setContext} on an

From 98e5943f9fe8337de42b46a1befa9002cabc527a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 15:43:09 -0600
Subject: [PATCH 0382/1208] ConsoleService: guard against infinite loops

The design of the ConsoleArgument handlers allows each handler to remove
one or more arguments from the beginning of the linked argument list,
which provides for a nice sequential processing sequence.

However, it is very easy to code a ConsoleArgument and then forget to
remove any elements from the list. Previously, such a bug would cause
the ConsoleService's processArgs method to never return, instead calling
the same handler over and over.

This change adds a rudimentary safeguard against such an occurrence: if
the list of arguments is totally unchanged after a ConsoleArgument
plugin has supposedly handled it, then we warn the user about the
improper handling, remove the first argument from the list, and proceed.
In this way, infinite loops should be a lot less likely; a bogus
ConsoleArgument plugin would now need to mutate the list (e.g., add an
argument rather than remove one) in order to cause trouble.
---
 .../console/DefaultConsoleService.java        | 35 +++++++++++++++++++
 .../scijava/console/ConsoleServiceTest.java   | 32 +++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 6d53557b1..7d26d3260 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -35,6 +35,7 @@
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.List;
 
 import org.scijava.Context;
 import org.scijava.console.OutputEvent.Source;
@@ -82,6 +83,8 @@ public void processArgs(final String... args) {
 			argList.add(arg);
 		}
 
+		final List<String> previousArgs = new ArrayList<>();
+
 		while (!argList.isEmpty()) {
 			final ConsoleArgument handler = getHandler(argList);
 			if (handler == null) {
@@ -90,7 +93,22 @@ public void processArgs(final String... args) {
 				log.warn("Ignoring invalid argument: " + arg);
 				continue;
 			}
+
+			// keep a copy of the argument list prior to handling
+			previousArgs.clear();
+			previousArgs.addAll(argList);
+
+			// process the argument
 			handler.handle(argList);
+
+			// verify that the handler did something to the list;
+			// this guards against bugs which would cause infinite loops
+			if (sameElements(previousArgs, argList)) {
+				// skip improperly handled argument
+				final String arg = argList.removeFirst();
+				log.warn("Plugin '" + handler.getClass().getName() +
+					"' failed to handle argument: " + arg);
+			}
 		}
 	}
 
@@ -174,6 +192,23 @@ private MultiPrintStream multiPrintStream(final PrintStream ps) {
 		return new MultiPrintStream(ps);
 	}
 
+	/**
+	 * Gets whether two lists have exactly the same elements in them.
+	 * <p>
+	 * We cannot use {@link List#equals(Object)} because want to check for
+	 * identical references, not per-element object equality.
+	 * </p>
+	 */
+	private boolean sameElements(final List<String> l1,
+		final List<String> l2)
+	{
+		if (l1.size() != l2.size()) return false;
+		for (int i = 0; i < l1.size(); i++) {
+			if (l1.get(i) != l2.get(i)) return false;
+		}
+		return true;
+	}
+
 	// -- Helper classes --
 
 	/**
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index d67f20ebf..c33074e35 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -32,6 +32,7 @@
 package org.scijava.console;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -72,10 +73,23 @@ public void tearDown() {
 	/** Tests {@link ConsoleService#processArgs(String...)}. */
 	@Test
 	public void testProcessArgs() {
+		assertFalse(consoleService.getInstance(FooArgument.class).argsHandled);
 		consoleService.processArgs("--foo", "--bar");
 		assertTrue(consoleService.getInstance(FooArgument.class).argsHandled);
 	}
 
+	/**
+	 * Tests that {@link ConsoleService#processArgs(String...)} does not result in
+	 * an infinite loop when a buggy {@link ConsoleArgument} forgets to remove its
+	 * handled argument from the list.
+	 */
+	@Test
+	public void testInfiniteLoopAvoidance() {
+		assertFalse(consoleService.getInstance(BrokenArgument.class).argsHandled);
+		consoleService.processArgs("--broken");
+		assertTrue(consoleService.getInstance(BrokenArgument.class).argsHandled);
+	}
+
 	/**
 	 * Tests the {@link OutputListener}-related API:
 	 * <ul>
@@ -225,6 +239,24 @@ public void handle(final LinkedList<String> args) {
 		}
 	}
 
+	@Plugin(type = ConsoleArgument.class)
+	public static class BrokenArgument extends AbstractConsoleArgument {
+
+		private boolean argsHandled;
+
+		public BrokenArgument() {
+			super(1, "--broken");
+		}
+
+		@Override
+		public void handle(final LinkedList<String> args) {
+			// NB: Does not shorten the list. This is an intentional "bug" which
+			// would naively result in an infinite loop. We want to test that
+			// the ConsoleService is at least minorly resilient to this problem.
+			argsHandled = true;
+		}
+	}
+
 	private static class OutputTracker implements OutputListener {
 
 		private final Collection<OutputEvent> events;

From 43b87e53de254425f3811f0fdcc49c03e9bbd893 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:06:29 -0600
Subject: [PATCH 0383/1208] Contextual: push setContext default impl to iface

Thank you Java 8.
---
 src/main/java/org/scijava/AbstractContextual.java | 6 ------
 src/main/java/org/scijava/Contextual.java         | 6 ++++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index 71afa3108..ed8da838a 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -62,10 +62,4 @@ public Context context() {
 	public Context getContext() {
 		return context;
 	}
-
-	@Override
-	public void setContext(final Context context) {
-		context.inject(this);
-	}
-
 }
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 30729043e..aba31ed13 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -69,12 +69,14 @@ public interface Contextual {
 	 * </p>
 	 * 
 	 * @see Context#inject(Object)
-	 * @see AbstractContextual for an example of how to implement this interface
 	 * @throws IllegalStateException If the object already has a context.
 	 * @throws IllegalArgumentException If the object has a required
 	 *           {@link Service} parameter (see {@link Parameter#required()})
 	 *           which is not available from the context.
 	 */
-	void setContext(Context context);
+	default void setContext(final Context context) {
+		context.inject(this);
+	}
+
 
 }

From 8e23240ff2f3fe90338a3cac15c77e61b52f57be Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:08:48 -0600
Subject: [PATCH 0384/1208] Disposable: make dispose() do nothing by default

Already, the abstract service layer did that. May as well generalize it.
---
 src/main/java/org/scijava/Disposable.java              | 5 +++--
 src/main/java/org/scijava/service/AbstractService.java | 7 -------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index 41b397cb5..fc179e7b9 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -42,6 +42,7 @@ public interface Disposable {
 	 * Performs any needed cleanup of the object's services, in preparation for
 	 * the object being retired (e.g., to make garbage collection possible).
 	 */
-	void dispose();
-
+	default void dispose() {
+		// NB: Do nothing by default.
+	}
 }
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index bc95cdf4a..4d6bb486c 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -74,13 +74,6 @@ public void setContext(final Context context) {
 		this.context = context;
 	}
 
-	// -- Disposable methods --
-
-	@Override
-	public void dispose() {
-		// NB: Do nothing by default.
-	}
-
 	// -- Object methods --
 
 	@Override

From 6c190de7655599f5851ec92c1f4a5451a41e272a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:14:04 -0600
Subject: [PATCH 0385/1208] App: push default method impls to iface

Thank you Java 8.
---
 .../java/org/scijava/app/AbstractApp.java     | 72 -------------------
 src/main/java/org/scijava/app/App.java        | 62 +++++++++++++---
 2 files changed, 54 insertions(+), 80 deletions(-)

diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 66e86db9d..f6657e86e 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -31,12 +31,9 @@
 
 package org.scijava.app;
 
-import java.io.File;
-
 import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractRichPlugin;
 import org.scijava.plugin.Parameter;
-import org.scijava.util.AppUtils;
 import org.scijava.util.Manifest;
 import org.scijava.util.POM;
 
@@ -58,11 +55,6 @@ public abstract class AbstractApp extends AbstractRichPlugin implements App {
 
 	// -- App methods --
 
-	@Override
-	public String getTitle() {
-		return getInfo().getName();
-	}
-
 	@Override
 	public POM getPOM() {
 		if (pom == null) {
@@ -81,72 +73,8 @@ public Manifest getManifest() {
 		return manifest;
 	}
 
-	@Override
-	public String getInfo(boolean mem) {
-		final String appTitle = getTitle();
-		final String appVersion = getVersion();
-		final String javaVersion = System.getProperty("java.version");
-		final String osArch = System.getProperty("os.arch");
-		final long maxMem = Runtime.getRuntime().maxMemory();
-		final long totalMem = Runtime.getRuntime().totalMemory();
-		final long freeMem = Runtime.getRuntime().freeMemory();
-		final long usedMem = totalMem - freeMem;
-		final long usedMB = usedMem / 1048576;
-		final long maxMB = maxMem / 1048576;
-		final StringBuilder sb = new StringBuilder();
-		sb.append(appTitle + " " + appVersion);
-		sb.append("; Java " + javaVersion + " [" + osArch + "]");
-		if (mem) sb.append("; " + usedMB + "MB of " + maxMB + "MB");
-		return sb.toString();
-	}
-
-	@Override
-	public String getSystemProperty() {
-		return getInfo().getName().toLowerCase() + ".dir";
-	}
-
-	@Override
-	public File getBaseDirectory() {
-		return AppUtils.getBaseDirectory(getSystemProperty(), getClass(), null);
-	}
-
 	@Override
 	public void about() {
 		if (log != null) log.info(getInfo(false));
 	}
-
-	@Override
-	public void prefs() {
-		// NB: Do nothing.
-	}
-
-	@Override
-	public void quit() {
-		getContext().dispose();
-	}
-
-	// -- Versioned methods --
-
-	@Override
-	public String getVersion() {
-		// NB: We do not use VersionUtils.getVersion(c, groupId, artifactId)
-		// because that method does not cache the parsed Manifest and/or POM.
-		// We might have them already parsed here, and if not, we want to
-		// parse then cache locally, rather than discarding them afterwards.
-
-		// try the manifest first, since it might know its build number
-		final Manifest m = getManifest();
-		if (m != null) {
-			final String v = m.getVersion();
-			if (v != null) return v;
-		}
-		// try the POM
-		final POM p = getPOM();
-		if (p != null) {
-			final String v = p.getVersion();
-			if (v != null) return v;
-		}
-		return "Unknown";
-	}
-
 }
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index e5aad2949..1179179df 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -36,6 +36,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 import org.scijava.plugin.SingletonPlugin;
+import org.scijava.util.AppUtils;
 import org.scijava.util.Manifest;
 import org.scijava.util.POM;
 
@@ -56,7 +57,10 @@
 public interface App extends RichPlugin, SingletonPlugin {
 
 	/** Gets the title of the application. */
-	String getTitle();
+	default String getTitle() {
+		return getInfo().getName();
+	}
+
 
 	/** The Maven {@code groupId} of the application. */
 	String getGroupId();
@@ -80,20 +84,40 @@ public interface App extends RichPlugin, SingletonPlugin {
 	 * 
 	 * @param mem If true, memory usage information is included.
 	 */
-	String getInfo(boolean mem);
+	default String getInfo(final boolean mem) {
+		final String appTitle = getTitle();
+		final String appVersion = getVersion();
+		final String javaVersion = System.getProperty("java.version");
+		final String osArch = System.getProperty("os.arch");
+		final long maxMem = Runtime.getRuntime().maxMemory();
+		final long totalMem = Runtime.getRuntime().totalMemory();
+		final long freeMem = Runtime.getRuntime().freeMemory();
+		final long usedMem = totalMem - freeMem;
+		final long usedMB = usedMem / 1048576;
+		final long maxMB = maxMem / 1048576;
+		final StringBuilder sb = new StringBuilder();
+		sb.append(appTitle + " " + appVersion);
+		sb.append("; Java " + javaVersion + " [" + osArch + "]");
+		if (mem) sb.append("; " + usedMB + "MB of " + maxMB + "MB");
+		return sb.toString();
+	}
 
 	/**
 	 * A system property which, if set, overrides the base directory of the
 	 * application.
 	 */
-	String getSystemProperty();
+	default String getSystemProperty() {
+		return getInfo().getName().toLowerCase() + ".dir";
+	}
 
 	/**
 	 * Gets the application's root directory. If the application's system property
 	 * is set, it is used. Otherwise, we scan up the tree from this class for a
 	 * suitable directory.
 	 */
-	File getBaseDirectory();
+	default File getBaseDirectory() {
+		return AppUtils.getBaseDirectory(getSystemProperty(), getClass(), null);
+	}
 
 	/**
 	 * Displays information about the application. Typically this action
@@ -105,13 +129,17 @@ public interface App extends RichPlugin, SingletonPlugin {
 	 * Displays application preferences. The behavior is application-specific, but
 	 * typically a preferences dialog will be shown onscreen.
 	 */
-	void prefs();
+	default void prefs() {
+		// NB: Do nothing.
+	}
 
 	/**
 	 * Quits the application. Typically this action will prompt the user about any
 	 * unsaved work first.
 	 */
-	void quit();
+	default void quit() {
+		getContext().dispose();
+	}
 
 	// -- Versioned methods --
 
@@ -125,6 +153,24 @@ public interface App extends RichPlugin, SingletonPlugin {
 	 * @return The application version, in {@code major.minor.micro} format.
 	 */
 	@Override
-	String getVersion();
-
+	default String getVersion() {
+		// NB: We do not use VersionUtils.getVersion(c, groupId, artifactId)
+		// because that method does not cache the parsed Manifest and/or POM.
+		// We might have them already parsed here, and if not, we want to
+		// parse then cache locally, rather than discarding them afterwards.
+
+		// try the manifest first, since it might know its build number
+		final Manifest m = getManifest();
+		if (m != null) {
+			final String v = m.getVersion();
+			if (v != null) return v;
+		}
+		// try the POM
+		final POM p = getPOM();
+		if (p != null) {
+			final String v = p.getVersion();
+			if (v != null) return v;
+		}
+		return "Unknown";
+	}
 }

From 4ab6b513193507e93e21b0150acdd1a72050bea3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:22:53 -0600
Subject: [PATCH 0386/1208] IOPlugin: push default method impls to iface

Thank you Java 8.
---
 .../java/org/scijava/io/AbstractIOPlugin.java | 43 +------------------
 src/main/java/org/scijava/io/IOPlugin.java    | 35 ++++++++++++---
 2 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index d7c526ad7..2c296c282 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -31,8 +31,6 @@
 
 package org.scijava.io;
 
-import java.io.IOException;
-
 import org.scijava.plugin.AbstractHandlerPlugin;
 
 /**
@@ -43,44 +41,5 @@
 public abstract class AbstractIOPlugin<D> extends AbstractHandlerPlugin<String>
 	implements IOPlugin<D>
 {
-
-	// -- IOPlugin methods --
-
-	@Override
-	public boolean supportsOpen(final String source) {
-		return false;
-	}
-
-	@Override
-	public boolean supportsSave(final String destination) {
-		return false;
-	}
-
-	@Override
-	public boolean supportsSave(final Object data, final String destination) {
-		return supportsSave(destination) && getDataType().isInstance(data);
-	}
-
-	@Override
-	public D open(final String source) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public void save(final D data, final String destination) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final String descriptor) {
-		return supportsOpen(descriptor) || supportsSave(descriptor);
-	}
-
-	@Override
-	public Class<String> getType() {
-		return String.class;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index e000c72ab..78613fab0 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -56,21 +56,46 @@ public interface IOPlugin<D> extends HandlerPlugin<String> {
 	Class<D> getDataType();
 
 	/** Checks whether the I/O plugin can open data from the given source. */
-	boolean supportsOpen(String source);
+	@SuppressWarnings("unused")
+	default boolean supportsOpen(final String source) {
+		return false;
+	}
 
 	/** Checks whether the I/O plugin can save data to the given destination. */
-	boolean supportsSave(String destination);
+	@SuppressWarnings("unused")
+	default boolean supportsSave(final String destination) {
+		return false;
+	}
 
 	/**
 	 * Checks whether the I/O plugin can save the given data to the specified
 	 * destination.
 	 */
-	boolean supportsSave(Object data, String destination);
+	default boolean supportsSave(final Object data, final String destination) {
+		return supportsSave(destination) && getDataType().isInstance(data);
+	}
 
 	/** Opens data from the given source. */
-	D open(String source) throws IOException;
+	@SuppressWarnings("unused")
+	default D open(final String source) throws IOException {
+		throw new UnsupportedOperationException();
+	}
 
 	/** Saves the given data to the specified destination. */
-	void save(D data, String destination) throws IOException;
+	@SuppressWarnings("unused")
+	default void save(final D data, final String destination) throws IOException {
+		throw new UnsupportedOperationException();
+	}
 
+	// -- Typed methods --
+
+	@Override
+	default boolean supports(final String descriptor) {
+		return supportsOpen(descriptor) || supportsSave(descriptor);
+	}
+
+	@Override
+	default Class<String> getType() {
+		return String.class;
+	}
 }

From 10bbc86851d5744e64cf48a5eca2781ca9fea6c5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:24:56 -0600
Subject: [PATCH 0387/1208] SciJavaPlugin: add App plugin to the list

---
 src/main/java/org/scijava/plugin/SciJavaPlugin.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 86d906c67..4b28e964a 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -42,6 +42,7 @@
  * The core types of plugins are as follows:
  * </p>
  * <ul>
+ * <li>{@link org.scijava.app.App} - metadata about a SciJava application.</li>
  * <li>{@link org.scijava.command.Command} - plugins that are executable. These
  * plugins typically perform a discrete operation, and are accessible via the
  * application menus.</li>

From a959e2bf835e749c0b9cb423a53bb345a6d55dfc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:24:44 -0600
Subject: [PATCH 0388/1208] TextFormat: push default method impls to iface

Thank you Java 8.
---
 .../org/scijava/text/AbstractTextFormat.java   | 18 +-----------------
 src/main/java/org/scijava/text/TextFormat.java | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 899f1be9c..a14e8a96a 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -34,7 +34,6 @@
 import java.io.File;
 
 import org.scijava.plugin.AbstractHandlerPlugin;
-import org.scijava.util.FileUtils;
 
 /**
  * Abstract superclass of {@link TextFormat} implementations.
@@ -44,20 +43,5 @@
 public abstract class AbstractTextFormat extends AbstractHandlerPlugin<File>
 	implements TextFormat
 {
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final File file) {
-		for (final String ext : getExtensions()) {
-			if (FileUtils.getExtension(file).equalsIgnoreCase(ext)) return true;
-		}
-		return false;
-	}
-
-	@Override
-	public Class<File> getType() {
-		return File.class;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 20ce9d4ee..5d76f381b 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -36,6 +36,7 @@
 
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
+import org.scijava.util.FileUtils;
 
 /**
  * {@code TextFormat} is a plugin that provides handling for a text markup
@@ -60,4 +61,19 @@ public interface TextFormat extends HandlerPlugin<File> {
 	/** Expresses the given text string in HTML format. */
 	String asHTML(String text);
 
+	// -- Typed methods --
+
+	@Override
+	default boolean supports(final File file) {
+		for (final String ext : getExtensions()) {
+			if (FileUtils.getExtension(file).equalsIgnoreCase(ext)) return true;
+		}
+		return false;
+	}
+
+	@Override
+	default Class<File> getType() {
+		return File.class;
+	}
+
 }

From 7d958873f488ebf08f5a9b49f1c0b77619b9eebe Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:27:35 -0600
Subject: [PATCH 0389/1208] ConsoleArgument: push default method impl to iface

---
 .../java/org/scijava/console/AbstractConsoleArgument.java  | 6 +-----
 src/main/java/org/scijava/console/ConsoleArgument.java     | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index ffab5502d..55a04474a 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -70,11 +70,7 @@ public boolean supports(final LinkedList<String> args) {
 		return isFlag(args);
 	}
 
-	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<LinkedList<String>> getType() {
-		return (Class) String.class;
-	}
+	// -- Internal methods --
 
 	/**
 	 * Check if the given list of arguments starts with a flag that matches this
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index 18f3762f3..cb0b857bc 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -54,4 +54,11 @@ public interface ConsoleArgument extends HandlerPlugin<LinkedList<String>> {
 	/** Handles the <em>front</em> of the given list of arguments. */
 	void handle(final LinkedList<String> args);
 
+	// -- Typed methods --
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	default Class<LinkedList<String>> getType() {
+		return (Class) String.class;
+	}
 }

From 23b8b42621211958d9440dc3118939e0378b5585 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:32:57 -0600
Subject: [PATCH 0390/1208] UIDetails: push default method impls to iface

---
 .../java/org/scijava/AbstractUIDetails.java   | 57 -------------------
 src/main/java/org/scijava/UIDetails.java      | 56 +++++++++++++++++-
 2 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index eccfbafe3..8391ffff1 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -31,8 +31,6 @@
 
 package org.scijava;
 
-import org.scijava.util.ClassUtils;
-import org.scijava.util.MiscUtils;
 import org.scijava.util.StringMaker;
 
 /**
@@ -88,31 +86,6 @@ public String toString() {
 
 	// -- UIDetails methods --
 
-	@Override
-	public String getTitle() {
-		// use object label, if available
-		if (getLabel() != null && !getLabel().isEmpty()) return getLabel();
-
-		// use name of leaf menu item, if available
-		if (menuPath != null && menuPath.size() > 0) {
-			final MenuEntry menuLeaf = menuPath.getLeaf();
-			final String menuName = menuLeaf.getName();
-			if (menuName != null && !menuName.isEmpty()) return menuName;
-		}
-
-		// use object name, if available
-		if (getName() != null && !getName().isEmpty()) return getName();
-
-		// use the unique identifier, if available
-		if (this instanceof Identifiable) {
-			final String id = ((Identifiable) this).getIdentifier();
-			if (id != null) return id;
-		}
-
-		// use class name as a last resort
-		return getClass().getSimpleName();
-	}
-
 	@Override
 	public MenuPath getMenuPath() {
 		return menuPath;
@@ -209,34 +182,4 @@ public double getPriority() {
 	public void setPriority(final double priority) {
 		this.priority = priority;
 	}
-
-	// -- Comparable methods --
-
-	@Override
-	public int compareTo(final Prioritized that) {
-		if (that == null) return 1;
-
-		// compare priorities
-		final int priorityCompare = Priority.compare(this, that);
-		if (priorityCompare != 0) return priorityCompare;
-
-		// compare classes
-		final int classCompare = ClassUtils.compare(getClass(), that.getClass());
-		if (classCompare != 0) return classCompare;
-
-		if (!(that instanceof UIDetails)) return 1;
-		final UIDetails uiDetails = (UIDetails) that;
-
-		// compare names
-		final String thisName = getName();
-		final String thatName = uiDetails.getName();
-		final int nameCompare = MiscUtils.compare(thisName, thatName);
-		if (nameCompare != 0) return nameCompare;
-
-		// compare titles
-		final String thisTitle = getTitle();
-		final String thatTitle = uiDetails.getTitle();
-		return MiscUtils.compare(thisTitle, thatTitle);
-	}
-
 }
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 94e6e5d12..e53a98506 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -31,6 +31,9 @@
 
 package org.scijava;
 
+import org.scijava.util.ClassUtils;
+import org.scijava.util.MiscUtils;
+
 /**
  * An interface defining details useful for generating relevant user interface
  * elements.
@@ -56,7 +59,30 @@ public interface UIDetails extends BasicDetails, Prioritized {
 	 * <li>Item's class name, without package prefix</li>
 	 * </ol>
 	 */
-	String getTitle();
+	default String getTitle() {
+		// use object label, if available
+		if (getLabel() != null && !getLabel().isEmpty()) return getLabel();
+
+		// use name of leaf menu item, if available
+		final MenuPath menuPath = getMenuPath();
+		if (menuPath != null && menuPath.size() > 0) {
+			final MenuEntry menuLeaf = menuPath.getLeaf();
+			final String menuName = menuLeaf.getName();
+			if (menuName != null && !menuName.isEmpty()) return menuName;
+		}
+
+		// use object name, if available
+		if (getName() != null && !getName().isEmpty()) return getName();
+
+		// use the unique identifier, if available
+		if (this instanceof Identifiable) {
+			final String id = ((Identifiable) this).getIdentifier();
+			if (id != null) return id;
+		}
+
+		// use class name as a last resort
+		return getClass().getSimpleName();
+	}
 
 	/** Gets the path to the object's suggested position in the menu structure. */
 	MenuPath getMenuPath();
@@ -124,4 +150,32 @@ public interface UIDetails extends BasicDetails, Prioritized {
 	 */
 	void setSelected(boolean selected);
 
+	// -- Comparable methods --
+
+	@Override
+	default int compareTo(final Prioritized that) {
+		if (that == null) return 1;
+
+		// compare priorities
+		final int priorityCompare = Priority.compare(this, that);
+		if (priorityCompare != 0) return priorityCompare;
+
+		// compare classes
+		final int classCompare = ClassUtils.compare(getClass(), that.getClass());
+		if (classCompare != 0) return classCompare;
+
+		if (!(that instanceof UIDetails)) return 1;
+		final UIDetails uiDetails = (UIDetails) that;
+
+		// compare names
+		final String thisName = getName();
+		final String thatName = uiDetails.getName();
+		final int nameCompare = MiscUtils.compare(thisName, thatName);
+		if (nameCompare != 0) return nameCompare;
+
+		// compare titles
+		final String thisTitle = getTitle();
+		final String thatTitle = uiDetails.getTitle();
+		return MiscUtils.compare(thisTitle, thatTitle);
+	}
 }

From 07e61f08b990a37cb1d99a1c9a8007dd780cec35 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:34:58 -0600
Subject: [PATCH 0391/1208] ModuleInfo: move default method impls to iface

This has the nice benefit of making the Module interface extend
the Identifiable, Locatable and Versioned interfaces directly,
as it should have done in the first place.
---
 .../scijava/module/AbstractModuleInfo.java    | 106 +----------------
 .../java/org/scijava/module/ModuleInfo.java   | 108 +++++++++++++++---
 2 files changed, 96 insertions(+), 118 deletions(-)

diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 581eb4ec5..d39b34dae 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -38,15 +38,7 @@
 import java.util.Map;
 
 import org.scijava.AbstractUIDetails;
-import org.scijava.Identifiable;
-import org.scijava.Locatable;
-import org.scijava.ValidityProblem;
-import org.scijava.Versioned;
-import org.scijava.event.EventService;
-import org.scijava.module.event.ModulesUpdatedEvent;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.VersionUtils;
 
 /**
  * Abstract superclass of {@link ModuleInfo} implementation.
@@ -58,7 +50,7 @@
  * @author Curtis Rueden
  */
 public abstract class AbstractModuleInfo extends AbstractUIDetails implements
-	ModuleInfo, Identifiable, Locatable, Versioned
+	ModuleInfo
 {
 
 	/** Table of inputs, keyed on name. */
@@ -108,102 +100,6 @@ public Iterable<ModuleItem<?>> outputs() {
 		return Collections.unmodifiableList(outputList());
 	}
 
-	@Override
-	public boolean isInteractive() {
-		return false;
-	}
-
-	@Override
-	public boolean canPreview() {
-		return false;
-	}
-
-	@Override
-	public boolean canCancel() {
-		return true;
-	}
-
-	@Override
-	public boolean canRunHeadless() {
-		return false;
-	}
-
-	@Override
-	public String getInitializer() {
-		return null;
-	}
-
-	@Override
-	public void update(final EventService eventService) {
-		eventService.publish(new ModulesUpdatedEvent(this));
-	}
-
-	// -- UIDetails methods --
-
-	@Override
-	public String getTitle() {
-		final String title = super.getTitle();
-		if (!title.equals(getClass().getSimpleName())) return title;
-
-		// use delegate class name rather than actual class name
-		final String className = getDelegateClassName();
-		final int dot = className.lastIndexOf(".");
-		return dot < 0 ? className : className.substring(dot + 1);
-	}
-
-	// -- Validated methods --
-
-	@Override
-	public boolean isValid() {
-		return true;
-	}
-
-	@Override
-	public List<ValidityProblem> getProblems() {
-		return null;
-	}
-
-	// -- Identifiable methods --
-
-	@Override
-	public String getIdentifier() {
-		// NB: By default, we assume that the delegate class name uniquely
-		// distinguishes the module from others. If the same delegate class is used
-		// for more than one module, though, it may need to override this method to
-		// provide more differentiating details.
-		return "module:" + getDelegateClassName();
-	}
-
-	// -- Locatable methods --
-
-	@Override
-	public String getLocation() {
-		// NB: By default, we use the location of the delegate class.
-		// If the same delegate class is used for more than one module, though,
-		// it may need to override this method to indicate a different location.
-		try {
-			return ClassUtils.getLocation(loadDelegateClass()).toExternalForm();
-		}
-		catch (final ClassNotFoundException exc) {
-			return null;
-		}
-	}
-
-	// -- Versioned methods --
-
-	@Override
-	public String getVersion() {
-		// NB: By default, we use the version of the delegate class's JAR archive.
-		// If the same delegate class is used for more than one module, though,
-		// it may need to override this method to indicate a different version.
-		try {
-			return VersionUtils.getVersion(loadDelegateClass());
-		}
-		catch (final ClassNotFoundException exc) {
-			return null;
-		}
-	}
-
 	// -- Internal methods --
 
 	/**
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index b17a0548d..41f3f2e3f 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -31,10 +31,18 @@
 
 package org.scijava.module;
 
+import java.util.List;
+
+import org.scijava.Identifiable;
+import org.scijava.Locatable;
 import org.scijava.UIDetails;
 import org.scijava.Validated;
+import org.scijava.ValidityProblem;
+import org.scijava.Versioned;
 import org.scijava.event.EventService;
 import org.scijava.module.event.ModulesUpdatedEvent;
+import org.scijava.util.ClassUtils;
+import org.scijava.util.VersionUtils;
 
 /**
  * A ModuleInfo object encapsulates metadata about a particular {@link Module}
@@ -49,7 +57,9 @@
  * @author Aivar Grislis
  * @author Curtis Rueden
  */
-public interface ModuleInfo extends UIDetails, Validated {
+public interface ModuleInfo extends UIDetails, Validated, Identifiable,
+	Locatable, Versioned
+{
 
 	/** Gets the input item with the given name. */
 	ModuleItem<?> getInput(String name);
@@ -116,7 +126,9 @@ public interface ModuleInfo extends UIDetails, Validated {
 	 * means its inputs are supposed to be presented in a non-modal dialog box,
 	 * with {@link Module#run()} being called whenever any of the values change.
 	 */
-	boolean isInteractive();
+	default boolean isInteractive() {
+		return false;
+	}
 
 	/**
 	 * Gets whether the module supports previews. A preview is a quick
@@ -124,7 +136,9 @@ public interface ModuleInfo extends UIDetails, Validated {
 	 * the module with {@link Module#run()}. If this method returns false, then
 	 * calling {@link Module#preview()} will have no effect.
 	 */
-	boolean canPreview();
+	default boolean canPreview() {
+		return false;
+	}
 
 	/**
 	 * Gets whether the module condones cancellation. Strictly speaking, any
@@ -133,7 +147,9 @@ public interface ModuleInfo extends UIDetails, Validated {
 	 * If this method returns false, then calling {@link Module#cancel()} will
 	 * have no effect.
 	 */
-	boolean canCancel();
+	default boolean canCancel() {
+		return true;
+	}
 
 	/**
 	 * Gets whether the module condones headless execution. Strictly speaking,
@@ -141,21 +157,87 @@ public interface ModuleInfo extends UIDetails, Validated {
 	 * declares itself so, but this flag hints that headless execution is likely
 	 * to succeed (if flag is true), or fail (if flag is false).
 	 */
-	boolean canRunHeadless();
+	default boolean canRunHeadless() {
+		return false;
+	}
 
 	/** Gets the function that is called to initialize the module's values. */
-	String getInitializer();
+	default String getInitializer() {
+		return null;
+	}
 
 	/**
 	 * Notifies interested parties that the module info has been modified. This
 	 * mechanism is useful for updating any corresponding user interface such as
 	 * menu items that are linked to the module.
-	 * <p>
-	 * For classes implementing this interface directly, this method should
-	 * publish a {@link ModulesUpdatedEvent} to the event bus (see
-	 * {@link AbstractModuleInfo#update(EventService)} for an example).
-	 * </p>
 	 */
-	void update(EventService eventService);
-
+	default void update(final EventService eventService) {
+		eventService.publish(new ModulesUpdatedEvent(this));
+	}
+
+	// -- UIDetails methods --
+
+	@Override
+	default String getTitle() {
+		final String title = UIDetails.super.getTitle();
+		if (!title.equals(getClass().getSimpleName())) return title;
+
+		// use delegate class name rather than actual class name
+		final String className = getDelegateClassName();
+		final int dot = className.lastIndexOf(".");
+		return dot < 0 ? className : className.substring(dot + 1);
+	}
+
+	// -- Validated methods --
+
+	@Override
+	default boolean isValid() {
+		return true;
+	}
+
+	@Override
+	default List<ValidityProblem> getProblems() {
+		return null;
+	}
+
+	// -- Identifiable methods --
+
+	@Override
+	default String getIdentifier() {
+		// NB: By default, we assume that the delegate class name uniquely
+		// distinguishes the module from others. If the same delegate class is used
+		// for more than one module, though, it may need to override this method to
+		// provide more differentiating details.
+		return "module:" + getDelegateClassName();
+	}
+
+	// -- Locatable methods --
+
+	@Override
+	default String getLocation() {
+		// NB: By default, we use the location of the delegate class.
+		// If the same delegate class is used for more than one module, though,
+		// it may need to override this method to indicate a different location.
+		try {
+			return ClassUtils.getLocation(loadDelegateClass()).toExternalForm();
+		}
+		catch (final ClassNotFoundException exc) {
+			return null;
+		}
+	}
+
+	// -- Versioned methods --
+
+	@Override
+	default String getVersion() {
+		// NB: By default, we use the version of the delegate class's JAR archive.
+		// If the same delegate class is used for more than one module, though,
+		// it may need to override this method to indicate a different version.
+		try {
+			return VersionUtils.getVersion(loadDelegateClass());
+		}
+		catch (final ClassNotFoundException exc) {
+			return null;
+		}
+	}
 }

From 010013e09b124d2e3cc1feb36ee36e36772adb34 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 16:42:03 -0600
Subject: [PATCH 0392/1208] Platform: push default method impls to iface

---
 .../scijava/platform/AbstractPlatform.java    | 68 -------------------
 .../java/org/scijava/platform/Platform.java   | 54 ++++++++++++---
 2 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index 922cf39fe..089d45978 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -42,82 +42,14 @@ public abstract class AbstractPlatform implements Platform {
 
 	// -- Platform methods --
 
-	@Override
-	public String javaVendor() {
-		return null;
-	}
-
-	@Override
-	public String javaVersion() {
-		return null;
-	}
-
-	@Override
-	public String osArch() {
-		return null;
-	}
-
-	@Override
-	public String osName() {
-		return null;
-	}
-
-	@Override
-	public String osVersion() {
-		return null;
-	}
-
-	@Override
-	public boolean isTarget() {
-		if (javaVendor() != null) {
-			final String javaVendor = System.getProperty("java.vendor");
-			if (!javaVendor.matches(".*" + javaVendor() + ".*")) return false;
-		}
-
-		if (javaVersion() != null) {
-			final String javaVersion = System.getProperty("java.version");
-			if (javaVersion.compareTo(javaVersion()) < 0) return false;
-		}
-
-		if (osName() != null) {
-			final String osName = System.getProperty("os.name");
-			if (!osName.matches(".*" + osName() + ".*")) return false;
-		}
-
-		if (osArch() != null) {
-			final String osArch = System.getProperty("os.arch");
-			if (!osArch.matches(".*" + osArch() + ".*")) return false;
-		}
-
-		if (osVersion() != null) {
-			final String osVersion = System.getProperty("os.version");
-			if (osVersion.compareTo(osVersion()) < 0) return false;
-		}
-
-		return true;
-	}
-
 	@Override
 	public void configure(final PlatformService service) {
 		platformService = service;
 	}
 
-	@Override
-	public boolean registerAppMenus(final Object menus) {
-		return false;
-	}
-
-	// -- Disposable methods --
-
-	@Override
-	public void dispose() {
-		// NB: Do nothing by default.
-	}
-
 	// -- Internal methods --
 
 	protected PlatformService getPlatformService() {
 		return platformService;
 	}
-
 }
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 329774e9e..e092f9ef9 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -56,22 +56,59 @@
 public interface Platform extends SingletonPlugin, Disposable {
 
 	/** Java Runtime Environment vendor to match. */
-	String javaVendor();
+	default String javaVendor() {
+		return null;
+	}
 
 	/** Minimum required Java Runtime Environment version. */
-	String javaVersion();
+	default String javaVersion() {
+		return null;
+	}
 
 	/** Operating system architecture to match. */
-	String osArch();
+	default String osArch() {
+		return null;
+	}
 
 	/** Operating system name to match. */
-	String osName();
+	default String osName() {
+		return null;
+	}
 
 	/** Minimum required operating system version. */
-	String osVersion();
+	default String osVersion() {
+		return null;
+	}
 
 	/** Determines whether the given platform is applicable to this runtime. */
-	boolean isTarget();
+	default boolean isTarget() {
+		if (javaVendor() != null) {
+			final String javaVendor = System.getProperty("java.vendor");
+			if (!javaVendor.matches(".*" + javaVendor() + ".*")) return false;
+		}
+
+		if (javaVersion() != null) {
+			final String javaVersion = System.getProperty("java.version");
+			if (javaVersion.compareTo(javaVersion()) < 0) return false;
+		}
+
+		if (osName() != null) {
+			final String osName = System.getProperty("os.name");
+			if (!osName.matches(".*" + osName() + ".*")) return false;
+		}
+
+		if (osArch() != null) {
+			final String osArch = System.getProperty("os.arch");
+			if (!osArch.matches(".*" + osArch() + ".*")) return false;
+		}
+
+		if (osVersion() != null) {
+			final String osVersion = System.getProperty("os.version");
+			if (osVersion.compareTo(osVersion()) < 0) return false;
+		}
+
+		return true;
+	}
 
 	/** Activates and configures the platform. */
 	void configure(PlatformService service);
@@ -86,6 +123,7 @@ public interface Platform extends SingletonPlugin, Disposable {
 	 * @return true iff the menus should not be added to the UI as normal because
 	 *         the platform did something platform-specific with them instead.
 	 */
-	boolean registerAppMenus(Object menus);
-
+	default boolean registerAppMenus(final Object menus) {
+		return false;
+	}
 }

From 1afbf42ab1f96e007bc3a92b33da0f2151b97e78 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 17:17:39 -0600
Subject: [PATCH 0393/1208] HandlerService: push default method impls to iface

Some minor tweaking is needed in the TextService, since it overrides
interface methods in order to specify different javadoc content.
---
 .../plugin/AbstractHandlerService.java        | 19 +------------------
 .../org/scijava/plugin/HandlerService.java    | 14 +++++++++-----
 .../java/org/scijava/text/TextService.java    |  9 ++++++---
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index 1768f9731..3ccd108c5 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -41,22 +41,5 @@
 public abstract class AbstractHandlerService<DT, PT extends HandlerPlugin<DT>>
 	extends AbstractSingletonService<PT> implements HandlerService<DT, PT>
 {
-
-	// -- HandlerService methods --
-
-	@Override
-	public PT getHandler(final DT data) {
-		for (final PT handler : getInstances()) {
-			if (handler.supports(data)) return handler;
-		}
-		return null;
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final DT data) {
-		return getHandler(data) != null;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index ed551a499..fde2fe5ae 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -54,9 +54,12 @@ public interface HandlerService<DT, PT extends HandlerPlugin<DT>> extends
 	 * Gets the most appropriate handler for the given data object, or null if no
 	 * handler supports it.
 	 */
-	PT getHandler(DT data);
-
-	// NB: Javadoc overrides.
+	default PT getHandler(final DT data) {
+		for (final PT handler : getInstances()) {
+			if (handler.supports(data)) return handler;
+		}
+		return null;
+	}
 
 	// -- SingletonService methods --
 
@@ -71,6 +74,7 @@ public interface HandlerService<DT, PT extends HandlerPlugin<DT>> extends
 
 	/** Gets whether the given data object is supported. */
 	@Override
-	boolean supports(DT data);
-
+	default boolean supports(final DT data) {
+		return getHandler(data) != null;
+	}
 }
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 1703fb0b3..0c53d3a96 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -59,7 +59,9 @@ public interface TextService extends HandlerService<File, TextFormat>,
 
 	/** Gets the text format which best handles the given file. */
 	@Override
-	TextFormat getHandler(File file);
+	default TextFormat getHandler(File file) {
+		return HandlerService.super.getHandler(file);
+	}
 
 	// -- SingletonService methods --
 
@@ -71,6 +73,7 @@ public interface TextService extends HandlerService<File, TextFormat>,
 
 	/** Gets whether the given file contains text data in a supported format. */
 	@Override
-	boolean supports(File file);
-
+	default boolean supports(final File file) {
+		return HandlerService.super.supports(file);
+	}
 }

From d287bc9f23d3d0175163682130046c5d2791ad66 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 17:39:21 -0600
Subject: [PATCH 0394/1208] CodeRunner: migrate default method impl to iface

---
 src/main/java/org/scijava/run/AbstractCodeRunner.java | 7 -------
 src/main/java/org/scijava/run/CodeRunner.java         | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index ce118eab4..10674f7bb 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -46,13 +46,6 @@ public abstract class AbstractCodeRunner extends
 	AbstractHandlerPlugin<Object> implements CodeRunner
 {
 
-	// -- Typed methods --
-
-	@Override
-	public Class<Object> getType() {
-		return Object.class;
-	}
-
 	// -- Internal methods --
 
 	protected <T> T waitFor(final Future<T> future)
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index 98129b975..803326347 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -68,4 +68,10 @@ public interface CodeRunner extends HandlerPlugin<Object> {
 	void run(Object code, Map<String, Object> inputMap)
 		throws InvocationTargetException;
 
+	// -- Typed methods --
+
+	@Override
+	default Class<Object> getType() {
+		return Object.class;
+	}
 }

From f009977aefda46f6ecbf95fe0408d694efbb63a2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 17:43:03 -0600
Subject: [PATCH 0395/1208] Display: move default method impls to iface

---
 .../java/org/scijava/display/AbstractDisplay.java     | 11 -----------
 src/main/java/org/scijava/display/Display.java        |  9 +++++++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index 534c5d31e..527b9317b 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -109,12 +109,6 @@ public boolean canDisplay(final Class<?> c) {
 		return type.isAssignableFrom(c);
 	}
 
-	@Override
-	public boolean canDisplay(final Object o) {
-		if (o == null) return false;
-		return canDisplay(o.getClass());
-	}
-
 	@Override
 	public void display(final Object o) {
 		checkObject(o);
@@ -123,11 +117,6 @@ public void display(final Object o) {
 		add(typedObj);
 	}
 
-	@Override
-	public boolean isDisplaying(final Object o) {
-		return contains(o);
-	}
-
 	@Override
 	public void update() {
 		if (eventService != null && !isClosed) {
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index 019a53443..e635baa31 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -66,7 +66,10 @@ public interface Display<T> extends List<T>, RichPlugin, Named {
 	boolean canDisplay(Class<?> c);
 
 	/** Tests whether the display is capable of visualizing the given object. */
-	boolean canDisplay(Object o);
+	default boolean canDisplay(final Object o) {
+		if (o == null) return false;
+		return canDisplay(o.getClass());
+	}
 
 	/**
 	 * Displays the given object in this display.
@@ -92,7 +95,9 @@ public interface Display<T> extends List<T>, RichPlugin, Named {
 	 * {@code DatasetView} that wraps that {@code Dataset}.
 	 * </p>
 	 */
-	boolean isDisplaying(Object o);
+	default boolean isDisplaying(final Object o) {
+		return contains(o);
+	}
 
 	/** Updates and redraws the display onscreen. */
 	void update();

From 249734058df6e317ae18b954174f237fb4a2778f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 17:44:06 -0600
Subject: [PATCH 0396/1208] ScriptHeader: move default method impl to iface

---
 src/main/java/org/scijava/script/AbstractScriptHeader.java | 5 -----
 src/main/java/org/scijava/script/ScriptHeader.java         | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index a2afb48cc..7a31a29eb 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -49,11 +49,6 @@ public boolean supports(final ScriptLanguage language) {
 		return language != null && language.getClass() == handledType();
 	}
 
-	@Override
-	public Class<ScriptLanguage> getType() {
-		return ScriptLanguage.class;
-	}
-
 	// -- Internal methods --
 
 	protected abstract Class<? extends ScriptLanguage> handledType();
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index b38ead72f..12071fc4f 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -45,4 +45,11 @@ public interface ScriptHeader extends HandlerPlugin<ScriptLanguage> {
 	 * @return The header text for scripts of the supported language.
 	 */
 	String getHeader();
+
+	// -- Typed methods --
+
+	@Override
+	default Class<ScriptLanguage> getType() {
+		return ScriptLanguage.class;
+	}
 }

From 894f014e1059af4c76fe9ff1262dba4e7b104cb9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 17:47:12 -0600
Subject: [PATCH 0397/1208] ScriptLanguage: move default method impls to iface

---
 .../script/AbstractScriptLanguage.java        | 83 -------------------
 .../org/scijava/script/ScriptLanguage.java    | 78 ++++++++++++++++-
 2 files changed, 76 insertions(+), 85 deletions(-)

diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index ee2ffdd03..250fd2e51 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -31,15 +31,10 @@
 
 package org.scijava.script;
 
-import java.util.Collections;
-import java.util.List;
-
-import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.plugin.AbstractRichPlugin;
 import org.scijava.plugin.PluginInfo;
-import org.scijava.util.VersionUtils;
 
 /**
  * Abstract superclass for {@link ScriptLanguage} implementations.
@@ -61,45 +56,8 @@ public String toString() {
 		return getLanguageName();
 	}
 
-	// -- ScriptLanguage methods --
-
-	@Override
-	public boolean isCompiledLanguage() {
-		return false;
-	}
-
-	@Override
-	public Object decode(final Object object) {
-		// NB: No decoding by default.
-		return object;
-	}
-
-	// -- (Possibly) unsupported operations --
-
-	@Override
-	public String getMethodCallSyntax(final String obj, final String m,
-		final String... args)
-	{
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String getOutputStatement(final String toDisplay) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public String getProgram(final String... statements) {
-		throw new UnsupportedOperationException();
-	}
-
 	// -- Default implementations --
 
-	@Override
-	public List<String> getExtensions() {
-		return Collections.<String> emptyList();
-	}
-
 	@Override
 	public String getEngineName() {
 		return inferNameFromClassName();
@@ -113,47 +71,6 @@ public String getLanguageName() {
 		return name != null && !name.isEmpty() ? name : inferNameFromClassName();
 	}
 
-	@Override
-	public List<String> getNames() {
-		return Collections.<String> singletonList(getEngineName());
-	}
-
-	@Override
-	public String getLanguageVersion() {
-		return VersionUtils.getVersion(getClass());
-	}
-
-	@Override
-	public List<String> getMimeTypes() {
-		return Collections.<String> emptyList();
-	}
-
-	@Override
-	public Object getParameter(final String key) {
-		if (key.equals(ScriptEngine.ENGINE)) {
-			return getEngineName();
-		}
-		else if (key.equals(ScriptEngine.ENGINE_VERSION)) {
-			return getEngineVersion();
-		}
-		else if (key.equals(ScriptEngine.NAME)) {
-			final List<String> list = getNames();
-			return list.size() > 0 ? list.get(0) : null;
-		}
-		else if (key.equals(ScriptEngine.LANGUAGE)) {
-			return getLanguageName();
-		}
-		else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) {
-			return getLanguageVersion();
-		}
-		return null;
-	}
-
-	@Override
-	public String getEngineVersion() {
-		return "0.0";
-	}
-
 	// -- Helper methods --
 
 	private String inferNameFromClassName() {
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 0605e4615..87862c491 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -31,6 +31,9 @@
 
 package org.scijava.script;
 
+import java.util.Collections;
+import java.util.List;
+
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 
@@ -38,6 +41,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 import org.scijava.plugin.SingletonPlugin;
+import org.scijava.util.VersionUtils;
 
 /**
  * The base interface for scripting language adapters.
@@ -67,7 +71,9 @@ public interface ScriptLanguage extends ScriptEngineFactory, RichPlugin,
 {
 
 	/** True iff this language requires a compilation step. */
-	boolean isCompiledLanguage();
+	default boolean isCompiledLanguage() {
+		return false;
+	}
 
 	/**
 	 * Performs any necessary conversion of an encoded object retrieved from the
@@ -75,6 +81,74 @@ public interface ScriptLanguage extends ScriptEngineFactory, RichPlugin,
 	 * 
 	 * @see ScriptEngine#get(String)
 	 */
-	Object decode(Object object);
+	default Object decode(final Object object) {
+		// NB: No decoding by default.
+		return object;
+	}
+
+	// -- ScriptEngineFactory methods --
+
+	@Override
+	default String getMethodCallSyntax(final String obj, final String m,
+		final String... args)
+	{
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	default String getOutputStatement(final String toDisplay) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	default String getProgram(final String... statements) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	default List<String> getExtensions() {
+		return Collections.<String> emptyList();
+	}
+
+	@Override
+	default List<String> getNames() {
+		return Collections.<String> singletonList(getEngineName());
+	}
+
+	@Override
+	default String getLanguageVersion() {
+		return VersionUtils.getVersion(getClass());
+	}
+
+	@Override
+	default List<String> getMimeTypes() {
+		return Collections.<String> emptyList();
+	}
+
+	@Override
+	default Object getParameter(final String key) {
+		if (key.equals(ScriptEngine.ENGINE)) {
+			return getEngineName();
+		}
+		else if (key.equals(ScriptEngine.ENGINE_VERSION)) {
+			return getEngineVersion();
+		}
+		else if (key.equals(ScriptEngine.NAME)) {
+			final List<String> list = getNames();
+			return list.size() > 0 ? list.get(0) : null;
+		}
+		else if (key.equals(ScriptEngine.LANGUAGE)) {
+			return getLanguageName();
+		}
+		else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) {
+			return getLanguageVersion();
+		}
+		return null;
+	}
+
+	@Override
+	default String getEngineVersion() {
+		return "0.0";
+	}
 
 }

From aa074500ca6c1e128a270771977d387c5999747d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 17:50:43 -0600
Subject: [PATCH 0398/1208] Tool: move default method impls to iface

---
 .../java/org/scijava/tool/AbstractTool.java   | 86 +------------------
 src/main/java/org/scijava/tool/Tool.java      | 69 +++++++++++----
 2 files changed, 54 insertions(+), 101 deletions(-)

diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index b042f4749..6c740055d 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -31,15 +31,6 @@
 
 package org.scijava.tool;
 
-import org.scijava.display.event.input.KyPressedEvent;
-import org.scijava.display.event.input.KyReleasedEvent;
-import org.scijava.display.event.input.MsClickedEvent;
-import org.scijava.display.event.input.MsDraggedEvent;
-import org.scijava.display.event.input.MsMovedEvent;
-import org.scijava.display.event.input.MsPressedEvent;
-import org.scijava.display.event.input.MsReleasedEvent;
-import org.scijava.display.event.input.MsWheelEvent;
-import org.scijava.input.MouseCursor;
 import org.scijava.plugin.AbstractRichPlugin;
 
 /**
@@ -49,80 +40,5 @@
  * @author Grant Harris
  */
 public abstract class AbstractTool extends AbstractRichPlugin implements Tool {
-
-	@Override
-	public boolean isAlwaysActive() {
-		return false;
-	}
-
-	@Override
-	public boolean isActiveInAppFrame() {
-		return false;
-	}
-
-	@Override
-	public MouseCursor getCursor() {
-		return MouseCursor.DEFAULT;
-	}
-
-	@Override
-	public void activate() {
-		// do nothing by default
-	}
-
-	@Override
-	public void deactivate() {
-		// do nothing by default
-	}
-
-	@Override
-	public void onKeyDown(final KyPressedEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void onKeyUp(final KyReleasedEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void onMouseDown(final MsPressedEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void onMouseUp(final MsReleasedEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void onMouseClick(final MsClickedEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void onMouseMove(final MsMovedEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void onMouseDrag(final MsDraggedEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void onMouseWheel(final MsWheelEvent evt) {
-		// do nothing by default
-	}
-
-	@Override
-	public void configure() {
-		// do nothing by default
-	}
-
-	@Override
-	public String getDescription() {
-		return getInfo().getDescription();
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index f0fa67ef7..237422f4b 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -69,51 +69,88 @@
 public interface Tool extends RichPlugin, SingletonPlugin {
 
 	/** When true, tool has no button but rather is active all the time. */
-	boolean isAlwaysActive();
+	default boolean isAlwaysActive() {
+		return false;
+	}
 
 	/**
 	 * When true, tool receives events when the main application frame is active.
 	 * When false, tool only receives events when a display window is active.
 	 */
-	boolean isActiveInAppFrame();
+	default boolean isActiveInAppFrame() {
+		return false;
+	}
 
 	/** The tool's mouse pointer. */
-	MouseCursor getCursor();
+	default MouseCursor getCursor() {
+		return MouseCursor.DEFAULT;
+	}
 
 	/** Informs the tool that it is now active. */
-	void activate();
+	default void activate() {
+		// do nothing by default
+	}
 
 	/** Informs the tool that it is no longer active. */
-	void deactivate();
+	default void deactivate() {
+		// do nothing by default
+	}
 
 	/** Occurs when a key on the keyboard is pressed while the tool is active. */
-	void onKeyDown(KyPressedEvent event);
+	@SuppressWarnings("unused")
+	default void onKeyDown(final KyPressedEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when a key on the keyboard is released while the tool is active. */
-	void onKeyUp(KyReleasedEvent event);
+	@SuppressWarnings("unused")
+	default void onKeyUp(final KyReleasedEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when a mouse button is pressed while the tool is active. */
-	void onMouseDown(MsPressedEvent event);
+	@SuppressWarnings("unused")
+	default void onMouseDown(final MsPressedEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when a mouse button is released while the tool is active. */
-	void onMouseUp(MsReleasedEvent event);
+	@SuppressWarnings("unused")
+	default void onMouseUp(final MsReleasedEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when a mouse button is double clicked while the tool is active. */
-	void onMouseClick(MsClickedEvent event);
+	@SuppressWarnings("unused")
+	default void onMouseClick(final MsClickedEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when the mouse is moved while the tool is active. */
-	void onMouseMove(MsMovedEvent event);
+	@SuppressWarnings("unused")
+	default void onMouseMove(final MsMovedEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when the mouse is dragged while the tool is active. */
-	void onMouseDrag(MsDraggedEvent event);
+	@SuppressWarnings("unused")
+	default void onMouseDrag(final MsDraggedEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when the mouse wheel is moved while the tool is active. */
-	void onMouseWheel(MsWheelEvent event);
+	@SuppressWarnings("unused")
+	default void onMouseWheel(final MsWheelEvent evt) {
+		// do nothing by default
+	}
 
 	/** Occurs when the user right clicks this tool's icon. */
-	void configure();
+	default void configure() {
+		// do nothing by default
+	}
 
 	/** Returns the text the tool provides when mouse hovers over tool */
-	String getDescription();
-
+	default String getDescription() {
+		return getInfo().getDescription();
+	}
 }

From 64a2333b925e7890c460c6e508435c84c3559acc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:00:59 -0600
Subject: [PATCH 0399/1208] DragAndDropData: move default method impls to iface

---
 .../ui/dnd/AbstractDragAndDropData.java       | 24 +------------------
 .../org/scijava/ui/dnd/DragAndDropData.java   | 19 ++++++++++++---
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 89e9ff137..39e22f33a 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -41,27 +41,5 @@
 public abstract class AbstractDragAndDropData extends AbstractContextual
 	implements DragAndDropData
 {
-
-	@Override
-	public boolean isSupported(final Class<?> type) {
-		return getMIMEType(type) != null;
-	}
-
-	@Override
-	public <T> T getData(final Class<T> type) {
-		final MIMEType mimeType = getMIMEType(type);
-		if (mimeType == null) return null;
-		@SuppressWarnings("unchecked")
-		final T data = (T) getData(mimeType);
-		return data;
-	}
-
-	@Override
-	public MIMEType getMIMEType(final Class<?> type) {
-		for (final MIMEType mimeType : getMIMETypes()) {
-			if (mimeType.isCompatible(type)) return mimeType;
-		}
-		return null;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index 7c707ca09..a9877b527 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -52,7 +52,9 @@ public interface DragAndDropData {
 	/**
 	 * Gets whether the data can be provided as an object of the given Java class.
 	 */
-	boolean isSupported(Class<?> type);
+	default boolean isSupported(final Class<?> type) {
+		return getMIMEType(type) != null;
+	}
 
 	/**
 	 * Gets the data with respect to the given MIME type.
@@ -65,10 +67,21 @@ public interface DragAndDropData {
 	Object getData(MIMEType mimeType);
 
 	/** Gets the data as an object of the given Java class. */
-	<T> T getData(Class<T> type);
+	default <T> T getData(final Class<T> type) {
+		final MIMEType mimeType = getMIMEType(type);
+		if (mimeType == null) return null;
+		@SuppressWarnings("unchecked")
+		final T data = (T) getData(mimeType);
+		return data;
+	}
 
 	/** Gets the best supported MIME type matching the given Java class. */
-	MIMEType getMIMEType(Class<?> type);
+	default MIMEType getMIMEType(final Class<?> type) {
+		for (final MIMEType mimeType : getMIMETypes()) {
+			if (mimeType.isCompatible(type)) return mimeType;
+		}
+		return null;
+	}
 
 	/** Gets the list of supported MIME types. */
 	List<MIMEType> getMIMETypes();

From 9b851117197bceb08418b7debb354691abba0330 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:03:45 -0600
Subject: [PATCH 0400/1208] DisplayViewer: move default method impls to iface

---
 .../ui/viewer/AbstractDisplayViewer.java      | 29 -------------------
 .../org/scijava/ui/viewer/DisplayViewer.java  | 27 ++++++++++++++---
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index 6e8d1ef1b..bc3b7a32c 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -32,11 +32,8 @@
 package org.scijava.ui.viewer;
 
 import org.scijava.display.Display;
-import org.scijava.display.event.DisplayActivatedEvent;
 import org.scijava.display.event.DisplayCreatedEvent;
-import org.scijava.display.event.DisplayDeletedEvent;
 import org.scijava.display.event.DisplayUpdatedEvent;
-import org.scijava.display.event.DisplayUpdatedEvent.DisplayUpdateLevel;
 import org.scijava.event.EventHandler;
 import org.scijava.plugin.AbstractRichPlugin;
 
@@ -87,32 +84,6 @@ public DisplayPanel getPanel() {
 		return panel;
 	}
 
-	@Override
-	public void onDisplayDeletedEvent(final DisplayDeletedEvent e) {
-		getPanel().getWindow().close();
-	}
-
-	@Override
-	public void onDisplayUpdatedEvent(final DisplayUpdatedEvent e) {
-		if (e.getLevel() == DisplayUpdateLevel.REBUILD) {
-			getPanel().redoLayout();
-		}
-		getPanel().redraw();
-	}
-
-	@Override
-	public void onDisplayActivatedEvent(final DisplayActivatedEvent e) {
-		getPanel().getWindow().requestFocus();
-	}
-
-	// -- Disposable methods --
-
-	@Override
-	public void dispose() {
-		final DisplayWindow w = getWindow();
-		if (w != null) w.close();
-	}
-
 	// -- Internal AbstractDisplayViewer methods --
 
 	protected void updateTitle() {
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index 557b035a3..6a6c3ed15 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -36,6 +36,7 @@
 import org.scijava.display.event.DisplayActivatedEvent;
 import org.scijava.display.event.DisplayDeletedEvent;
 import org.scijava.display.event.DisplayUpdatedEvent;
+import org.scijava.display.event.DisplayUpdatedEvent.DisplayUpdateLevel;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.RichPlugin;
 import org.scijava.ui.UserInterface;
@@ -90,16 +91,34 @@ public interface DisplayViewer<T> extends RichPlugin, Disposable {
 	DisplayPanel getPanel();
 
 	/** Synchronizes the user interface appearance with the display model. */
-	void onDisplayUpdatedEvent(DisplayUpdatedEvent e);
+	default void onDisplayUpdatedEvent(final DisplayUpdatedEvent e) {
+		if (e.getLevel() == DisplayUpdateLevel.REBUILD) {
+			getPanel().redoLayout();
+		}
+		getPanel().redraw();
+	}
 
 	/** Removes the user interface when the display is deleted. */
-	void onDisplayDeletedEvent(DisplayDeletedEvent e);
+	@SuppressWarnings("unused")
+	default void onDisplayDeletedEvent(final DisplayDeletedEvent e) {
+		getPanel().getWindow().close();
+	}
 
 	/**
 	 * Handles a display activated event directed at this viewer's display. Note
 	 * that the event's display may not be the viewer's display, but the active
 	 * display will always be the viewer's display.
 	 */
-	void onDisplayActivatedEvent(DisplayActivatedEvent e);
-	
+	@SuppressWarnings("unused")
+	default void onDisplayActivatedEvent(final DisplayActivatedEvent e) {
+		getPanel().getWindow().requestFocus();
+	}
+
+	// -- Disposable methods --
+
+	@Override
+	default void dispose() {
+		final DisplayWindow w = getWindow();
+		if (w != null) w.close();
+	}
 }

From 3d1328826af96f0c79a6a4a96700254dd6ad14a4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:06:02 -0600
Subject: [PATCH 0401/1208] TextDisplayViewer: move default method impl to
 iface

---
 .../scijava/ui/viewer/text/AbstractTextDisplayViewer.java  | 7 -------
 .../java/org/scijava/ui/viewer/text/TextDisplayViewer.java | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index d36b752c1..c09641463 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -31,7 +31,6 @@
 
 package org.scijava.ui.viewer.text;
 
-import org.scijava.display.Display;
 import org.scijava.display.TextDisplay;
 import org.scijava.ui.viewer.AbstractDisplayViewer;
 
@@ -44,14 +43,8 @@ public abstract class AbstractTextDisplayViewer extends
 	AbstractDisplayViewer<String>
 {
 
-	@Override
-	public boolean canView(final Display<?> d) {
-		return d instanceof TextDisplay;
-	}
-
 	@Override
 	public TextDisplay getDisplay() {
 		return (TextDisplay) super.getDisplay();
 	}
-
 }
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 55953b5fb..ba9fff07b 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -31,6 +31,7 @@
 
 package org.scijava.ui.viewer.text;
 
+import org.scijava.display.Display;
 import org.scijava.display.TextDisplay;
 import org.scijava.ui.viewer.DisplayViewer;
 
@@ -44,4 +45,10 @@ public interface TextDisplayViewer extends DisplayViewer<String> {
 	@Override
 	TextDisplay getDisplay();
 
+	// -- DisplayViewer methods --
+
+	@Override
+	default boolean canView(final Display<?> d) {
+		return d instanceof TextDisplay;
+	}
 }

From 403e422336e94a2dff9ad5da500cf8e1a274bf49 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:10:23 -0600
Subject: [PATCH 0402/1208] InputHarvester: move default method impls to iface

---
 .../widget/AbstractInputHarvester.java        | 30 ++-----------------
 .../org/scijava/widget/InputHarvester.java    | 25 ++++++++++++++--
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index a437389c3..3e30459df 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -38,7 +38,6 @@
 import org.scijava.convert.ConvertService;
 import org.scijava.log.LogService;
 import org.scijava.module.Module;
-import org.scijava.module.ModuleCanceledException;
 import org.scijava.module.ModuleException;
 import org.scijava.module.ModuleItem;
 import org.scijava.object.ObjectService;
@@ -74,21 +73,8 @@ public abstract class AbstractInputHarvester<P, W> extends AbstractContextual
 	// -- InputHarvester methods --
 
 	@Override
-	public void harvest(final Module module) throws ModuleException {
-		final InputPanel<P, W> inputPanel = createInputPanel();
-		buildPanel(inputPanel, module);
-		if (!inputPanel.hasWidgets()) return; // no inputs left to harvest
-
-		final boolean ok = harvestInputs(inputPanel, module);
-		if (!ok) throw new ModuleCanceledException();
-
-		processResults(inputPanel, module);
-	}
-
-	@Override
-	public void
-		buildPanel(final InputPanel<P, W> inputPanel, final Module module)
-			throws ModuleException
+	public void buildPanel(final InputPanel<P, W> inputPanel, final Module module)
+		throws ModuleException
 	{
 		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
 
@@ -107,18 +93,6 @@ public void harvest(final Module module) throws ModuleException {
 		module.preview();
 	}
 
-	@Override
-	public void processResults(final InputPanel<P, W> inputPanel,
-		final Module module) throws ModuleException
-	{
-		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
-
-		for (final ModuleItem<?> item : inputs) {
-			final String name = item.getName();
-			module.resolveInput(name);
-		}
-	}
-
 	// -- Helper methods --
 
 	private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index d2f57d154..f70581838 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -33,7 +33,9 @@
 
 import org.scijava.Priority;
 import org.scijava.module.Module;
+import org.scijava.module.ModuleCanceledException;
 import org.scijava.module.ModuleException;
+import org.scijava.module.ModuleItem;
 
 /**
  * An input harvester collects {@link Module} input values, according to the
@@ -62,7 +64,16 @@ public interface InputHarvester<P, W> {
 	 * @param module The module whose inputs should be harvest.
 	 * @throws ModuleException If the process goes wrong, or is canceled.
 	 */
-	void harvest(Module module) throws ModuleException;
+	default void harvest(final Module module) throws ModuleException {
+		final InputPanel<P, W> inputPanel = createInputPanel();
+		buildPanel(inputPanel, module);
+		if (!inputPanel.hasWidgets()) return; // no inputs left to harvest
+
+		final boolean ok = harvestInputs(inputPanel, module);
+		if (!ok) throw new ModuleCanceledException();
+
+		processResults(inputPanel, module);
+	}
 
 	/**
 	 * Constructs an empty {@link InputPanel}. Widgets are added later using the
@@ -89,7 +100,15 @@ void buildPanel(InputPanel<P, W> inputPanel, Module module)
 	boolean harvestInputs(InputPanel<P, W> inputPanel, Module module);
 
 	/** Does any needed processing, after input values have been harvested. */
-	void processResults(InputPanel<P, W> inputPanel, Module module)
-		throws ModuleException;
+	@SuppressWarnings("unused")
+	default void processResults(final InputPanel<P, W> inputPanel,
+		final Module module) throws ModuleException
+	{
+		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
 
+		for (final ModuleItem<?> item : inputs) {
+			final String name = item.getName();
+			module.resolveInput(name);
+		}
+	}
 }

From 190222db9cd9c243117520fe7aef54c8e9b76563 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:11:37 -0600
Subject: [PATCH 0403/1208] InputPanel: move default method impls to iface

---
 src/main/java/org/scijava/widget/AbstractInputPanel.java | 8 --------
 src/main/java/org/scijava/widget/InputPanel.java         | 7 ++++++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index a4d1cbf6a..3b1c9e0ec 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -49,14 +49,6 @@ public abstract class AbstractInputPanel<P, W> implements InputPanel<P, W> {
 
 	// -- InputPanel methods --
 
-	@Override
-	public boolean supports(final InputWidget<?, ?> widget) {
-		// verify this panel's widget type matches that of the given widget
-		final Class<?> thisType = getWidgetComponentType();
-		final Class<?> thatType = widget.getComponentType();
-		return thisType.isAssignableFrom(thatType);
-	}
-
 	@Override
 	public void addWidget(final InputWidget<?, W> widget) {
 		widgets.put(widget.get().getItem().getName(), widget);
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 4a6e17dda..a8b3cbb6b 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -44,7 +44,12 @@ public interface InputPanel<P, W> extends UIComponent<P> {
 	// TODO - groups of fields
 
 	/** Gets whether the given widget would be appropriate for the given panel. */
-	boolean supports(InputWidget<?, ?> widget);
+	default boolean supports(final InputWidget<?, ?> widget) {
+		// verify this panel's widget type matches that of the given widget
+		final Class<?> thisType = getWidgetComponentType();
+		final Class<?> thatType = widget.getComponentType();
+		return thisType.isAssignableFrom(thatType);
+	}
 
 	/** Adds a widget to the panel. */
 	void addWidget(InputWidget<?, W> widget);

From 9bac6ab57a60427e2f1859035f052ebba8e099d8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:13:01 -0600
Subject: [PATCH 0404/1208] InputWidget: move default method impls to iface

---
 .../scijava/widget/AbstractInputWidget.java   | 24 -------------------
 .../java/org/scijava/widget/InputWidget.java  | 17 ++++++++++---
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 7ae6e7eef..1b28f6554 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -53,16 +53,6 @@ public void updateModel() {
 		widgetModel.setValue(getValue());
 	}
 
-	@Override
-	public boolean isLabeled() {
-		return true;
-	}
-
-	@Override
-	public boolean isMessage() {
-		return false;
-	}
-
 	// -- WrapperPlugin methods --
 
 	@Override
@@ -77,18 +67,4 @@ public void set(final WidgetModel model) {
 	public WidgetModel get() {
 		return widgetModel;
 	}
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final WidgetModel model) {
-		// check compatibility with the intended input panel
-		return model.getPanel().supports(this);
-	}
-
-	@Override
-	public Class<WidgetModel> getType() {
-		return WidgetModel.class;
-	}
-
 }
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 0b793f47e..28bfbbce1 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -75,7 +75,9 @@ public interface InputWidget<T, W> extends WrapperPlugin<WidgetModel>,
 	 * 
 	 * @see WidgetModel#getWidgetLabel()
 	 */
-	boolean isLabeled();
+	default boolean isLabeled() {
+		return true;
+	}
 
 	/**
 	 * Returns true iff the widget should be considered a read-only "message"
@@ -83,7 +85,9 @@ public interface InputWidget<T, W> extends WrapperPlugin<WidgetModel>,
 	 * {@link InputPanel#isMessageOnly()} method will return true iff this method
 	 * returns true for all of its widgets.
 	 */
-	boolean isMessage();
+	default boolean isMessage() {
+		return false;
+	}
 
 	// NB: Javadoc overrides.
 
@@ -104,6 +108,13 @@ public interface InputWidget<T, W> extends WrapperPlugin<WidgetModel>,
 
 	/** Gets whether this widget would be appropriate for the given model. */
 	@Override
-	boolean supports(WidgetModel model);
+	default boolean supports(final WidgetModel model) {
+		// check compatibility with the intended input panel
+		return model.getPanel().supports(this);
+	}
 
+	@Override
+	default Class<WidgetModel> getType() {
+		return WidgetModel.class;
+	}
 }

From 2366080c44a428cfc90b250473ead48ee3cfd903 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:15:08 -0600
Subject: [PATCH 0405/1208] AppService: move default method impls to iface

---
 src/main/java/org/scijava/app/AppService.java     | 13 ++++++++++++-
 .../java/org/scijava/app/DefaultAppService.java   | 15 ---------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index f7d00844a..5392eda31 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -31,6 +31,7 @@
 
 package org.scijava.app;
 
+import java.util.List;
 import java.util.Map;
 
 import org.scijava.plugin.SingletonService;
@@ -44,7 +45,11 @@
 public interface AppService extends SingletonService<App>, SciJavaService {
 
 	/** Gets the foremost application (the one with the highest priority). */
-	App getApp();
+	default App getApp() {
+		final List<App> appList = getInstances();
+		if (appList == null || appList.isEmpty()) return null;
+		return appList.get(0);
+	}
 
 	/** Gets an application by name. */
 	App getApp(final String name);
@@ -56,4 +61,10 @@ public interface AppService extends SingletonService<App>, SciJavaService {
 	 */
 	Map<String, App> getApps();
 
+	// -- SingletonService methods --
+
+	@Override
+	default Class<App> getPluginType() {
+		return App.class;
+	}
 }
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 9a1ae4125..30b0eba02 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -33,7 +33,6 @@
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.scijava.event.EventHandler;
@@ -66,13 +65,6 @@ public class DefaultAppService extends AbstractSingletonService<App> implements
 
 	// -- AppService methods --
 
-	@Override
-	public App getApp() {
-		final List<App> appList = getInstances();
-		if (appList == null || appList.isEmpty()) return null;
-		return appList.get(0);
-	}
-
 	@Override
 	public App getApp(final String name) {
 		return apps().get(name);
@@ -83,13 +75,6 @@ public Map<String, App> getApps() {
 		return apps();
 	}
 
-	// -- SingletonService methods --
-
-	@Override
-	public Class<App> getPluginType() {
-		return App.class;
-	}
-
 	// -- Event handlers --
 
 	@EventHandler(key = "org.scijava.app.AppService#about")

From 656d1f738305c33def97453fa9a58f2d86e9fb1f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:16:37 -0600
Subject: [PATCH 0406/1208] CacheService: move default method impl to iface

---
 src/main/java/org/scijava/cache/CacheService.java      |  8 +++++++-
 .../java/org/scijava/cache/DefaultCacheService.java    | 10 ----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index 11981d906..049dbe813 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -63,5 +63,11 @@ public interface CacheService extends SciJavaService {
 	 *         of the value loader.
 	 * @throws ExecutionException
 	 */
-	<V> V get(Object key, Callable<V> valueLoader) throws ExecutionException;
+	@SuppressWarnings("unchecked")
+	default <V> V get(final Object key, final Callable<V> valueLoader)
+		throws ExecutionException
+	{
+		return (V)get(key);
+	}
+
 }
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index f78f93686..29d62de81 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -33,8 +33,6 @@
 
 import java.util.Map;
 import java.util.WeakHashMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
@@ -61,14 +59,6 @@ public Object get(final Object key) {
 		return map.get(key);
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public <V> V get(final Object key, final Callable<V> valueLoader)
-		throws ExecutionException
-	{
-		return (V)get(key);
-	}
-
 	// -- Service Methods --
 
 	@Override

From c17fd1699c38d9434c1461cf55a52746f369daea Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:17:26 -0600
Subject: [PATCH 0407/1208] ConsoleService: move default method impls to iface

---
 .../java/org/scijava/console/ConsoleService.java  | 14 ++++++++++++++
 .../scijava/console/DefaultConsoleService.java    | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 77cef9477..e6510058c 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -62,4 +62,18 @@ public interface ConsoleService extends
 	/** Notifies listeners of output sent to {@code stdout} or {@code stderr}. */
 	void notifyListeners(OutputEvent event);
 
+	// -- PTService methods --
+
+	@Override
+	default Class<ConsoleArgument> getPluginType() {
+		return ConsoleArgument.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	default Class<LinkedList<String>> getType() {
+		return (Class) LinkedList.class;
+	}
 }
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 7d26d3260..520ddd195 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -138,21 +138,6 @@ public void notifyListeners(final OutputEvent event) {
 			l.outputOccurred(event);
 	}
 
-	// -- PTService methods --
-
-	@Override
-	public Class<ConsoleArgument> getPluginType() {
-		return ConsoleArgument.class;
-	}
-
-	// -- Typed methods --
-
-	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<LinkedList<String>> getType() {
-		return (Class) LinkedList.class;
-	}
-
 	// -- Disposable methods --
 
 	@Override

From 84be9d18ddfb8c055cb8d0da64607491329a6517 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:20:39 -0600
Subject: [PATCH 0408/1208] DataHandleService: move default method impls to
 iface

---
 .../java/org/scijava/io/DataHandleService.java  | 16 +++++++++++++++-
 .../scijava/io/DefaultDataHandleService.java    | 17 +----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/scijava/io/DataHandleService.java b/src/main/java/org/scijava/io/DataHandleService.java
index caec74a59..076c06aa9 100644
--- a/src/main/java/org/scijava/io/DataHandleService.java
+++ b/src/main/java/org/scijava/io/DataHandleService.java
@@ -45,5 +45,19 @@
 public interface DataHandleService extends
 	WrapperService<Location, DataHandle<Location>>, SciJavaService
 {
-	// NB: Marker interface.
+
+	// -- PTService methods --
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	default Class<DataHandle<Location>> getPluginType() {
+		return (Class) DataHandle.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default Class<Location> getType() {
+		return Location.class;
+	}
 }
diff --git a/src/main/java/org/scijava/io/DefaultDataHandleService.java b/src/main/java/org/scijava/io/DefaultDataHandleService.java
index 92882cbd1..90f123d38 100644
--- a/src/main/java/org/scijava/io/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/DefaultDataHandleService.java
@@ -45,20 +45,5 @@ public class DefaultDataHandleService extends
 	AbstractWrapperService<Location, DataHandle<Location>> implements
 	DataHandleService
 {
-
-	// -- PTService methods --
-
-	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<DataHandle<Location>> getPluginType() {
-		return (Class) DataHandle.class;
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public Class<Location> getType() {
-		return Location.class;
-	}
-
+	// NB: No implementation needed.
 }

From 46a6f5018e363afc4cc696b8ab0adc6d78500e3a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:23:11 -0600
Subject: [PATCH 0409/1208] IOService: move default method impls to iface

---
 .../java/org/scijava/io/DefaultIOService.java | 34 -------------------
 src/main/java/org/scijava/io/IOService.java   | 30 ++++++++++++++--
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 173ebc664..e8a2ddd42 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -60,26 +60,6 @@ public final class DefaultIOService
 
 	// -- IOService methods --
 
-	@Override
-	public IOPlugin<?> getOpener(final String source) {
-		for (final IOPlugin<?> handler : getInstances()) {
-			if (handler.supportsOpen(source)) return handler;
-		}
-		return null;
-	}
-
-	@Override
-	public <D> IOPlugin<D> getSaver(final D data, final String destination) {
-		for (final IOPlugin<?> handler : getInstances()) {
-			if (handler.supportsSave(data, destination)) {
-				@SuppressWarnings("unchecked")
-				final IOPlugin<D> typedHandler = (IOPlugin<D>) handler;
-				return typedHandler;
-			}
-		}
-		return null;
-	}
-
 	@Override
 	public Object open(final String source) throws IOException {
 		final IOPlugin<?> opener = getOpener(source);
@@ -102,18 +82,4 @@ public void save(final Object data, final String destination)
 			eventService.publish(new DataSavedEvent(destination, data));
 		}
 	}
-
-	// -- HandlerService methods --
-
-	@Override
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public Class<IOPlugin<?>> getPluginType() {
-		return (Class) IOPlugin.class;
-	}
-
-	@Override
-	public Class<String> getType() {
-		return String.class;
-	}
-
 }
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 5f64ba7ad..b099aa89a 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -51,13 +51,27 @@ public interface IOService extends HandlerService<String, IOPlugin<?>>,
 	 * Gets the most appropriate {@link IOPlugin} for opening data from the given
 	 * source.
 	 */
-	IOPlugin<?> getOpener(String source);
+	default IOPlugin<?> getOpener(final String source) {
+		for (final IOPlugin<?> handler : getInstances()) {
+			if (handler.supportsOpen(source)) return handler;
+		}
+		return null;
+	}
 
 	/**
 	 * Gets the most appropriate {@link IOPlugin} for saving data to the given
 	 * destination.
 	 */
-	<D> IOPlugin<D> getSaver(D data, String destination);
+	default <D> IOPlugin<D> getSaver(final D data, final String destination) {
+		for (final IOPlugin<?> handler : getInstances()) {
+			if (handler.supportsSave(data, destination)) {
+				@SuppressWarnings("unchecked")
+				final IOPlugin<D> typedHandler = (IOPlugin<D>) handler;
+				return typedHandler;
+			}
+		}
+		return null;
+	}
 
 	/**
 	 * Loads data from the given source. For extensibility, the nature of the
@@ -91,4 +105,16 @@ public interface IOService extends HandlerService<String, IOPlugin<?>>,
 	 */
 	void save(Object data, String destination) throws IOException;
 
+	// -- HandlerService methods --
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	default Class<IOPlugin<?>> getPluginType() {
+		return (Class) IOPlugin.class;
+	}
+
+	@Override
+	default Class<String> getType() {
+		return String.class;
+	}
 }

From 8d1f80b3a7cf0201c7fb1d94b05352c2ca760130 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:27:34 -0600
Subject: [PATCH 0410/1208] MenuService: move default method impls to iface

---
 .../org/scijava/menu/DefaultMenuService.java  | 19 -------------------
 .../java/org/scijava/menu/MenuService.java    | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 39dc744d4..203d43fb9 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -37,7 +37,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.scijava.UIDetails;
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.module.ModuleInfo;
@@ -71,29 +70,11 @@ public class DefaultMenuService extends AbstractService implements MenuService
 
 	// -- MenuService methods --
 
-	@Override
-	public ShadowMenu getMenu() {
-		return getMenu(UIDetails.APPLICATION_MENU_ROOT);
-	}
-
 	@Override
 	public ShadowMenu getMenu(final String menuRoot) {
 		return rootMenus().get(menuRoot);
 	}
 
-	@Override
-	public <T> T createMenus(final MenuCreator<T> creator, final T menu) {
-		return createMenus(UIDetails.APPLICATION_MENU_ROOT, creator, menu);
-	}
-
-	@Override
-	public <T> T createMenus(final String menuRoot,
-		final MenuCreator<T> creator, final T menu)
-	{
-		creator.createMenus(getMenu(menuRoot), menu);
-		return menu;
-	}
-
 	// -- Event handlers --
 
 	@EventHandler
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index 000ac5bcd..e4eb3423c 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -31,6 +31,7 @@
 
 package org.scijava.menu;
 
+import org.scijava.UIDetails;
 import org.scijava.module.ModuleInfo;
 import org.scijava.service.SciJavaService;
 
@@ -42,7 +43,9 @@
 public interface MenuService extends SciJavaService {
 
 	/** Gets the root node of the application menu structure. */
-	ShadowMenu getMenu();
+	default ShadowMenu getMenu() {
+		return getMenu(UIDetails.APPLICATION_MENU_ROOT);
+	}
 
 	/**
 	 * Gets the root node of a menu structure.
@@ -58,7 +61,9 @@ public interface MenuService extends SciJavaService {
 	 * @param creator the {@link MenuCreator} to use to populate the menus.
 	 * @param menu the destination menu structure to populate.
 	 */
-	<T> T createMenus(MenuCreator<T> creator, T menu);
+	default <T> T createMenus(final MenuCreator<T> creator, final T menu) {
+		return createMenus(UIDetails.APPLICATION_MENU_ROOT, creator, menu);
+	}
 
 	/**
 	 * Populates a UI-specific menu structure.
@@ -68,6 +73,10 @@ public interface MenuService extends SciJavaService {
 	 * @param creator the {@link MenuCreator} to use to populate the menus.
 	 * @param menu the destination menu structure to populate.
 	 */
-	<T> T createMenus(String menuRoot, MenuCreator<T> creator, T menu);
-
+	default <T> T createMenus(final String menuRoot,
+		final MenuCreator<T> creator, final T menu)
+	{
+		creator.createMenus(getMenu(menuRoot), menu);
+		return menu;
+	}
 }

From 9572dac88db27208491dce8ede331a58c0f5edec Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:31:07 -0600
Subject: [PATCH 0411/1208] MutableModule: move default method impls to iface

---
 .../scijava/module/DefaultMutableModule.java  | 50 -------------------
 .../org/scijava/module/MutableModule.java     | 42 +++++++++++++---
 2 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index d2fe1b1c1..3887b5927 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -52,60 +52,10 @@ public DefaultMutableModule(final MutableModuleInfo info) {
 		info.setModuleClass(getClass());
 	}
 
-	// -- MutableModule methods --
-
-	@Override
-	public <T> MutableModuleItem<T> addInput(final String name,
-		final Class<T> type)
-	{
-		final DefaultMutableModuleItem<T> item =
-			new DefaultMutableModuleItem<>(this, name, type);
-		addInput(item);
-		return item;
-	}
-
-	@Override
-	public void addInput(final ModuleItem<?> input) {
-		getInfo().addInput(input);
-	}
-
-	@Override
-	public <T> MutableModuleItem<T> addOutput(final String name,
-		final Class<T> type)
-	{
-		final DefaultMutableModuleItem<T> item =
-			new DefaultMutableModuleItem<>(this, name, type);
-		addOutput(item);
-		return item;
-	}
-
-	@Override
-	public void addOutput(final ModuleItem<?> output) {
-		getInfo().addOutput(output);
-	}
-
-	@Override
-	public void removeInput(final ModuleItem<?> input) {
-		getInfo().removeInput(input);
-	}
-
-	@Override
-	public void removeOutput(final ModuleItem<?> output) {
-		getInfo().removeOutput(output);
-	}
-
 	// -- Module methods --
 
 	@Override
 	public MutableModuleInfo getInfo() {
 		return info;
 	}
-
-	// -- Runnable methods --
-
-	@Override
-	public void run() {
-		// do nothing by default
-	}
-
 }
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 3838b12a3..fb4e77069 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -47,28 +47,54 @@
 public interface MutableModule extends Module {
 
 	/** Adds an input to the list. */
-	<T> MutableModuleItem<T> addInput(String name, Class<T> type);
+	default <T> MutableModuleItem<T> addInput(final String name,
+		final Class<T> type)
+	{
+		final DefaultMutableModuleItem<T> item =
+			new DefaultMutableModuleItem<>(this, name, type);
+		addInput(item);
+		return item;
+	}
 
 	/** Adds an input to the list. */
-	void addInput(ModuleItem<?> input);
+	default void addInput(final ModuleItem<?> input) {
+		getInfo().addInput(input);
+	}
 
 	/** Adds an output to the list. */
-	<T> MutableModuleItem<T> addOutput(String name, Class<T> type);
+	default <T> MutableModuleItem<T> addOutput(final String name,
+		final Class<T> type)
+	{
+		final DefaultMutableModuleItem<T> item =
+			new DefaultMutableModuleItem<>(this, name, type);
+		addOutput(item);
+		return item;
+	}
 
 	/** Adds an output to the list. */
-	void addOutput(ModuleItem<?> output);
+	default void addOutput(final ModuleItem<?> output) {
+		getInfo().addOutput(output);
+	}
 
 	/** Removes an input from the list. */
-	void removeInput(ModuleItem<?> input);
+	default void removeInput(final ModuleItem<?> input) {
+		getInfo().removeInput(input);
+	}
 
 	/** Removes an output from the list. */
-	void removeOutput(ModuleItem<?> output);
-
-	// NB: Type narrowing.
+	default void removeOutput(final ModuleItem<?> output) {
+		getInfo().removeOutput(output);
+	}
 
 	// -- ModuleInfo methods --
 
 	@Override
 	MutableModuleInfo getInfo();
 
+	// -- Runnable methods --
+
+	@Override
+	default void run() {
+		// do nothing by default
+	}
 }

From 9fb20a9d4e44623607d4554d19d287ce1609f77a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:33:16 -0600
Subject: [PATCH 0412/1208] MutableModuleInfo: move default method impls to
 iface

---
 .../module/DefaultMutableModuleInfo.java      | 24 -------------------
 .../org/scijava/module/MutableModuleInfo.java | 21 ++++++++++++++++
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index 7585c16ff..5de1cf327 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -87,28 +87,4 @@ public void removeOutput(final ModuleItem<?> output) {
 		outputMap().remove(output.getName());
 		outputList().remove(output);
 	}
-
-	// -- ModuleInfo methods --
-
-	@Override
-	public String getDelegateClassName() {
-		return getModuleClass().getName();
-	}
-
-	@Override
-	public Class<?> loadDelegateClass() {
-		return getModuleClass();
-	}
-
-	@Override
-	public Module createModule() throws ModuleException {
-		try {
-			return getModuleClass().newInstance();
-		}
-		catch (final Exception e) {
-			// NB: Several types of exceptions; simpler to handle them all the same.
-			throw new ModuleException(e);
-		}
-	}
-
 }
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index 4de34d722..bbb36ff94 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -64,4 +64,25 @@ public interface MutableModuleInfo extends ModuleInfo {
 	/** Removes an output from the list. */
 	void removeOutput(ModuleItem<?> output);
 
+	// -- ModuleInfo methods --
+
+	@Override
+	default String getDelegateClassName() {
+		return getModuleClass().getName();
+	}
+
+	@Override
+	default Class<?> loadDelegateClass() {
+		return getModuleClass();
+	}
+
+	@Override
+	default Module createModule() throws ModuleException {
+		try {
+			return getModuleClass().newInstance();
+		}
+		catch (final InstantiationException | IllegalAccessException exc) {
+			throw new ModuleException(exc);
+		}
+	}
 }

From 857c1e83ca864c1bfceabfbe89c5f66f9eed6b21 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:35:08 -0600
Subject: [PATCH 0413/1208] OptionsService: move default method impls to iface

---
 .../scijava/options/DefaultOptionsService.java   | 16 ----------------
 .../java/org/scijava/options/OptionsService.java | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index a75b24045..230bad79f 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -72,14 +72,6 @@ public <O extends OptionsPlugin> O getOptions(final Class<O> optionsClass) {
 		return objects == null || objects.isEmpty() ? null : objects.get(0);
 	}
 
-	@Override
-	public void reset() {
-		final List<OptionsPlugin> optionsPlugins = getInstances();
-		for (final OptionsPlugin plugin : optionsPlugins) {
-			plugin.reset();
-		}
-	}
-
 	// -- SingletonService methods --
 
 	@Override
@@ -93,12 +85,4 @@ public List<OptionsPlugin> getInstances() {
 
 		return instances;
 	}
-
-	// -- PTService methods --
-
-	@Override
-	public Class<OptionsPlugin> getPluginType() {
-		return OptionsPlugin.class;
-	}
-
 }
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index cec85eda4..fcd27879c 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -31,6 +31,8 @@
 
 package org.scijava.options;
 
+import java.util.List;
+
 import org.scijava.plugin.SingletonService;
 import org.scijava.service.SciJavaService;
 
@@ -53,6 +55,17 @@ public interface OptionsService extends SingletonService<OptionsPlugin>,
 	 * 
 	 * @see OptionsPlugin#reset()
 	 */
-	void reset();
+	default void reset() {
+		final List<OptionsPlugin> optionsPlugins = getInstances();
+		for (final OptionsPlugin plugin : optionsPlugins) {
+			plugin.reset();
+		}
+	}
+
+	// -- PTService methods --
 
+	@Override
+	default Class<OptionsPlugin> getPluginType() {
+		return OptionsPlugin.class;
+	}
 }

From 16d42893f848268df7890c5725c63845f987e364 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:36:03 -0600
Subject: [PATCH 0414/1208] ParseService: move default method impl to iface

---
 src/main/java/org/scijava/parse/DefaultParseService.java | 5 -----
 src/main/java/org/scijava/parse/ParseService.java        | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index bbc92f3f8..a3d2102d9 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -53,11 +53,6 @@ public class DefaultParseService extends AbstractService implements
 	ParseService
 {
 
-	@Override
-	public Items parse(final String arg) {
-		return parse(arg, true);
-	}
-
 	@Override
 	public Items parse(final String arg, final boolean strict) {
 		if (arg == null) throw new NullPointerException("arg must not be null");
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 102719442..8ba6e85d4 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -52,7 +52,9 @@ public interface ParseService extends SciJavaService {
 	 * @throws IllegalArgumentException If the string does not conform to expected
 	 *           syntax.
 	 */
-	Items parse(String arg);
+	default Items parse(final String arg) {
+		return parse(arg, true);
+	}
 
 	/**
 	 * Parses a comma-delimited list of data elements.

From 9bab0760b0f6673976eed4502b4f193536446e0a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:38:36 -0600
Subject: [PATCH 0415/1208] RunService: move default method impls to iface

---
 .../org/scijava/run/DefaultRunService.java    | 52 +------------------
 src/main/java/org/scijava/run/RunService.java | 38 ++++++++++++--
 2 files changed, 36 insertions(+), 54 deletions(-)

diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index cf6828f9a..27cc093ad 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -31,12 +31,7 @@
 
 package org.scijava.run;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-
-import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractHandlerService;
-import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
 
@@ -49,50 +44,5 @@
 public class DefaultRunService extends
 	AbstractHandlerService<Object, CodeRunner> implements RunService
 {
-
-	@Parameter
-	private LogService log;
-
-	// -- RunService methods --
-
-	@Override
-	public void run(final Object code, final Object... args)
-		throws InvocationTargetException
-	{
-		for (final CodeRunner runner : getInstances()) {
-			if (runner.supports(code)) {
-				runner.run(code, args);
-				return;
-			}
-		}
-		throw new IllegalArgumentException("Unknown code type: " + code);
-	}
-
-	@Override
-	public void run(final Object code, final Map<String, Object> inputMap)
-		throws InvocationTargetException
-	{
-		for (final CodeRunner runner : getInstances()) {
-			if (runner.supports(code)) {
-				runner.run(code, inputMap);
-				return;
-			}
-		}
-		throw new IllegalArgumentException("Unknown code type: " + code);
-	}
-
-	// -- PTService methods --
-
-	@Override
-	public Class<CodeRunner> getPluginType() {
-		return CodeRunner.class;
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public Class<Object> getType() {
-		return Object.class;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 2a9b4db85..f7e771a58 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -50,13 +50,45 @@ public interface RunService extends
 	 * Executes the given code using the most appropriate handler, passing the
 	 * specified arguments as inputs.
 	 */
-	void run(Object code, Object... args) throws InvocationTargetException;
+	default void run(final Object code, final Object... args)
+		throws InvocationTargetException
+	{
+		for (final CodeRunner runner : getInstances()) {
+			if (runner.supports(code)) {
+				runner.run(code, args);
+				return;
+			}
+		}
+		throw new IllegalArgumentException("Unknown code type: " + code);
+	}
 
 	/**
 	 * Executes the given code using the most appropriate handler, passing the
 	 * arguments in the specified map as inputs.
 	 */
-	void run(Object code, Map<String, Object> inputMap)
-		throws InvocationTargetException;
+	default void run(final Object code, final Map<String, Object> inputMap)
+		throws InvocationTargetException
+	{
+		for (final CodeRunner runner : getInstances()) {
+			if (runner.supports(code)) {
+				runner.run(code, inputMap);
+				return;
+			}
+		}
+		throw new IllegalArgumentException("Unknown code type: " + code);
+	}
 
+	// -- PTService methods --
+
+	@Override
+	default Class<CodeRunner> getPluginType() {
+		return CodeRunner.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default Class<Object> getType() {
+		return Object.class;
+	}
 }

From 368048a36f798e2d89f94eb6faa073c9c79ef1cf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:39:49 -0600
Subject: [PATCH 0416/1208] ScriptHeaderService: move default method impls to
 iface

---
 .../script/DefaultScriptHeaderService.java    | 29 +------------------
 .../scijava/script/ScriptHeaderService.java   | 24 ++++++++++++++-
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index 5b51ca2f6..cc1b25c92 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -45,32 +45,5 @@ public class DefaultScriptHeaderService extends
 	AbstractHandlerService<ScriptLanguage, ScriptHeader> implements
 	ScriptHeaderService
 {
-
-	// -- ScriptHeaderService methods --
-
-	@Override
-	public String getHeader(final ScriptLanguage language) {
-		StringBuilder header = new StringBuilder();
-		for (final ScriptHeader scriptHeader : getInstances()) {
-			if (scriptHeader.supports(language)) {
-				header.append(scriptHeader.getHeader());
-				header.append("\n");
-			}
-		}
-
-		return header.toString();
-	}
-
-	// -- HandlerService methods --
-
-	@Override
-	public Class<ScriptHeader> getPluginType() {
-		return ScriptHeader.class;
-	}
-
-	@Override
-	public Class<ScriptLanguage> getType() {
-		return ScriptLanguage.class;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index b87ce51b9..fb4f22590 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -58,5 +58,27 @@ public interface ScriptHeaderService extends
 	 * @param language - Language to look up
 	 * @return The combined header text to insert at the top of a script.
 	 */
-	String getHeader(final ScriptLanguage language);
+	default String getHeader(final ScriptLanguage language) {
+		StringBuilder header = new StringBuilder();
+		for (final ScriptHeader scriptHeader : getInstances()) {
+			if (scriptHeader.supports(language)) {
+				header.append(scriptHeader.getHeader());
+				header.append("\n");
+			}
+		}
+
+		return header.toString();
+	}
+
+	// -- HandlerService methods --
+
+	@Override
+	default Class<ScriptHeader> getPluginType() {
+		return ScriptHeader.class;
+	}
+
+	@Override
+	default Class<ScriptLanguage> getType() {
+		return ScriptLanguage.class;
+	}
 }

From 63824f7991e1d9f77f7c44316b71f394bcf4b6d0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:45:43 -0600
Subject: [PATCH 0417/1208] DefaultScriptInterpreter: fix javadoc syntax

---
 src/main/java/org/scijava/script/DefaultScriptInterpreter.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 649787886..a38c231e8 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -178,7 +178,6 @@ public Object eval(final String command) throws ScriptException {
 	 * For further details, see <a href="http://stackoverflow.com/a/5598207">SO
 	 * #5584674</a>.
 	 * </p>
-	 * </p>
 	 */
 	@Override
 	public Object interpret(final String line) throws ScriptException {

From 34c47d075a5ebfce5b3883f28d474b386cfd51fb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:45:55 -0600
Subject: [PATCH 0418/1208] ScriptService: move default method impls to iface

---
 .../scijava/script/DefaultScriptService.java  | 67 -------------------
 .../org/scijava/script/ScriptService.java     | 61 ++++++++++++-----
 2 files changed, 46 insertions(+), 82 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 9f3410734..1244eb666 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -32,8 +32,6 @@
 package org.scijava.script;
 
 import java.io.File;
-import java.io.Reader;
-import java.io.StringReader;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -120,21 +118,6 @@ public ScriptLanguageIndex getIndex() {
 		return scriptLanguageIndex();
 	}
 
-	@Override
-	public List<ScriptLanguage> getLanguages() {
-		return new ArrayList<>(getIndex());
-	}
-
-	@Override
-	public ScriptLanguage getLanguageByExtension(final String extension) {
-		return getIndex().getByExtension(extension);
-	}
-
-	@Override
-	public ScriptLanguage getLanguageByName(final String name) {
-		return getIndex().getByName(name);
-	}
-
 	// -- ScriptService methods - scripts --
 
 	@Override
@@ -189,34 +172,6 @@ public Future<ScriptModule> run(final File file, final boolean process,
 		return run(getOrCreate(file), process, inputMap);
 	}
 
-	@Override
-	public Future<ScriptModule> run(final String path, final String script,
-		final boolean process, final Object... inputs)
-	{
-		return run(path, new StringReader(script), process, inputs);
-	}
-
-	@Override
-	public Future<ScriptModule> run(final String path, final String script,
-		final boolean process, final Map<String, Object> inputMap)
-	{
-		return run(path, new StringReader(script), process, inputMap);
-	}
-
-	@Override
-	public Future<ScriptModule> run(final String path, final Reader reader,
-		final boolean process, final Object... inputs)
-	{
-		return run(new ScriptInfo(getContext(), path, reader), process, inputs);
-	}
-
-	@Override
-	public Future<ScriptModule> run(final String path, final Reader reader,
-		final boolean process, final Map<String, Object> inputMap)
-	{
-		return run(new ScriptInfo(getContext(), path, reader), process, inputMap);
-	}
-
 	@Override
 	public Future<ScriptModule> run(final ScriptInfo info, final boolean process,
 		final Object... inputs)
@@ -231,21 +186,6 @@ public Future<ScriptModule> run(final ScriptInfo info, final boolean process,
 		return cast(moduleService.run(info, process, inputMap));
 	}
 
-	@Override
-	public boolean canHandleFile(final File file) {
-		return getIndex().canHandleFile(file);
-	}
-
-	@Override
-	public boolean canHandleFile(final String fileName) {
-		return getIndex().canHandleFile(fileName);
-	}
-
-	@Override
-	public void addAlias(final Class<?> type) {
-		addAlias(type.getSimpleName(), type);
-	}
-
 	@Override
 	public void addAlias(final String alias, final Class<?> type) {
 		aliasMap().put(alias, type);
@@ -274,13 +214,6 @@ public synchronized Class<?> lookupClass(final String alias)
 		}
 	}
 
-	// -- PTService methods --
-
-	@Override
-	public Class<ScriptLanguage> getPluginType() {
-		return ScriptLanguage.class;
-	}
-
 	// -- Service methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 4e3e9be30..2b3a35d34 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -33,8 +33,9 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -83,13 +84,19 @@ public interface ScriptService extends SingletonService<ScriptLanguage>,
 	 * This method does the same thing as {@link #getInstances()}.
 	 * </p>
 	 */
-	List<ScriptLanguage> getLanguages();
+	default List<ScriptLanguage> getLanguages() {
+		return new ArrayList<>(getIndex());
+	}
 
 	/** Gets the scripting language that handles the given file extension. */
-	ScriptLanguage getLanguageByExtension(String extension);
+	default ScriptLanguage getLanguageByExtension(final String extension) {
+		return getIndex().getByExtension(extension);
+	}
 
 	/** Gets the scripting language with the given name. */
-	ScriptLanguage getLanguageByName(String name);
+	default ScriptLanguage getLanguageByName(final String name) {
+		return getIndex().getByName(name);
+	}
 
 	// -- Scripts --
 
@@ -180,8 +187,11 @@ Future<ScriptModule> run(File file, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, String script, boolean process,
-		Object... inputs) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final String script,
+		final boolean process, final Object... inputs)
+	{
+		return run(path, new StringReader(script), process, inputs);
+	}
 
 	/**
 	 * Executes the given script.
@@ -201,8 +211,11 @@ Future<ScriptModule> run(String path, String script, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, String script, boolean process,
-		Map<String, Object> inputMap) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final String script,
+		final boolean process, final Map<String, Object> inputMap)
+	{
+		return run(path, new StringReader(script), process, inputMap);
+	}
 
 	/**
 	 * Executes the given script.
@@ -224,8 +237,11 @@ Future<ScriptModule> run(String path, String script, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, Reader reader, boolean process,
-		Object... inputs) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final Reader reader,
+		final boolean process, final Object... inputs)
+	{
+		return run(new ScriptInfo(getContext(), path, reader), process, inputs);
+	}
 
 	/**
 	 * Executes the given script.
@@ -245,8 +261,11 @@ Future<ScriptModule> run(String path, Reader reader, boolean process,
 	 * @return {@link Future} of the module instance being executed. Calling
 	 *         {@link Future#get()} will block until execution is complete.
 	 */
-	Future<ScriptModule> run(String path, Reader reader, boolean process,
-		Map<String, Object> inputMap) throws IOException, ScriptException;
+	default Future<ScriptModule> run(final String path, final Reader reader,
+		final boolean process, final Map<String, Object> inputMap)
+	{
+		return run(new ScriptInfo(getContext(), path, reader), process, inputMap);
+	}
 
 	/**
 	 * Executes the given script.
@@ -286,13 +305,19 @@ Future<ScriptModule> run(ScriptInfo info, boolean process,
 		Map<String, Object> inputMap);
 
 	/** TODO */
-	boolean canHandleFile(File file);
+	default boolean canHandleFile(final File file) {
+		return getIndex().canHandleFile(file);
+	}
 
 	/** TODO */
-	boolean canHandleFile(String fileName);
+	default boolean canHandleFile(final String fileName) {
+		return getIndex().canHandleFile(fileName);
+	}
 
 	/** TODO */
-	void addAlias(Class<?> type);
+	default void addAlias(final Class<?> type) {
+		addAlias(type.getSimpleName(), type);
+	}
 
 	/** TODO */
 	void addAlias(String alias, Class<?> type);
@@ -300,4 +325,10 @@ Future<ScriptModule> run(ScriptInfo info, boolean process,
 	/** TODO */
 	Class<?> lookupClass(String typeName) throws ScriptException;
 
+	// -- PTService methods --
+
+	@Override
+	default Class<ScriptLanguage> getPluginType() {
+		return ScriptLanguage.class;
+	}
 }

From 068b44695c9500067e9c433a95deed4d42051db6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:55:27 -0600
Subject: [PATCH 0419/1208] ToolService: move default method impls to iface

---
 .../org/scijava/tool/DefaultToolService.java  | 48 -------------------
 .../java/org/scijava/tool/ToolService.java    | 41 ++++++++++++++--
 2 files changed, 36 insertions(+), 53 deletions(-)

diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index 76061a22f..2ccf32477 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -55,7 +55,6 @@
 import org.scijava.service.Service;
 import org.scijava.tool.event.ToolActivatedEvent;
 import org.scijava.tool.event.ToolDeactivatedEvent;
-import org.scijava.util.RealCoords;
 
 /**
  * Default service for keeping track of available tools, including which tool is
@@ -71,8 +70,6 @@ public class DefaultToolService extends AbstractSingletonService<Tool>
 	implements ToolService
 {
 
-	private static final double SEPARATOR_DISTANCE = 10;
-
 	@Parameter
 	private EventService eventService;
 
@@ -96,17 +93,6 @@ public Tool getTool(final String name) {
 		return tools().get(name);
 	}
 
-	@Override
-	public <T extends Tool> T getTool(final Class<T> toolClass) {
-		for (final Tool tool : alwaysActiveToolList()) {
-			if (toolClass.isInstance(tool)) return toolClass.cast(tool);
-		}
-		for (final Tool tool : toolList()) {
-			if (toolClass.isInstance(tool)) return toolClass.cast(tool);
-		}
-		return null;
-	}
-
 	@Override
 	public List<Tool> getTools() {
 		return toolList();
@@ -140,14 +126,6 @@ public void setActiveTool(final Tool activeTool) {
 		eventService.publish(new ToolActivatedEvent(activeTool));
 	}
 
-	@Override
-	public boolean isSeparatorNeeded(final Tool tool1, final Tool tool2) {
-		if (tool1 == null || tool2 == null) return false;
-		final double priority1 = tool1.getInfo().getPriority();
-		final double priority2 = tool2.getInfo().getPriority();
-		return Math.abs(priority1 - priority2) >= SEPARATOR_DISTANCE;
-	}
-
 	@Override
 	public void reportRectangle(final double x, final double y, final double w,
 		final double h)
@@ -161,15 +139,6 @@ public void reportRectangle(final double x, final double y, final double w,
 			fh);
 	}
 
-	@Override
-	public void reportRectangle(final RealCoords p1, final RealCoords p2) {
-		final double x = Math.min(p1.x, p2.x);
-		final double y = Math.min(p1.y, p2.y);
-		final double w = Math.abs(p2.x - p1.x);
-		final double h = Math.abs(p2.y - p1.y);
-		reportRectangle(x, y, w, h);
-	}
-
 	@Override
 	public void reportLine(final double x1, final double y1, final double x2,
 		final double y2)
@@ -193,11 +162,6 @@ public void reportLine(final double x1, final double y1, final double x2,
 			", length=" + fl);
 	}
 
-	@Override
-	public void reportLine(final RealCoords p1, final RealCoords p2) {
-		reportLine(p1.x, p1.y, p2.x, p2.y);
-	}
-
 	@Override
 	public void reportPoint(final double x, final double y) {
 		final DecimalFormat f = new DecimalFormat("0.##");
@@ -206,18 +170,6 @@ public void reportPoint(final double x, final double y) {
 		statusService.showStatus("x=" + fx + ", y=" + fy);
 	}
 
-	@Override
-	public void reportPoint(final RealCoords p) {
-		reportPoint(p.x, p.y);
-	}
-
-	// -- PTService methods --
-
-	@Override
-	public Class<Tool> getPluginType() {
-		return Tool.class;
-	}
-
 	// -- Event handlers --
 
 	@EventHandler
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index c9145bf5e..fb994b235 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -45,6 +45,8 @@
  */
 public interface ToolService extends SingletonService<Tool>, SciJavaService {
 
+	double SEPARATOR_DISTANCE = 10;
+
 	Tool getTool(String name);
 
 	/**
@@ -54,7 +56,15 @@ public interface ToolService extends SingletonService<Tool>, SciJavaService {
 	 * @param toolClass the class of the tool to fetch
 	 * @return the tool, or null if no such tool
 	 */
-	<T extends Tool> T getTool(Class<T> toolClass);
+	default <T extends Tool> T getTool(final Class<T> toolClass) {
+		for (final Tool tool : getAlwaysActiveTools()) {
+			if (toolClass.isInstance(tool)) return toolClass.cast(tool);
+		}
+		for (final Tool tool : getTools()) {
+			if (toolClass.isInstance(tool)) return toolClass.cast(tool);
+		}
+		return null;
+	}
 
 	List<Tool> getTools();
 
@@ -68,26 +78,47 @@ public interface ToolService extends SingletonService<Tool>, SciJavaService {
 	 * Returns true if the two specified tools should have a separator between
 	 * them on the tool bar.
 	 */
-	boolean isSeparatorNeeded(Tool tool1, Tool tool2);
+	default boolean isSeparatorNeeded(final Tool tool1, final Tool tool2) {
+		if (tool1 == null || tool2 == null) return false;
+		final double priority1 = tool1.getInfo().getPriority();
+		final double priority2 = tool2.getInfo().getPriority();
+		return Math.abs(priority1 - priority2) >= SEPARATOR_DISTANCE;
+	}
 
 	/** Publishes rectangle dimensions in the status bar. */
 	void reportRectangle(final double x, final double y, final double w,
 		final double h);
 
 	/** Publishes rectangle dimensions in the status bar. */
-	void reportRectangle(final RealCoords p1, final RealCoords p2);
+	default void reportRectangle(final RealCoords p1, final RealCoords p2) {
+		final double x = Math.min(p1.x, p2.x);
+		final double y = Math.min(p1.y, p2.y);
+		final double w = Math.abs(p2.x - p1.x);
+		final double h = Math.abs(p2.y - p1.y);
+		reportRectangle(x, y, w, h);
+	}
 
 	/** Publishes line length and angle in the status bar. */
 	void reportLine(final double x1, final double y1, final double x2,
 		final double y2);
 
 	/** Publishes line length and angle in the status bar. */
-	void reportLine(final RealCoords p1, final RealCoords p2);
+	default void reportLine(final RealCoords p1, final RealCoords p2) {
+		reportLine(p1.x, p1.y, p2.x, p2.y);
+	}
 
 	/** Publishes point coordinates to the status bar. */
 	void reportPoint(final double x, final double y);
 
 	/** Publishes point coordinates to the status bar. */
-	void reportPoint(final RealCoords p);
+	default void reportPoint(final RealCoords p) {
+		reportPoint(p.x, p.y);
+	}
+
+	// -- PTService methods --
 
+	@Override
+	default Class<Tool> getPluginType() {
+		return Tool.class;
+	}
 }

From e5185755398a3a21bbc50395ef1b53b13f372ba6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:57:49 -0600
Subject: [PATCH 0420/1208] DragAndDropService: move default method impls to
 iface

---
 .../ui/dnd/DefaultDragAndDropService.java     | 64 -------------------
 .../scijava/ui/dnd/DragAndDropService.java    | 54 ++++++++++++++--
 2 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index 21399db2a..c91be236d 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -32,7 +32,6 @@
 package org.scijava.ui.dnd;
 
 import org.scijava.app.StatusService;
-import org.scijava.display.Display;
 import org.scijava.event.EventHandler;
 import org.scijava.plugin.AbstractHandlerService;
 import org.scijava.plugin.Parameter;
@@ -60,69 +59,6 @@ public class DefaultDragAndDropService extends
 	@Parameter
 	private StatusService statusService;
 
-	// -- DragAndDropService methods --
-
-	@Override
-	public boolean supports(final DragAndDropData data,
-		final Display<?> display)
-	{
-		return getHandler(data, display) != null;
-	}
-
-	@Override
-	public boolean supports(final Object object, final Display<?> display) {
-		return getHandler(object, display) != null;
-	}
-
-	@Override
-	public boolean drop(final DragAndDropData data, final Display<?> display) {
-		final DragAndDropHandler<?> handler = getHandler(data, display);
-		if (handler == null) return false;
-		return handler.dropData(data, display);
-	}
-
-	@Override
-	public boolean drop(final Object data, final Display<?> display) {
-		final DragAndDropHandler<?> handler = getHandler(data, display);
-		if (handler == null) return false;
-		return handler.dropObject(data, display);
-	}
-
-	@Override
-	public DragAndDropHandler<?> getHandler(final DragAndDropData data,
-		final Display<?> display)
-	{
-		for (final DragAndDropHandler<?> handler : getInstances()) {
-			if (handler.supportsData(data, display)) return handler;
-		}
-		return null;
-	}
-
-	@Override
-	public DragAndDropHandler<?> getHandler(final Object object,
-		final Display<?> display)
-	{
-		for (final DragAndDropHandler<?> handler : getInstances()) {
-			if (handler.supportsObject(object, display)) return handler;
-		}
-		return null;
-	}
-
-	// -- PTService methods --
-
-	@Override
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public Class<DragAndDropHandler<Object>> getPluginType() {
-		return (Class) DragAndDropHandler.class;
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public Class<Object> getType() {
-		return Object.class;
-	}
-
 	// -- Event handlers --
 
 	@EventHandler
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index 38c782304..1816f99d3 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -53,7 +53,11 @@ public interface DragAndDropService extends
 	 * 
 	 * @see DragAndDropHandler
 	 */
-	boolean supports(DragAndDropData data, Display<?> display);
+	default boolean supports(final DragAndDropData data,
+		final Display<?> display)
+	{
+		return getHandler(data, display) != null;
+	}
 
 	/**
 	 * Checks whether the given object can be dropped onto the specified display.
@@ -62,7 +66,9 @@ public interface DragAndDropService extends
 	 * 
 	 * @see DragAndDropHandler
 	 */
-	boolean supports(Object object, Display<?> display);
+	default boolean supports(final Object object, final Display<?> display) {
+		return getHandler(object, display) != null;
+	}
 
 	/**
 	 * Performs a drag-and-drop operation in the given display with the specified
@@ -73,7 +79,11 @@ public interface DragAndDropService extends
 	 * @throws IllegalArgumentException if the display and/or data object are
 	 *           unsupported, or are incompatible with one another.
 	 */
-	boolean drop(DragAndDropData data, Display<?> display);
+	default boolean drop(final DragAndDropData data, final Display<?> display) {
+		final DragAndDropHandler<?> handler = getHandler(data, display);
+		if (handler == null) return false;
+		return handler.dropData(data, display);
+	}
 
 	/**
 	 * Performs a drag-and-drop operation in the given display with the specified
@@ -84,7 +94,11 @@ public interface DragAndDropService extends
 	 * @throws IllegalArgumentException if the display and/or data object are
 	 *           unsupported, or are incompatible with one another.
 	 */
-	boolean drop(Object data, Display<?> display);
+	default boolean drop(final Object data, final Display<?> display) {
+		final DragAndDropHandler<?> handler = getHandler(data, display);
+		if (handler == null) return false;
+		return handler.dropObject(data, display);
+	}
 
 	/**
 	 * Gets the drag-and-drop handler which will be used to handle the given
@@ -93,7 +107,14 @@ public interface DragAndDropService extends
 	 * @return The first compatible drag-and-drop handler, or null if none
 	 *         available.
 	 */
-	DragAndDropHandler<?> getHandler(DragAndDropData data, Display<?> display);
+	default DragAndDropHandler<?> getHandler(final DragAndDropData data,
+		final Display<?> display)
+	{
+		for (final DragAndDropHandler<?> handler : getInstances()) {
+			if (handler.supportsData(data, display)) return handler;
+		}
+		return null;
+	}
 
 	/**
 	 * Gets the drag-and-drop handler which will be used to handle the given
@@ -102,7 +123,14 @@ public interface DragAndDropService extends
 	 * @return The first compatible drag-and-drop handler, or null if none
 	 *         available.
 	 */
-	DragAndDropHandler<?> getHandler(Object object, Display<?> display);
+	default DragAndDropHandler<?> getHandler(final Object object,
+		final Display<?> display)
+	{
+		for (final DragAndDropHandler<?> handler : getInstances()) {
+			if (handler.supportsObject(object, display)) return handler;
+		}
+		return null;
+	}
 
 	// NB: Javadoc overrides.
 
@@ -115,4 +143,18 @@ public interface DragAndDropService extends
 	@Override
 	List<DragAndDropHandler<Object>> getInstances();
 
+	// -- PTService methods --
+
+	@Override
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	default Class<DragAndDropHandler<Object>> getPluginType() {
+		return (Class) DragAndDropHandler.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default Class<Object> getType() {
+		return Object.class;
+	}
 }

From 97c3961dee1bef0540785d4eee97c7b408804009 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:59:18 -0600
Subject: [PATCH 0421/1208] WidgetService: move default method impls to iface

---
 .../scijava/widget/DefaultWidgetService.java  | 36 +------------------
 .../org/scijava/widget/WidgetService.java     | 22 ++++++++++--
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index fdc6c94a9..8a92ca6fd 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -31,13 +31,7 @@
 
 package org.scijava.widget;
 
-import java.util.List;
-
-import org.scijava.log.LogService;
-import org.scijava.module.Module;
-import org.scijava.module.ModuleItem;
 import org.scijava.plugin.AbstractWrapperService;
-import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
 
@@ -51,33 +45,5 @@ public class DefaultWidgetService extends
 	AbstractWrapperService<WidgetModel, InputWidget<?, ?>> implements
 	WidgetService
 {
-
-	@Parameter
-	private LogService log;
-
-	// -- WidgetService methods --
-
-	@Override
-	public WidgetModel createModel(InputPanel<?, ?> inputPanel, Module module,
-		ModuleItem<?> item, List<?> objectPool)
-	{
-		return new DefaultWidgetModel(getContext(), inputPanel, module, item,
-			objectPool);
-	}
-
-	// -- PTService methods --
-
-	@Override
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public Class<InputWidget<?, ?>> getPluginType() {
-		return (Class) InputWidget.class;
-	}
-
-	// -- Typed methods --
-
-	@Override
-	public Class<WidgetModel> getType() {
-		return WidgetModel.class;
-	}
-
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index e0311419d..bb5e01561 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -59,7 +59,25 @@ public interface WidgetService extends
 	 * @param item
 	 * @param objectPool
 	 */
-	WidgetModel createModel(InputPanel<?, ?> inputPanel, Module module,
-		ModuleItem<?> item, List<?> objectPool);
+	default WidgetModel createModel(InputPanel<?, ?> inputPanel, Module module,
+		ModuleItem<?> item, List<?> objectPool)
+	{
+		return new DefaultWidgetModel(getContext(), inputPanel, module, item,
+			objectPool);
+	}
 
+	// -- PTService methods --
+
+	@Override
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	default Class<InputWidget<?, ?>> getPluginType() {
+		return (Class) InputWidget.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default Class<WidgetModel> getType() {
+		return WidgetModel.class;
+	}
 }

From bf7c0c6614b516b7410d7c8f5552030e26bc4497 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Dec 2016 18:59:45 -0600
Subject: [PATCH 0422/1208] POMTest: remove unused import

---
 src/test/java/org/scijava/util/POMTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index f54d3ff7f..e094e2897 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -33,7 +33,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;

From 225d4ba7d393aa5414c66f6dea881fcf453acfd8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 30 Dec 2016 15:54:35 -0600
Subject: [PATCH 0423/1208] ModuleService: be smart about maps passed to run

This hack works around an issue where some script languages,
notably Jython but potentially others too, invoke the wrong run
method when called with a map. The Object... varargs method is
chosen instead of the Map method, with the map being passed as
the sole element of the object array. The code below detects
this situation, propagating the map entries into the new map.

Thanks to Robert Haase for the suggestion.

Closes scijava/scripting-jython#8.
---
 .../scijava/module/DefaultModuleService.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 1d96526c5..1d2d1a49b 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -412,6 +412,26 @@ private Map<String, Object> createMap(final Object[] values) {
 
 		final HashMap<String, Object> inputMap = new HashMap<>();
 
+		if (values.length == 1 && values[0] instanceof Map) {
+			// NB: This hack works around an issue where some script languages,
+			// notably Jython but potentially others too, invoke the wrong run
+			// method when called with a map. The Object... varargs method is
+			// chosen instead of the Map method, with the map being passed as
+			// the sole element of the object array. The code below detects
+			// this situation, propagating the map entries into the new map.
+			final Map<?, ?> valueMap = (Map<?, ?>) values[0];
+			for (final Object key : valueMap.keySet()) {
+				if (!(key instanceof String)) {
+					log.error("Invalid input name: " + key);
+					continue;
+				}
+				final String name = (String) key;
+				final Object value = valueMap.get(key);
+				inputMap.put(name, value);
+			}
+			return inputMap;
+		}
+
 		if (values.length % 2 != 0) {
 			log.error("Ignoring extraneous argument: " + values[values.length - 1]);
 		}

From 023a379b82f4f01f4ed2d0a3ef311fffa2b302af Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 30 Dec 2016 15:55:56 -0600
Subject: [PATCH 0424/1208] ModuleService: remove redundant check

As of 07e61f08b990a37cb1d99a1c9a8007dd780cec35, the
ModuleInfo interface now extends Identifiable directly.
---
 src/main/java/org/scijava/module/DefaultModuleService.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 1d2d1a49b..7f1508b61 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -42,7 +42,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.scijava.Identifiable;
 import org.scijava.MenuPath;
 import org.scijava.Priority;
 import org.scijava.convert.ConvertService;
@@ -145,8 +144,7 @@ public List<ModuleInfo> getModules() {
 	public ModuleInfo getModuleById(final String id) {
 		// TODO: Cache identifiers in a hash?
 		for (final ModuleInfo info : getModules()) {
-			if (!(info instanceof Identifiable)) continue;
-			final String infoID = ((Identifiable) info).getIdentifier();
+			final String infoID = info.getIdentifier();
 			if (id.equals(infoID)) return info;
 		}
 		return null;

From 41d00e6e1ed9a047b5a1643484bab4a9d8c50025 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 30 Dec 2016 16:06:27 -0600
Subject: [PATCH 0425/1208] ModuleServiceTest: isolate setup and teardown

---
 .../org/scijava/module/ModuleServiceTest.java  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index a1276f915..66147c3a3 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -34,6 +34,8 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
 
@@ -44,11 +46,21 @@
  */
 public class ModuleServiceTest {
 
-	@Test
-	public void testGetSingleInput() throws ModuleException {
+	private ModuleService moduleService;
+
+	@Before
+	public void setUp() {
 		final Context context = new Context(ModuleService.class);
-		final ModuleService moduleService = context.getService(ModuleService.class);
+		moduleService = context.service(ModuleService.class);
+	}
 
+	@After
+	public void tearDown() {
+		moduleService.context().dispose();
+	}
+
+	@Test
+	public void testGetSingleInput() throws ModuleException {
 		final ModuleInfo info = new FooModuleInfo();
 		final Module module = info.createModule();
 

From efd4216bc69dae9b5802f9d417070040ccdcd3fd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 30 Dec 2016 16:13:18 -0600
Subject: [PATCH 0426/1208] ModuleServiceTest: test the run methods explicitly

Previously, they were tested only indirectly by e.g. CommandServiceTest.
---
 .../org/scijava/module/ModuleServiceTest.java | 107 +++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index 66147c3a3..c192c8950 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -31,9 +31,15 @@
 
 package org.scijava.module;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ExecutionException;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,6 +65,50 @@ public void tearDown() {
 		moduleService.context().dispose();
 	}
 
+	/** Tests {@link ModuleService#run(ModuleInfo, boolean, Object...)}. */
+	@Test
+	public void testRunModuleInfoArray() throws InterruptedException,
+		ExecutionException
+	{
+		final ModuleInfo info = new FooModuleInfo();
+		final Module m = moduleService.run(info, false, createInputArray()).get();
+		assertEquals(expectedResult(), m.getOutput("result"));
+	}
+
+	/** Tests {@link ModuleService#run(ModuleInfo, boolean, Map)}. */
+	@Test
+	public void testRunModuleInfoMap() throws InterruptedException,
+		ExecutionException
+	{
+		final ModuleInfo info = new FooModuleInfo();
+		final Module m = moduleService.run(info, false, createInputMap()).get();
+		assertEquals(expectedResult(), m.getOutput("result"));
+	}
+
+	/** Tests {@link ModuleService#run(Module, boolean, Object...)}. */
+	@Test
+	public void testRunModuleArray() throws ModuleException, InterruptedException,
+		ExecutionException
+	{
+		final ModuleInfo info = new FooModuleInfo();
+		final Module module = info.createModule();
+		final Module m = moduleService.run(module, false, createInputArray()).get();
+		assertSame(module, m);
+		assertEquals(expectedResult(), m.getOutput("result"));
+	}
+
+	/** Tests {@link ModuleService#run(Module, boolean, Map)}. */
+	@Test
+	public void testRunModuleMap() throws ModuleException, InterruptedException,
+		ExecutionException
+	{
+		final ModuleInfo info = new FooModuleInfo();
+		final Module module = info.createModule();
+		final Module m = moduleService.run(module, false, createInputMap()).get();
+		assertSame(module, m);
+		assertEquals(expectedResult(), m.getOutput("result"));
+	}
+
 	@Test
 	public void testGetSingleInput() throws ModuleException {
 		final ModuleInfo info = new FooModuleInfo();
@@ -86,6 +136,44 @@ public void testGetSingleInput() throws ModuleException {
 		assertSame(info.getInput("double2"), singleDouble);
 	}
 
+	// -- Helper methods --
+
+	private Object[] createInputArray() {
+		return new Object[] { //
+			"string", "hello", //
+			"float", 1.234f, //
+			"integer1", -2, //
+			"integer2", 7, //
+			"double1", Math.E, //
+			"double2", Math.PI //
+		};
+	}
+
+	private Map<String, Object> createInputMap() {
+		final Map<String, Object> inputMap = new HashMap<>();
+		inputMap.put("string", "hello");
+		inputMap.put("float", 1.234f);
+		inputMap.put("integer1", -2);
+		inputMap.put("integer2", 7);
+		inputMap.put("double1", Math.E);
+		inputMap.put("double2", Math.PI);
+		return inputMap;
+	}
+
+	private String expectedResult() {
+		return mapToString(createInputMap());
+	}
+
+	private static String mapToString(final Map<String, Object> map) {
+		final StringBuilder sb = new StringBuilder();
+		for (final Entry<String, Object> entry : map.entrySet()) {
+			sb.append(entry.getKey() + " = " + entry.getValue() + "\n");
+		}
+		return sb.toString();
+	}
+
+	// -- Helper classes --
+
 	/** A sample module for testing the module service. */
 	public static class FooModule extends AbstractModule {
 
@@ -102,7 +190,7 @@ public ModuleInfo getInfo() {
 
 		@Override
 		public void run() {
-			// TODO Auto-generated method stub
+			setOutput("result", mapToString(getInputs()));
 		}
 
 	}
@@ -133,6 +221,7 @@ protected void parseParameters() {
 			addInput("integer2", Integer.class, true);
 			addInput("double1", Double.class, false);
 			addInput("double2", Double.class, true);
+			addOutput("result", String.class);
 		}
 
 		private <T> void addInput(final String name, final Class<T> type,
@@ -158,6 +247,22 @@ public boolean isAutoFill() {
 			});
 		}
 
+		private <T> void addOutput(final String name, final Class<T> type) {
+			registerOutput(new AbstractModuleItem<T>(this) {
+
+				@Override
+				public String getName() {
+					return name;
+				}
+
+				@Override
+				public Class<T> getType() {
+					return type;
+				}
+
+			});
+		}
+
 	}
 
 }

From 163b3b70954cf617d63e40fa1c1c07bc7099cab8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 30 Dec 2016 16:31:39 -0600
Subject: [PATCH 0427/1208] ModuleServiceTest: test that our map hack works

See 225d4ba7d393aa5414c66f6dea881fcf453acfd8.
---
 .../org/scijava/module/ModuleServiceTest.java | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index c192c8950..e406bf64c 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -109,6 +109,30 @@ public void testRunModuleMap() throws ModuleException, InterruptedException,
 		assertEquals(expectedResult(), m.getOutput("result"));
 	}
 
+	/**
+	 * Tests that {@link ModuleService#run(ModuleInfo, boolean, Object...)} and
+	 * {@link ModuleService#run(Module, boolean, Object...)} intelligently handle
+	 * a single-element {@link Object} array consisting of a {@code Map<String,
+	 * Object>}.
+	 * <p>
+	 * This situation can happen e.g. due to Jython choosing the wrong overloaded
+	 * {@code run} method. We correct for the issue on our side, for convenience.
+	 * </p>
+	 */
+	@Test
+	public void testRunMapHack() throws ModuleException, InterruptedException,
+		ExecutionException
+	{
+		final ModuleInfo info = new FooModuleInfo();
+		final Object[] inputs = new Object[] { createInputMap() };
+		final Module m = moduleService.run(info, false, inputs).get();
+		assertEquals(expectedResult(), m.getOutput("result"));
+
+		final Module module = info.createModule();
+		final Module m2 = moduleService.run(module, false, inputs).get();
+		assertEquals(expectedResult(), m2.getOutput("result"));
+	}
+
 	@Test
 	public void testGetSingleInput() throws ModuleException {
 		final ModuleInfo info = new FooModuleInfo();

From c28e91a339f1ee33176aad1f82f76af2d4962e1e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 5 Jan 2017 16:49:33 -0600
Subject: [PATCH 0428/1208] Rename package from ui.headlessUI -> ui.headless

The second "UI" suffix was redundant.
---
 src/main/java/org/scijava/ui/DefaultUIService.java              | 2 +-
 .../org/scijava/ui/{headlessUI => headless}/HeadlessUI.java     | 2 +-
 src/test/java/org/scijava/ui/UIServiceTest.java                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/main/java/org/scijava/ui/{headlessUI => headless}/HeadlessUI.java (98%)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 66f81401c..030795826 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -62,7 +62,7 @@
 import org.scijava.ui.DialogPrompt.OptionType;
 import org.scijava.ui.DialogPrompt.Result;
 import org.scijava.ui.event.UIShownEvent;
-import org.scijava.ui.headlessUI.HeadlessUI;
+import org.scijava.ui.headless.HeadlessUI;
 import org.scijava.ui.viewer.DisplayViewer;
 
 /**
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
similarity index 98%
rename from src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
rename to src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 167e4e5ed..f4b03a386 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.ui.headlessUI;
+package org.scijava.ui.headless;
 
 import java.io.File;
 
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index aef87bd99..716a2a846 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -42,7 +42,7 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.display.Display;
-import org.scijava.ui.headlessUI.HeadlessUI;
+import org.scijava.ui.headless.HeadlessUI;
 import org.scijava.ui.viewer.DisplayWindow;
 
 /**

From d6964d29066bd3ef52b465424b3d4d03b5140d16 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 6 Jan 2017 13:47:30 -0600
Subject: [PATCH 0429/1208] Restore old HeadlessUI for backwards compatibility

Deprecated, of course.
---
 .../org/scijava/ui/headlessUI/HeadlessUI.java | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java

diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
new file mode 100644
index 000000000..282380bfb
--- /dev/null
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -0,0 +1,45 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.ui.headlessUI;
+
+/** @deprecated Use {@link org.scijava.ui.headless.HeadlessUI} instead. */
+@Deprecated
+public class HeadlessUI extends org.scijava.ui.headless.HeadlessUI {
+
+	/**
+	 * @deprecated Use {@link org.scijava.ui.headless.HeadlessUI#NAME} instead.
+	 */
+	@Deprecated
+	@SuppressWarnings("hiding")
+	public static final String NAME = "headless";
+
+}

From cca83dcf0c7f8504442bffc6b960726405236bec Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 6 Jan 2017 13:48:17 -0600
Subject: [PATCH 0430/1208] HeadlessUI: improve javadoc

---
 src/main/java/org/scijava/ui/headless/HeadlessUI.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index f4b03a386..1970db9cd 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -38,12 +38,13 @@
 import org.scijava.plugin.AbstractRichPlugin;
 import org.scijava.plugin.Plugin;
 import org.scijava.ui.DialogPrompt;
+import org.scijava.ui.UIService;
 import org.scijava.ui.UserInterface;
 import org.scijava.ui.viewer.DisplayWindow;
 
 /**
- * A "null object" UI implementation that can be returned when a UIService is
- * running headless
+ * A "null object" {@link UIService} implementation used when the application is
+ * running headless.
  *
  * @author Richard Domander (Royal Veterinary College, London)
  * @author Curtis Rueden

From cb31d6fc0a95f53d60c275413c1472c4e5feb58a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 Jan 2017 10:24:10 -0600
Subject: [PATCH 0431/1208] ListUtils: add methods to convert list to string

Of course, you can call toString() on most List implementations and
get a similar result, but these methods give the caller more control,
and ensure consistent behavior across different List implementations.
---
 src/main/java/org/scijava/util/ListUtils.java | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index 33e8c7985..f71fca9ce 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -53,4 +53,69 @@ public static <T> T first(final List<T> list) {
 		return list.get(0);
 	}
 
+	/**
+	 * Converts the given list to a string.
+	 * <p>
+	 * The list elements will be separated by a comma then a space. The list will
+	 * be enclosed in square brackets.
+	 * </p>
+	 * 
+	 * @param list The list to stringify.
+	 * @see #string(List, String, String, String, boolean)
+	 */
+	public static String string(final List<?> list) {
+		return string(list, true);
+	}
+
+	/**
+	 * Converts the given list to a string.
+	 * <p>
+	 * The list elements will be separated by a comma then a space. The list will
+	 * be enclosed in square brackets unless it is a singleton with the
+	 * {@code encloseSingletons} flag set to false.
+	 * </p>
+	 * 
+	 * @param list The list to stringify.
+	 * @param encloseSingletons Whether to enclose singleton lists in brackets.
+	 * @return The stringified list.
+	 * @see #string(List, String, String, String, boolean)
+	 */
+	public static String string(final List<?> list,
+		final boolean encloseSingletons)
+	{
+		return string(list, "[", "]", ", ", encloseSingletons);
+	}
+
+	/**
+	 * Converts the given list to a string.
+	 * <p>
+	 * The list elements will be comma-separated. It will be enclosed in square
+	 * brackets unless the list is a singleton with the {@code encloseSingletons}
+	 * flag set to false.
+	 * </p>
+	 * 
+	 * @param list The list to stringify.
+	 * @param lDelimiter The left-hand symbol(s) in which to enclose the list.
+	 * @param rDelimiter The right-hand symbol(s) in which to enclose the list.
+	 * @param separator The symbol(s) to place in between each element.
+	 * @param encloseSingletons Whether to enclose singleton lists inside the
+	 *          delimiter symbols.
+	 * @return The stringified list.
+	 */
+	public static String string(final List<?> list, //
+		final String lDelimiter, final String rDelimiter, //
+		final String separator, final boolean encloseSingletons)
+	{
+		final boolean delimit = encloseSingletons || list.size() != 1;
+		final StringBuilder sb = new StringBuilder();
+		if (delimit) sb.append(lDelimiter);
+		boolean first = true;
+		for (final Object e : list) {
+			if (first) first = false;
+			else sb.append(separator);
+			sb.append(e);
+		}
+		if (delimit) sb.append(rDelimiter);
+		return sb.toString();
+	}
 }

From c67a6d0fd3c1f612b6f6d4f4f33b12d45eb00971 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 Jan 2017 07:56:41 -0600
Subject: [PATCH 0432/1208] Remember whether the headless UI is visible

Otherwise, related subsystems do not behave as intended.
In particular, a HeadlessDisplayViewer will not handle supported
displays properly unless it thinks a HeadlessUI is active.
---
 src/main/java/org/scijava/ui/headless/HeadlessUI.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 1970db9cd..015e355d0 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -55,12 +55,16 @@ public class HeadlessUI extends AbstractRichPlugin implements UserInterface {
 
 	public static final String NAME = "headless";
 
+	private boolean visible;
+
 	@Override
-	public void show() {}
+	public void show() {
+		visible = true;
+	}
 
 	@Override
 	public boolean isVisible() {
-		return false;
+		return visible;
 	}
 
 	@Override

From 2f83fd22a43d820a3cf20c958904f528fece36c3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 Jan 2017 08:08:33 -0600
Subject: [PATCH 0433/1208] When a display is shown headless, log its elements

The user might care, especially when running commands
and hoping to see outputs appear on the console.
---
 .../ui/headless/HeadlessDisplayViewer.java    | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java

diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
new file mode 100644
index 000000000..407667f04
--- /dev/null
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.ui.headless;
+
+import org.scijava.display.Display;
+import org.scijava.plugin.Plugin;
+import org.scijava.ui.UserInterface;
+import org.scijava.ui.viewer.AbstractDisplayViewer;
+import org.scijava.ui.viewer.DisplayViewer;
+import org.scijava.ui.viewer.DisplayWindow;
+import org.scijava.util.ListUtils;
+
+/**
+ * A display viewer used when running headless.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = DisplayViewer.class)
+public class HeadlessDisplayViewer extends AbstractDisplayViewer<Object> {
+
+	@Override
+	public boolean isCompatible(final UserInterface ui) {
+		return ui instanceof HeadlessUI;
+	}
+
+	@Override
+	public void view(final DisplayWindow w, final Display<?> d) {
+		if (log() == null) return;
+		log().info(d.getName() + " = " + ListUtils.string(d, false));
+	}
+
+	@Override
+	public boolean canView(Display<?> d) {
+		return true;
+	}
+
+}

From 858f188ce514aa2a7ea6305dc597108fc9803315 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 6 Jan 2017 13:48:28 -0600
Subject: [PATCH 0434/1208] HeadlessUI: log attempts to show objects

---
 src/main/java/org/scijava/ui/headless/HeadlessUI.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 015e355d0..66cc3266e 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -41,6 +41,7 @@
 import org.scijava.ui.UIService;
 import org.scijava.ui.UserInterface;
 import org.scijava.ui.viewer.DisplayWindow;
+import org.scijava.util.ListUtils;
 
 /**
  * A "null object" {@link UIService} implementation used when the application is
@@ -68,10 +69,16 @@ public boolean isVisible() {
 	}
 
 	@Override
-	public void show(final String name, final Object o) {}
+	public void show(final String name, final Object o) {
+		// NB: Rather than creating a Display, let's just log it.
+		log().info(name + " = " + o);
+	}
 
 	@Override
-	public void show(final Display<?> display) {}
+	public void show(final Display<?> display) {
+		// NB: Rather than looking for a DisplayViewer, let's just log it.
+		log().info(display.getName() + " = " + ListUtils.string(display, false));
+	}
 
 	@Override
 	public DisplayWindow createDisplayWindow(final Display<?> display) {

From a2fe41c0f6d8003c01151c01c34847da86242c41 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 Jan 2017 10:49:45 -0600
Subject: [PATCH 0435/1208] HeadlessUI: improve the javadoc

---
 src/main/java/org/scijava/ui/headless/HeadlessUI.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 66cc3266e..621661af6 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -35,17 +35,20 @@
 
 import org.scijava.Priority;
 import org.scijava.display.Display;
+import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractRichPlugin;
 import org.scijava.plugin.Plugin;
 import org.scijava.ui.DialogPrompt;
-import org.scijava.ui.UIService;
 import org.scijava.ui.UserInterface;
 import org.scijava.ui.viewer.DisplayWindow;
 import org.scijava.util.ListUtils;
 
 /**
- * A "null object" {@link UIService} implementation used when the application is
- * running headless.
+ * A no-op user interface used when the application is running headless.
+ * <p>
+ * Most operations do nothing. Attempting to show an object via one of the
+ * {@link #show} methods logs the object via the {@link LogService}.
+ * </p>
  *
  * @author Richard Domander (Royal Veterinary College, London)
  * @author Curtis Rueden

From 31d19be609762c8248cdac38cfc5ec9a68c28653 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 Jan 2017 10:49:54 -0600
Subject: [PATCH 0436/1208] DefaultUIService: remove duplicate blank line

---
 src/main/java/org/scijava/ui/DefaultUIService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 030795826..dfde08f9d 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -176,7 +176,6 @@ public boolean isVisible(final String name) {
 		return ui.isVisible();
 	}
 
-
 	@Override
 	public void setHeadless(final boolean headless) {
 		System.setProperty("java.awt.headless", String.valueOf(headless));

From 8afe5dae655986c9fac3bbddea057684bd4ee4ce Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 10 Jan 2017 11:19:52 -0600
Subject: [PATCH 0437/1208] AbstractGateway: show UI when launching headless

Now that we have a dedicated headless UI plugin, we should "show"
it even when running headless. This will no longer hose the system,
but rather ensure the headless UI behaves as desired.
---
 src/main/java/org/scijava/AbstractGateway.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 0b55b646d..166aac342 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -98,7 +98,8 @@ public void launch(final String... args) {
 		final int mainCount = main().execMains();
 
 		// display the user interface (NB: does not block)
-		if (mainCount == 0 && !ui().isHeadless()) ui().showUI();
+		// NB: When running headless, the HeadlessUI will be used.
+		if (mainCount == 0) ui().showUI();
 
 		if (ui().isHeadless()) {
 			// now that CLI processing/execution is done, we can shut down

From d921719cee8d4ccd1d6b3cce6a3a2faec21b9055 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Jan 2017 15:28:23 -0600
Subject: [PATCH 0438/1208] Make TextDisplayViewer base class implement iface

Otherwise, since 3d1328826af96f0c79a6a4a96700254dd6ad14a4,
concrete extensions of AbstractTextDisplayViewer no longer
inherit the default implementation of canView(Display).
---
 .../org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index c09641463..e7872768a 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -40,7 +40,7 @@
  * @author Lee Kamentsky
  */
 public abstract class AbstractTextDisplayViewer extends
-	AbstractDisplayViewer<String>
+	AbstractDisplayViewer<String> implements TextDisplayViewer
 {
 
 	@Override

From 4772b6687e159e0b0fe76425b95ec559eb7eece9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 12 Jan 2017 08:44:27 -0600
Subject: [PATCH 0439/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ce204c345..8960567ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.62.0-SNAPSHOT</version>
+	<version>2.62.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 832c671183d3ea88663dbd42670f5fe217aa89ee Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Jan 2017 11:34:15 -0600
Subject: [PATCH 0440/1208] Test that enum multiple choice parameters work

---
 .../org/scijava/command/CommandInfoTest.java  | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 src/test/java/org/scijava/command/CommandInfoTest.java

diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
new file mode 100644
index 000000000..8f39eb1ce
--- /dev/null
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -0,0 +1,118 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.command;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Iterator;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.command.CommandInfoTest.CommandWithEnumParam.Choice;
+import org.scijava.module.ModuleItem;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+
+/**
+ * Tests {@link CommandInfo}.
+ * 
+ * @author Curtis Rueden
+ */
+public class CommandInfoTest {
+
+	private CommandService commandService;
+
+	@Before
+	public void setUp() {
+		final Context ctx = new Context(CommandService.class);
+		commandService = ctx.getService(CommandService.class);
+	}
+
+	@Test
+	public void testEnumParam() {
+		final CommandInfo info = commandService.getCommand(
+			CommandWithEnumParam.class);
+		assertNotNull(info);
+
+		final Iterator<ModuleItem<?>> iter = info.inputs().iterator();
+		assertTrue(iter.hasNext());
+		ModuleItem<?> freeform = iter.next();
+		assertTrue(iter.hasNext());
+		ModuleItem<?> constrained = iter.next();
+		assertTrue(iter.hasNext());
+		ModuleItem<?> choice = iter.next();
+		assertFalse(iter.hasNext());
+
+		assertSame(String.class, freeform.getType());
+		assertNull(freeform.getChoices());
+
+		assertSame(String.class, constrained.getType());
+		assertEquals(Arrays.asList("foo", "bar", "fubar"), //
+			constrained.getChoices());
+
+		assertSame(Choice.class, choice.getType());
+		assertEquals(Arrays.asList(Choice.YES, Choice.NO, Choice.MAYBE_SO), //
+			choice.getChoices());
+	}
+
+	// -- Helper classes --
+
+	/** A command with an enum parameter. */
+	@Plugin(type = Command.class)
+	public static class CommandWithEnumParam implements Command {
+
+		public enum Choice {
+				YES, NO, MAYBE_SO
+		}
+
+		@Parameter
+		private String freeform;
+
+		@Parameter(choices = {"foo", "bar", "fubar"})
+		private String constrained;
+
+		@Parameter
+		private Choice choice;
+
+		@Override
+		public void run() {
+			// NB: No implementation needed.
+		}
+	}
+}

From 608831075023f9ddf053691a82c2be24458f337c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Jan 2017 11:35:52 -0600
Subject: [PATCH 0441/1208] Happy New Year 2017

---
 LICENSE.txt                                                 | 2 +-
 src/it/apt-test/pom.xml                                     | 2 +-
 src/it/apt-test/setup.bsh                                   | 2 +-
 .../src/main/java/org/scijava/annotation/its/Annotated.java | 2 +-
 .../java/org/scijava/annotation/its/CustomAnnotation.java   | 2 +-
 src/it/apt-test/verify.bsh                                  | 2 +-
 src/it/settings.xml                                         | 2 +-
 src/main/java/org/scijava/AbstractBasicDetails.java         | 2 +-
 src/main/java/org/scijava/AbstractContextual.java           | 2 +-
 src/main/java/org/scijava/AbstractGateway.java              | 2 +-
 src/main/java/org/scijava/AbstractUIDetails.java            | 2 +-
 src/main/java/org/scijava/BasicDetails.java                 | 2 +-
 src/main/java/org/scijava/Cancelable.java                   | 2 +-
 src/main/java/org/scijava/Context.java                      | 2 +-
 src/main/java/org/scijava/Contextual.java                   | 2 +-
 src/main/java/org/scijava/Disposable.java                   | 2 +-
 src/main/java/org/scijava/Gateway.java                      | 2 +-
 src/main/java/org/scijava/Identifiable.java                 | 2 +-
 src/main/java/org/scijava/Initializable.java                | 2 +-
 src/main/java/org/scijava/Instantiable.java                 | 2 +-
 src/main/java/org/scijava/InstantiableException.java        | 2 +-
 src/main/java/org/scijava/ItemIO.java                       | 2 +-
 src/main/java/org/scijava/ItemVisibility.java               | 2 +-
 src/main/java/org/scijava/Locatable.java                    | 2 +-
 src/main/java/org/scijava/MenuEntry.java                    | 2 +-
 src/main/java/org/scijava/MenuPath.java                     | 2 +-
 src/main/java/org/scijava/Named.java                        | 2 +-
 src/main/java/org/scijava/NoSuchServiceException.java       | 2 +-
 src/main/java/org/scijava/NullContextException.java         | 2 +-
 src/main/java/org/scijava/Optional.java                     | 2 +-
 src/main/java/org/scijava/Prioritized.java                  | 2 +-
 src/main/java/org/scijava/Priority.java                     | 2 +-
 src/main/java/org/scijava/SciJava.java                      | 2 +-
 src/main/java/org/scijava/Typed.java                        | 2 +-
 src/main/java/org/scijava/UIDetails.java                    | 2 +-
 src/main/java/org/scijava/Validated.java                    | 2 +-
 src/main/java/org/scijava/ValidityProblem.java              | 2 +-
 src/main/java/org/scijava/Versioned.java                    | 2 +-
 .../java/org/scijava/annotations/AbstractIndexWriter.java   | 2 +-
 .../java/org/scijava/annotations/AnnotationCombiner.java    | 2 +-
 .../java/org/scijava/annotations/AnnotationProcessor.java   | 2 +-
 src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java | 2 +-
 src/main/java/org/scijava/annotations/DirectoryIndexer.java | 2 +-
 src/main/java/org/scijava/annotations/EclipseHelper.java    | 2 +-
 src/main/java/org/scijava/annotations/Index.java            | 2 +-
 src/main/java/org/scijava/annotations/IndexItem.java        | 2 +-
 src/main/java/org/scijava/annotations/IndexReader.java      | 2 +-
 src/main/java/org/scijava/annotations/Indexable.java        | 2 +-
 .../java/org/scijava/annotations/legacy/LegacyReader.java   | 2 +-
 src/main/java/org/scijava/app/AbstractApp.java              | 2 +-
 src/main/java/org/scijava/app/App.java                      | 2 +-
 src/main/java/org/scijava/app/AppService.java               | 2 +-
 src/main/java/org/scijava/app/DefaultAppService.java        | 2 +-
 src/main/java/org/scijava/app/DefaultStatusService.java     | 2 +-
 src/main/java/org/scijava/app/SciJavaApp.java               | 2 +-
 src/main/java/org/scijava/app/StatusService.java            | 2 +-
 src/main/java/org/scijava/app/event/StatusEvent.java        | 2 +-
 src/main/java/org/scijava/cache/CacheService.java           | 2 +-
 src/main/java/org/scijava/cache/DefaultCacheService.java    | 2 +-
 src/main/java/org/scijava/command/Command.java              | 2 +-
 src/main/java/org/scijava/command/CommandInfo.java          | 2 +-
 src/main/java/org/scijava/command/CommandModule.java        | 2 +-
 src/main/java/org/scijava/command/CommandModuleItem.java    | 2 +-
 src/main/java/org/scijava/command/CommandService.java       | 2 +-
 src/main/java/org/scijava/command/ContextCommand.java       | 2 +-
 .../java/org/scijava/command/DefaultCommandService.java     | 2 +-
 src/main/java/org/scijava/command/DynamicCommand.java       | 2 +-
 src/main/java/org/scijava/command/DynamicCommandInfo.java   | 2 +-
 src/main/java/org/scijava/command/Interactive.java          | 2 +-
 src/main/java/org/scijava/command/InteractiveCommand.java   | 2 +-
 src/main/java/org/scijava/command/ModuleCommand.java        | 2 +-
 src/main/java/org/scijava/command/Previewable.java          | 2 +-
 src/main/java/org/scijava/command/UnimplementedCommand.java | 2 +-
 src/main/java/org/scijava/command/console/RunArgument.java  | 2 +-
 .../java/org/scijava/command/run/CommandCodeRunner.java     | 2 +-
 .../java/org/scijava/console/AbstractConsoleArgument.java   | 2 +-
 src/main/java/org/scijava/console/ConsoleArgument.java      | 2 +-
 src/main/java/org/scijava/console/ConsoleService.java       | 2 +-
 src/main/java/org/scijava/console/ConsoleUtils.java         | 2 +-
 .../java/org/scijava/console/DefaultConsoleService.java     | 2 +-
 src/main/java/org/scijava/console/HeadlessArgument.java     | 2 +-
 src/main/java/org/scijava/console/MultiOutputStream.java    | 2 +-
 src/main/java/org/scijava/console/MultiPrintStream.java     | 2 +-
 src/main/java/org/scijava/console/OutputEvent.java          | 2 +-
 src/main/java/org/scijava/console/OutputListener.java       | 2 +-
 .../java/org/scijava/console/SystemPropertyArgument.java    | 2 +-
 .../java/org/scijava/convert/AbstractConvertService.java    | 2 +-
 src/main/java/org/scijava/convert/AbstractConverter.java    | 2 +-
 src/main/java/org/scijava/convert/ArrayConverters.java      | 2 +-
 src/main/java/org/scijava/convert/CastingConverter.java     | 2 +-
 src/main/java/org/scijava/convert/ConversionRequest.java    | 2 +-
 src/main/java/org/scijava/convert/ConvertService.java       | 2 +-
 src/main/java/org/scijava/convert/Converter.java            | 2 +-
 .../java/org/scijava/convert/DefaultConvertService.java     | 2 +-
 src/main/java/org/scijava/convert/DefaultConverter.java     | 2 +-
 src/main/java/org/scijava/convert/NullConverter.java        | 2 +-
 src/main/java/org/scijava/convert/NumberConverters.java     | 2 +-
 .../org/scijava/convert/NumberToBigDecimalConverter.java    | 2 +-
 .../org/scijava/convert/NumberToBigIntegerConverter.java    | 2 +-
 .../java/org/scijava/convert/NumberToDoubleConverter.java   | 2 +-
 .../java/org/scijava/convert/NumberToFloatConverter.java    | 2 +-
 .../java/org/scijava/convert/NumberToIntegerConverter.java  | 2 +-
 .../java/org/scijava/convert/NumberToLongConverter.java     | 2 +-
 .../java/org/scijava/convert/NumberToNumberConverter.java   | 2 +-
 .../java/org/scijava/convert/NumberToShortConverter.java    | 2 +-
 .../java/org/scijava/convert/PrimitiveArrayUnwrapper.java   | 2 +-
 .../java/org/scijava/convert/PrimitiveArrayWrapper.java     | 2 +-
 src/main/java/org/scijava/display/AbstractDisplay.java      | 2 +-
 .../java/org/scijava/display/ActiveDisplayPreprocessor.java | 2 +-
 src/main/java/org/scijava/display/DefaultDisplay.java       | 2 +-
 .../java/org/scijava/display/DefaultDisplayService.java     | 2 +-
 src/main/java/org/scijava/display/DefaultTextDisplay.java   | 2 +-
 src/main/java/org/scijava/display/Display.java              | 2 +-
 src/main/java/org/scijava/display/DisplayPostprocessor.java | 2 +-
 src/main/java/org/scijava/display/DisplayService.java       | 2 +-
 src/main/java/org/scijava/display/Displayable.java          | 2 +-
 src/main/java/org/scijava/display/TextDisplay.java          | 2 +-
 .../org/scijava/display/event/DisplayActivatedEvent.java    | 2 +-
 .../java/org/scijava/display/event/DisplayCreatedEvent.java | 2 +-
 .../java/org/scijava/display/event/DisplayDeletedEvent.java | 2 +-
 src/main/java/org/scijava/display/event/DisplayEvent.java   | 2 +-
 .../java/org/scijava/display/event/DisplayUpdatedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/InputEvent.java    | 2 +-
 src/main/java/org/scijava/display/event/input/KyEvent.java  | 2 +-
 .../org/scijava/display/event/input/KyPressedEvent.java     | 2 +-
 .../org/scijava/display/event/input/KyReleasedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/KyTypedEvent.java  | 2 +-
 .../java/org/scijava/display/event/input/MsButtonEvent.java | 2 +-
 .../org/scijava/display/event/input/MsClickedEvent.java     | 2 +-
 .../org/scijava/display/event/input/MsDraggedEvent.java     | 2 +-
 .../org/scijava/display/event/input/MsEnteredEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/MsEvent.java  | 2 +-
 .../java/org/scijava/display/event/input/MsExitedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsMovedEvent.java  | 2 +-
 .../org/scijava/display/event/input/MsPressedEvent.java     | 2 +-
 .../org/scijava/display/event/input/MsReleasedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsWheelEvent.java  | 2 +-
 .../org/scijava/display/event/window/WinActivatedEvent.java | 2 +-
 .../org/scijava/display/event/window/WinClosedEvent.java    | 2 +-
 .../org/scijava/display/event/window/WinClosingEvent.java   | 2 +-
 .../scijava/display/event/window/WinDeactivatedEvent.java   | 2 +-
 .../scijava/display/event/window/WinDeiconifiedEvent.java   | 2 +-
 .../java/org/scijava/display/event/window/WinEvent.java     | 2 +-
 .../org/scijava/display/event/window/WinIconifiedEvent.java | 2 +-
 .../org/scijava/display/event/window/WinOpenedEvent.java    | 2 +-
 src/main/java/org/scijava/event/ContextDisposingEvent.java  | 2 +-
 src/main/java/org/scijava/event/DefaultEventBus.java        | 2 +-
 src/main/java/org/scijava/event/DefaultEventHistory.java    | 2 +-
 src/main/java/org/scijava/event/DefaultEventService.java    | 2 +-
 src/main/java/org/scijava/event/EventDetails.java           | 2 +-
 src/main/java/org/scijava/event/EventHandler.java           | 2 +-
 src/main/java/org/scijava/event/EventHistory.java           | 2 +-
 src/main/java/org/scijava/event/EventHistoryListener.java   | 2 +-
 src/main/java/org/scijava/event/EventService.java           | 2 +-
 src/main/java/org/scijava/event/EventSubscriber.java        | 2 +-
 src/main/java/org/scijava/event/SciJavaEvent.java           | 2 +-
 src/main/java/org/scijava/input/Accelerator.java            | 2 +-
 src/main/java/org/scijava/input/DefaultInputService.java    | 2 +-
 src/main/java/org/scijava/input/InputModifiers.java         | 2 +-
 src/main/java/org/scijava/input/InputService.java           | 2 +-
 src/main/java/org/scijava/input/KeyCode.java                | 2 +-
 src/main/java/org/scijava/input/MouseCursor.java            | 2 +-
 src/main/java/org/scijava/io/AbstractDataHandle.java        | 2 +-
 src/main/java/org/scijava/io/AbstractIOPlugin.java          | 2 +-
 src/main/java/org/scijava/io/AbstractLocation.java          | 2 +-
 src/main/java/org/scijava/io/BytesLocation.java             | 2 +-
 src/main/java/org/scijava/io/DataHandle.java                | 2 +-
 src/main/java/org/scijava/io/DataHandleInputStream.java     | 2 +-
 src/main/java/org/scijava/io/DataHandleOutputStream.java    | 2 +-
 src/main/java/org/scijava/io/DataHandleService.java         | 2 +-
 src/main/java/org/scijava/io/DefaultDataHandleService.java  | 2 +-
 src/main/java/org/scijava/io/DefaultIOService.java          | 2 +-
 src/main/java/org/scijava/io/DefaultRecentFileService.java  | 2 +-
 src/main/java/org/scijava/io/FileHandle.java                | 2 +-
 src/main/java/org/scijava/io/FileLocation.java              | 2 +-
 src/main/java/org/scijava/io/IOPlugin.java                  | 2 +-
 src/main/java/org/scijava/io/IOService.java                 | 2 +-
 src/main/java/org/scijava/io/Location.java                  | 2 +-
 src/main/java/org/scijava/io/RecentFileService.java         | 2 +-
 src/main/java/org/scijava/io/URILocation.java               | 2 +-
 src/main/java/org/scijava/io/URLLocation.java               | 2 +-
 src/main/java/org/scijava/io/console/OpenArgument.java      | 2 +-
 src/main/java/org/scijava/io/event/DataOpenedEvent.java     | 2 +-
 src/main/java/org/scijava/io/event/DataSavedEvent.java      | 2 +-
 src/main/java/org/scijava/io/event/IOEvent.java             | 2 +-
 src/main/java/org/scijava/log/AbstractLogService.java       | 6 +++---
 .../org/scijava/log/DefaultUncaughtExceptionHandler.java    | 2 +-
 src/main/java/org/scijava/log/LogService.java               | 2 +-
 src/main/java/org/scijava/log/Logged.java                   | 2 +-
 src/main/java/org/scijava/log/StderrLogService.java         | 2 +-
 src/main/java/org/scijava/main/DefaultMainService.java      | 2 +-
 src/main/java/org/scijava/main/MainService.java             | 2 +-
 src/main/java/org/scijava/main/console/MainArgument.java    | 2 +-
 src/main/java/org/scijava/main/run/MainCodeRunner.java      | 2 +-
 src/main/java/org/scijava/menu/AbstractMenuCreator.java     | 2 +-
 src/main/java/org/scijava/menu/DefaultMenuService.java      | 2 +-
 src/main/java/org/scijava/menu/MenuConstants.java           | 2 +-
 src/main/java/org/scijava/menu/MenuCreator.java             | 2 +-
 src/main/java/org/scijava/menu/MenuService.java             | 2 +-
 src/main/java/org/scijava/menu/ShadowMenu.java              | 2 +-
 src/main/java/org/scijava/menu/ShadowMenuIterator.java      | 2 +-
 src/main/java/org/scijava/menu/event/MenuEvent.java         | 2 +-
 src/main/java/org/scijava/menu/event/MenusAddedEvent.java   | 2 +-
 src/main/java/org/scijava/menu/event/MenusRemovedEvent.java | 2 +-
 src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java | 2 +-
 src/main/java/org/scijava/module/AbstractModule.java        | 2 +-
 src/main/java/org/scijava/module/AbstractModuleInfo.java    | 2 +-
 src/main/java/org/scijava/module/AbstractModuleItem.java    | 2 +-
 src/main/java/org/scijava/module/DefaultModuleService.java  | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModule.java  | 2 +-
 .../java/org/scijava/module/DefaultMutableModuleInfo.java   | 2 +-
 .../java/org/scijava/module/DefaultMutableModuleItem.java   | 2 +-
 src/main/java/org/scijava/module/MethodCallException.java   | 2 +-
 src/main/java/org/scijava/module/MethodRef.java             | 2 +-
 src/main/java/org/scijava/module/Module.java                | 2 +-
 .../java/org/scijava/module/ModuleCanceledException.java    | 2 +-
 src/main/java/org/scijava/module/ModuleException.java       | 2 +-
 src/main/java/org/scijava/module/ModuleIndex.java           | 2 +-
 src/main/java/org/scijava/module/ModuleInfo.java            | 2 +-
 src/main/java/org/scijava/module/ModuleItem.java            | 2 +-
 src/main/java/org/scijava/module/ModuleRunner.java          | 2 +-
 src/main/java/org/scijava/module/ModuleService.java         | 2 +-
 src/main/java/org/scijava/module/MutableModule.java         | 2 +-
 src/main/java/org/scijava/module/MutableModuleInfo.java     | 2 +-
 src/main/java/org/scijava/module/MutableModuleItem.java     | 2 +-
 .../java/org/scijava/module/event/ModuleCanceledEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleEvent.java     | 2 +-
 .../java/org/scijava/module/event/ModuleExecutedEvent.java  | 2 +-
 .../java/org/scijava/module/event/ModuleExecutingEvent.java | 2 +-
 .../java/org/scijava/module/event/ModuleExecutionEvent.java | 2 +-
 .../java/org/scijava/module/event/ModuleFinishedEvent.java  | 2 +-
 .../org/scijava/module/event/ModulePostprocessEvent.java    | 2 +-
 .../org/scijava/module/event/ModulePreprocessEvent.java     | 2 +-
 .../java/org/scijava/module/event/ModuleProcessEvent.java   | 2 +-
 .../java/org/scijava/module/event/ModuleStartedEvent.java   | 2 +-
 .../java/org/scijava/module/event/ModulesAddedEvent.java    | 2 +-
 .../java/org/scijava/module/event/ModulesListEvent.java     | 2 +-
 .../java/org/scijava/module/event/ModulesRemovedEvent.java  | 2 +-
 .../java/org/scijava/module/event/ModulesUpdatedEvent.java  | 2 +-
 .../scijava/module/process/AbstractPostprocessorPlugin.java | 2 +-
 .../scijava/module/process/AbstractPreprocessorPlugin.java  | 2 +-
 .../module/process/AbstractSingleInputPreprocessor.java     | 2 +-
 .../org/scijava/module/process/CheckInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/DebugPostprocessor.java | 2 +-
 .../java/org/scijava/module/process/DebugPreprocessor.java  | 2 +-
 .../scijava/module/process/DefaultValuePreprocessor.java    | 2 +-
 .../org/scijava/module/process/GatewayPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/InitPreprocessor.java   | 2 +-
 .../org/scijava/module/process/LoadInputsPreprocessor.java  | 2 +-
 .../org/scijava/module/process/ModulePostprocessor.java     | 2 +-
 .../java/org/scijava/module/process/ModulePreprocessor.java | 2 +-
 .../java/org/scijava/module/process/ModuleProcessor.java    | 2 +-
 .../org/scijava/module/process/PostprocessorPlugin.java     | 2 +-
 .../java/org/scijava/module/process/PreprocessorPlugin.java | 2 +-
 .../org/scijava/module/process/SaveInputsPreprocessor.java  | 2 +-
 .../org/scijava/module/process/ServicePreprocessor.java     | 2 +-
 .../org/scijava/module/process/ValidityPreprocessor.java    | 2 +-
 src/main/java/org/scijava/module/run/ModuleCodeRunner.java  | 2 +-
 src/main/java/org/scijava/object/DefaultObjectService.java  | 2 +-
 src/main/java/org/scijava/object/LazyObjects.java           | 2 +-
 src/main/java/org/scijava/object/ObjectIndex.java           | 2 +-
 src/main/java/org/scijava/object/ObjectService.java         | 2 +-
 src/main/java/org/scijava/object/SortedObjectIndex.java     | 2 +-
 src/main/java/org/scijava/object/event/ListEvent.java       | 2 +-
 .../java/org/scijava/object/event/ObjectCreatedEvent.java   | 2 +-
 .../java/org/scijava/object/event/ObjectDeletedEvent.java   | 2 +-
 src/main/java/org/scijava/object/event/ObjectEvent.java     | 2 +-
 .../java/org/scijava/object/event/ObjectModifiedEvent.java  | 2 +-
 .../java/org/scijava/object/event/ObjectsAddedEvent.java    | 2 +-
 .../java/org/scijava/object/event/ObjectsListEvent.java     | 2 +-
 .../java/org/scijava/object/event/ObjectsRemovedEvent.java  | 2 +-
 .../java/org/scijava/options/DefaultOptionsService.java     | 2 +-
 src/main/java/org/scijava/options/OptionsPlugin.java        | 2 +-
 src/main/java/org/scijava/options/OptionsService.java       | 2 +-
 src/main/java/org/scijava/options/event/OptionsEvent.java   | 2 +-
 src/main/java/org/scijava/parse/DefaultParseService.java    | 2 +-
 src/main/java/org/scijava/parse/Item.java                   | 2 +-
 src/main/java/org/scijava/parse/Items.java                  | 2 +-
 src/main/java/org/scijava/parse/ParseService.java           | 2 +-
 src/main/java/org/scijava/platform/AbstractPlatform.java    | 2 +-
 src/main/java/org/scijava/platform/AppEventService.java     | 2 +-
 .../java/org/scijava/platform/DefaultAppEventService.java   | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatform.java     | 2 +-
 .../java/org/scijava/platform/DefaultPlatformService.java   | 2 +-
 src/main/java/org/scijava/platform/Platform.java            | 2 +-
 src/main/java/org/scijava/platform/PlatformService.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppAboutEvent.java | 2 +-
 src/main/java/org/scijava/platform/event/AppFocusEvent.java | 2 +-
 .../org/scijava/platform/event/AppMenusCreatedEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppOpenFilesEvent.java  | 2 +-
 .../org/scijava/platform/event/AppPreferencesEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppPrintEvent.java | 2 +-
 src/main/java/org/scijava/platform/event/AppQuitEvent.java  | 2 +-
 .../java/org/scijava/platform/event/AppReOpenEvent.java     | 2 +-
 .../org/scijava/platform/event/AppScreenSleepEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppSleepEvent.java | 2 +-
 .../org/scijava/platform/event/AppSystemSleepEvent.java     | 2 +-
 .../org/scijava/platform/event/AppUserSessionEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppVisibleEvent.java    | 2 +-
 .../java/org/scijava/platform/event/ApplicationEvent.java   | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java | 2 +-
 .../java/org/scijava/plugin/AbstractHandlerService.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractPTService.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractRichPlugin.java    | 2 +-
 .../java/org/scijava/plugin/AbstractSingletonService.java   | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedPlugin.java   | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedService.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java | 2 +-
 .../java/org/scijava/plugin/AbstractWrapperService.java     | 2 +-
 src/main/java/org/scijava/plugin/Attr.java                  | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginFinder.java   | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginService.java  | 2 +-
 src/main/java/org/scijava/plugin/HandlerPlugin.java         | 2 +-
 src/main/java/org/scijava/plugin/HandlerService.java        | 2 +-
 src/main/java/org/scijava/plugin/HasPluginInfo.java         | 2 +-
 src/main/java/org/scijava/plugin/Menu.java                  | 2 +-
 src/main/java/org/scijava/plugin/PTService.java             | 2 +-
 src/main/java/org/scijava/plugin/Parameter.java             | 2 +-
 src/main/java/org/scijava/plugin/Plugin.java                | 2 +-
 src/main/java/org/scijava/plugin/PluginFinder.java          | 2 +-
 src/main/java/org/scijava/plugin/PluginIndex.java           | 2 +-
 src/main/java/org/scijava/plugin/PluginInfo.java            | 2 +-
 src/main/java/org/scijava/plugin/PluginService.java         | 2 +-
 src/main/java/org/scijava/plugin/RichPlugin.java            | 2 +-
 src/main/java/org/scijava/plugin/SciJavaPlugin.java         | 2 +-
 src/main/java/org/scijava/plugin/SingletonPlugin.java       | 2 +-
 src/main/java/org/scijava/plugin/SingletonService.java      | 2 +-
 src/main/java/org/scijava/plugin/SortablePlugin.java        | 2 +-
 src/main/java/org/scijava/plugin/TypedPlugin.java           | 2 +-
 src/main/java/org/scijava/plugin/TypedService.java          | 2 +-
 src/main/java/org/scijava/plugin/WrapperPlugin.java         | 2 +-
 src/main/java/org/scijava/plugin/WrapperService.java        | 2 +-
 .../java/org/scijava/plugin/event/PluginsAddedEvent.java    | 2 +-
 .../java/org/scijava/plugin/event/PluginsListEvent.java     | 2 +-
 .../java/org/scijava/plugin/event/PluginsRemovedEvent.java  | 2 +-
 src/main/java/org/scijava/prefs/AbstractPrefService.java    | 2 +-
 src/main/java/org/scijava/prefs/DefaultPrefService.java     | 2 +-
 src/main/java/org/scijava/prefs/PrefService.java            | 2 +-
 src/main/java/org/scijava/run/AbstractCodeRunner.java       | 2 +-
 src/main/java/org/scijava/run/CodeRunner.java               | 2 +-
 src/main/java/org/scijava/run/DefaultRunService.java        | 2 +-
 src/main/java/org/scijava/run/RunService.java               | 2 +-
 src/main/java/org/scijava/run/console/RunArgument.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptContext.java | 2 +-
 src/main/java/org/scijava/script/AbstractScriptEngine.java  | 2 +-
 src/main/java/org/scijava/script/AbstractScriptHeader.java  | 2 +-
 .../java/org/scijava/script/AbstractScriptLanguage.java     | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptEngine.java   | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptLanguage.java | 2 +-
 src/main/java/org/scijava/script/CodeGenerator.java         | 2 +-
 src/main/java/org/scijava/script/CodeGeneratorJava.java     | 2 +-
 .../java/org/scijava/script/DefaultScriptHeaderService.java | 2 +-
 .../java/org/scijava/script/DefaultScriptInterpreter.java   | 2 +-
 src/main/java/org/scijava/script/DefaultScriptService.java  | 2 +-
 src/main/java/org/scijava/script/History.java               | 2 +-
 src/main/java/org/scijava/script/InvocationObject.java      | 2 +-
 src/main/java/org/scijava/script/ParameterObject.java       | 2 +-
 src/main/java/org/scijava/script/ScriptFinder.java          | 2 +-
 src/main/java/org/scijava/script/ScriptHeader.java          | 2 +-
 src/main/java/org/scijava/script/ScriptHeaderService.java   | 2 +-
 src/main/java/org/scijava/script/ScriptInfo.java            | 2 +-
 src/main/java/org/scijava/script/ScriptInterpreter.java     | 2 +-
 src/main/java/org/scijava/script/ScriptLanguage.java        | 2 +-
 src/main/java/org/scijava/script/ScriptLanguageIndex.java   | 2 +-
 src/main/java/org/scijava/script/ScriptModule.java          | 2 +-
 src/main/java/org/scijava/script/ScriptREPL.java            | 2 +-
 src/main/java/org/scijava/script/ScriptService.java         | 2 +-
 .../java/org/scijava/script/console/RunScriptArgument.java  | 2 +-
 src/main/java/org/scijava/script/io/ScriptIOPlugin.java     | 2 +-
 src/main/java/org/scijava/script/run/ScriptCodeRunner.java  | 2 +-
 src/main/java/org/scijava/service/AbstractService.java      | 2 +-
 src/main/java/org/scijava/service/SciJavaService.java       | 2 +-
 src/main/java/org/scijava/service/Service.java              | 2 +-
 src/main/java/org/scijava/service/ServiceHelper.java        | 2 +-
 src/main/java/org/scijava/service/ServiceIndex.java         | 2 +-
 .../java/org/scijava/service/event/ServicesLoadedEvent.java | 2 +-
 src/main/java/org/scijava/test/TestUtils.java               | 2 +-
 src/main/java/org/scijava/text/AbstractTextFormat.java      | 2 +-
 src/main/java/org/scijava/text/DefaultTextService.java      | 2 +-
 src/main/java/org/scijava/text/TextFormat.java              | 2 +-
 src/main/java/org/scijava/text/TextService.java             | 2 +-
 src/main/java/org/scijava/text/io/TextIOPlugin.java         | 2 +-
 src/main/java/org/scijava/thread/DefaultThreadService.java  | 2 +-
 src/main/java/org/scijava/thread/ThreadService.java         | 2 +-
 src/main/java/org/scijava/tool/AbstractTool.java            | 2 +-
 src/main/java/org/scijava/tool/CustomDrawnTool.java         | 2 +-
 src/main/java/org/scijava/tool/DefaultToolService.java      | 2 +-
 src/main/java/org/scijava/tool/DummyTool.java               | 2 +-
 src/main/java/org/scijava/tool/IconDrawer.java              | 2 +-
 src/main/java/org/scijava/tool/IconService.java             | 2 +-
 src/main/java/org/scijava/tool/Tool.java                    | 2 +-
 src/main/java/org/scijava/tool/ToolService.java             | 2 +-
 .../java/org/scijava/tool/event/ToolActivatedEvent.java     | 2 +-
 .../java/org/scijava/tool/event/ToolDeactivatedEvent.java   | 2 +-
 src/main/java/org/scijava/tool/event/ToolEvent.java         | 2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java                 | 2 +-
 .../java/org/scijava/ui/AbstractInputHarvesterPlugin.java   | 2 +-
 src/main/java/org/scijava/ui/AbstractUIInputWidget.java     | 2 +-
 src/main/java/org/scijava/ui/AbstractUserInterface.java     | 2 +-
 src/main/java/org/scijava/ui/ApplicationFrame.java          | 2 +-
 src/main/java/org/scijava/ui/Arrangeable.java               | 2 +-
 src/main/java/org/scijava/ui/CloseConfirmable.java          | 2 +-
 src/main/java/org/scijava/ui/DefaultUIService.java          | 2 +-
 src/main/java/org/scijava/ui/Desktop.java                   | 2 +-
 src/main/java/org/scijava/ui/DialogPrompt.java              | 2 +-
 src/main/java/org/scijava/ui/FilePreprocessor.java          | 2 +-
 src/main/java/org/scijava/ui/StatusBar.java                 | 2 +-
 src/main/java/org/scijava/ui/SystemClipboard.java           | 2 +-
 src/main/java/org/scijava/ui/ToolBar.java                   | 2 +-
 src/main/java/org/scijava/ui/UIPreprocessor.java            | 2 +-
 src/main/java/org/scijava/ui/UIService.java                 | 2 +-
 src/main/java/org/scijava/ui/UserInterface.java             | 2 +-
 .../java/org/scijava/ui/console/AbstractConsolePane.java    | 2 +-
 src/main/java/org/scijava/ui/console/ConsolePane.java       | 2 +-
 src/main/java/org/scijava/ui/console/UIArgument.java        | 2 +-
 .../java/org/scijava/ui/dnd/AbstractDragAndDropData.java    | 2 +-
 .../java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java | 2 +-
 .../java/org/scijava/ui/dnd/DefaultDragAndDropData.java     | 2 +-
 .../java/org/scijava/ui/dnd/DefaultDragAndDropService.java  | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropData.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropService.java    | 2 +-
 .../java/org/scijava/ui/dnd/FileDragAndDropHandler.java     | 2 +-
 .../java/org/scijava/ui/dnd/ListDragAndDropHandler.java     | 2 +-
 src/main/java/org/scijava/ui/dnd/MIMEType.java              | 2 +-
 .../org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java    | 2 +-
 .../java/org/scijava/ui/dnd/event/DragAndDropEvent.java     | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java  | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java   | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java   | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DropEvent.java       | 2 +-
 src/main/java/org/scijava/ui/event/UIEvent.java             | 2 +-
 src/main/java/org/scijava/ui/event/UIShownEvent.java        | 2 +-
 .../java/org/scijava/ui/headless/HeadlessDisplayViewer.java | 2 +-
 src/main/java/org/scijava/ui/headless/HeadlessUI.java       | 6 +++---
 src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java     | 6 +++---
 .../java/org/scijava/ui/viewer/AbstractDisplayViewer.java   | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayPanel.java       | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayViewer.java      | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayWindow.java      | 2 +-
 .../scijava/ui/viewer/text/AbstractTextDisplayViewer.java   | 2 +-
 .../java/org/scijava/ui/viewer/text/TextDisplayPanel.java   | 2 +-
 .../java/org/scijava/ui/viewer/text/TextDisplayViewer.java  | 2 +-
 src/main/java/org/scijava/util/AbstractPrimitiveArray.java  | 2 +-
 src/main/java/org/scijava/util/AppUtils.java                | 2 +-
 src/main/java/org/scijava/util/ArrayUtils.java              | 2 +-
 src/main/java/org/scijava/util/BoolArray.java               | 2 +-
 src/main/java/org/scijava/util/ByteArray.java               | 2 +-
 src/main/java/org/scijava/util/Bytes.java                   | 2 +-
 src/main/java/org/scijava/util/CharArray.java               | 2 +-
 src/main/java/org/scijava/util/CheckSezpoz.java             | 2 +-
 src/main/java/org/scijava/util/ClassUtils.java              | 2 +-
 src/main/java/org/scijava/util/ColorRGB.java                | 2 +-
 src/main/java/org/scijava/util/ColorRGBA.java               | 2 +-
 src/main/java/org/scijava/util/Colors.java                  | 2 +-
 src/main/java/org/scijava/util/CombineAnnotations.java      | 2 +-
 src/main/java/org/scijava/util/Combiner.java                | 2 +-
 src/main/java/org/scijava/util/ConversionUtils.java         | 2 +-
 src/main/java/org/scijava/util/DebugUtils.java              | 2 +-
 src/main/java/org/scijava/util/DigestUtils.java             | 2 +-
 src/main/java/org/scijava/util/DoubleArray.java             | 2 +-
 src/main/java/org/scijava/util/FileUtils.java               | 2 +-
 src/main/java/org/scijava/util/FloatArray.java              | 2 +-
 src/main/java/org/scijava/util/GenericUtils.java            | 2 +-
 src/main/java/org/scijava/util/IntArray.java                | 2 +-
 src/main/java/org/scijava/util/IntCoords.java               | 2 +-
 src/main/java/org/scijava/util/IntRect.java                 | 2 +-
 src/main/java/org/scijava/util/IteratorPlus.java            | 2 +-
 src/main/java/org/scijava/util/LastRecentlyUsed.java        | 2 +-
 src/main/java/org/scijava/util/LineOutputStream.java        | 2 +-
 src/main/java/org/scijava/util/ListUtils.java               | 2 +-
 src/main/java/org/scijava/util/LongArray.java               | 2 +-
 src/main/java/org/scijava/util/Manifest.java                | 2 +-
 src/main/java/org/scijava/util/MersenneTwisterFast.java     | 2 +-
 src/main/java/org/scijava/util/MetaInfCombiner.java         | 2 +-
 src/main/java/org/scijava/util/MirrorWebsite.java           | 2 +-
 src/main/java/org/scijava/util/MiscUtils.java               | 2 +-
 src/main/java/org/scijava/util/NumberUtils.java             | 2 +-
 src/main/java/org/scijava/util/ObjectArray.java             | 2 +-
 src/main/java/org/scijava/util/POM.java                     | 2 +-
 src/main/java/org/scijava/util/PlatformUtils.java           | 2 +-
 src/main/java/org/scijava/util/Prefs.java                   | 2 +-
 src/main/java/org/scijava/util/PrimitiveArray.java          | 2 +-
 src/main/java/org/scijava/util/ProcessUtils.java            | 2 +-
 src/main/java/org/scijava/util/Query.java                   | 2 +-
 src/main/java/org/scijava/util/ReadInto.java                | 2 +-
 src/main/java/org/scijava/util/RealCoords.java              | 2 +-
 src/main/java/org/scijava/util/RealRect.java                | 2 +-
 src/main/java/org/scijava/util/ReflectException.java        | 2 +-
 src/main/java/org/scijava/util/ReflectedUniverse.java       | 2 +-
 src/main/java/org/scijava/util/ServiceCombiner.java         | 2 +-
 src/main/java/org/scijava/util/ShortArray.java              | 2 +-
 src/main/java/org/scijava/util/Sizable.java                 | 2 +-
 src/main/java/org/scijava/util/SizableArrayList.java        | 2 +-
 src/main/java/org/scijava/util/StringMaker.java             | 2 +-
 src/main/java/org/scijava/util/StringUtils.java             | 2 +-
 src/main/java/org/scijava/util/Timing.java                  | 2 +-
 src/main/java/org/scijava/util/TunePlayer.java              | 2 +-
 src/main/java/org/scijava/util/UnitUtils.java               | 2 +-
 src/main/java/org/scijava/util/VersionUtils.java            | 2 +-
 src/main/java/org/scijava/util/XML.java                     | 2 +-
 .../java/org/scijava/welcome/DefaultWelcomeService.java     | 2 +-
 src/main/java/org/scijava/welcome/WelcomeService.java       | 2 +-
 src/main/java/org/scijava/welcome/event/WelcomeEvent.java   | 2 +-
 .../java/org/scijava/widget/AbstractInputHarvester.java     | 2 +-
 src/main/java/org/scijava/widget/AbstractInputPanel.java    | 2 +-
 src/main/java/org/scijava/widget/AbstractInputWidget.java   | 2 +-
 src/main/java/org/scijava/widget/Button.java                | 2 +-
 src/main/java/org/scijava/widget/ButtonWidget.java          | 2 +-
 src/main/java/org/scijava/widget/ChoiceWidget.java          | 2 +-
 src/main/java/org/scijava/widget/ColorWidget.java           | 2 +-
 src/main/java/org/scijava/widget/DateWidget.java            | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetModel.java    | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetService.java  | 2 +-
 src/main/java/org/scijava/widget/FileWidget.java            | 2 +-
 src/main/java/org/scijava/widget/InputHarvester.java        | 2 +-
 src/main/java/org/scijava/widget/InputPanel.java            | 2 +-
 src/main/java/org/scijava/widget/InputWidget.java           | 2 +-
 src/main/java/org/scijava/widget/MessageWidget.java         | 2 +-
 src/main/java/org/scijava/widget/NumberWidget.java          | 2 +-
 src/main/java/org/scijava/widget/ObjectWidget.java          | 2 +-
 src/main/java/org/scijava/widget/TextWidget.java            | 2 +-
 src/main/java/org/scijava/widget/ToggleWidget.java          | 2 +-
 src/main/java/org/scijava/widget/UIComponent.java           | 2 +-
 src/main/java/org/scijava/widget/WidgetModel.java           | 2 +-
 src/main/java/org/scijava/widget/WidgetService.java         | 2 +-
 src/test/java/org/scijava/ContextCreationTest.java          | 2 +-
 src/test/java/org/scijava/ContextInjectionTest.java         | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedA.java       | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedB.java       | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedC.java       | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedD.java       | 2 +-
 .../java/org/scijava/annotations/AnnotatedInnerClass.java   | 2 +-
 src/test/java/org/scijava/annotations/Complex.java          | 2 +-
 .../java/org/scijava/annotations/DirectoryIndexerTest.java  | 2 +-
 .../java/org/scijava/annotations/EclipseHelperTest.java     | 2 +-
 src/test/java/org/scijava/annotations/Fruit.java            | 2 +-
 src/test/java/org/scijava/annotations/LegacyTest.java       | 2 +-
 src/test/java/org/scijava/annotations/Simple.java           | 2 +-
 src/test/java/org/scijava/app/StatusServiceTest.java        | 2 +-
 src/test/java/org/scijava/command/CommandInfoTest.java      | 2 +-
 src/test/java/org/scijava/command/CommandModuleTest.java    | 2 +-
 src/test/java/org/scijava/command/CommandServiceTest.java   | 2 +-
 src/test/java/org/scijava/command/InvalidCommandTest.java   | 2 +-
 .../java/org/scijava/command/run/CommandCodeRunnerTest.java | 2 +-
 src/test/java/org/scijava/console/ConsoleServiceTest.java   | 2 +-
 .../org/scijava/console/SystemPropertyArgumentTest.java     | 2 +-
 .../org/scijava/convert/AbstractNumberConverterTests.java   | 2 +-
 .../convert/BigIntegerToBigDecimalConverterTest.java        | 2 +-
 .../org/scijava/convert/ByteToBigDecimalConverterTest.java  | 2 +-
 .../org/scijava/convert/ByteToBigIntegerConverterTest.java  | 2 +-
 .../java/org/scijava/convert/ByteToDoubleConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToFloatConverterTest.java  | 2 +-
 .../org/scijava/convert/ByteToIntegerConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ByteToLongConverterTest.java   | 2 +-
 .../java/org/scijava/convert/ByteToShortConverterTest.java  | 2 +-
 src/test/java/org/scijava/convert/ConvertServiceTest.java   | 2 +-
 src/test/java/org/scijava/convert/ConverterTest.java        | 2 +-
 .../scijava/convert/DoubleToBigDecimalConverterTest.java    | 2 +-
 .../org/scijava/convert/FloatToBigDecimalConverterTest.java | 2 +-
 .../org/scijava/convert/FloatToDoubleConverterTest.java     | 2 +-
 .../scijava/convert/IntegerToBigDecimalConverterTest.java   | 2 +-
 .../scijava/convert/IntegerToBigIntegerConverterTest.java   | 2 +-
 .../org/scijava/convert/IntegerToDoubleConverterTest.java   | 2 +-
 .../org/scijava/convert/IntegerToLongConverterTest.java     | 2 +-
 .../org/scijava/convert/LongToBigDecimalConverterTest.java  | 2 +-
 .../org/scijava/convert/LongToBigIntegerConverterTest.java  | 2 +-
 .../org/scijava/convert/ShortToBigDecimalConverterTest.java | 2 +-
 .../org/scijava/convert/ShortToBigIntegerConverterTest.java | 2 +-
 .../org/scijava/convert/ShortToDoubleConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToFloatConverterTest.java | 2 +-
 .../org/scijava/convert/ShortToIntegerConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ShortToLongConverterTest.java  | 2 +-
 src/test/java/org/scijava/display/DisplayTest.java          | 2 +-
 src/test/java/org/scijava/event/EventServiceTest.java       | 2 +-
 src/test/java/org/scijava/io/BytesLocationTest.java         | 2 +-
 src/test/java/org/scijava/io/DataHandleTest.java            | 2 +-
 src/test/java/org/scijava/io/FileHandleTest.java            | 2 +-
 src/test/java/org/scijava/io/FileLocationTest.java          | 2 +-
 src/test/java/org/scijava/io/URILocationTest.java           | 2 +-
 src/test/java/org/scijava/io/URLLocationTest.java           | 2 +-
 src/test/java/org/scijava/log/LogServiceTest.java           | 2 +-
 src/test/java/org/scijava/main/MainServiceTest.java         | 2 +-
 src/test/java/org/scijava/main/run/MainCodeRunnerTest.java  | 2 +-
 src/test/java/org/scijava/menu/MenuServiceTest.java         | 2 +-
 src/test/java/org/scijava/menu/ShadowMenuTest.java          | 2 +-
 src/test/java/org/scijava/module/ModuleServiceTest.java     | 2 +-
 .../java/org/scijava/module/run/ModuleCodeRunnerTest.java   | 2 +-
 src/test/java/org/scijava/object/ObjectIndexTest.java       | 2 +-
 src/test/java/org/scijava/object/SortedObjectIndexTest.java | 2 +-
 src/test/java/org/scijava/options/OptionsTest.java          | 2 +-
 src/test/java/org/scijava/parse/ParseServiceTest.java       | 2 +-
 src/test/java/org/scijava/plugin/PluginFinderTest.java      | 2 +-
 src/test/java/org/scijava/plugin/PluginIndexTest.java       | 2 +-
 src/test/java/org/scijava/plugin/PluginInfoTest.java        | 2 +-
 src/test/java/org/scijava/prefs/PrefServiceTest.java        | 2 +-
 src/test/java/org/scijava/run/RunServiceTest.java           | 2 +-
 .../java/org/scijava/script/AbstractScriptLanguageTest.java | 2 +-
 src/test/java/org/scijava/script/ScriptEngineTest.java      | 2 +-
 src/test/java/org/scijava/script/ScriptFinderTest.java      | 2 +-
 src/test/java/org/scijava/script/ScriptInfoTest.java        | 2 +-
 src/test/java/org/scijava/script/ScriptServiceTest.java     | 2 +-
 src/test/java/org/scijava/service/ServiceIndexTest.java     | 2 +-
 src/test/java/org/scijava/test/AbstractSciJavaTest.java     | 2 +-
 src/test/java/org/scijava/test/TestUtilsTest.java           | 2 +-
 src/test/java/org/scijava/thread/ThreadServiceTest.java     | 2 +-
 src/test/java/org/scijava/ui/UIServiceTest.java             | 6 +++---
 src/test/java/org/scijava/util/AppUtilsTest.java            | 2 +-
 src/test/java/org/scijava/util/ArrayUtilsTest.java          | 2 +-
 src/test/java/org/scijava/util/BoolArrayTest.java           | 2 +-
 src/test/java/org/scijava/util/ByteArrayTest.java           | 2 +-
 src/test/java/org/scijava/util/CharArrayTest.java           | 2 +-
 src/test/java/org/scijava/util/ClassUtilsTest.java          | 2 +-
 src/test/java/org/scijava/util/ColorRGBTest.java            | 2 +-
 src/test/java/org/scijava/util/ConversionUtilsTest.java     | 2 +-
 src/test/java/org/scijava/util/DigestUtilsTest.java         | 2 +-
 src/test/java/org/scijava/util/DoubleArrayTest.java         | 2 +-
 src/test/java/org/scijava/util/FileUtilsTest.java           | 2 +-
 src/test/java/org/scijava/util/FloatArrayTest.java          | 2 +-
 src/test/java/org/scijava/util/GenericUtilsTest.java        | 2 +-
 src/test/java/org/scijava/util/IntArrayTest.java            | 2 +-
 src/test/java/org/scijava/util/LastRecentlyUsedTest.java    | 2 +-
 src/test/java/org/scijava/util/LongArrayTest.java           | 2 +-
 src/test/java/org/scijava/util/ObjectArrayTest.java         | 2 +-
 src/test/java/org/scijava/util/POMTest.java                 | 2 +-
 src/test/java/org/scijava/util/PrimitiveArrayTest.java      | 2 +-
 src/test/java/org/scijava/util/ProcessUtilsTest.java        | 2 +-
 src/test/java/org/scijava/util/ShortArrayTest.java          | 2 +-
 src/test/java/org/scijava/util/UnitUtilsTest.java           | 2 +-
 629 files changed, 637 insertions(+), 637 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 4513c78b9..aaa28e8b4 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2016, Board of Regents of the University of
+Copyright (c) 2009 - 2017, Board of Regents of the University of
 Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
 Institute of Molecular Cell Biology and Genetics.
 All rights reserved.
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 973fa0c14..fba517e29 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2016 Board of Regents of the University of
+  Copyright (C) 2009 - 2017 Board of Regents of the University of
   Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
   Institute of Molecular Cell Biology and Genetics.
   %%
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 2b08f010f..86549ce6d 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index ff5cdf3e8..466bd78c3 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index 80c1db3ba..a21cd5344 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index 71a9c5efa..edc3dfab2 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/it/settings.xml b/src/it/settings.xml
index c7205a7b0..d4ee30ac3 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2016 Board of Regents of the University of
+  Copyright (C) 2009 - 2017 Board of Regents of the University of
   Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
   Institute of Molecular Cell Biology and Genetics.
   %%
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index 513cf0258..df0bcba15 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index ed8da838a..768ce4986 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 166aac342..a4980d63d 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 8391ffff1..2c81d5f31 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index 3f061494a..4dd50a1a9 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 2f738e626..030ba023a 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 108ac7240..4813fdeab 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index aba31ed13..9821c0dd7 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index fc179e7b9..0a86dfbce 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 052f9d54e..e74b7188e 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index e057780bb..e04fbb682 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index 8c6b05fed..ce331d0df 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index f3f174aa5..041ffa413 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index 596e59ee9..1af1cef0c 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index b45f5062e..96b7b49da 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index 4055bc8f6..db5e7db88 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index 9d4d73bf5..aff02fe28 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index fa8fb4821..f2fc2b8f1 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index f53f5cb1a..1771a7e8b 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index 5ddd9cb16..654fce4ab 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 09d23663c..b291f021d 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index acae73049..ce05a776b 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index dcfc568e3..1dddc3441 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index de544e2bf..416ae93f6 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 2f0c06e29..019ae17bf 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index 8ae9c8e0c..462b92f72 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index 20d877557..e76d0fc93 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index e53a98506..3545d6ce8 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index ea17c28ab..7b006ffed 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index a7f7134e4..ea8b3b121 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index 03379bead..233510e35 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index f8238b0fa..0f8a06221 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index cde5a05fe..a4f02935f 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 3940bc3f7..0f96bab4f 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index c7b5b13bf..933ce8197 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 5943d9abb..b292d9831 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index d9a8dbb91..80cad4334 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index e30dc7cf7..13d8e2d88 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index a413ad57a..31d849867 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index aa3069feb..ef8a2a576 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 8204de4d1..69e26bcc1 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 8deee7f31..acf3c3d29 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index f6657e86e..6a79a67ff 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index 1179179df..5f5c4979d 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 5392eda31..884b0aea5 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 30b0eba02..52bb33ca4 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 3d15f6252..43a5e58b0 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 97b1f54a5..ef758592f 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 8ae39845a..67cccf86d 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index e6bfbcdb1..d8a3005e2 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index 049dbe813..c0ab8850b 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 29d62de81..87bcc909a 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 85f191060..19f5f1de4 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 445a53f2c..222237422 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 6258260b2..6542022b6 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 79b9424e8..10c0c7b78 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 3d0a4f80a..7a4feb704 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index 5d74e3863..3ce3ec96d 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index b4f74e32e..2e344365a 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index dac4df9ee..aa81671c0 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index d3c1552fd..b47e64d91 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index 9f8b389b3..bb41ca906 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index c080ce0fa..920ad4047 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index fe3f47561..14bdb641a 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index a853bb355..6d062edf4 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 43c967bb3..8bc9448f5 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 26924fa0d..c2a8ce8bb 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index 40b34de68..f0ecfcb9b 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 55a04474a..4711e5d18 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index cb0b857bc..49bd88590 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index e6510058c..7e9a9be58 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index b3ac60dbc..47c712b62 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 520ddd195..99b9867b0 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/HeadlessArgument.java b/src/main/java/org/scijava/console/HeadlessArgument.java
index 6f67331ce..db4c64109 100644
--- a/src/main/java/org/scijava/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/console/HeadlessArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 0f1cda471..855947bdf 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 2261c533a..72fae4aea 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index 6d81ebdef..d3bc2c5e7 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index 6636c1ad6..1641542f0 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index ad3b94bff..ef812d1ef 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 5faf2f9ab..3938415f3 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 10478e841..080788ae8 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index f2d129cd1..9837b58a0 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index da6fe9d90..a611d67f2 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 1b0a211f0..a4397e60f 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index caf9d1d68..cea655f5c 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 157a7a744..325152928 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index 6249432c7..71c2d47ec 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 262a55249..b3f091258 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index f3686ea2f..5eb02c50a 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index 678addc1c..98f636b60 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index fb24c86f5..e55b2db61 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 30825bebf..5080cb153 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 911959663..cbc2e9f24 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index ee3c9f46c..8da2cf802 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index aef88f2ed..ab230327c 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index d60844eaf..ed8846725 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index 1f0436fef..a47ff573a 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index b6fa2bcfd..9c6a83448 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index 9a821393b..c0a564c05 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index a6d421608..ab31f5359 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index 527b9317b..e9156d608 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index b49596826..5406ba4ec 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index cad0c02f3..a891da42c 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index 018b73c69..e383301fe 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index 2b5940087..acf37864e 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index e635baa31..810350a13 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 48987e637..bee7ccb7a 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 92bb6e725..2f50512c4 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index ffc22461e..6236703b8 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 5da87694c..600e4a729 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 9a81b32f1..89ab73888 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index c1ef3e70d..f7a632a17 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index 37889a187..978ff2296 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 12ae2b5de..a533eaf74 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index 9fa301481..2df034dc3 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index 7855ae923..fab6bcc83 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index 8892b20a1..a019dc780 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 1d936b33d..089dd17e2 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 3604fe6b6..128e10b50 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index 553a791b6..e3071db3b 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index 6a4a41ed6..d6ca4f712 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 71fefc267..6110f6330 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index 9a2157b06..765c73e73 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index e9813d94e..2bbe67f53 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index e000e0a09..7b4238bdb 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index eb6ad2716..8f1a9864f 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index e5d367ec0..f702b1927 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index 44271958d..ba6f9d7ab 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 4a7cf0a49..0efacbe71 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index d33d2d6d4..73f93a14f 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index 8ec498c73..a63bae0d0 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 450883dd4..8638eb469 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index b3eedf74e..331f82b72 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index 3d9f08236..fbb144fe4 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 1f66c2861..12a830f82 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index af3a4fb21..ad9ad56ab 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 740de597b..8cede75c9 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index 2cc54a73f..c2ffa1794 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 7df001f65..0dc1aaf34 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index f9a7fbe14..4ebb70883 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 9cc78716d..4b468cd09 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index f297a6bc3..f7e924b46 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index 4f210c0ee..3336f4da9 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 6fdfb967f..fc549034e 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index 8cd782253..706ac59f3 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index acf0c07c8..a5426bb76 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index fcacb1b46..efe3b1179 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index 69796fe43..79c328cf6 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index 13920ce43..e644763e8 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index 3c83dd0d5..c3976e9b8 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index ca0f8ee75..5c485330c 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index f7da0c4b7..91fce4bc5 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index 261aab401..215256789 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 613b87fb8..f6401761f 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index f55d0c768..cc87247e6 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/AbstractDataHandle.java b/src/main/java/org/scijava/io/AbstractDataHandle.java
index f6d02f82a..7a30a6d3b 100644
--- a/src/main/java/org/scijava/io/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 2c296c282..1574e109c 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/AbstractLocation.java b/src/main/java/org/scijava/io/AbstractLocation.java
index 046b3c569..8937d3847 100644
--- a/src/main/java/org/scijava/io/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/BytesLocation.java b/src/main/java/org/scijava/io/BytesLocation.java
index f0cf50b4b..8070dc225 100644
--- a/src/main/java/org/scijava/io/BytesLocation.java
+++ b/src/main/java/org/scijava/io/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandle.java b/src/main/java/org/scijava/io/DataHandle.java
index ea6417fa1..f058d9241 100644
--- a/src/main/java/org/scijava/io/DataHandle.java
+++ b/src/main/java/org/scijava/io/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandleInputStream.java b/src/main/java/org/scijava/io/DataHandleInputStream.java
index 01c013a6b..6b2e21e4a 100644
--- a/src/main/java/org/scijava/io/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandleOutputStream.java b/src/main/java/org/scijava/io/DataHandleOutputStream.java
index 4e03766ef..6f876694d 100644
--- a/src/main/java/org/scijava/io/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DataHandleService.java b/src/main/java/org/scijava/io/DataHandleService.java
index 076c06aa9..723461870 100644
--- a/src/main/java/org/scijava/io/DataHandleService.java
+++ b/src/main/java/org/scijava/io/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DefaultDataHandleService.java b/src/main/java/org/scijava/io/DefaultDataHandleService.java
index 90f123d38..dc98ce28f 100644
--- a/src/main/java/org/scijava/io/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index e8a2ddd42..2e6cdc63b 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 7c699f846..62506bb26 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/FileHandle.java b/src/main/java/org/scijava/io/FileHandle.java
index 53a604f21..f3ac1f422 100644
--- a/src/main/java/org/scijava/io/FileHandle.java
+++ b/src/main/java/org/scijava/io/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/FileLocation.java b/src/main/java/org/scijava/io/FileLocation.java
index 7ebb80119..3d93ee12c 100644
--- a/src/main/java/org/scijava/io/FileLocation.java
+++ b/src/main/java/org/scijava/io/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 78613fab0..7de3cc315 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index b099aa89a..a4f284680 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/Location.java b/src/main/java/org/scijava/io/Location.java
index a2e509fcc..34b79f63b 100644
--- a/src/main/java/org/scijava/io/Location.java
+++ b/src/main/java/org/scijava/io/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index ea6220426..6eb0e68cd 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/URILocation.java b/src/main/java/org/scijava/io/URILocation.java
index fb22b0e68..819fb2282 100644
--- a/src/main/java/org/scijava/io/URILocation.java
+++ b/src/main/java/org/scijava/io/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/URLLocation.java b/src/main/java/org/scijava/io/URLLocation.java
index 54d8fbb06..1b7490894 100644
--- a/src/main/java/org/scijava/io/URLLocation.java
+++ b/src/main/java/org/scijava/io/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 36a4668f1..6f0c7947e 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 893ad63b6..08df4c44e 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index fe911efa9..73e21c01a 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 9140893c2..83bb16f7b 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index f84aad31d..69eddd8c0 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index 6b1dbd7cd..ab28a4515 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 35cb1720a..c86563871 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index 54707a4e3..cb73be8c5 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 23da68cb6..f79baab50 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 7511ea501..f8fcfc99d 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index fcd15831c..d865ec95c 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index c7608b37b..d33c64121 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index a34ad8861..153d5303d 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index ab476c375..d3835cdca 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 203d43fb9..99e6c8c9e 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index 336a1832f..6ee40aa5f 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index 45d7c7402..84691ad71 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index e4eb3423c..b0b611c13 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index cf0307b00..604492b65 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index 7b13e3f23..bb1784cba 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index 16c1b5de2..e3220196f 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index 03d00ae91..c22b02cf6 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index 3214051df..b1a1ac583 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index cc6da3099..c7063001f 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 41ecf2eb9..2b63ba440 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index d39b34dae..ffd48cf37 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index f29453329..e7ce1f0d2 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 7f1508b61..f7a7f7a46 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 3887b5927..c368a602c 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index 5de1cf327..ff6a07fb1 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index a627750a2..363388587 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index 43a2cccad..25058c382 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index 45706d786..35d44b0dd 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 068b91e2c..3cb81187e 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index 8442e20aa..1eb8c6b8f 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index e75d47128..01d8612f8 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index 4131a5ec7..b4a8e146d 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index 41f3f2e3f..f6972555d 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index cdb439e16..6def93c65 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 27fb61347..a3a1253b6 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 6d3613c9e..165d83ffe 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index fb4e77069..63771f2ca 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index bbb36ff94..b4b6d3ca1 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 3fc9e6d32..c546fb8ef 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index 53d4240e5..e6955c597 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index ec8cbc044..f17936668 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index 97d51205d..095ee07b6 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index a7927f3b2..e24bd4f4f 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index ab3e4cdd7..1dcc35616 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index b07316001..294cd8637 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 5cdd679f5..95b2379a1 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index ff41de328..b81f1ffa1 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 3aa87b220..55305f2af 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index bd532fb72..7a5df739f 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index adc9b2a78..d695e8d27 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 212903786..2bd2b150d 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index dede673ac..cc9038d05 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index 062850923..3278acceb 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index c03d757a5..cc33882a2 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index d87bb47d8..a0f3e4ab1 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index f4eb2e044..a6f69dc0d 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index db69245aa..117a1e7fe 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 6a5274f29..368702df6 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index 7ac9db72a..43f4498ac 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 07df44016..6d1cecf01 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 54591d97f..3cc9d45ac 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 2df7a6682..a853ba785 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index 4c158d688..426be0bed 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index 4aecdd0c5..7f991b220 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index 6f547bf00..7f7df3348 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 5deb1f398..5bda98f14 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index 37bfbcd34..e86f1b471 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index 1fa632790..8ab370ef5 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 3720d839e..0784574c1 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 51c70c8ee..d268eb8b2 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index 2beeca9be..2ccb94e36 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 03f1a9f3c..3f4fc437f 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 1b25c787d..7567a4630 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 83e9a1efc..715ef0887 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index 7dafa1831..f172e3822 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index ef5ce9692..5b8833a85 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 1cd3120d6..ab5de4579 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index 037941db7..20043b4fa 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index eb3804baf..a2f823b7e 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index 09cdf01a6..7e96da519 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index dfcc549f1..f4265bad5 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 83a268634..03cb59af2 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index b505e49d3..990622fc4 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index 598c83866..86eee883e 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index c88a8314a..47df9da30 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 230bad79f..5d1b9fc9f 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 47420f0b0..0c432e835 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index fcd27879c..84a7ee761 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index e57296aa5..b01199d23 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index a3d2102d9..de2163885 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index 311227ae7..e58f0fec9 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index af1187620..687ef817d 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 8ba6e85d4..68cc81156 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index 089d45978..4364fa93d 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index 6a55084e4..aa030cd95 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index d5216ae82..807b8d871 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 3cda5fabf..630672060 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index 5b64ed8c4..9b6b11047 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index e092f9ef9..1b19de6fa 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 267881bc8..65282f726 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 22b9c5e40..19f58943a 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index b595cc98f..4e2cac09f 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index d0762cb66..cc29c24c4 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index 6d0d19c8a..b4d81c1e3 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index b11e0eb87..71bc04fd0 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index a6f3dfa6b..da6acd058 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index be29a6a0e..dee21cabd 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index 71eed3f60..6e0f9a291 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index 60b1bc7b5..4c0a273b5 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index c105f7f5d..7c9d6de2b 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index 07cc9fbf8..d0a1386d3 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index 0ee88d175..60c9e6825 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 9292e9d2c..133d763c8 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 1076d9a7b..365fc1d11 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 6773ccbbf..ebbd663df 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index 3ccd108c5..0e18aca5a 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 201f06738..07c44d43f 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 3ef02bcff..3aa264d28 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index 14b2eeab4..65fdf2a13 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 9493deced..e8b3ff338 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 04a444637..4e5fc5029 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index 80acfa436..dae79f675 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index ab5cf266a..2e4b933d9 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index 9d7a8a47f..5c8f262e4 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 10b646715..e258bff85 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 923d644da..16c94a132 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index 9331331e6..1c0700565 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index fde2fe5ae..21724b2a1 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 69a2bb81a..804a325d9 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index 962df19f9..63a3285ba 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 9951e8478..b131a8600 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index 4fc208a94..c8591c48a 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index 7f70f564b..66ac0576d 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 84f3325db..ab261521b 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 38ffa36e6..bba5410be 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index a5d4efa01..d9ad9141a 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index 03db44d30..f68c4db65 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index a1a37dd42..ce7ced233 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 4b28e964a..65da01d77 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 48de6c945..84f0f41b0 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 343033112..bf22ba95c 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index ef2e60411..0ba87ea57 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index ecf27077b..806f04016 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index ff118ea0c..f8cb8e887 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index 062e2c639..9ed8c969d 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index d174ca149..98dc1dc68 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index 836074a67..d15e620b3 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index 0726c81d6..8e78e58b7 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index b6feeaac1..a5dd1deb0 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 42c71fbe5..401632185 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 681fa3e50..288d2f2dc 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 8b4349bb6..3e9c2429b 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 10674f7bb..b1382ec8d 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index 803326347..c8124ee67 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index 27cc093ad..67366a0e0 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index f7e771a58..7b287413c 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 429addb29..5e2d5673d 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index d5cf7ee06..46b475f0e 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index 61ff5a4d8..ab6ab7de7 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 7a31a29eb..1f5c6f9e1 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index 250fd2e51..5f52e9ac7 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index 381b99017..97bd240ee 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index 403bc7693..f0344cdb9 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index e7f9b6e56..d79c7f6c4 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index de2fc84c2..750aa55b3 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index cc1b25c92..9281fd122 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index a38c231e8..543ea506a 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 1244eb666..41ec47dab 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/History.java b/src/main/java/org/scijava/script/History.java
index 22208d189..648a466c9 100644
--- a/src/main/java/org/scijava/script/History.java
+++ b/src/main/java/org/scijava/script/History.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 5d5b96b59..4ace6b083 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 80e1e615e..7f02b1d39 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 951cda817..d51709bbc 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index 12071fc4f..3e61a9fd9 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index fb4f22590..1adb82576 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 46194dcfe..88c3bed46 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index eab65c3f9..9c08ebcf5 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 87862c491..14cf95866 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 4d7e77126..f032b8356 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 458a249e0..92cf3ced9 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 95a7a6a0e..7ff8c1a07 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 2b3a35d34..4a5f10fb8 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index 0bc8347c1..4b9ad3ba6 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index 18cba6c8c..14810c80a 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index da6f4cd07..b56d24831 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index 4d6bb486c..dab8524d7 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index a1ea5ee51..eaa461ba0 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index e707aee67..a8e2d6827 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 52c6583fb..1a684c034 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index 2c39bd946..23f48642e 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index 01f23192a..93f8588fd 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index ec3667ba4..9ee2b8932 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index a14e8a96a..032dae0af 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index c4f36d680..80e23acbc 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 5d76f381b..3aa6122c8 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 0c53d3a96..3d16e46e3 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index e499c943a..5311ba524 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index c63016cc7..945a6fe43 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index 2287c87f2..7be845d97 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index 6c740055d..b28ddd785 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 3850e5ebf..1bd46df11 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index 2ccf32477..47e1c89a7 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index 5b729c595..208f8b497 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index d4bacb3ba..ab95d0f8d 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index 88e8600dc..ecb572f53 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index 237422f4b..43267f76a 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index fb994b235..4dca68db9 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 7c560a73a..55fb9e038 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 09857e75e..62a895a5c 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 18427dc01..0062595c6 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index 1559bbda9..370c4668e 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index a92458a61..f7c566aed 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index deff1ce46..c76edb136 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 2bae5bea8..b625f5d0f 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index 4150ee826..761bd52ef 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index 9d21573cb..9a3649fab 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index 8df904b3d..c1e7f905e 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index dfde08f9d..8b88490ca 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index f5d008322..e2fd8df81 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index d09553606..97b921a15 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index f82d624ee..bed279e2b 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 731f03b18..4d4a20f11 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index c9303005b..ca9f8d925 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index a6e0f3dbe..d63910601 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index bfd11993e..2449bb517 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 787da5810..1c6a2d15e 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index f5cf978d0..d041fabc9 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index f704ad027..da45ed875 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index ec03b3663..ab6866f4b 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index ca4611406..a40902b3e 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 39e22f33a..9a1939671 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index 9f4e63434..da0213cca 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index 124229a17..1886ddcdf 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index c91be236d..19d875485 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index a9877b527..9195070f0 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index d02c25e44..3ca4e88bb 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index 1816f99d3..15522d4cb 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index cbc282026..9b989496d 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index de627cd6d..dcd1e7581 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 71618b2b4..3a084bb38 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index 5ac984613..5546dea09 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index 429237d30..df48275e2 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index b092a1a75..d3effdcf3 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 198f5265d..47b241366 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index 5bb837d35..a0fbff395 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index cf9ac5de6..d68710044 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index a430604f2..da808fa0e 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index a397df034..e176d238e 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index 407667f04..c3f11f2c9 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 621661af6..188a6b952 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 282380bfb..25b21c871 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index bc3b7a32c..bbbfb511e 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index cbcf53aeb..1b7e1d628 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index 6a6c3ed15..f8fd52a74 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index 2f0f195db..a7ae16b15 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index e7872768a..3abc8f587 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 4438f34c2..eff753250 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index ba9fff07b..5c64f9c6a 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index a5118d874..492ced3c7 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index bd3d79f78..c8ed71cf8 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index b53426756..06a67b80a 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 916b0e67b..80ce58772 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index f0499e138..85f59844e 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index 293e53d7a..7be781de3 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index 4d857ead5..94e8f10c1 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index f76785999..b9f61c7e7 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 816ee9925..cd18e2500 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 714946065..9895caf95 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index 504e3aa07..cb124a382 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index 409ad5975..ce96ba8b1 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index 7b7260826..fc7e6deee 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index e38565a0d..c3397a45c 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index fdc38de19..ba866f43b 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 8f199a165..e0c6e34a7 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 27b0d1dec..0b568e776 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index bf2337ecf..244abd2ae 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index c41a4e101..d48f3114c 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index b427d3055..22244a61f 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index 72fc323f2..e0a6ae873 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index b88fe3f6c..6800f7929 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index 8480882f7..eb4bce513 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index 90362a37d..d6a674e13 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index cb706c90a..6abf6562d 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 684bc4701..64f5679ce 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index 5afd7f78f..21cab3510 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index f71fca9ce..aef0f63b6 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index f71460601..3c3a6ad56 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 8d40cc80c..cbf701e9f 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 78df195bd..21a51595f 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 5a73573a9..75418f949 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index 47a31b43f..2f21226eb 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 15ed2b596..9502f7894 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 108610ba3..95f7207a2 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index a20352b7a..febf6bdaa 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 99a57c6da..85b403b3c 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index ff7fbfa8c..3ffcf9c59 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index a526d49ec..c7919fb9c 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 6b1af3128..c1c9d47dd 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index da30b7c06..6e09e202a 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index e3942d124..a2cabad05 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 13b4a9186..8f43b9070 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index 5c4e569ea..a75303756 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index 006c233ae..0c90c0e4b 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index 0d5d6240f..9c9d621ca 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index a0027b628..2f7f1d6fa 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index 2c6f63d33..8422b4b5f 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 1db496b8c..4f6fea077 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index 9b55aaeea..936e4b0ed 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index 09f468286..db572380d 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 6d7fafd1e..3e3bf8385 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 1145a409f..d970c402c 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 52e54d352..a4390222c 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index 48f1f511a..f5acd838b 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 3b400f57a..8446802c6 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index 4e1fe115f..c1ae21e45 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index c195967e9..3fce35ced 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 90d8e1a00..2be5c30ea 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index 4b822c406..f4fa9470d 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index 3098adb93..513895055 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 3e30459df..a9bf541de 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index 3b1c9e0ec..ce65e8c2c 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 1b28f6554..0a95225ac 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index 323793c3a..6b9340c08 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index 1bbd8ada6..53181eb71 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index e578a3011..bfd15d7c8 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 7b87694c0..6e539f14f 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index 0fc3a0ed0..477a86aa4 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 26305ee9d..395def82f 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 8a92ca6fd..78d0ae3f6 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index faa979214..5ba0c5dd5 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index f70581838..4370cbd8a 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index a8b3cbb6b..81c4d508f 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 28bfbbce1..19cd7030a 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 89096ac6e..42492607b 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index a0b1c5a92..423de683e 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index 49d4f47c3..f6da02732 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index c5ffdbcbb..f8d76bb4d 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index 61682d22f..bf13ebdff 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 3f07a535e..1647d4db7 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index ee7968266..52cbcc1bd 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index bb5e01561..b1fbedc5a 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 97caa7f8c..8de76276e 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index 2ddf1ea5a..d7369f2dd 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 48829628e..92836407d 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index 424fcc21b..7a7dae9d7 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index e2c6c7e7c..fe4b360a8 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index 1e7380474..d63e3cae7 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 8ca3a1ff8..0387fdfe8 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index d1a6ce84d..d9b960dd3 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 35c1bc7ed..a9c84b302 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index 373558b38..c56a4f1ad 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index 4f2b9bfdb..9abcc4fb3 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index cbcef610b..8ee5cc012 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index a6af80190..aadb9ab4d 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 674fc5365..d3fe9e66e 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 8f39eb1ce..2e022050a 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 1951fa42a..1021d537c 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index 2921d7979..7b06c0451 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 30eb59989..94e25e694 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index 43277d036..c2284b95f 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index c33074e35..84d552f6a 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index f0042394b..22ad053e1 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 32618f0d9..3c15f173e 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index 502104206..fdac8b40f 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 4741a8c5d..9e96ff0b0 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index 7cf5030e3..ca9cf8e5a 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index 0c398fac6..05f3ab842 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 846d4df75..2cafe9404 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index f3a3ad127..562a282e9 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 5ab8a85c9..4cd8dc2ae 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index 8045395cb..e1c58e705 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 8f106da8a..ce3b6a2ee 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 798796def..0d77baab4 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index a8faeac1d..5d8df5b77 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index ea2ce8f74..9350e6564 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index f8632d524..beb7d5968 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index e56bec712..8788bab96 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index a5df04620..8b7ba5235 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 114246f17..e0b2dc0a8 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index 489f3eeb1..d0f89e0df 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 2a874eb5c..879230b73 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 98d432a10..a5946bf21 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index 12c1f0596..f6b140e44 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index ad166093f..502e384fc 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index 585fa52a1..4409e6510 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index 7c64a1b26..02288d693 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 4d0b3d557..959e32105 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index a3162331c..d79cbd6b6 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index b99635b17..520948b1c 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index a76dced38..2f346e2d8 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/BytesLocationTest.java b/src/test/java/org/scijava/io/BytesLocationTest.java
index 67a0e9716..014dff813 100644
--- a/src/test/java/org/scijava/io/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/DataHandleTest.java b/src/test/java/org/scijava/io/DataHandleTest.java
index d496a665b..185f47881 100644
--- a/src/test/java/org/scijava/io/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/DataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/FileHandleTest.java b/src/test/java/org/scijava/io/FileHandleTest.java
index 89d8914f9..ed8effa58 100644
--- a/src/test/java/org/scijava/io/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/FileHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/FileLocationTest.java b/src/test/java/org/scijava/io/FileLocationTest.java
index 098cdaa54..60b95e1b0 100644
--- a/src/test/java/org/scijava/io/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/URILocationTest.java b/src/test/java/org/scijava/io/URILocationTest.java
index ccd9155ac..866837b04 100644
--- a/src/test/java/org/scijava/io/URILocationTest.java
+++ b/src/test/java/org/scijava/io/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/io/URLLocationTest.java b/src/test/java/org/scijava/io/URLLocationTest.java
index 69e85135e..0fde7d087 100644
--- a/src/test/java/org/scijava/io/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 416069776..515e44a1d 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index d3ec4aca5..542dd3cc9 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index 9814b758b..8c74eec92 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index 5e464c741..bfaa74f23 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 479531083..4962136a0 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index e406bf64c..73a991970 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index 05bcd6957..cdd88db72 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 659db41ae..08296c0da 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 2606115e8..3b2ceb06d 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 8433da024..46d4c1348 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index a125dfff8..1f0c40a34 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index 1c8df132f..f6db17850 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 6508facfa..afe868fb9 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 33510e5ec..06f934666 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index a4e1f22ed..c6dfdaa10 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index 80c6ca809..55f35e89e 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index 00c0aa2d2..fd3f3f239 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index 4b3a8685f..bce9fe6f2 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 8f6276f83..c24fad50c 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index eb384c03a..8d022f748 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index ec40e4790..3e1c06711 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 200db1a85..fd643e259 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index 1cc567e4c..d2ab485fa 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 7e6c6278f..f8b7f94b6 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 878ccfc1a..9a29ead8e 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 716a2a846..03bae44f1 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,19 +2,19 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index 8634a5ca5..2fd9342ef 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index bd21d71d3..59b463ac2 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index 8468c911f..f29d1d5ab 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index 70d3cbcd7..cdf6fc2f6 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 0947b9ce0..8e31741ee 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index a32dffe57..0dba2d7f2 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 25f3d8c69..02942c614 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 6a1bed171..9f430a010 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index f066f24ed..4610931ae 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index 1430a530a..ce980ff89 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index ad8d51c1a..1d9c7a2e0 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index 0b7947657..4f8992c32 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/GenericUtilsTest.java b/src/test/java/org/scijava/util/GenericUtilsTest.java
index 6b0a10939..b39c2cc71 100644
--- a/src/test/java/org/scijava/util/GenericUtilsTest.java
+++ b/src/test/java/org/scijava/util/GenericUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index 30f97a709..43bd6b610 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 553be9b92..46522d150 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index 17b5294cc..24df63313 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index d3ef289f1..ef8dad647 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index e094e2897..0d5205c21 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index fb985d03f..5446480e2 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index 1ee21a581..c2a4ae0b2 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index 26ed7c378..4a3fd60c6 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index f584fe72f..f2d005c2c 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
  * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
  * Institute of Molecular Cell Biology and Genetics.
  * %%

From dded05f2c7b80eb13ca54d29fb7cf4232d83f95e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Jan 2017 13:10:31 -0600
Subject: [PATCH 0442/1208] CommandInfoTest: workaround for strange javac bug

Without this change, some javac versions fail with:

    [ERROR]
    /data/devel/jenkins-maven/workspace/SciJava-common/src/test/java/org/scijava/command/CommandInfoTest.java:[97,10]
    cannot find symbol
      symbol:   class Plugin
      location: class org.scijava.command.CommandInfoTest
    [INFO] 1 error

Notably, compilation fails on Ubuntu 12.04.5 LTS using:

    openjdk version "1.8.0_111"
    OpenJDK Runtime Environment (build 1.8.0_111-8u111-b14-3~12.04-b14)
    OpenJDK 64-Bit Server VM (build 25.111-b14, mixed mode)

But works fine on macOS Sierra using:

    java version "1.8.0_112"
    Java(TM) SE Runtime Environment (build 1.8.0_112-b16)
    Java HotSpot(TM) 64-Bit Server VM (build 25.112-b16, mixed mode)
---
 src/test/java/org/scijava/command/CommandInfoTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 2e022050a..7704f5378 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -94,7 +94,7 @@ public void testEnumParam() {
 	// -- Helper classes --
 
 	/** A command with an enum parameter. */
-	@Plugin(type = Command.class)
+	@org.scijava.plugin.Plugin(type = Command.class)
 	public static class CommandWithEnumParam implements Command {
 
 		public enum Choice {

From 5755c59050d17c7f3be451ea871e90776f84986e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 6 Feb 2017 15:42:51 -0600
Subject: [PATCH 0443/1208] Update pom-scijava parent to 13.1.0

This switches to Parsington from the old scijava-expression-parser.
---
 pom.xml                                                  | 4 ++--
 src/main/java/org/scijava/parse/DefaultParseService.java | 4 ++--
 src/main/java/org/scijava/script/ScriptInfo.java         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8960567ca..7317867c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>12.0.0</version>
+		<version>13.1.0</version>
 		<relativePath />
 	</parent>
 
@@ -134,7 +134,7 @@ Institute of Molecular Cell Biology and Genetics.</license.copyrightOwners>
 		<!-- SciJava dependencies -->
 		<dependency>
 			<groupId>org.scijava</groupId>
-			<artifactId>scijava-expression-parser</artifactId>
+			<artifactId>parsington</artifactId>
 		</dependency>
 
 		<!-- Third-party dependencies -->
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index de2163885..97ff4eb37 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -36,11 +36,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.scijava.parse.Variable;
+import org.scijava.parse.eval.DefaultEvaluator;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
-import org.scijava.sjep.Variable;
-import org.scijava.sjep.eval.DefaultEvaluator;
 import org.scijava.util.ObjectArray;
 
 /**
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 88c3bed46..b93751a31 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -517,7 +517,7 @@ private <T> T as(final Object v, final Class<T> type) {
 		if (converted != null) return converted;
 		// NB: Attempt to convert via string.
 		// This is useful in cases where a weird type of object came back
-		// (e.g., org.scijava.sjep.eval.Unresolved), but which happens to have a
+		// (e.g., org.scijava.parse.eval.Unresolved), but which happens to have a
 		// nice string representation which ultimately is expressible as the type.
 		return convertService.convert(v.toString(), type);
 	}

From 8a153359bd77411a390c04da8243bc32aba29276 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 6 Feb 2017 15:45:57 -0600
Subject: [PATCH 0444/1208] Bump to next development cycle

Signed-off-by: Jenkins <jenkins@imagej.net>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7317867c4..22cea577a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.62.1-SNAPSHOT</version>
+	<version>2.62.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 8719512c0e19af1eaefee9f838daaa413b01a3a7 Mon Sep 17 00:00:00 2001
From: Leon Yang <leon.gh.yang@gmail.com>
Date: Wed, 8 Feb 2017 16:46:34 -0600
Subject: [PATCH 0445/1208] Make canCast support auto-unboxing

This behavior is especially important for conversion with constructors
when the constructor accepts primitive type while a Number is given. See
conversion from int to net.imglib2.type.number.integer.IntType for
example.
---
 .../org/scijava/util/ConversionUtils.java     |  5 +++-
 .../scijava/convert/ConvertServiceTest.java   | 28 +++++++++++++++++++
 .../org/scijava/util/ConversionUtilsTest.java |  5 ++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index ba866f43b..23bc239f8 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -106,7 +106,10 @@ public static <T> T cast(final Object src, final Class<T> dest) {
 	 */
 	public static boolean canCast(final Class<?> src, final Class<?> dest) {
 		if (dest == null) return false;
-		return src == null || dest.isAssignableFrom(src);
+		if (src == null) return true;
+		final Class<?> saneSrc = getNonprimitiveType(src);
+		final Class<?> saneDest = getNonprimitiveType(dest);
+		return saneDest.isAssignableFrom(saneSrc);
 	}
 
 	/**
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index ce3b6a2ee..8985e0d58 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -498,6 +498,22 @@ class Struct {
 		setFieldValue(struct, "singleValue", new int[] { 4, 8, 2 });
 	}
 
+	/**
+	 * Test behavior when setting a single element field with a constructor that
+	 * accepts a primitive type (int).
+	 */
+	@Test
+	public void testLegitimateSingletonInt() {
+		class Struct {
+			
+			private IntWrapper intWrapper;
+		}
+		final Struct struct = new Struct();
+		
+		setFieldValue(struct, "intWrapper", Integer.valueOf(12));
+		assertNotNull(struct.intWrapper);
+	}
+
 	/**
 	 * Test behavior when setting a single element field with a constructor that
 	 * accepts a primitive array.
@@ -628,6 +644,18 @@ private static interface INumberList extends List<Number> {
 		// NB: No implementation needed.
 	}
 
+	/**
+	 * Dummy class with an int constructor to ensure that when converting using
+	 * constructors, auto-unboxing should work as expected.
+	 */
+	public static class IntWrapper {
+		
+		@SuppressWarnings("unused")
+		public IntWrapper(final int gonnaWrapThisInt) {
+			// nothing to do
+		}
+	}
+
 	/**
 	 * Dummy class with an array constructor to ensure that the logic to
 	 * recursively convert arrays doesn't consume the array improperly when it
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 9f430a010..139fd015b 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -73,9 +73,8 @@ public void testCanCast() {
 		assertFalse(ConversionUtils.canCast(double.class, float.class));
 		assertFalse(ConversionUtils.canCast(float.class, double.class));
 
-		// boxing is not reported to work
-		// TODO: Consider changing this behavior.
-		assertFalse(ConversionUtils.canCast(int.class, Number.class));
+		// check casting with boxing
+		assertTrue(ConversionUtils.canCast(int.class, Number.class));
 
 		// casting from null always works
 		final Class<?> nullClass = null;

From b72870d7fe2fc54e93b7d27e69d6f914403c195b Mon Sep 17 00:00:00 2001
From: Leon Yang <leon.gh.yang@gmail.com>
Date: Wed, 8 Feb 2017 17:07:42 -0600
Subject: [PATCH 0446/1208] Rename canCast to canAssign

---
 .../org/scijava/util/ConversionUtils.java     | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 23bc239f8..0408c6ff2 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -97,13 +97,34 @@ public static <T> T cast(final Object src, final Class<T> dest) {
 	}
 
 	/**
-	 * Checks whether objects of the given class can be cast to the specified
-	 * type.
-	 *
+	 * Checks whether objects of the given class can be assigned to the specified
+	 * type. Unlike {@link Class#isAssignableFrom(Class)}, this method considers
+	 * auto-unboxing.
+	 * 
 	 * @return true If the destination class is assignable from the source one, or
 	 *         if the source class is null and destination class is non-null.
-	 * @see #cast(Object, Class)
 	 */
+	public static boolean canAssign(final Class<?> src, final Class<?> dest) {
+		return canCast(src, dest);
+	}
+
+	/**
+	 * Checks whether the given object can be assigned to the specified type.
+	 * Unlike {@link Class#isAssignableFrom(Class)}, this method considers
+	 * auto-unboxing.
+	 * 
+	 * @return true If the destination class is assignable from the source
+	 *         object's class, or if the source object is null and destionation
+	 *         class is non-null.
+	 */
+	public static boolean canAssign(final Object src, final Class<?> dest) {
+		return canCast(src, dest);
+	}
+
+	/**
+	 * @deprecated use {@link #canAssign(Class, Class)} instead
+	 */
+	@Deprecated
 	public static boolean canCast(final Class<?> src, final Class<?> dest) {
 		if (dest == null) return false;
 		if (src == null) return true;
@@ -113,13 +134,9 @@ public static boolean canCast(final Class<?> src, final Class<?> dest) {
 	}
 
 	/**
-	 * Checks whether the given object can be cast to the specified type.
-	 *
-	 * @return true If the destination class is assignable from the source
-	 *         object's class, or if the source object is null and destionation
-	 *         class is non-null.
-	 * @see #cast(Object, Class)
+	 * @deprecated use {@link #canAssign(Object, Class)} instead
 	 */
+	@Deprecated
 	public static boolean canCast(final Object src, final Class<?> dest) {
 		if (dest == null) return false;
 		return src == null || canCast(src.getClass(), dest);

From 001a5f203830ff9ceaee2dc451a11ccf470464be Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 9 Feb 2017 09:45:09 -0600
Subject: [PATCH 0447/1208] HeadlessArgument: move to the correct package

It was in the wrong package. The org.scijava.console package is lower
level than org.scijava.ui. Logic relating to the union of those two
packages goes into org.scijava.ui.console.

This is technically a breaking API change, but in this case we are
moving a plugin implementation class, which no one should be relying on
directly. It is probably worth a formal rule stating that SJC public API
(covered by SemVer) does not include `@Plugin` implementations at all.
---
 .../java/org/scijava/{ => ui}/console/HeadlessArgument.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 rename src/main/java/org/scijava/{ => ui}/console/HeadlessArgument.java (93%)

diff --git a/src/main/java/org/scijava/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
similarity index 93%
rename from src/main/java/org/scijava/console/HeadlessArgument.java
rename to src/main/java/org/scijava/ui/console/HeadlessArgument.java
index db4c64109..2272eb14b 100644
--- a/src/main/java/org/scijava/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -28,11 +28,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package org.scijava.console;
+package org.scijava.ui.console;
 
 import java.util.LinkedList;
 
 import org.scijava.Context;
+import org.scijava.console.AbstractConsoleArgument;
+import org.scijava.console.ConsoleArgument;
+import org.scijava.console.ConsoleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.ui.UIService;

From c4a8d36cb7425c455d1024506aa5524b77f67215 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 9 Feb 2017 09:59:27 -0600
Subject: [PATCH 0448/1208] UIArgument: improve javadoc

---
 src/main/java/org/scijava/ui/console/UIArgument.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index a40902b3e..29345595d 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -43,6 +43,9 @@
 
 /**
  * Handles the {@code --ui} command line argument.
+ * <p>
+ * This argument overrides the default user interface.
+ * </p>
  * 
  * @author Curtis Rueden
  */

From a3f94276003ba75888b5c3646c7faf665a58db89 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 9 Feb 2017 09:59:35 -0600
Subject: [PATCH 0449/1208] Add the --showUI console argument

This shows the UI immediately. It is useful if you want to have some
arguments get processed after the UI appears, instead of beforehand.
---
 .../scijava/ui/console/ShowUIArgument.java    | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/main/java/org/scijava/ui/console/ShowUIArgument.java

diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
new file mode 100644
index 000000000..9294b94f7
--- /dev/null
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.ui.console;
+
+import java.util.LinkedList;
+
+import org.scijava.Gateway;
+import org.scijava.console.AbstractConsoleArgument;
+import org.scijava.console.ConsoleArgument;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.ui.UIService;
+
+/**
+ * Handles the {@code --showUI} argument, which signals that the UI should be
+ * opened immediately.
+ * <p>
+ * This is useful for specifying later command line arguments to be handled
+ * <em>after</em> the UI is shown, since normally, all arguments are processed
+ * before showing the UI.
+ * </p>
+ *
+ * @author Curtis Rueden
+ * @see Gateway#launch(String[])
+ */
+@Plugin(type = ConsoleArgument.class)
+public class ShowUIArgument extends AbstractConsoleArgument {
+
+	@Parameter(required = false)
+	private UIService uiService;
+
+	// -- Constructor --
+
+	public ShowUIArgument() {
+		super(1, "--showUI");
+	}
+
+	// -- ConsoleArgument methods --
+
+	@Override
+	public void handle(final LinkedList<String> args) {
+		if (!supports(args)) return;
+
+		args.removeFirst(); // --showUI
+
+		uiService.showUI();
+	}
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		return uiService != null && super.supports(args);
+	}
+
+}

From acbe58c46723e9cc131477c6ac9bb4e8b628e68f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 28 Feb 2017 08:16:15 -0600
Subject: [PATCH 0450/1208] Switch from Jenkins to Travis CI

---
 .travis.yml          | 12 ++++++++++++
 .travis/build.sh     |  7 +++++++
 .travis/notify.sh    |  2 ++
 .travis/settings.xml | 14 ++++++++++++++
 README.md            |  2 +-
 pom.xml              |  4 ++--
 6 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 .travis.yml
 create mode 100755 .travis/build.sh
 create mode 100755 .travis/notify.sh
 create mode 100644 .travis/settings.xml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..1570c3987
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,12 @@
+language: java
+jdk: oraclejdk8
+branches:
+  only: master
+install: true
+script: ".travis/build.sh"
+after_success: ".travis/notify.sh Travis-Success"
+after_failure: ".travis/notify.sh Travis-Failure"
+env:
+  global:
+  - secure: l5k7gyNsC7cS1QcqPcSzxQeueZmakAvYRDBevIGA61yDjL/cK4Pyy/7yNz4CHo+mgHaHul9uLIQuZvQdeAs4FqHi37brY1//emVI4BiUow+XDvge7DttDJ+JjBlGsZrxX0YKtnn/V83WO23RtGGQUZ8PBwpNWYB52stDpizhqqg=
+  - secure: Hs3V7J4BmasiXNWOBzFuxYcPeImFYo8Ze3UWqg85gRa1YxKNbnJLGPjQoIcUxXQU34Fa0qvvWcPUyEjne+nAbWtAVrq/xRSVj5Fnen+UmH3fjV1aR6Rsr56gkdqlaeIfcxaaeGTeguHQB1LSNCIvcF5s8f6J+37l65UUxGsL3+4=
diff --git a/.travis/build.sh b/.travis/build.sh
new file mode 100755
index 000000000..4c2f8d2e4
--- /dev/null
+++ b/.travis/build.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+dir="$(dirname "$0")"
+test "$TRAVIS_SECURE_ENV_VARS" = true \
+  -a "$TRAVIS_PULL_REQUEST" = false \
+  -a "$TRAVIS_BRANCH" = master &&
+  mvn -Pdeploy-to-imagej deploy --settings "$dir/settings.xml" ||
+  mvn install
diff --git a/.travis/notify.sh b/.travis/notify.sh
new file mode 100755
index 000000000..b3b239e46
--- /dev/null
+++ b/.travis/notify.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+curl -fs "https://jenkins.imagej.net/job/$1/buildWithParameters?token=$TOKEN_NAME&repo=$TRAVIS_REPO_SLUG&commit=$TRAVIS_COMMIT&pr=$TRAVIS_PULL_REQUEST"
diff --git a/.travis/settings.xml b/.travis/settings.xml
new file mode 100644
index 000000000..71a56300a
--- /dev/null
+++ b/.travis/settings.xml
@@ -0,0 +1,14 @@
+<settings>
+  <servers>
+    <server>
+      <id>imagej.releases</id>
+      <username>travis</username>
+      <password>${env.MAVEN_PASS}</password>
+    </server>
+    <server>
+      <id>imagej.snapshots</id>
+      <username>travis</username>
+      <password>${env.MAVEN_PASS}</password>
+    </server>
+  </servers>
+</settings>
diff --git a/README.md b/README.md
index 68ac93496..0838f7b7b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
-[![](http://jenkins.imagej.net/job/SciJava-common/lastBuild/badge/icon)](http://jenkins.imagej.net/job/SciJava-common/)
+[![](https://travis-ci.org/scijava/scijava-common.svg?branch=master)](https://travis-ci.org/scijava/scijava-common)
 [![Join the chat at https://gitter.im/scijava/scijava-common](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scijava/scijava-common?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 SciJava Common is a common library for SciJava software. It provides a
diff --git a/pom.xml b/pom.xml
index 22cea577a..c879fc31e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,8 +116,8 @@
 		<url>https://github.com/scijava/scijava-common/issues</url>
 	</issueManagement>
 	<ciManagement>
-		<system>Jenkins</system>
-		<url>http://jenkins.imagej.net/job/SciJava-common/</url>
+		<system>Travis CI</system>
+		<url>https://travis-ci.org/scijava/scijava-common</url>
 	</ciManagement>
 
 	<properties>

From 4711e5965198a5a490cff38b7d74f0d056ec6395 Mon Sep 17 00:00:00 2001
From: Richard Domander <rdomander@rvc.ac.uk>
Date: Wed, 1 Mar 2017 16:57:48 +0000
Subject: [PATCH 0451/1208] Fix POMTest

POMTest was failing, since it expected Jenkins instead of TravisCI.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 src/test/java/org/scijava/util/POMTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 0d5205c21..aa7069201 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -94,9 +94,9 @@ public void testAccessors() throws ParserConfigurationException,
 		assertEquals("org.scijava", pom.getGroupId());
 		assertEquals("scijava-common", pom.getArtifactId());
 		assertNotNull(pom.getVersion());
-		assertEquals("Jenkins", pom.getCIManagementSystem());
+		assertEquals("Travis CI", pom.getCIManagementSystem());
 		final String ciManagementURL = pom.getCIManagementURL();
-		assertEquals("http://jenkins.imagej.net/job/SciJava-common/",
+		assertEquals("https://travis-ci.org/scijava/scijava-common",
 			ciManagementURL);
 		assertEquals("GitHub Issues", pom.getIssueManagementSystem());
 		final String issueManagementURL = pom.getIssueManagementURL();

From af089de04bd05b749d895e3fcd2409c8f07ee442 Mon Sep 17 00:00:00 2001
From: Richard Domander <rdomander@rvc.ac.uk>
Date: Wed, 1 Mar 2017 16:37:02 +0000
Subject: [PATCH 0452/1208] Add String utils

---
 .../java/org/scijava/util/StringUtils.java    |  73 +++++++++
 .../org/scijava/util/StringUtilsTest.java     | 143 ++++++++++++++++++
 2 files changed, 216 insertions(+)
 create mode 100644 src/test/java/org/scijava/util/StringUtilsTest.java

diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index d970c402c..0d77ce1bc 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -69,9 +69,12 @@
  * @author Curtis Rueden
  * @author Chris Allan
  * @author Melissa Linkert
+ * @author Richard Domander (Royal Veterinary College, London)
  */
 public final class StringUtils {
 
+	public static final char DEFAULT_PAD_CHAR = ' ';
+
 	private StringUtils() {
 		// NB: prevent instantiation of utility class.
 	}
@@ -130,4 +133,74 @@ public static String sanitize(final String s) {
 		return buf.toString();
 	}
 
+	public static boolean isNullOrEmpty(final String s) {
+		return s == null || s.isEmpty();
+	}
+
+	/**
+	 * Calls {@link #padEnd(String, int, char)} with the {@link #DEFAULT_PAD_CHAR}
+	 */
+	public static String padEnd(final String s, final int length) {
+		return padEnd(s, length, DEFAULT_PAD_CHAR);
+	}
+
+	/**
+	 * Adds characters to the end of the {@link String} to make it the given
+	 * length
+	 *
+	 * @param s the original string
+	 * @param length the length of the string with padding
+	 * @param padChar the character added to the end
+	 * @return the end padded {@link String}. Null if s is null, s if no padding
+	 *         is not necessary
+	 */
+	public static String padEnd(final String s, final int length,
+		final char padChar)
+	{
+		if (s == null) {
+			return null;
+		}
+
+		final StringBuilder builder = new StringBuilder(s);
+		final int padding = length - s.length();
+		for (int i = 0; i < padding; i++) {
+			builder.append(padChar);
+		}
+
+		return builder.toString();
+	}
+
+	/**
+	 * Calls {@link #padStart(String, int, char)} with the
+	 * {@link #DEFAULT_PAD_CHAR}
+	 */
+	public static String padStart(final String s, final int length) {
+		return padStart(s, length, DEFAULT_PAD_CHAR);
+	}
+
+	/**
+	 * Adds characters to the start of the {@link String} to make it the given
+	 * length
+	 *
+	 * @param s the original string
+	 * @param length the length of the string with padding
+	 * @param padChar the character added to the start
+	 * @return the start padded {@link String}. Null if s is null, s if no padding
+	 *         is not necessary
+	 */
+	public static String padStart(final String s, final int length,
+		final char padChar)
+	{
+		if (s == null) {
+			return null;
+		}
+
+		final StringBuilder builder = new StringBuilder();
+		final int padding = length - s.length();
+		for (int i = 0; i < padding; i++) {
+			builder.append(padChar);
+		}
+
+		return builder.append(s).toString();
+	}
 }
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
new file mode 100644
index 000000000..908b59eca
--- /dev/null
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -0,0 +1,143 @@
+
+package org.scijava.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Tests for the utility methods in {@link StringUtils}
+ *
+ * @author Richard Domander (Royal Veterinary College, London)
+ */
+public class StringUtilsTest {
+
+	@Test
+	public void isNullOrEmptyFalseIfString() throws Exception {
+		assertFalse(StringUtils.isNullOrEmpty("Fresh out of Red Leicester"));
+	}
+
+	@Test
+	public void isNullOrEmpty() throws Exception {
+		assertTrue(StringUtils.isNullOrEmpty(null));
+		assertTrue(StringUtils.isNullOrEmpty(""));
+	}
+
+	@Test
+	public void padEndNullStringReturnsNull() throws Exception {
+		assertNull(StringUtils.padEnd(null, 5, '*'));
+	}
+
+	@Test
+	public void padEndEmptyString() throws Exception {
+		final int length = 5;
+		final char padChar = '*';
+
+		final String padded = StringUtils.padEnd("", length, padChar);
+		assertNotNull(padded);
+		assertFalse(padded.isEmpty());
+		assertEquals(length, padded.length());
+		assertTrue(padded.chars().allMatch(c -> c == padChar));
+	}
+
+	@Test
+	public void padEndLengthSmaller() throws Exception {
+		final String s = "Eric the fruit bat";
+
+		final String padded = StringUtils.padEnd(s, 3, '*');
+
+		assertEquals(s, padded);
+	}
+
+	@Test
+	public void padEndLengthEqual() throws Exception {
+		final String s = "Eric the cat";
+
+		final String padded = StringUtils.padEnd(s, s.length(), '*');
+
+		assertEquals(s, padded);
+	}
+
+	@Test
+	public void padEndLengthNegative() throws Exception {
+		final String s = "Eric the dog";
+
+		final String padded = StringUtils.padEnd(s, -1, '~');
+
+		assertEquals(s, padded);
+	}
+
+	@Test
+	public void padEnd() throws Exception {
+		final String s = "Eric the halibut";
+		final int newLength = s.length() + 5;
+
+		final String padded = StringUtils.padEnd(s, newLength);
+
+		assertEquals(newLength, padded.length());
+		final String padding = padded.substring(padded.length() - 5);
+		assertTrue(padding.chars().allMatch(c -> c == StringUtils.DEFAULT_PAD_CHAR));
+		assertEquals(s, padded.substring(0, padded.length() - 5));
+	}
+
+	@Test
+	public void padStartNullStringReturnsNull() throws Exception {
+		assertNull(StringUtils.padStart(null, 5, '*'));
+	}
+
+	@Test
+	public void padStartEmptyString() throws Exception {
+		final int length = 5;
+		final char padChar = '*';
+
+		final String padded = StringUtils.padStart("", length, padChar);
+		assertNotNull(padded);
+		assertFalse(padded.isEmpty());
+		assertEquals(length, padded.length());
+		assertTrue(padded.chars().allMatch(c -> c == padChar));
+	}
+
+	@Test
+	public void padStartLengthSmaller() throws Exception {
+		final String s = "Eric the dog";
+
+		final String padded = StringUtils.padStart(s, 3, '*');
+
+		assertEquals(s, padded);
+	}
+
+	@Test
+	public void padStartLengthEqual() throws Exception {
+		final String s = "Simon the prawn";
+
+		final String padded = StringUtils.padStart(s, s.length(), '*');
+
+		assertEquals(s, padded);
+	}
+
+	@Test
+	public void padStartLengthNegative() throws Exception {
+		final String s = "Norman the pike";
+
+		final String padded = StringUtils.padStart(s, -1, '~');
+
+		assertEquals(s, padded);
+	}
+
+	@Test
+	public void padStart() throws Exception {
+		final String s = "Norman the pike";
+		final int newLength = s.length() + 5;
+
+		final String padded = StringUtils.padStart(s, newLength);
+
+		assertEquals(newLength, padded.length());
+		final String padding = padded.substring(0, 5);
+		assertTrue(padding.chars().allMatch(c -> c == StringUtils.DEFAULT_PAD_CHAR));
+		assertEquals(s, padded.substring(5, padded.length()));
+	}
+}

From d1a39aee5bf4d165e0fffb7d69d37d29088c5582 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 14 Mar 2017 14:40:47 -0500
Subject: [PATCH 0453/1208] POM: use a better URL

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c879fc31e..fd1a7ddea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
-	<url>http://scijava.org/</url>
+	<url>https://github.com/scijava/scijava-common</url>
 	<inceptionYear>2009</inceptionYear>
 	<organization>
 		<name>SciJava</name>

From f7457f0e0538a9f61b25ffe43988660766e14a7a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 14 Mar 2017 15:21:39 -0500
Subject: [PATCH 0454/1208] POMTest: update tests to reflect new project URL

---
 src/test/java/org/scijava/util/POMTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index aa7069201..f8d2e3f6d 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -109,7 +109,8 @@ public void testAccessors() throws ParserConfigurationException,
 			"SciJava Common is a shared library for SciJava software."));
 		assertEquals("2009", pom.getProjectInceptionYear());
 		assertEquals("SciJava Common", pom.getProjectName());
-		assertEquals("http://scijava.org/", pom.getProjectURL());
+		assertEquals("https://github.com/scijava/scijava-common", //
+			pom.getProjectURL());
 		final String scmConnection = pom.getSCMConnection();
 		assertEquals("scm:git:git://github.com/scijava/scijava-common",
 			scmConnection);
@@ -126,7 +127,8 @@ public void testCdata() throws ParserConfigurationException,
 	{
 		final POM pom = new POM(new File("pom.xml"));
 		assertEquals("repo", pom.cdata("//project/licenses/license/distribution"));
-		assertEquals("http://scijava.org/", pom.cdata("//project/url"));
+		assertEquals("https://github.com/scijava/scijava-common", //
+			pom.cdata("//project/url"));
 	}
 
 	@Test

From 4990fc071b8e9b269920ec8cf176f51f23cf1c5c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Apr 2017 15:38:59 -0500
Subject: [PATCH 0455/1208] Fix the Travis configuration

Without this, failed builds of master trigger another "mvn install".

See: https://gist.github.com/ctrueden/ae0f024a0cdf2cb53c915d75b0759553
---
 .travis/build.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis/build.sh b/.travis/build.sh
index 4c2f8d2e4..8cddb5f18 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 dir="$(dirname "$0")"
-test "$TRAVIS_SECURE_ENV_VARS" = true \
+if [ "$TRAVIS_SECURE_ENV_VARS" = true \
   -a "$TRAVIS_PULL_REQUEST" = false \
-  -a "$TRAVIS_BRANCH" = master &&
-  mvn -Pdeploy-to-imagej deploy --settings "$dir/settings.xml" ||
+  -a "$TRAVIS_BRANCH" = master ]
+then
+  mvn -Pdeploy-to-imagej deploy --settings "$dir/settings.xml"
+else
   mvn install
+fi

From 2b24dafa013e4abb09a966c8598b390e196a893b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 27 Apr 2017 14:58:43 -0500
Subject: [PATCH 0456/1208] Fix javadoc errors

---
 src/main/java/org/scijava/Context.java        |  11 +-
 src/main/java/org/scijava/Identifiable.java   |   2 +-
 src/main/java/org/scijava/SciJava.java        |   5 +-
 .../java/org/scijava/annotations/Index.java   |  15 +-
 .../scijava/convert/ConversionRequest.java    |  18 +-
 .../org/scijava/convert/ConvertService.java   |  16 +-
 .../java/org/scijava/convert/Converter.java   |   5 +-
 src/main/java/org/scijava/input/KeyCode.java  |   2 +-
 .../java/org/scijava/menu/ShadowMenu.java     |   3 +-
 src/main/java/org/scijava/plugin/Plugin.java  |   8 +-
 .../java/org/scijava/script/ScriptInfo.java   |  17 +-
 src/main/java/org/scijava/test/TestUtils.java |  20 +-
 .../java/org/scijava/util/CheckSezpoz.java    |  22 +-
 .../org/scijava/util/ConversionUtils.java     |   4 +
 src/main/java/org/scijava/util/FileUtils.java |   3 +-
 .../org/scijava/util/MersenneTwisterFast.java | 286 +++++++++---------
 src/main/java/org/scijava/util/Timing.java    |  27 +-
 17 files changed, 231 insertions(+), 233 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 4813fdeab..e74971f46 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -141,8 +141,9 @@ public Context(final boolean noServices, final boolean noPlugins) {
 	 * {@code new Context(DisplayService.class)}) yield the potentially confusing
 	 * warning:
 	 * </p>
-	 * <blockquote>Type safety: A generic array of Class<? extends Service> is
-	 * created for a varargs parameter</blockquote>
+	 * <blockquote>Type safety: A generic array of
+	 * {@code Class<? extends Service>} is created for a varargs
+	 * parameter</blockquote>
 	 * <p>
 	 * To avoid this, we have opted to use raw types and suppress the relevant
 	 * warnings here instead.
@@ -351,7 +352,7 @@ public Service getService(final String className) {
 	/**
 	 * Injects the application context into the given object. This does three
 	 * distinct things:
-	 * <ul>
+	 * <ol>
 	 * <li>If the given object has any non-final {@link Context} fields annotated
 	 * with @{@link Parameter}, sets the value of those fields to this context.
 	 * </li>
@@ -360,8 +361,8 @@ public Service getService(final String className) {
 	 * corresponding service available from this context.</li>
 	 * <li>Calls {@link EventService#subscribe(Object)} with the object to
 	 * register any @{@link EventHandler} annotated methods as event subscribers.
-	 * </li> .</li>
-	 * </ul>
+	 * </li>
+	 * </ol>
 	 *
 	 * @param o The object to which the context should be assigned.
 	 * @throws IllegalStateException If the object already has a context.
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index e04fbb682..116ee2775 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -49,7 +49,7 @@
  * <p>
  * In this way, objects themselves do not need to be {@link Serializable}, nor
  * do multiple potentially equivalent objects need to be synthesized and then
- * compared using {@link #equals}.
+ * compared using {@link Object#equals}.
  * </p>
  * 
  * @author Curtis Rueden
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index 462b92f72..927cbb224 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -74,8 +74,9 @@ public SciJava(final boolean empty) {
 	 * {@code new SciJava(LogService.class)}) yield the potentially confusing
 	 * warning:
 	 * </p>
-	 * <blockquote>Type safety: A generic array of Class<? extends Service> is
-	 * created for a varargs parameter</blockquote>
+	 * <blockquote>Type safety: A generic array of
+	 * {@code Class<? extends Service>} is created for a varargs
+	 * parameter</blockquote>
 	 * <p>
 	 * To avoid this, we have opted to use raw types and suppress the relevant
 	 * warning here instead.
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index 13d8e2d88..84ae391d1 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -45,14 +45,15 @@
 /**
  * Makes the annotation indexes accessible.
  * <p>
- * You would call it like this:<br />
- * <code>
- * for (IndexItem<MyAnnotation> item : Index.load(MyAnnotation.class)) {<br />
- *    // do something with item.annotation() and/or item.className()<br />
- * }<br />
- * </code>
+ * You would call it like this:
  * </p>
  * 
+ * <pre>
+ * for (IndexItem&lt;MyAnnotation&gt; item : Index.load(MyAnnotation.class)) {
+ *   // do something with item.annotation() and/or item.className()
+ * }
+ * </pre>
+ * 
  * @author Johannes Schindelin
  */
 public class Index<A extends Annotation> implements Iterable<IndexItem<A>> {
@@ -74,8 +75,6 @@ public static <A extends Annotation> Index<A> load(final Class<A> annotation)
 
 	/**
 	 * Loads the index of all classes annotated with the specified annotation.
-	 * <p>
-	 * </p>
 	 * 
 	 * @param annotation the annotation type
 	 * @param loader the class loader to use when loading {@link Class}-type
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index a4397e60f..14c1ae26f 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -33,29 +33,27 @@
 
 import java.lang.reflect.Type;
 
+import org.scijava.plugin.HandlerService;
 import org.scijava.util.GenericUtils;
 
 /**
- * Currency for use in {@link Converter} and {@link ConvertService}
- * methods.
+ * Currency for use in {@link Converter} and {@link ConvertService} methods.
  * <p>
  * {@link #ConversionRequest} provides a variety of constructors. Note that only
  * one destination type needs to be set (e.g. either a {@link Type} or a
  * {@link Class}).
  * </p>
  * <p>
- * Only the {@link Class} source needs to be set for {@link Converter}
- * lookup, such as through
- * {@link ConvertService#getHandler(ConversionRequest)}. However, to perform
- * an actual conversion, e.g. using
+ * Only the {@link Class} source needs to be set for {@link Converter} lookup,
+ * such as through {@link HandlerService#getHandler(Object)}. However, to
+ * perform an actual conversion, e.g. using
  * {@link Converter#convert(ConversionRequest)}, you must provide an
  * {@link Object} source.
  * </p>
  * <p>
- * NB: once a {@link Converter} has been acquired, the
- * {@code ConversionRequest} used for lookup can be reused to cast to the same
- * destination type, simply by updating the source object using the
- * {@link #setSourceObject(Object)} method.
+ * NB: once a {@link Converter} has been acquired, the {@code ConversionRequest}
+ * used for lookup can be reused to cast to the same destination type, simply by
+ * updating the source object using the {@link #setSourceObject(Object)} method.
  * </p>
  *
  * @author Mark Hiner
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index cea655f5c..39d950e1e 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -66,22 +66,22 @@ public interface ConvertService extends
 	Object convert(ConversionRequest request);
 
 	/**
-	 * @see #getHandler(ConversionRequest)
+	 * @see HandlerService#supports(Object)
 	 */
 	Converter<?, ?> getHandler(Object src, Class<?> dest);
 
 	/**
-	 * @see #getHandler(ConversionRequest)
+	 * @see HandlerService#supports(Object)
 	 */
 	Converter<?, ?> getHandler(Object src, Type dest);
 
 	/**
-	 * @see #supports(ConversionRequest)
+	 * @see HandlerService#supports(Object)
 	 */
 	boolean supports(Object src, Class<?> dest);
 
 	/**
-	 * @see #supports(ConversionRequest)
+	 * @see HandlerService#supports(Object)
 	 */
 	boolean supports(Object src, Type dest);
 
@@ -106,28 +106,28 @@ public interface ConvertService extends
 	// -- Deprecated API --
 
 	/**
-	 * @see #getHandler(ConversionRequest)
+	 * @see HandlerService#getHandler(Object)
 	 * @deprecated Use {@link #getHandler(Object, Class)}
 	 */
 	@Deprecated
 	Converter<?, ?> getHandler(Class<?> src, Class<?> dest);
 
 	/**
-	 * @see #getHandler(ConversionRequest)
+	 * @see HandlerService#getHandler(Object)
 	 * @deprecated Use {@link #getHandler(Object, Type)}
 	 */
 	@Deprecated
 	Converter<?, ?> getHandler(Class<?> src, Type dest);
 
 	/**
-	 * @see #supports(ConversionRequest)
+	 * @see HandlerService#supports(Object)
 	 * @deprecated Use {@link #supports(Object, Class)}
 	 */
 	@Deprecated
 	boolean supports(Class<?> src, Class<?> dest);
 
 	/**
-	 * @see #supports(ConversionRequest)
+	 * @see HandlerService#supports(Object)
 	 * @deprecated Use {@link #supports(Object, Type)}
 	 */
 	@Deprecated
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 325152928..f918d4ee0 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -50,9 +50,8 @@
 public interface Converter<I, O> extends HandlerPlugin<ConversionRequest> {
 
 	/**
-	 * Checks whether a given {@ConversionRequest} can be
-	 * processed, by converting the desired
-	 * {@link ConversionRequest#sourceClass()} to its
+	 * Checks whether a given {@link ConversionRequest} can be processed, by
+	 * converting the desired {@link ConversionRequest#sourceClass()} to its
 	 * {@link ConversionRequest#destClass()} or
 	 * {@link ConversionRequest#destType()}.
 	 *
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index f6401761f..e70e63222 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -442,7 +442,7 @@ public enum KeyCode {
 	/** TODO. */
 	DEAD_SEMIVOICED_SOUND(0x8f),
 
-	/** Ampersand ('&'). */
+	/** Ampersand ('&amp;'). */
 	AMPERSAND(0x96),
 
 	/** Asterisk ('*'). */
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 604492b65..529ba1f81 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -172,7 +172,8 @@ public MenuEntry getMenuEntry() {
 
 	/**
 	 * Gets how deep into the menu structure this node is. For example, "File"
-	 * would be at depth 1, whereas "Exit" (of "File>Exit") would be at depth 2.
+	 * would be at depth 1, whereas "Exit" (of "File&gt;Exit") would be at depth
+	 * 2.
 	 */
 	public int getMenuDepth() {
 		return menuDepth;
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index 66ac0576d..3a3223574 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -79,10 +79,10 @@
 
 	/**
 	 * Abbreviated menu path defining where the plugin is shown in the menu
-	 * structure. Uses greater than signs (>) as a separator; e.g.:
-	 * "Image > Overlay > Properties..." defines a "Properties..." menu item
-	 * within the "Overlay" submenu of the "Image" menu. Use either
-	 * {@link #menuPath} or {@link #menu} but not both.
+	 * structure. Uses greater than signs ({@code >}) as a separator; e.g.: "Image
+	 * &gt; Overlay &gt; Properties..." defines a "Properties..." menu item within
+	 * the "Overlay" submenu of the "Image" menu. Use either {@link #menuPath} or
+	 * {@link #menu} but not both.
 	 */
 	String menuPath() default "";
 
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index b93751a31..d22e3902a 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -238,11 +238,11 @@ public BufferedReader getReader() {
 	 * </p>
 	 * <ul>
 	 * <li>{@code // @<type> <varName>}</li>
-	 * <li>{@code // @<type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}</li>
-	 * <li>{@code // @<IOType> <type> <varName>}</li>
-	 * <li>
-	 * {@code // @<IOType>(<attr1>=<value1>, ..., <attrN>=<valueN>) <type> <varName>}
+	 * <li>{@code // @<type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}
 	 * </li>
+	 * <li>{@code // @<IOType> <type> <varName>}</li>
+	 * <li>{@code // @<IOType>(<attr1>=<value1>, ..., <attrN>=<valueN>) <type> 
+	 * <varName>}</li>
 	 * </ul>
 	 * <p>
 	 * Where:
@@ -267,10 +267,13 @@ public BufferedReader getReader() {
 	 * <li>{@code // @Dataset dataset}</li>
 	 * <li>{@code // @double(type=OUTPUT) result}</li>
 	 * <li>{@code // @BOTH ImageDisplay display}</li>
-	 * <li>{@code // @INPUT(persist=false, visibility=INVISIBLE) boolean verbose}</li>
-	 * parameters will be parsed and filled just like @{@link Parameter}
-	 * -annotated fields in {@link Command}s.
+	 * <li>{@code // @INPUT(persist=false, visibility=INVISIBLE) boolean verbose}
+	 * </li>
 	 * </ul>
+	 * <p>
+	 * Parameters will be parsed and filled just like @{@link Parameter}-annotated
+	 * fields in {@link Command}s.
+	 * </p>
 	 */
 	// NB: Widened visibility from AbstractModuleInfo.
 	@Override
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 9ee2b8932..fd7e48eee 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -74,8 +74,8 @@ public static File createPath(final File parent, final String path)
 	 * Makes a temporary directory for use with unit tests.
 	 * <p>
 	 * When the unit test runs in a Maven context, the temporary directory will be
-	 * created in the <i>target/</i> directory corresponding to the calling class
-	 * instead of <i>/tmp/</i>.
+	 * created in the {@code target/} directory corresponding to the calling class
+	 * instead of {@code /tmp/}.
 	 * </p>
 	 * 
 	 * @param prefix the prefix for the directory's name
@@ -91,13 +91,13 @@ public static File createTemporaryDirectory(final String prefix) throws IOExcept
 	 * Makes a temporary directory for use with unit tests.
 	 * <p>
 	 * When the unit test runs in a Maven context, the temporary directory will be
-	 * created in the corresponding <i>target/</i> directory instead of
-	 * <i>/tmp/</i>.
+	 * created in the corresponding {@code target/} directory instead of
+	 * {@code /tmp/}.
 	 * </p>
 	 * 
 	 * @param prefix the prefix for the directory's name
 	 * @param forClass the class for context (to determine whether there's a
-	 *          <i>target/<i> directory)
+	 *          {@code target/} directory)
 	 * @return the reference to the newly-created temporary directory
 	 * @throws IOException
 	 */
@@ -113,13 +113,13 @@ public static File createTemporaryDirectory(final String prefix,
 	 * Makes a temporary directory for use with unit tests.
 	 * <p>
 	 * When the unit test runs in a Maven context, the temporary directory will be
-	 * created in the corresponding <i>target/</i> directory instead of
-	 * <i>/tmp/</i>.
+	 * created in the corresponding {@code target/} directory instead of
+	 * {@code /tmp/}.
 	 * </p>
 	 * 
 	 * @param prefix the prefix for the directory's name
 	 * @param forClass the class for context (to determine whether there's a
-	 *          <i>target/<i> directory)
+	 *          {@code target/} directory)
 	 * @param suffix the suffix for the directory's name
 	 * @return the reference to the newly-created temporary directory
 	 * @throws IOException
@@ -165,7 +165,7 @@ else if (file.exists() && !file.delete()) {
 	 * Sometimes it is convenient to determine the caller's context, e.g. to
 	 * determine whether running in a maven-surefire-plugin context (in which case
 	 * the location of the caller's class would end in
-	 * <i>target/test-classes/</i>).
+	 * {@code target/test-classes/}).
 	 * </p>
 	 * 
 	 * @param excluding the class to exclude (or null)
@@ -181,7 +181,7 @@ public static Class<?> getCallingClass(final Class<?> excluding) {
 	 * Sometimes it is convenient to determine the caller's context, e.g. to
 	 * determine whether running in a maven-surefire-plugin context (in which case
 	 * the location of the caller's class would end in
-	 * <i>target/test-classes/</i>).
+	 * {@code target/test-classes/}).
 	 * </p>
 	 * 
 	 * @param excluding the class to exclude (or null)
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index b9f61c7e7..1a207272c 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -117,15 +117,15 @@ public static boolean checkDirectory(final File classes) throws IOException {
 	/**
 	 * Checks whether the annotations are possibly out-of-date.
 	 * <p>
-	 * This method looks whether there are any <i>.class</i> files older than
-	 * their corresponding <i>.java</i> files, or whether there are <i>.class</i>
-	 * files that were generated since last time we checked.
+	 * This method looks whether there are any {@code .class} files older than
+	 * their corresponding {@code .java} files, or whether there are
+	 * {@code .class} files that were generated since last time we checked.
 	 * </p>
 	 * 
-	 * @param classes the <i>classes/</i> directory where Maven puts the
-	 *          <i>.class</i> files
-	 * @param source the <i>src/main/java/<i> directory where Maven expects the
-	 *          <i>.java</i> files
+	 * @param classes the {@code classes/} directory where Maven puts the
+	 *          {@code .class} files
+	 * @param source the {@code src/main/java/} directory where Maven expects the
+	 *          {@code .java} files
 	 * @param youngerThan the date/time when we last checked
 	 * @see EclipseHelper
 	 */
@@ -137,13 +137,13 @@ public static boolean checkDirectory(final File classes, final File source,
 	}
 
 	/**
-	 * Checks a <i>.jar</i> file for stale annotations.
+	 * Checks a {@code .jar} file for stale annotations.
 	 * <p>
 	 * This method is broken at the moment since there is no good way to verify
-	 * that SezPoz ran before the <i>.jar</i> file was packaged.
+	 * that SezPoz ran before the {@code .jar} file was packaged.
 	 * </p>
 	 * 
-	 * @param file the <i>.jar</i> file
+	 * @param file the {@code .jar} file
 	 * @see EclipseHelper
 	 */
 	@Deprecated
@@ -170,7 +170,7 @@ public static boolean fix(final File classes, final File sources) {
 	}
 
 	/**
-	 * Writes out a DOM as <i>.xml</i> file.
+	 * Writes out a DOM as {@code .xml} file.
 	 * 
 	 * @param xml the DOM
 	 * @param file the file to write
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 0408c6ff2..00439911c 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -146,6 +146,7 @@ public static boolean canCast(final Object src, final Class<?> dest) {
 	 * Returns the primitive {@link Class} closest to the given type.
 	 * <p>
 	 * Specifically, the following type conversions are done:
+	 * </p>
 	 * <ul>
 	 * <li>Boolean.class becomes boolean.class</li>
 	 * <li>Byte.class becomes byte.class</li>
@@ -157,6 +158,7 @@ public static boolean canCast(final Object src, final Class<?> dest) {
 	 * <li>Short.class becomes short.class</li>
 	 * <li>Void.class becomes void.class</li>
 	 * </ul>
+	 * <p>
 	 * All other types are unchanged.
 	 * </p>
 	 */
@@ -181,6 +183,7 @@ public static <T> Class<T> getPrimitiveType(final Class<T> type) {
 	 * Returns the non-primitive {@link Class} closest to the given type.
 	 * <p>
 	 * Specifically, the following type conversions are done:
+	 * </p>
 	 * <ul>
 	 * <li>boolean.class becomes Boolean.class</li>
 	 * <li>byte.class becomes Byte.class</li>
@@ -192,6 +195,7 @@ public static <T> Class<T> getPrimitiveType(final Class<T> type) {
 	 * <li>short.class becomes Short.class</li>
 	 * <li>void.class becomes Void.class</li>
 	 * </ul>
+	 * <p>
 	 * All other types are unchanged.
 	 * </p>
 	 */
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index d48f3114c..f916dd5db 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -668,7 +668,8 @@ public static Map<String, URL> findResources(final String regex,
 	 * <p>
 	 * Each of the given {@link URL}s is recursively scanned using
 	 * {@link #listContents(URL)}, and anything matching the given {@code regex}
-	 * pattern is added to the output map.</li>
+	 * pattern is added to the output map.
+	 * </p>
 	 *
 	 * @param regex The regex to use when matching resources, or null to match
 	 *          everything.
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 21a51595f..03b5dca30 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -37,156 +37,146 @@
 import java.io.Serializable;
 import java.util.Random;
 
-/** 
+/**
  * <h3>MersenneTwister and MersenneTwisterFast</h3>
- * <p><b>Version 17</b>, based on version MT199937(99/10/29)
- * of the Mersenne Twister algorithm found at 
- * <a href="http://www.math.keio.ac.jp/matumoto/emt.html">
- * The Mersenne Twister Home Page</a>, with the initialization
- * improved using the new 2002/1/26 initialization algorithm
- * By Sean Luke, October 2004.
- * 
- * <p><b>MersenneTwister</b> is a drop-in subclass replacement
- * for java.util.Random.  It is properly synchronized and
- * can be used in a multithreaded environment.  On modern VMs such
- * as HotSpot, it is approximately 1/3 slower than java.util.Random.
- *
- * <p><b>MersenneTwisterFast</b> is not a subclass of java.util.Random.  It has
- * the same public methods as Random does, however, and it is
- * algorithmically identical to MersenneTwister.  MersenneTwisterFast
- * has hard-code inlined all of its methods directly, and made all of them
- * final (well, the ones of consequence anyway).  Further, these
- * methods are <i>not</i> synchronized, so the same MersenneTwisterFast
- * instance cannot be shared by multiple threads.  But all this helps
- * MersenneTwisterFast achieve well over twice the speed of MersenneTwister.
- * java.util.Random is about 1/3 slower than MersenneTwisterFast.
- *
+ * <p>
+ * <b>Version 17</b>, based on version MT199937(99/10/29) of the Mersenne
+ * Twister algorithm found at
+ * <a href="http://www.math.keio.ac.jp/matumoto/emt.html"> The Mersenne Twister
+ * Home Page</a>, with the initialization improved using the new 2002/1/26
+ * initialization algorithm By Sean Luke, October 2004.
+ * <p>
+ * <b>MersenneTwister</b> is a drop-in subclass replacement for
+ * java.util.Random. It is properly synchronized and can be used in a
+ * multithreaded environment. On modern VMs such as HotSpot, it is approximately
+ * 1/3 slower than java.util.Random.
+ * <p>
+ * <b>MersenneTwisterFast</b> is not a subclass of java.util.Random. It has the
+ * same public methods as Random does, however, and it is algorithmically
+ * identical to MersenneTwister. MersenneTwisterFast has hard-code inlined all
+ * of its methods directly, and made all of them final (well, the ones of
+ * consequence anyway). Further, these methods are <i>not</i> synchronized, so
+ * the same MersenneTwisterFast instance cannot be shared by multiple threads.
+ * But all this helps MersenneTwisterFast achieve well over twice the speed of
+ * MersenneTwister. java.util.Random is about 1/3 slower than
+ * MersenneTwisterFast.
  * <h3>About the Mersenne Twister</h3>
- * <p>This is a Java version of the C-program for MT19937: Integer version.
- * The MT19937 algorithm was created by Makoto Matsumoto and Takuji Nishimura,
- * who ask: "When you use this, send an email to: matumoto@math.keio.ac.jp
- * with an appropriate reference to your work".  Indicate that this
- * is a translation of their algorithm into Java.
- *
- * <p><b>Reference. </b>
- * Makato Matsumoto and Takuji Nishimura,
- * "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform
- * Pseudo-Random Number Generator",
- * <i>ACM Transactions on Modeling and. Computer Simulation,</i>
- * Vol. 8, No. 1, January 1998, pp 3--30.
- *
+ * <p>
+ * This is a Java version of the C-program for MT19937: Integer version. The
+ * MT19937 algorithm was created by Makoto Matsumoto and Takuji Nishimura, who
+ * ask: "When you use this, send an email to: matumoto@math.keio.ac.jp with an
+ * appropriate reference to your work". Indicate that this is a translation of
+ * their algorithm into Java.
+ * <p>
+ * <b>Reference. </b> Makato Matsumoto and Takuji Nishimura, "Mersenne Twister:
+ * A 623-Dimensionally Equidistributed Uniform Pseudo-Random Number Generator",
+ * <i>ACM Transactions on Modeling and. Computer Simulation,</i> Vol. 8, No. 1,
+ * January 1998, pp 3--30.
  * <h3>About this Version</h3>
- *
- * <p><b>Changes since V16:</b> Added nextDouble(includeZero, includeOne) and
+ * <p>
+ * <b>Changes since V16:</b> Added nextDouble(includeZero, includeOne) and
  * nextFloat(includeZero, includeOne) to allow for half-open, fully-closed, and
  * fully-open intervals.
- *
- * <p><b>Changes Since V15:</b> Added serialVersionUID to quiet compiler warnings
+ * <p>
+ * <b>Changes Since V15:</b> Added serialVersionUID to quiet compiler warnings
  * from Sun's overly verbose compilers as of JDK 1.5.
- *
- * <p><b>Changes Since V14:</b> made strictfp, with StrictMath.log and StrictMath.sqrt
- * in nextGaussian instead of Math.log and Math.sqrt.  This is largely just to be safe,
- * as it presently makes no difference in the speed, correctness, or results of the
- * algorithm.
- *
- * <p><b>Changes Since V13:</b> clone() method CloneNotSupportedException removed.  
- *
- * <p><b>Changes Since V12:</b> clone() method added.  
- *
- * <p><b>Changes Since V11:</b> stateEquals(...) method added.  MersenneTwisterFast
+ * <p>
+ * <b>Changes Since V14:</b> made strictfp, with StrictMath.log and
+ * StrictMath.sqrt in nextGaussian instead of Math.log and Math.sqrt. This is
+ * largely just to be safe, as it presently makes no difference in the speed,
+ * correctness, or results of the algorithm.
+ * <p>
+ * <b>Changes Since V13:</b> clone() method CloneNotSupportedException removed.
+ * <p>
+ * <b>Changes Since V12:</b> clone() method added.
+ * <p>
+ * <b>Changes Since V11:</b> stateEquals(...) method added. MersenneTwisterFast
  * is equal to other MersenneTwisterFasts with identical state; likewise
- * MersenneTwister is equal to other MersenneTwister with identical state.
- * This isn't equals(...) because that requires a contract of immutability
- * to compare by value.
- *
- * <p><b>Changes Since V10:</b> A documentation error suggested that
- * setSeed(int[]) required an int[] array 624 long.  In fact, the array
- * can be any non-zero length.  The new version also checks for this fact.
- *
- * <p><b>Changes Since V9:</b> readState(stream) and writeState(stream)
- * provided.
- *
- * <p><b>Changes Since V8:</b> setSeed(int) was only using the first 28 bits
- * of the seed; it should have been 32 bits.  For small-number seeds the
- * behavior is identical.
- *
- * <p><b>Changes Since V7:</b> A documentation error in MersenneTwisterFast
- * (but not MersenneTwister) stated that nextDouble selects uniformly from
- * the full-open interval [0,1].  It does not.  nextDouble's contract is
- * identical across MersenneTwisterFast, MersenneTwister, and java.util.Random,
- * namely, selection in the half-open interval [0,1).  That is, 1.0 should
- * not be returned.  A similar contract exists in nextFloat.
- *
- * <p><b>Changes Since V6:</b> License has changed from LGPL to BSD.
- * New timing information to compare against
- * java.util.Random.  Recent versions of HotSpot have helped Random increase
- * in speed to the point where it is faster than MersenneTwister but slower
- * than MersenneTwisterFast (which should be the case, as it's a less complex
- * algorithm but is synchronized).
- * 
- * <p><b>Changes Since V5:</b> New empty constructor made to work the same
- * as java.util.Random -- namely, it seeds based on the current time in
+ * MersenneTwister is equal to other MersenneTwister with identical state. This
+ * isn't equals(...) because that requires a contract of immutability to compare
+ * by value.
+ * <p>
+ * <b>Changes Since V10:</b> A documentation error suggested that setSeed(int[])
+ * required an int[] array 624 long. In fact, the array can be any non-zero
+ * length. The new version also checks for this fact.
+ * <p>
+ * <b>Changes Since V9:</b> readState(stream) and writeState(stream) provided.
+ * <p>
+ * <b>Changes Since V8:</b> setSeed(int) was only using the first 28 bits of the
+ * seed; it should have been 32 bits. For small-number seeds the behavior is
+ * identical.
+ * <p>
+ * <b>Changes Since V7:</b> A documentation error in MersenneTwisterFast (but
+ * not MersenneTwister) stated that nextDouble selects uniformly from the
+ * full-open interval [0,1]. It does not. nextDouble's contract is identical
+ * across MersenneTwisterFast, MersenneTwister, and java.util.Random, namely,
+ * selection in the half-open interval [0,1). That is, 1.0 should not be
+ * returned. A similar contract exists in nextFloat.
+ * <p>
+ * <b>Changes Since V6:</b> License has changed from LGPL to BSD. New timing
+ * information to compare against java.util.Random. Recent versions of HotSpot
+ * have helped Random increase in speed to the point where it is faster than
+ * MersenneTwister but slower than MersenneTwisterFast (which should be the
+ * case, as it's a less complex algorithm but is synchronized).
+ * <p>
+ * <b>Changes Since V5:</b> New empty constructor made to work the same as
+ * java.util.Random -- namely, it seeds based on the current time in
  * milliseconds.
- *
- * <p><b>Changes Since V4:</b> New initialization algorithms.  See
- * (see <a href="http://www.math.keio.ac.jp/matumoto/MT2002/emt19937ar.html"</a>
- * http://www.math.keio.ac.jp/matumoto/MT2002/emt19937ar.html</a>)
- *
- * <p>The MersenneTwister code is based on standard MT19937 C/C++ 
- * code by Takuji Nishimura,
- * with suggestions from Topher Cooper and Marc Rieffel, July 1997.
- * The code was originally translated into Java by Michael Lecuyer,
- * January 1999, and the original code is Copyright (c) 1999 by Michael Lecuyer.
- *
+ * <p>
+ * <b>Changes Since V4:</b> New initialization algorithms (see
+ * <a href="http://www.math.keio.ac.jp/matumoto/MT2002/emt19937ar.html">
+ * http://www.math.keio.ac.jp/matumoto/MT2002/emt19937ar.html</a>).
+ * <p>
+ * The MersenneTwister code is based on standard MT19937 C/C++ code by Takuji
+ * Nishimura, with suggestions from Topher Cooper and Marc Rieffel, July 1997.
+ * The code was originally translated into Java by Michael Lecuyer, January
+ * 1999, and the original code is Copyright (c) 1999 by Michael Lecuyer.
  * <h3>Java notes</h3>
- * 
- * <p>This implementation implements the bug fixes made
- * in Java 1.2's version of Random, which means it can be used with
- * earlier versions of Java.  See 
- * <a href="http://www.javasoft.com/products/jdk/1.2/docs/api/java/util/Random.html">
- * the JDK 1.2 java.util.Random documentation</a> for further documentation
- * on the random-number generation contracts made.  Additionally, there's
- * an undocumented bug in the JDK java.util.Random.nextBytes() method,
- * which this code fixes.
- *
- * <p> Just like java.util.Random, this
- * generator accepts a long seed but doesn't use all of it.  java.util.Random
- * uses 48 bits.  The Mersenne Twister instead uses 32 bits (int size).
- * So it's best if your seed does not exceed the int range.
- *
- * <p>MersenneTwister can be used reliably 
- * on JDK version 1.1.5 or above.  Earlier Java versions have serious bugs in
- * java.util.Random; only MersenneTwisterFast (and not MersenneTwister nor
- * java.util.Random) should be used with them.
- *
- * <h3>License</h3>
- *
- * Copyright (c) 2003 by Sean Luke. <br>
+ * <p>
+ * This implementation implements the bug fixes made in Java 1.2's version of
+ * Random, which means it can be used with earlier versions of Java. See
+ * <a href=
+ * "http://www.javasoft.com/products/jdk/1.2/docs/api/java/util/Random.html">
+ * the JDK 1.2 java.util.Random documentation</a> for further documentation on
+ * the random-number generation contracts made. Additionally, there's an
+ * undocumented bug in the JDK java.util.Random.nextBytes() method, which this
+ * code fixes.
+ * <p>
+ * Just like java.util.Random, this generator accepts a long seed but doesn't
+ * use all of it. java.util.Random uses 48 bits. The Mersenne Twister instead
+ * uses 32 bits (int size). So it's best if your seed does not exceed the int
+ * range.
+ * <p>
+ * MersenneTwister can be used reliably on JDK version 1.1.5 or above. Earlier
+ * Java versions have serious bugs in java.util.Random; only MersenneTwisterFast
+ * (and not MersenneTwister nor java.util.Random) should be used with them.
+ * <h3>License</h3> Copyright (c) 2003 by Sean Luke. <br>
  * Portions copyright (c) 1993 by Michael Lecuyer. <br>
  * All rights reserved. <br>
- *
- * <p>Redistribution and use in source and binary forms, with or without 
+ * <p>
+ * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * <ul>
- * <li> Redistributions of source code must retain the above copyright notice, 
+ * <li>Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
- * <li> Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+ * <li>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.
- * <li> Neither the name of the copyright owners, their employers, nor the 
- * names of its contributors may be used to endorse or promote products 
- * derived from this software without specific prior written permission.
+ * <li>Neither the name of the copyright owners, their employers, nor the names
+ * of its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
  * </ul>
- * <p>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 ARE 
- * DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE 
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * <p>
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @author Sean Luke
@@ -795,7 +785,7 @@ public final long nextLong()
 
 
     /** Returns a long drawn uniformly from 0 to n-1.  Suffice it to say,
-        n must be > 0, or an IllegalArgumentException is raised. */
+        n must be &gt; 0, or an IllegalArgumentException is raised. */
     public final long nextLong(final long n)
         {
         if (n<=0)
@@ -940,12 +930,12 @@ public final double nextDouble()
 
     /** Returns a double in the range from 0.0 to 1.0, possibly inclusive of 0.0 and 1.0 themselves.  Thus:
 
-        <p><table border=0>
-        <th><td>Expression<td>Interval
-        <tr><td>nextDouble(false, false)<td>(0.0, 1.0)
-        <tr><td>nextDouble(true, false)<td>[0.0, 1.0)
-        <tr><td>nextDouble(false, true)<td>(0.0, 1.0]
-        <tr><td>nextDouble(true, true)<td>[0.0, 1.0]
+        <table border=0 summary="Table">
+        <tr><th>Expression</th><th>Interval</th></tr>
+        <tr><td>nextDouble(false, false)</td><td>(0.0, 1.0)</td></tr>
+        <tr><td>nextDouble(true, false)</td><td>[0.0, 1.0)</td></tr>
+        <tr><td>nextDouble(false, true)</td><td>(0.0, 1.0]</td></tr>
+        <tr><td>nextDouble(true, true)</td><td>[0.0, 1.0]</td></tr>
         </table>
         
         <p>This version preserves all possible random values in the double range.
@@ -1153,12 +1143,12 @@ public final float nextFloat()
 
     /** Returns a float in the range from 0.0f to 1.0f, possibly inclusive of 0.0f and 1.0f themselves.  Thus:
 
-        <p><table border=0>
-        <th><td>Expression<td>Interval
-        <tr><td>nextFloat(false, false)<td>(0.0f, 1.0f)
-        <tr><td>nextFloat(true, false)<td>[0.0f, 1.0f)
-        <tr><td>nextFloat(false, true)<td>(0.0f, 1.0f]
-        <tr><td>nextFloat(true, true)<td>[0.0f, 1.0f]
+        <table border=0 summary="Table">
+        <tr><th>Expression</th><th>Interval</th></tr>
+        <tr><td>nextFloat(false, false)</td><td>(0.0f, 1.0f)</td></tr>
+        <tr><td>nextFloat(true, false)</td><td>[0.0f, 1.0f)</td></tr>
+        <tr><td>nextFloat(false, true)</td><td>(0.0f, 1.0f]</td></tr>
+        <tr><td>nextFloat(true, true)</td><td>[0.0f, 1.0f]</td></tr>
         </table>
         
         <p>This version preserves all possible random values in the float range.
@@ -1179,7 +1169,7 @@ public double nextFloat(boolean includeZero, boolean includeOne)
 
 
     /** Returns an integer drawn uniformly from 0 to n-1.  Suffice it to say,
-        n must be > 0, or an IllegalArgumentException is raised. */
+        n must be &gt; 0, or an IllegalArgumentException is raised. */
     public final int nextInt(final int n)
         {
         if (n<=0)
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index a4390222c..15641e7dd 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -50,20 +50,21 @@
  * <p>
  * Use this class as following:
  * </p>
- * <code>
- * private static Timing timing = new Timing();<br />
- * ...<br />
- * private void oneOperation() {<br />
- * &nbsp;final long t1 = System.nanoTime();<br />
- * &nbsp;...<br />
- * &nbsp;timing.add(System.nanoTime() - t1, "Operation #1");<br />
- * }<br />
- * ...<br />
- * private void atEnd() {<br />
- * &nbsp;...<br />
- * &nbsp;timing.report("Operations");<br />
+ * 
+ * <pre>
+ * private static Timing timing = new Timing();
+ * ...
+ * private void oneOperation() {
+ * &nbsp;final long t1 = System.nanoTime();
+ * &nbsp;...
+ * &nbsp;timing.add(System.nanoTime() - t1, "Operation #1");
+ * }
+ * ...
+ * private void atEnd() {
+ * &nbsp;...
+ * &nbsp;timing.report("Operations");
  * }
- * </code>
+ * </pre>
  * 
  * @author Johannes Schindelin
  */

From 7cb92b90e5e8c0455a730ba40d124b867049f95c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 14:13:36 -0500
Subject: [PATCH 0457/1208] StringUtilsTest: add missing license header

---
 .../org/scijava/util/StringUtilsTest.java     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 908b59eca..395b23db2 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -1,3 +1,33 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.util;
 

From 60ef945e2c310e4e6c88807eed8ce2e01ea48aba Mon Sep 17 00:00:00 2001
From: Leon Yang <leon.gh.yang@gmail.com>
Date: Fri, 14 Oct 2016 22:30:01 -0500
Subject: [PATCH 0458/1208] Make Module support Initializable

It might be easier for the delegate class inside the module to implement
this interface than to specify the initializer inside the Plugin
annotation, especially because annotation could not be partially
overridden. Now the Initializable interface has higher priority than the
initializer annotation, and at most one of them will be called when a
module is initialized.

Closes #249.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../java/org/scijava/module/AbstractModule.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 2b63ba440..e50a162e7 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -35,6 +35,8 @@
 import java.util.HashSet;
 import java.util.Map;
 
+import org.scijava.Initializable;
+
 /**
  * Abstract superclass of {@link Module} implementations.
  * <p>
@@ -76,11 +78,16 @@ public void cancel() {
 	public void initialize() throws MethodCallException {
 		// execute global module initializer
 		final Object delegateObject = getDelegateObject();
-		if (initializerRef == null) {
-			final String initializer = getInfo().getInitializer();
-			initializerRef = new MethodRef(delegateObject.getClass(), initializer);
+		if (delegateObject instanceof Initializable) {
+			((Initializable) delegateObject).initialize();
+		}
+		else {
+			if (initializerRef == null) {
+				final String initializer = getInfo().getInitializer();
+				initializerRef = new MethodRef(delegateObject.getClass(), initializer);
+			}
+			initializerRef.execute(delegateObject);
 		}
-		initializerRef.execute(delegateObject);
 
 		// execute individual module item initializers
 		for (final ModuleItem<?> item : getInfo().inputs()) {

From dbcdc4f97d4cdbb2316b02f500feb83d9e46ade5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 14:27:15 -0500
Subject: [PATCH 0459/1208] CommandModuleTest: test Initializable Command

This verifies that the initialize() method of a Command implementing
the Initializable interface is called during module preprocessing.
---
 .../scijava/command/CommandModuleTest.java    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 1021d537c..76ee6bba7 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -42,6 +42,7 @@
 import org.junit.Test;
 import org.scijava.Cancelable;
 import org.scijava.Context;
+import org.scijava.Initializable;
 import org.scijava.ItemIO;
 import org.scijava.Priority;
 import org.scijava.log.LogService;
@@ -127,6 +128,22 @@ public void testCommandInjection() throws InterruptedException,
 		assertTrue((boolean) module.getOutput("success"));
 	}
 
+	@Test
+	public void testInitializable() throws InterruptedException,
+		ExecutionException
+	{
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+
+		final CommandModule preprocessedModule = //
+			commandService.run(InitializableCommand.class, true).get();
+		assertEquals(42, preprocessedModule.getOutput("output"));
+
+		final CommandModule plainModule = //
+			commandService.run(InitializableCommand.class, false).get();
+		assertEquals(7, plainModule.getOutput("output"));
+	}
+
 	// -- Helper classes --
 
 	/** A command which implements {@link Cancelable}. */
@@ -267,4 +284,20 @@ public void run() {
 		}
 	}
 
+	@Plugin(type = Command.class)
+	public static class InitializableCommand implements Command, Initializable {
+		private int magicNumber = 7;
+
+		@Parameter(type = ItemIO.OUTPUT)
+		private int output;
+
+		@Override
+		public void initialize() {
+			magicNumber = 42;
+		}
+		@Override
+		public void run() {
+			output = magicNumber;
+		}
+	}
 }

From 743deaf4b47f2429f653f4d9cec6b8762a51614c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 14:41:03 -0500
Subject: [PATCH 0460/1208] Remove unused imports

---
 src/main/java/org/scijava/parse/DefaultParseService.java | 1 -
 src/test/java/org/scijava/command/CommandInfoTest.java   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 97ff4eb37..457a19ac9 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -36,7 +36,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.scijava.parse.Variable;
 import org.scijava.parse.eval.DefaultEvaluator;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 7704f5378..35579a804 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -47,7 +47,6 @@
 import org.scijava.command.CommandInfoTest.CommandWithEnumParam.Choice;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
-import org.scijava.plugin.Plugin;
 
 /**
  * Tests {@link CommandInfo}.

From d90c3679a0c2daceaacd31d4fa409b766d65861a Mon Sep 17 00:00:00 2001
From: Hadrien Mary <hadrien.mary@gmail.com>
Date: Mon, 17 Apr 2017 23:18:10 -0400
Subject: [PATCH 0461/1208] Add autocompletion framework

The default autocompletion works by inspecting attributes/methods of an object.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../scijava/script/AbstractAutoCompleter.java | 149 ++++++++++++++++++
 .../org/scijava/script/AutoCompleter.java     |  50 ++++++
 .../scijava/script/AutoCompletionResult.java  |  40 +++++
 .../scijava/script/DefaultAutoCompleter.java  |  44 ++++++
 .../org/scijava/script/ScriptLanguage.java    |  10 ++
 5 files changed, 293 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/AbstractAutoCompleter.java
 create mode 100644 src/main/java/org/scijava/script/AutoCompleter.java
 create mode 100644 src/main/java/org/scijava/script/AutoCompletionResult.java
 create mode 100644 src/main/java/org/scijava/script/DefaultAutoCompleter.java

diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
new file mode 100644
index 000000000..545f4d5a5
--- /dev/null
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -0,0 +1,149 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+
+/**
+ * Abstract base class for {@link AutoCompleter} implementations.
+ * 
+ * @author Hadrien Mary
+ */
+public abstract class AbstractAutoCompleter implements AutoCompleter {
+
+	@SuppressWarnings("unused")
+	private ScriptLanguage scriptLanguage;
+
+	public AbstractAutoCompleter(final ScriptLanguage scriptLanguage) {
+		this.scriptLanguage = scriptLanguage;
+	}
+
+	@Override
+	public AutoCompletionResult autocomplete(final String code, final int index,
+		final ScriptEngine engine)
+	{
+
+		final List<String> matches = new ArrayList<>();
+		final int startIndex = 0;
+
+		if (code.endsWith(".")) {
+			// Autocompletion with all the attributes of the object
+			matches.addAll(engineAttributesCompleter(code, index, engine));
+
+		}
+		else if (code.contains(".")) {
+			final List<String> codeList = Arrays.asList(code.split("\\."));
+			final String objectString = codeList.get(codeList.size() - 2);
+			final String fieldBeginWith = codeList.get(codeList.size() - 1);
+			matches.addAll(engineAttributesCompleter(objectString + ".",
+				fieldBeginWith, index, engine));
+
+		}
+		else {
+			// Autocompletion with variables in the engine scope
+			matches.addAll(engineVariablesCompleter(code, index, engine));
+		}
+
+		// Remove duplicates
+		matches.stream().distinct().collect(Collectors.toList());
+
+		// Sort alphabetically, ignoring case
+		Collections.sort(matches, new Comparator<Object>() {
+
+			@Override
+			public int compare(final Object o1, final Object o2) {
+				final String s1 = (String) o1;
+				final String s2 = (String) o2;
+				return s1.toLowerCase().compareTo(s2.toLowerCase());
+			}
+		});
+
+		// Return results. For now we ignore index and startIndex.
+		return new AutoCompletionResult(matches, startIndex);
+	}
+
+	private List<String> engineVariablesCompleter(final String code,
+		@SuppressWarnings("unused") final int index, final ScriptEngine engine)
+	{
+		final List<String> matches = new ArrayList<>();
+
+		final Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+		for (final String key : bindings.keySet()) {
+			if (key.toLowerCase().startsWith(code.toLowerCase())) {
+				matches.add(key);
+			}
+		}
+		return matches;
+
+	}
+
+	private List<String> engineAttributesCompleter(final String objectString,
+		final int index, final ScriptEngine engine)
+	{
+		return engineAttributesCompleter(objectString, "", index, engine);
+	}
+
+	private List<String> engineAttributesCompleter(final String objectString,
+		final String fieldBeginWith, @SuppressWarnings("unused") final int index,
+		final ScriptEngine engine)
+	{
+		final List<String> matches = new ArrayList<>();
+
+		final Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+		for (final String key : bindings.keySet()) {
+			if (objectString.endsWith(key + ".")) {
+				final Object obj = bindings.get(key);
+				for (final Field field : obj.getClass().getDeclaredFields()) {
+					if (field.getName().toLowerCase().startsWith(fieldBeginWith
+						.toLowerCase()))
+					{
+						matches.add(objectString + field.getName());
+					}
+				}
+			}
+		}
+
+		return matches;
+	}
+}
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
new file mode 100644
index 000000000..55590081e
--- /dev/null
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.script;
+
+import javax.script.ScriptEngine;
+
+/**
+ * Helper for generating autocomplete suggestions for code fragments.
+ *
+ * @author Hadrien Mary
+ */
+public interface AutoCompleter {
+
+	default AutoCompletionResult autocomplete(final String code,
+		final ScriptEngine engine)
+	{
+		return autocomplete(code, 0, engine);
+	}
+
+	AutoCompletionResult autocomplete(String code, int startIndex,
+		ScriptEngine engine);
+}
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
new file mode 100644
index 000000000..6ea4dbcc3
--- /dev/null
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -0,0 +1,40 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.scijava.script;
+
+import java.util.List;
+
+/**
+ * Data structure housing suggestions given by {@link AutoCompleter} helpers.
+ * 
+ * @author Hadrien Mary
+ */
+public class AutoCompletionResult {
+
+	private List<String> matches;
+	private int startIndex;
+
+	public AutoCompletionResult(final List<String> matches) {
+		this(matches, 0);
+	}
+
+	public AutoCompletionResult(final List<String> matches,
+		final int startIndex)
+	{
+		this.matches = matches;
+		this.startIndex = startIndex;
+	}
+
+	public int getStartIndex() {
+		return startIndex;
+	}
+
+	public List<String> getMatches() {
+		return matches;
+	}
+
+}
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
new file mode 100644
index 000000000..9d2681d79
--- /dev/null
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script;
+
+/**
+ * Default implementation of {@link AutoCompleter}.
+ *
+ * @author Hadrien Mary
+ */
+public class DefaultAutoCompleter extends AbstractAutoCompleter {
+
+	public DefaultAutoCompleter(final ScriptLanguage scriptLanguage) {
+		super(scriptLanguage);
+	}
+}
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 14cf95866..2cdb474e1 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -65,6 +65,8 @@
  * </p>
  * 
  * @author Johannes Schindelin
+ * @author Curtis Rueden
+ * @author Hadrien Mary
  */
 public interface ScriptLanguage extends ScriptEngineFactory, RichPlugin,
 	SingletonPlugin
@@ -86,6 +88,14 @@ default Object decode(final Object object) {
 		return object;
 	}
 
+	/**
+	 * Gets a helper object capable of generating autocomplete suggestions for a
+	 * code fragment.
+	 */
+	default AutoCompleter getAutoCompleter() {
+		return new DefaultAutoCompleter(this);
+	}
+
 	// -- ScriptEngineFactory methods --
 
 	@Override

From b24bd0d1f01b9dd0019f49f3d5326489bf354e99 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 15:02:58 -0500
Subject: [PATCH 0462/1208] ScriptEngineTest: dispose contexts properly

---
 .../org/scijava/script/ScriptEngineTest.java  | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index bce9fe6f2..c21150c05 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -46,6 +46,8 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.plugin.Plugin;
@@ -54,13 +56,28 @@
  * Basic tests for the {@link ScriptService}.
  * 
  * @author Johannes Schindelin
+ * @author Curtis Rueden
  */
 public class ScriptEngineTest {
 
+	private Context context;
+	private ScriptService scriptService;
+
+	@Before
+	public void setUp() {
+		context = new Context(ScriptService.class);
+		scriptService = context.getService(ScriptService.class);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+		context = null;
+		scriptService = null;
+	}
+
 	@Test
 	public void testRot13() throws Exception {
-		final Context context = new Context(ScriptService.class);
-		final ScriptService scriptService = context.getService(ScriptService.class);
 		final ScriptLanguage hello = scriptService.getLanguageByName("Hello");
 		assertNotNull(hello);
 		final ScriptLanguage rot13 = scriptService.getLanguageByName("Rot13");
@@ -70,8 +87,6 @@ public void testRot13() throws Exception {
 
 	@Test
 	public void testScriptModuleValue() throws Exception {
-		final Context context = new Context(ScriptService.class);
-		final ScriptService scriptService = context.getService(ScriptService.class);
 		final ScriptModule module =
 			scriptService.run("test.rot13", ScriptModule.class.getName(), false,
 				(Map<String, Object>) null).get();

From 4e30352e3a3f9b3993fa2bb1ddd4a9aaac02ddc5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 15:05:09 -0500
Subject: [PATCH 0463/1208] Autocomplete public fields only

---
 src/main/java/org/scijava/script/AbstractAutoCompleter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index 545f4d5a5..4f21f77ad 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -134,7 +134,8 @@ private List<String> engineAttributesCompleter(final String objectString,
 		for (final String key : bindings.keySet()) {
 			if (objectString.endsWith(key + ".")) {
 				final Object obj = bindings.get(key);
-				for (final Field field : obj.getClass().getDeclaredFields()) {
+				// check for public field completions
+				for (final Field field : obj.getClass().getFields()) {
 					if (field.getName().toLowerCase().startsWith(fieldBeginWith
 						.toLowerCase()))
 					{

From 5e05056f5ff55d59e66b33583228cacdacce8962 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 15:06:38 -0500
Subject: [PATCH 0464/1208] Refactor variable name to be more general

It's not just a field name prefix -- it could be a prefix for something
else.
---
 .../org/scijava/script/AbstractAutoCompleter.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index 4f21f77ad..96db1ddf0 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -73,9 +73,9 @@ public AutoCompletionResult autocomplete(final String code, final int index,
 		else if (code.contains(".")) {
 			final List<String> codeList = Arrays.asList(code.split("\\."));
 			final String objectString = codeList.get(codeList.size() - 2);
-			final String fieldBeginWith = codeList.get(codeList.size() - 1);
+			final String prefix = codeList.get(codeList.size() - 1);
 			matches.addAll(engineAttributesCompleter(objectString + ".",
-				fieldBeginWith, index, engine));
+				prefix, index, engine));
 
 		}
 		else {
@@ -124,10 +124,11 @@ private List<String> engineAttributesCompleter(final String objectString,
 	}
 
 	private List<String> engineAttributesCompleter(final String objectString,
-		final String fieldBeginWith, @SuppressWarnings("unused") final int index,
+		final String prefix, @SuppressWarnings("unused") final int index,
 		final ScriptEngine engine)
 	{
 		final List<String> matches = new ArrayList<>();
+		final String lPrefix = prefix.toLowerCase();
 
 		final Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
 
@@ -136,9 +137,7 @@ private List<String> engineAttributesCompleter(final String objectString,
 				final Object obj = bindings.get(key);
 				// check for public field completions
 				for (final Field field : obj.getClass().getFields()) {
-					if (field.getName().toLowerCase().startsWith(fieldBeginWith
-						.toLowerCase()))
-					{
+					if (field.getName().toLowerCase().startsWith(lPrefix)) {
 						matches.add(objectString + field.getName());
 					}
 				}

From 2ecfbef18a330cce6160c5131fb4447f8b896d37 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 15:07:50 -0500
Subject: [PATCH 0465/1208] Autocomplete public methods, too

---
 .../java/org/scijava/script/AbstractAutoCompleter.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index 96db1ddf0..b69bfca70 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -32,6 +32,7 @@
 package org.scijava.script;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -141,6 +142,12 @@ private List<String> engineAttributesCompleter(final String objectString,
 						matches.add(objectString + field.getName());
 					}
 				}
+				// check for public method completions
+				for (final Method method : obj.getClass().getMethods()) {
+					if (method.getName().toLowerCase().startsWith(lPrefix)) {
+						matches.add(objectString + method.getName() + "(");
+					}
+				}
 			}
 		}
 

From cbe709755ce3053d592869e92bd2f811ea34f698 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 20:46:33 -0500
Subject: [PATCH 0466/1208] AbstractAutoCompleter: fix duplicate removal logic

---
 .../java/org/scijava/script/AbstractAutoCompleter.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index b69bfca70..5155ba784 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -85,10 +85,11 @@ else if (code.contains(".")) {
 		}
 
 		// Remove duplicates
-		matches.stream().distinct().collect(Collectors.toList());
+		final List<String> unique = //
+			matches.stream().distinct().collect(Collectors.toList());
 
 		// Sort alphabetically, ignoring case
-		Collections.sort(matches, new Comparator<Object>() {
+		Collections.sort(unique, new Comparator<Object>() {
 
 			@Override
 			public int compare(final Object o1, final Object o2) {
@@ -99,7 +100,7 @@ public int compare(final Object o1, final Object o2) {
 		});
 
 		// Return results. For now we ignore index and startIndex.
-		return new AutoCompletionResult(matches, startIndex);
+		return new AutoCompletionResult(unique, startIndex);
 	}
 
 	private List<String> engineVariablesCompleter(final String code,

From 514797099c95ce763a3edd9a0dc3761388863f44 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 5 May 2017 20:46:53 -0500
Subject: [PATCH 0467/1208] ScriptEngineTest: test the AutoCompleter logic

---
 .../org/scijava/script/ScriptEngineTest.java  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index c21150c05..1f75dcfa6 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -97,6 +97,35 @@ public void testScriptModuleValue() throws Exception {
 		assertEquals(context, info.context());
 	}
 
+	@Test
+	public void testAutoCompleter() {
+		final ScriptLanguage hello = scriptService.getLanguageByName("Hello");
+		final ScriptEngine engine = hello.getScriptEngine();
+		final AutoCompleter ac = hello.getAutoCompleter();
+
+		// test all matches
+		engine.put("thing", new Object());
+		final AutoCompletionResult result = ac.autocomplete("thing.", engine);
+		assertEquals(0, result.getStartIndex());
+		final List<String> matches = result.getMatches();
+		final List<String> expected = Arrays.asList("thing.equals(",
+			"thing.getClass(", "thing.hashCode(", "thing.notify(", "thing.notifyAll(",
+			"thing.toString(", "thing.wait(");
+		assertEquals(matches, expected);
+
+		// test prefix
+		engine.put("hello", "world");
+		final AutoCompletionResult cWords = ac.autocomplete("hello.c", engine);
+		assertEquals(0, cWords.getStartIndex());
+		final List<String> cMatches = cWords.getMatches();
+		final List<String> cExpected = Arrays.asList("hello.CASE_INSENSITIVE_ORDER",
+			"hello.charAt(", "hello.chars(", "hello.codePointAt(",
+			"hello.codePointBefore(", "hello.codePointCount(", "hello.codePoints(",
+			"hello.compareTo(", "hello.compareToIgnoreCase(", "hello.concat(",
+			"hello.contains(", "hello.contentEquals(", "hello.copyValueOf(");
+		assertEquals(cMatches, cExpected);
+	}
+
 	@Plugin(type = ScriptLanguage.class)
 	public static class Rot13 extends AbstractScriptLanguage {
 

From 49c055b05f5d46340eeade887744ab72bbba7525 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2017 08:08:25 -0500
Subject: [PATCH 0468/1208] Fix author tags

---
 src/main/java/org/scijava/event/ContextDisposingEvent.java | 2 +-
 src/test/java/org/scijava/util/ProcessUtilsTest.java       | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 0dc1aaf34..bbe3fba40 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -34,6 +34,6 @@
 /**
  * Event to be published just before disposing a context.
  * 
- * @author Johannes Schindein
+ * @author Johannes Schindelin
  */
 public class ContextDisposingEvent extends SciJavaEvent { }
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index c2a4ae0b2..227703ca9 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -71,11 +71,7 @@ private void assumePOSIX() {
 		assumeTrue(PlatformUtils.isPOSIX());
 	}
 
-	/**
-	 * A class executing a 'sleep' call, to be interrupted.
-	 * 
-	 * @author Johannes Schindelin
-	 */
+	/** A class executing a 'sleep' call, to be interrupted. */
 	private static class SleepThread extends Thread {
 		private int seconds;
 		private Throwable result;

From 96ae9bed1c67b3832a8ac47aed3db6ffe037b2a7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2017 09:13:01 -0500
Subject: [PATCH 0469/1208] Add missing contributors

All of these folks wrote code which ended up here in SJC.
---
 pom.xml | 43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd1a7ddea..c04cd8bcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,16 +55,15 @@
 			<url>http://imagej.net/User:Schindelin</url>
 			<properties><id>dscho</id></properties>
 		</contributor>
+		<contributor>
+			<name>Chris Allan</name>
+			<properties><id>callan</id></properties>
+		</contributor>
 		<contributor>
 			<name>Barry DeZonia</name>
 			<url>http://imagej.net/User:Bdezonia</url>
 			<properties><id>bdezonia</id></properties>
 		</contributor>
-		<contributor>
-			<name>Lee Kamentsky</name>
-			<url>http://imagej.net/User:Leek</url>
-			<properties><id>LeeKamentsky</id></properties>
-		</contributor>
 		<contributor>
 			<name>Christian Dietz</name>
 			<url>http://imagej.net/User:Dietzc</url>
@@ -80,15 +79,49 @@
 			<url>http://imagej.net/User:Gab1one</url>
 			<properties><id>gab1one</id></properties>
 		</contributor>
+		<contributor>
+			<name>Aivar Grislis</name>
+			<url>http://imagej.net/User:Grislis</url>
+			<properties><id>grislis</id></properties>
+		</contributor>
 		<contributor>
 			<name>Jonathan Hale</name>
 			<properties><id>Squareys</id></properties>
 		</contributor>
+		<contributor>
+			<name>Grant Harris</name>
+			<url>http://imagej.net/User:Harris</url>
+			<properties><id>tnargsirrah</id></properties>
+		</contributor>
+		<contributor>
+			<name>Lee Kamentsky</name>
+			<url>http://imagej.net/User:Leek</url>
+			<properties><id>LeeKamentsky</id></properties>
+		</contributor>
+		<contributor>
+			<name>Rick Lentz</name>
+			<url>http://imagej.net/User:Lentz</url>
+		</contributor>
+		<contributor>
+			<name>Melissa Linkert</name>
+			<url>http://imagej.net/User:Linkert</url>
+			<properties><id>melissalinkert</id></properties>
+		</contributor>
 		<contributor>
 			<name>Kevin Mader</name>
 			<url>http://imagej.net/User:Ksmader</url>
 			<properties><id>kmader</id></properties>
 		</contributor>
+		<contributor>
+			<name>Hadrien Mary</name>
+			<url>http://imagej.net/User:Hadim</url>
+			<properties><id>hadim</id></properties>
+		</contributor>
+		<contributor>
+			<name>Alison Walter</name>
+			<url>http://imagej.net/User:Awalter2</url>
+			<properties><id>awalter17</id></properties>
+		</contributor>
 		<contributor>
 			<name>Jay Warrick</name>
 			<properties><id>jaywarrick</id></properties>

From 418de99580412c34ab8afc0d50e637c9a6f7ef58 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 May 2017 10:31:19 -0500
Subject: [PATCH 0470/1208] ThreadService: improve thread safety

We now use double-checked locking for initialization. Otherwise,
conceivably, two threads could trigger simultaneous creation of
competing ExecutorServices.

And we also synchronize the disposal, so that the ExecutorService
cannot possibly be created after dispose() is called.
---
 .../org/scijava/thread/DefaultThreadService.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 945a6fe43..1de7899fe 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -141,9 +141,12 @@ public ThreadContext getThreadContext(final Thread thread) {
 	// -- Disposable methods --
 
 	@Override
-	public void dispose() {
+	public synchronized void dispose() {
 		disposed = true;
-		if (executor != null) executor.shutdown();
+		if (executor != null) {
+			executor.shutdown();
+			executor = null;
+		}
 	}
 
 	// -- ThreadFactory methods --
@@ -157,12 +160,15 @@ public Thread newThread(final Runnable r) {
 	// -- Helper methods --
 
 	private ExecutorService executor() {
-		if (executor == null) {
-			executor = Executors.newCachedThreadPool(this);
-		}
+		if (executor == null) initExecutor();
 		return executor;
 	}
 
+	private synchronized void initExecutor() {
+		if (executor != null) return;
+		executor = Executors.newCachedThreadPool(this);
+	}
+
 	private Runnable wrap(final Runnable r) {
 		final Thread parent = Thread.currentThread();
 		return new Runnable() {

From 35ee2f494f9869bed55883181986a9af696b267c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 May 2017 10:32:10 -0500
Subject: [PATCH 0471/1208] ThreadService: clarify javadoc

---
 src/main/java/org/scijava/thread/ThreadService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index 7be845d97..bbc03acfd 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -112,7 +112,7 @@ public enum ThreadContext {
 
 	/**
 	 * Gets whether the current thread is a dispatch thread for use with
-	 * {@link #invoke} and {@link #queue}.
+	 * {@link #invoke(Runnable)} and {@link #queue(Runnable)}.
 	 * <p>
 	 * In the case of AWT-based applications (e.g., Java on the desktop), this is
 	 * typically the AWT Event Dispatch Thread (EDT). However, ultimately the
@@ -141,7 +141,8 @@ void invoke(Runnable code) throws InterruptedException,
 		InvocationTargetException;
 
 	/**
-	 * Queues the given code for later execution in a special dispatch thread.
+	 * Queues the given code for later execution in a special dispatch thread,
+	 * returning immediately.
 	 * <p>
 	 * In the case of AWT-based applications (e.g., Java on the desktop), this is
 	 * typically the AWT Event Dispatch Thread (EDT). However, ultimately the

From ec4f6e0336148bd10f0fd3538d9b1cac216a9f82 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 May 2017 10:50:00 -0500
Subject: [PATCH 0472/1208] ThreadService: add ability to queue jobs flexibly

Previously, you could only queue a job to the special dispatch thread
(typically the EDT). But in some scenarios, the EDT is exactly the wrong
one to use. This commit adds the capability to queue jobs to any
arbitrarily named queue. Essentially, each ID corresponds to a different
single thread processing its jobs one at a time.

This commit is dedicated to Hadrien Mary.
---
 .../scijava/thread/DefaultThreadService.java  | 30 +++++++++++++++++++
 .../org/scijava/thread/ThreadService.java     | 25 ++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 1de7899fe..88f36f893 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -33,6 +33,8 @@
 
 import java.awt.EventQueue;
 import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -65,6 +67,9 @@ public final class DefaultThreadService extends AbstractService implements
 
 	private ExecutorService executor;
 
+	/** Mapping from ID to single-thread {@link ExecutorService} queue. */
+	private Map<String, ExecutorService> queues;
+
 	private int nextThread = 0;
 
 	private boolean disposed;
@@ -117,6 +122,16 @@ public void queue(final Runnable code) {
 		EventQueue.invokeLater(wrap(code));
 	}
 
+	@Override
+	public Future<?> queue(final String id, final Runnable code) {
+		return executor(id).submit(wrap(code));
+	}
+
+	@Override
+	public <V> Future<V> queue(final String id, final Callable<V> code) {
+		return executor(id).submit(wrap(code));
+	}
+
 	@Override
 	public Thread getParent(final Thread thread) {
 		return parents.get(thread != null ? thread : Thread.currentThread());
@@ -147,6 +162,11 @@ public synchronized void dispose() {
 			executor.shutdown();
 			executor = null;
 		}
+		if (queues != null) {
+			for (final ExecutorService queue : queues.values()) {
+				queue.shutdown();
+			}
+		}
 	}
 
 	// -- ThreadFactory methods --
@@ -164,6 +184,16 @@ private ExecutorService executor() {
 		return executor;
 	}
 
+	private synchronized ExecutorService executor(final String id) {
+		if (disposed) return null;
+		if (queues == null) queues = new HashMap<>();
+		if (!queues.containsKey(id)) {
+			final ExecutorService queue = Executors.newSingleThreadExecutor();
+			queues.put(id, queue);
+		}
+		return queues.get(id);
+	}
+
 	private synchronized void initExecutor() {
 		if (executor != null) return;
 		executor = Executors.newCachedThreadPool(this);
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index bbc03acfd..9ae680fc2 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -153,6 +153,31 @@ void invoke(Runnable code) throws InterruptedException,
 	 */
 	void queue(Runnable code);
 
+	/**
+	 * Queues the given code for later execution in a dispatch thread associated
+	 * with the specified ID, returning immediately.
+	 *
+	 * @param id The ID designating which dispatch thread will execute the code.
+	 * @param code The code to execute.
+	 * @return A {@link Future} whose {@link Future#get()} method blocks until the
+	 *         queued code has completed executing and returns {@code null}.
+	 * @see ExecutorService#submit(Runnable)
+	 */
+	Future<?> queue(String id, Runnable code);
+
+	/**
+	 * Queues the given code for later execution in a dispatch thread associated
+	 * with the specified ID, returning immediately.
+	 *
+	 * @param id The ID designating which dispatch thread will execute the code.
+	 * @param code The code to execute.
+	 * @return A {@link Future} whose {@link Future#get()} method blocks until the
+	 *         queued code has completed executing and returns the result of the
+	 *         execution.
+	 * @see ExecutorService#submit(Callable)
+	 */
+	<V> Future<V> queue(String id, Callable<V> code);
+
 	/**
 	 * Returns the thread that called the specified thread.
 	 * <p>

From 02b59b0398e408c18a3025b365e7bbc1c698ea72 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 May 2017 11:40:12 -0500
Subject: [PATCH 0473/1208] POM: bump the minor version

The ThreadService has new API.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c04cd8bcc..d3e2e0eab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.62.2-SNAPSHOT</version>
+	<version>2.63.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 6fa4c8e68d89c42c89ef3ed10fa70740903ddd62 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 May 2017 21:15:57 -0500
Subject: [PATCH 0474/1208] ThreadService: give job queue threads better names

Now the thread names use the same convention as ThreadService#run,
but instead of thread number suffixes, the suffix is the ID given.
---
 .../org/scijava/thread/DefaultThreadService.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 88f36f893..f16ec6beb 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -40,6 +40,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
 
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -188,7 +189,16 @@ private synchronized ExecutorService executor(final String id) {
 		if (disposed) return null;
 		if (queues == null) queues = new HashMap<>();
 		if (!queues.containsKey(id)) {
-			final ExecutorService queue = Executors.newSingleThreadExecutor();
+			final ThreadFactory factory = new ThreadFactory() {
+
+				@Override
+				public Thread newThread(final Runnable r) {
+					final String threadName = contextThreadPrefix() + id;
+					return new Thread(r, threadName);
+				}
+
+			};
+			final ExecutorService queue = Executors.newSingleThreadExecutor(factory);
 			queues.put(id, queue);
 		}
 		return queues.get(id);

From 0856f790d987b2c88861f78263b8f7175f65b441 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2017 10:28:39 -0500
Subject: [PATCH 0475/1208] Deprecate CodeGenerator classes

---
 src/main/java/org/scijava/script/CodeGenerator.java     | 2 ++
 src/main/java/org/scijava/script/CodeGeneratorJava.java | 2 ++
 src/main/java/org/scijava/script/InvocationObject.java  | 2 ++
 src/main/java/org/scijava/script/ParameterObject.java   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index d79c7f6c4..12591841a 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -35,7 +35,9 @@
  * Code Generator Interface
  * 
  * @author Grant Harris
+ * @deprecated To be removed in SciJava Common 3.0.0.
  */
+@Deprecated
 public interface CodeGenerator {
 
 	/** Adds delimiter character between arguments (typically a ','). */
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 750aa55b3..1dba40118 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -35,7 +35,9 @@
  * {@link CodeGenerator} for Java.
  * 
  * @author Grant Harris
+ * @deprecated To be removed in SciJava Common 3.0.0.
  */
+@Deprecated
 public class CodeGeneratorJava implements CodeGenerator {
 
 	static final String lsep = System.getProperty("line.separator");
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 4ace6b083..639c33833 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -38,7 +38,9 @@
  * the parameters that were passed to it.
  * 
  * @author Grant Harris
+ * @deprecated To be removed in SciJava Common 3.0.0.
  */
+@Deprecated
 public class InvocationObject {
 
 	public String moduleCalled;
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 7f02b1d39..5073e147c 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -35,7 +35,9 @@
  * Holds a parameter, its type and value, for a recorded macro.
  * 
  * @author Grant Harris
+ * @deprecated To be removed in SciJava Common 3.0.0.
  */
+@Deprecated
 public class ParameterObject {
 
 	public ParameterObject(final String param, final Class<?> type,

From 8c84c5660eadd1ec7539bcc0848590effefed47b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2017 10:32:41 -0500
Subject: [PATCH 0476/1208] Move internal class into DefaultScriptInterpreter

---
 .../script/DefaultScriptInterpreter.java      | 110 +++++++++++++
 src/main/java/org/scijava/script/History.java | 145 ------------------
 2 files changed, 110 insertions(+), 145 deletions(-)
 delete mode 100644 src/main/java/org/scijava/script/History.java

diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 543ea506a..4a2599713 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -42,6 +42,7 @@
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.prefs.PrefService;
+import org.scijava.util.LastRecentlyUsed;
 
 /**
  * The default implementation of a {@link ScriptInterpreter}.
@@ -363,4 +364,113 @@ private static <T> T callMethod(final Object object, final String methodName,
 		return null;
 	}
 
+	// -- Helper classes --
+	
+	/** Container for a script language's interpreter history. */
+	private static class History {
+
+		@SuppressWarnings("unused")
+		protected static final long serialVersionUID = 2L;
+
+		private static final String PREFIX = "History.";
+		private final int MAX_ENTRIES = 1000;
+
+		private final PrefService prefs;
+		private final String name;
+		private final LastRecentlyUsed<String> entries =
+			new LastRecentlyUsed<>(MAX_ENTRIES);
+		private String currentCommand = "";
+		private int position = -1;
+
+		/**
+		 * Constructs a history object for a given scripting language.
+		 * 
+		 * @param name the name of the scripting language
+		 */
+		public History(final PrefService prefs, final String name) {
+			this.prefs = prefs;
+			this.name = name;
+		}
+
+		/**
+		 * Read back a persisted history.
+		 */
+		public void read() {
+			entries.clear();
+			for (final String item : prefs.getIterable(getClass(), PREFIX + name)) {
+				entries.addToEnd(item);
+			}
+		}
+
+		/**
+		 * Persist the history.
+		 * 
+		 * @see PrefService
+		 */
+		public void write() {
+			prefs.putIterable(getClass(), entries, PREFIX + name);
+		}
+
+		/**
+		 * Adds the most recently issued command.
+		 * 
+		 * @param command the most recent command to add to the history
+		 */
+		public void add(final String command) {
+			entries.add(command);
+			position = -1;
+			currentCommand = "";
+		}
+
+		public boolean replace(final String command) {
+			if (position < 0) {
+				currentCommand = command;
+				return false;
+			}
+			return entries.replace(position, command);
+		}
+
+		/**
+		 * Navigates to the next (more recent) command.
+		 * <p>
+		 * This method wraps around, i.e. it returns {@code null} when there is no
+		 * more-recent command in the history.
+		 * </p>
+		 * 
+		 * @return the next command
+		 */
+		public String next() {
+			position = entries.next(position);
+			return position < 0 ? currentCommand : entries.get(position);
+		}
+
+		/**
+		 * Navigates to the previous (i.e less recent) command.
+		 * <p>
+		 * This method wraps around, i.e. it returns {@code null} when there is no
+		 * less-recent command in the history.
+		 * </p>
+		 * 
+		 * @return the previous command
+		 */
+		public String previous() {
+			position = entries.previous(position);
+			return position < 0 ? currentCommand : entries.get(position);
+		}
+
+		@Override
+		public String toString() {
+			final StringBuilder builder = new StringBuilder();
+			int pos = -1;
+			for (;;) {
+				pos = entries.previous(pos);
+				if (pos < 0) break;
+				if (builder.length() > 0) builder.append(" -> ");
+				if (this.position == pos) builder.append("[");
+				builder.append(entries.get(pos));
+				if (this.position == pos) builder.append("]");
+			}
+			return builder.toString();
+		}
+	}
 }
diff --git a/src/main/java/org/scijava/script/History.java b/src/main/java/org/scijava/script/History.java
deleted file mode 100644
index 648a466c9..000000000
--- a/src/main/java/org/scijava/script/History.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava.script;
-
-import org.scijava.prefs.PrefService;
-import org.scijava.util.LastRecentlyUsed;
-
-/**
- * Container for a script language's interpreter history.
- * 
- * @author Johannes Schindelin
- */
-class History {
-
-	protected static final long serialVersionUID = 1L;
-
-	private static final String PREFIX = "History.";
-	private final int MAX_ENTRIES = 1000;
-
-	private final PrefService prefs;
-	private final String name;
-	private final LastRecentlyUsed<String> entries = new LastRecentlyUsed<>(MAX_ENTRIES);
-	private String currentCommand = "";
-	private int position = -1;
-
-	/**
-	 * Constructs a history object for a given scripting language.
-	 * 
-	 * @param name the name of the scripting language
-	 */
-	public History(final PrefService prefs, final String name) {
-		this.prefs = prefs;
-		this.name = name;
-	}
-
-	/**
-	 * Read back a persisted history.
-	 */
-	public void read() {
-		entries.clear();
-		for (final String item : prefs.getIterable(getClass(), PREFIX + name)) {
-			entries.addToEnd(item);
-		}
-	}
-
-	/**
-	 * Persist the history.
-	 * 
-	 * @see PrefService
-	 */
-	public void write() {
-		prefs.putIterable(getClass(), entries, PREFIX + name);
-	}
-
-	/**
-	 * Adds the most recently issued command.
-	 * 
-	 * @param command the most recent command to add to the history
-	 */
-	public void add(final String command) {
-		entries.add(command);
-		position = -1;
-		currentCommand = "";
-	}
-
-	public boolean replace(final String command) {
-		if (position < 0) {
-			currentCommand = command;
-			return false;
-		}
-		return entries.replace(position, command);
-	}
-
-	/**
-	 * Navigates to the next (more recent) command.
-	 * <p>
-	 * This method wraps around, i.e. it returns {@code null} when there is no
-	 * more-recent command in the history.
-	 * </p>
-	 * 
-	 * @return the next command
-	 */
-	public String next() {
-		position = entries.next(position);
-		return position < 0 ? currentCommand : entries.get(position);
-	}
-
-	/**
-	 * Navigates to the previous (i.e less recent) command.
-	 * <p>
-	 * This method wraps around, i.e. it returns {@code null} when there is no
-	 * less-recent command in the history.
-	 * </p>
-	 * 
-	 * @return the previous command
-	 */
-	public String previous() {
-		position = entries.previous(position);
-		return position < 0 ? currentCommand : entries.get(position);
-	}
-
-	@Override
-	public String toString() {
-		final StringBuilder builder = new StringBuilder();
-		int pos = -1;
-		for (;;) {
-			pos = entries.previous(pos);
-			if (pos < 0) break;
-			if (builder.length() > 0) builder.append(" -> ");
-			if (this.position == pos) builder.append("[");
-			builder.append(entries.get(pos));
-			if (this.position == pos) builder.append("]");
-		}
-		return builder.toString();
-	}
-}

From 2faeac5d4380196fd0545b83b443254f3ccb12c5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2017 10:33:42 -0500
Subject: [PATCH 0477/1208] Add missing license headers

---
 .../scijava/script/AbstractAutoCompleter.java |  4 +--
 .../scijava/script/AutoCompletionResult.java  | 33 ++++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index 5155ba784..05956001a 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.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
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index 6ea4dbcc3..ec48da96c 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -1,7 +1,32 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
  */
 
 package org.scijava.script;

From 55518586f39d9b58d2686bd8064b51c9d5f492da Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 May 2017 23:03:28 -0500
Subject: [PATCH 0478/1208] ScriptInfo: fix big bug in the return value logic

The actual return value never got assigned to the implicit "result"
output, because addReturnValue called addItem to add "result" as an
output, which then mistakenly disabled the appendReturnValue flag.
That flag should only be disabled when an _explicit_ output exists.
---
 src/main/java/org/scijava/script/ScriptInfo.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index d22e3902a..1b3d7f62e 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -432,7 +432,7 @@ private void parseParam(final String param,
 			varName = tokens[1];
 		}
 		final Class<?> type = scriptService.lookupClass(typeName);
-		addItem(varName, type, attrs);
+		addItem(varName, type, attrs, true);
 
 		if (ScriptModule.RETURN_VALUE.equals(varName)) {
 			// NB: The return value variable is declared as an explicit OUTPUT.
@@ -460,11 +460,11 @@ private void checkValid(final boolean valid, final String param)
 	private void addReturnValue() {
 		final HashMap<String, Object> attrs = new HashMap<>();
 		attrs.put("type", "OUTPUT");
-		addItem(ScriptModule.RETURN_VALUE, Object.class, attrs);
+		addItem(ScriptModule.RETURN_VALUE, Object.class, attrs, false);
 	}
 
 	private <T> void addItem(final String name, final Class<T> type,
-		final Map<String, Object> attrs)
+		final Map<String, Object> attrs, final boolean explicit)
 	{
 		final DefaultMutableModuleItem<T> item =
 			new DefaultMutableModuleItem<>(this, name, type);
@@ -477,7 +477,7 @@ private <T> void addItem(final String name, final Class<T> type,
 			registerOutput(item);
 			// NB: Only append the return value as an extra
 			// output when no explicit outputs are declared.
-			appendReturnValue = false;
+			if (explicit) appendReturnValue = false;
 		}
 	}
 

From 059e6993df31deb0270ea81185894861da98ec08 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 19 May 2017 19:02:02 -0500
Subject: [PATCH 0479/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d3e2e0eab..08815add8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.63.0-SNAPSHOT</version>
+	<version>2.63.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 15e232db8dd82cb0b7a81faad30805638bb1ac62 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 23 May 2017 07:18:17 -0500
Subject: [PATCH 0480/1208] PTService: fix javadoc

The examples given are all from SciJava Common, not ImageJ.
---
 src/main/java/org/scijava/plugin/PTService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index b131a8600..36a128498 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -40,7 +40,7 @@
  * <p>
  * There are many kinds of services, but most of them share one common
  * characteristic: they provide API specific to a particular type of plugin. A
- * few examples from ImageJ:
+ * few examples:
  * </p>
  * <ul>
  * <li>The {@link org.scijava.command.CommandService} works with

From ed9cb477312cb9bee4c2ba5bc9ca5d4c25817ca8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 May 2017 13:52:09 -0500
Subject: [PATCH 0481/1208] Move ScriptModule#getLanguage() into ScriptInfo

For a given script, which language to use is a constant. It should
be part of the script _metadata_, not the script module _instance_.
---
 pom.xml                                       |  2 +-
 .../java/org/scijava/script/ScriptInfo.java   | 19 ++++++++++
 .../java/org/scijava/script/ScriptModule.java | 37 ++++++++-----------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 08815add8..9a0b01354 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.63.1-SNAPSHOT</version>
+	<version>2.64.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 1b3d7f62e..c3668767e 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -101,6 +101,9 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	/** True iff the return value should be appended as an output. */
 	private boolean appendReturnValue;
 
+	/** Script language in which the script should be executed. */
+	private ScriptLanguage scriptLanguage;
+
 	/**
 	 * Creates a script metadata object which describes the given script file.
 	 * 
@@ -224,6 +227,22 @@ public BufferedReader getReader() {
 		return new BufferedReader(new StringReader(script), PARAM_CHAR_MAX);
 	}
 
+	/** Gets the scripting language of the script. */
+	public ScriptLanguage getLanguage() {
+		if (scriptLanguage == null) {
+			// infer the language from the script path's extension
+			final String scriptPath = getPath();
+			final String extension = FileUtils.getExtension(scriptPath);
+			scriptLanguage = scriptService.getLanguageByExtension(extension);
+		}
+		return scriptLanguage;
+	}
+
+	/** Overrides the script language to use when executing the script. */
+	public void setLanguage(final ScriptLanguage scriptLanguage) {
+		this.scriptLanguage = scriptLanguage;
+	}
+
 	/**
 	 * Parses the script's input and output parameters from the script header.
 	 * <p>
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 92cf3ced9..d00b7ab5e 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -50,7 +50,6 @@
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
-import org.scijava.util.FileUtils;
 
 /**
  * A {@link Module} which executes a script.
@@ -76,9 +75,6 @@ public class ScriptModule extends AbstractModule implements Contextual {
 	@Parameter
 	private LogService log;
 
-	/** Script language in which the script should be executed. */
-	private ScriptLanguage scriptLanguage;
-
 	/** Script engine with which the script should be executed. */
 	private ScriptEngine scriptEngine;
 
@@ -96,22 +92,6 @@ public ScriptModule(final ScriptInfo info) {
 
 	// -- ScriptModule methods --
 
-	/** Gets the scripting language of the script. */
-	public ScriptLanguage getLanguage() {
-		if (scriptLanguage == null) {
-			// infer the language from the script path's extension
-			final String path = getInfo().getPath();
-			final String extension = FileUtils.getExtension(path);
-			scriptLanguage = scriptService.getLanguageByExtension(extension);
-		}
-		return scriptLanguage;
-	}
-
-	/** Overrides the script language to use when executing the script. */
-	public void setLanguage(final ScriptLanguage scriptLanguage) {
-		this.scriptLanguage = scriptLanguage;
-	}
-
 	/** Sets the writer used to record the standard output stream. */
 	public void setOutputWriter(final Writer output) {
 		this.output = output;
@@ -125,7 +105,7 @@ public void setErrorWriter(final Writer error) {
 	/** Gets the script engine used to execute the script. */
 	public ScriptEngine getEngine() {
 		if (scriptEngine == null) {
-			scriptEngine = getLanguage().getScriptEngine();
+			scriptEngine = getInfo().getLanguage().getScriptEngine();
 		}
 		return scriptEngine;
 	}
@@ -185,7 +165,7 @@ public void run() {
 		}
 
 		// populate output values
-		final ScriptLanguage language = getLanguage();
+		final ScriptLanguage language = getInfo().getLanguage();
 		for (final ModuleItem<?> item : getInfo().outputs()) {
 			final String name = item.getName();
 			final Object value;
@@ -230,4 +210,17 @@ public void setContext(final Context context) {
 		context.inject(this);
 	}
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link ScriptInfo#getLanguage()} instead. */
+	@Deprecated
+	public ScriptLanguage getLanguage() {
+		return getInfo().getLanguage();
+	}
+
+	/** @deprecated Use {@link ScriptInfo#setLanguage(ScriptLanguage)} instead. */
+	@Deprecated
+	public void setLanguage(final ScriptLanguage scriptLanguage) {
+		getInfo().setLanguage(scriptLanguage);
+	}
 }

From e467c5d30435c5614974afabd2fc0819aac6b09d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 May 2017 13:53:06 -0500
Subject: [PATCH 0482/1208] ScriptInfo: add fallback code for null url & path

Now, the URL and (psuedo-)path can both be null. If that happens,
the getURL() and getPath() methods will both return null. And the
ScriptLanguage will be detected as the highest priority plugin
available (typically Groovy, but depends on runtime classpath).
---
 .../java/org/scijava/script/ScriptInfo.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index c3668767e..768a9ee23 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -232,8 +232,16 @@ public ScriptLanguage getLanguage() {
 		if (scriptLanguage == null) {
 			// infer the language from the script path's extension
 			final String scriptPath = getPath();
-			final String extension = FileUtils.getExtension(scriptPath);
-			scriptLanguage = scriptService.getLanguageByExtension(extension);
+			if (scriptPath != null) {
+				// use language associated with the script path extension
+				final String extension = FileUtils.getExtension(scriptPath);
+				scriptLanguage = scriptService.getLanguageByExtension(extension);
+			}
+			else {
+				// use the highest priority language
+				final List<ScriptLanguage> langs = scriptService.getLanguages();
+				if (langs != null && !langs.isEmpty()) scriptLanguage = langs.get(0);
+			}
 		}
 		return scriptLanguage;
 	}
@@ -371,7 +379,7 @@ public void setContext(final Context context) {
 
 	@Override
 	public String getIdentifier() {
-		return "script:" + path;
+		return "script:" + (path == null ? "<inline>" : path);
 	}
 
 	// -- Locatable methods --
@@ -403,6 +411,7 @@ public String getVersion() {
 
 	private URL url(final URL u, final String p) {
 		if (u != null) return u;
+		if (p == null) return null;
 		try {
 			return new File(p).toURI().toURL();
 		}
@@ -413,7 +422,8 @@ private URL url(final URL u, final String p) {
 	}
 
 	private String path(final URL u, final String p) {
-		return p == null ? u.getPath() : p;
+		if (p != null) return p;
+		return u == null ? null : u.getPath();
 	}
 
 	private void parseParam(final String param) throws ScriptException {

From bebaf6b179ae77402bfd2d6212d5407511901a9f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 May 2017 15:18:24 -0500
Subject: [PATCH 0483/1208] ScriptInfo: relocate isReturnValueAppended method

See: https://imagej.net/Coding_style#Ordering_of_code_blocks
---
 src/main/java/org/scijava/script/ScriptInfo.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 768a9ee23..b5f4ccdbc 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -251,6 +251,13 @@ public void setLanguage(final ScriptLanguage scriptLanguage) {
 		this.scriptLanguage = scriptLanguage;
 	}
 
+	/** Gets whether the return value is appended as an additional output. */
+	public boolean isReturnValueAppended() {
+		return appendReturnValue;
+	}
+
+	// -- AbstractModuleInfo methods --
+
 	/**
 	 * Parses the script's input and output parameters from the script header.
 	 * <p>
@@ -335,11 +342,6 @@ public void parseParameters() {
 		}
 	}
 
-	/** Gets whether the return value is appended as an additional output. */
-	public boolean isReturnValueAppended() {
-		return appendReturnValue;
-	}
-
 	// -- ModuleInfo methods --
 
 	@Override

From 012b00d4fe92587973e304c264081a7749b93c31 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 May 2017 15:19:04 -0500
Subject: [PATCH 0484/1208] ScriptInfo: add setter for appendReturnValue

This matches the getter isReturnValueAppended. It will
be useful when we externalize the parameter parsing logic.
---
 src/main/java/org/scijava/script/ScriptInfo.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index b5f4ccdbc..1e36139c2 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -256,6 +256,11 @@ public boolean isReturnValueAppended() {
 		return appendReturnValue;
 	}
 
+	/** Gets whether the return value is appended as an additional output. */
+	public void setReturnValueAppended(final boolean appendReturnValue) {
+		this.appendReturnValue = appendReturnValue;
+	}
+
 	// -- AbstractModuleInfo methods --
 
 	/**

From 27423a8874f5d2d4c55ec7bf28cb7228c5ca2ea9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 May 2017 15:20:41 -0500
Subject: [PATCH 0485/1208] ScriptInfo: widen visibility of parameter methods

We will need to be able to manipulate a ScriptInfo's inputs and outputs
from external code, as part of the parameter parsing externalization.
---
 .../java/org/scijava/script/ScriptInfo.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 1e36139c2..844f6d912 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -60,6 +60,7 @@
 import org.scijava.module.AbstractModuleInfo;
 import org.scijava.module.DefaultMutableModuleItem;
 import org.scijava.module.ModuleException;
+import org.scijava.module.ModuleItem;
 import org.scijava.parse.ParseService;
 import org.scijava.plugin.Parameter;
 import org.scijava.util.DigestUtils;
@@ -347,6 +348,24 @@ public void parseParameters() {
 		}
 	}
 
+	// NB: Widened visibility from AbstractModuleInfo.
+	@Override
+	public void clearParameters() {
+		super.clearParameters();
+	}
+
+	// NB: Widened visibility from AbstractModuleInfo.
+	@Override
+	public void registerInput(final ModuleItem<?> input) {
+		super.registerInput(input);
+	}
+
+	// NB: Widened visibility from AbstractModuleInfo.
+	@Override
+	public void registerOutput(final ModuleItem<?> output) {
+		super.registerOutput(output);
+	}
+
 	// -- ModuleInfo methods --
 
 	@Override

From bcb24546ac3aba8db49801141f70b778f8ec6425 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 May 2017 13:27:19 -0500
Subject: [PATCH 0486/1208] Add service and plugin type to process scripts

This will be useful for implementing script processing directives in
an extensible way. Here is one example, for dependency declaration:

  #@repository('https://maven.imagej.net/content/groups/public')
  #@dependency('net.imagej:imagej:2.0.0-rc-60')

And here is another, for defining the intended script language:

  #!clojure

We will also migrate the script parameter syntax to this scheme:

  #@input String name
  #@input int age
  #@output String greeting

Or with the familiar sloppy shorthand:

  #@String name
  #@int age
  #@output String greeting

See #265
See https://github.com/hadim/scijava-jupyter-kernel/issues/51#issuecomment-301816226
---
 .../scijava/script/DefaultScriptService.java  |  1 +
 .../DefaultScriptProcessorService.java        | 49 ++++++++++
 .../script/process/ScriptProcessor.java       | 54 +++++++++++
 .../process/ScriptProcessorService.java       | 93 +++++++++++++++++++
 .../java/org/scijava/ContextCreationTest.java |  1 +
 5 files changed, 198 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
 create mode 100644 src/main/java/org/scijava/script/process/ScriptProcessor.java
 create mode 100644 src/main/java/org/scijava/script/process/ScriptProcessorService.java

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 41ec47dab..9480cf863 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -62,6 +62,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginService;
 import org.scijava.plugin.SciJavaPlugin;
+import org.scijava.script.process.ScriptProcessorService;
 import org.scijava.service.Service;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ColorRGB;
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
new file mode 100644
index 000000000..3cbce02e3
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import org.scijava.plugin.AbstractSingletonService;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.Service;
+
+/**
+ * Default implementation of {@link ScriptProcessorService}.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultScriptProcessorService extends
+	AbstractSingletonService<ScriptProcessor> implements
+	ScriptProcessorService
+{
+	// NB: No implementation needed.
+}
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
new file mode 100644
index 000000000..3d412d074
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import org.scijava.plugin.SingletonPlugin;
+import org.scijava.script.ScriptInfo;
+
+/**
+ * A script processor defines some sort of processing that primes a particular
+ * script for execution.
+ * <p>
+ * Typically, these plugins look for special directives in the script itself
+ * beginning with distinctive character sequences like {@code #@}, and then
+ * perform some action in response.
+ * </p>
+ * 
+ * @author Curtis Rueden
+ */
+public interface ScriptProcessor extends SingletonPlugin {
+
+	void begin(ScriptInfo info);
+	void process(String line);
+	default void end() {}
+
+}
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
new file mode 100644
index 000000000..2f1d431cf
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.scijava.plugin.PTService;
+import org.scijava.script.ScriptInfo;
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for service that processes scripts. This service discovers
+ * available {@link ScriptProcessor} plugins, and provides convenience methods
+ * to interact with them.
+ * 
+ * @author Curtis Rueden
+ */
+public interface ScriptProcessorService extends
+	PTService<ScriptProcessor>, SciJavaService
+{
+
+	/**
+	 * Invokes all {@link ScriptProcessor} plugins on the given script, line by
+	 * line in sequence.
+	 */
+	default void process(final ScriptInfo info) throws IOException {
+		final List<ScriptProcessor> processors = getPlugins().stream().map(
+			p -> pluginService().createInstance(p)).collect(Collectors.toList());
+
+		BufferedReader reader = info.getReader();
+		if (reader == null) {
+			reader = new BufferedReader(new FileReader(info.getPath()));
+		}
+
+		for (final ScriptProcessor p : processors) {
+			p.begin(info);
+		}
+
+		try (final BufferedReader in = reader) {
+			while (true) {
+				final String line = in.readLine();
+				if (line == null) break;
+				for (final ScriptProcessor p : processors) {
+					p.process(line);
+				}
+			}
+		}
+
+		for (final ScriptProcessor p : processors) {
+			p.end();
+		}
+	}
+
+	// -- PTService methods --
+
+	@Override
+	default Class<ScriptProcessor> getPluginType() {
+		return ScriptProcessor.class;
+	}
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 8de76276e..5dc0ed1b4 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -109,6 +109,7 @@ public void testFull() {
 				org.scijava.prefs.DefaultPrefService.class,
 				org.scijava.run.DefaultRunService.class,
 				org.scijava.script.DefaultScriptHeaderService.class,
+				org.scijava.script.process.DefaultScriptProcessorService.class,
 				org.scijava.text.DefaultTextService.class,
 				org.scijava.thread.DefaultThreadService.class,
 				org.scijava.tool.DefaultToolService.class,

From 50d4997c3bae8a437a6aa691bcfc8c01c4093a78 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 22 May 2017 15:21:56 -0500
Subject: [PATCH 0487/1208] Externalize the script parameter parsing logic

It now lives in a new ParameterScriptProcessor.

For the moment, script processing is triggered internally by the
ScriptInfo's parseParameters method, which is a bit hacky.
---
 .../scijava/script/DefaultScriptService.java  |   3 +
 .../java/org/scijava/script/ScriptInfo.java   | 241 +--------------
 .../process/ParameterScriptProcessor.java     | 286 ++++++++++++++++++
 3 files changed, 300 insertions(+), 230 deletions(-)
 create mode 100644 src/main/java/org/scijava/script/process/ParameterScriptProcessor.java

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 9480cf863..f63eb7938 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -91,6 +91,9 @@ public class DefaultScriptService extends
 	@Parameter
 	private AppService appService;
 
+	@Parameter
+	private ScriptProcessorService scriptProcessorService;
+
 	@Parameter
 	private ParseService parser;
 
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 844f6d912..fb3859b2b 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -33,7 +33,6 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -41,37 +40,24 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
-import javax.script.ScriptException;
 
 import org.scijava.Context;
 import org.scijava.Contextual;
-import org.scijava.ItemIO;
-import org.scijava.ItemVisibility;
 import org.scijava.NullContextException;
-import org.scijava.command.Command;
-import org.scijava.convert.ConvertService;
 import org.scijava.log.LogService;
 import org.scijava.module.AbstractModuleInfo;
-import org.scijava.module.DefaultMutableModuleItem;
 import org.scijava.module.ModuleException;
 import org.scijava.module.ModuleItem;
-import org.scijava.parse.ParseService;
 import org.scijava.plugin.Parameter;
+import org.scijava.script.process.ParameterScriptProcessor;
+import org.scijava.script.process.ScriptProcessorService;
 import org.scijava.util.DigestUtils;
 import org.scijava.util.FileUtils;
 
 /**
  * Metadata about a script.
- * <p>
- * This class is responsible for parsing the script for parameters. See
- * {@link #parseParameters()} for details.
- * </p>
  * 
  * @author Curtis Rueden
  * @author Johannes Schindelin
@@ -94,10 +80,7 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	private ScriptService scriptService;
 
 	@Parameter
-	private ParseService parser;
-
-	@Parameter
-	private ConvertService convertService;
+	private ScriptProcessorService scriptProcessorService;
 
 	/** True iff the return value should be appended as an output. */
 	private boolean appendReturnValue;
@@ -265,86 +248,21 @@ public void setReturnValueAppended(final boolean appendReturnValue) {
 	// -- AbstractModuleInfo methods --
 
 	/**
-	 * Parses the script's input and output parameters from the script header.
-	 * <p>
-	 * This method is called automatically the first time any parameter accessor
-	 * method is called ({@link #getInput}, {@link #getOutput}, {@link #inputs()},
-	 * {@link #outputs()}, etc.). Subsequent calls will reparse the parameters.
-	 * <p>
-	 * SciJava's scripting framework supports specifying @{@link Parameter}-style
-	 * inputs and outputs in a preamble. The format is a simplified version of the
-	 * Java @{@link Parameter} annotation syntax. The following syntaxes are
-	 * supported:
-	 * </p>
-	 * <ul>
-	 * <li>{@code // @<type> <varName>}</li>
-	 * <li>{@code // @<type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}
-	 * </li>
-	 * <li>{@code // @<IOType> <type> <varName>}</li>
-	 * <li>{@code // @<IOType>(<attr1>=<value1>, ..., <attrN>=<valueN>) <type> 
-	 * <varName>}</li>
-	 * </ul>
-	 * <p>
-	 * Where:
-	 * </p>
-	 * <ul>
-	 * <li>{@code //} = the comment style of the scripting language, so that the
-	 * parameter line is ignored by the script engine itself.</li>
-	 * <li>{@code <IOType>} = one of {@code INPUT}, {@code OUTPUT}, or
-	 * {@code BOTH}.</li>
-	 * <li>{@code <varName>} = the name of the input or output variable.</li>
-	 * <li>{@code <type>} = the Java {@link Class} of the variable.</li>
-	 * <li>{@code <attr*>} = an attribute key.</li>
-	 * <li>{@code <value*>} = an attribute value.</li>
-	 * </ul>
-	 * <p>
-	 * See the @{@link Parameter} annotation for a list of valid attributes.
-	 * </p>
-	 * <p>
-	 * Here are a few examples:
-	 * </p>
-	 * <ul>
-	 * <li>{@code // @Dataset dataset}</li>
-	 * <li>{@code // @double(type=OUTPUT) result}</li>
-	 * <li>{@code // @BOTH ImageDisplay display}</li>
-	 * <li>{@code // @INPUT(persist=false, visibility=INVISIBLE) boolean verbose}
-	 * </li>
-	 * </ul>
-	 * <p>
-	 * Parameters will be parsed and filled just like @{@link Parameter}-annotated
-	 * fields in {@link Command}s.
-	 * </p>
+	 * Performs script processing. In particular, parses the script parameters.
+	 * 
+	 * @see ParameterScriptProcessor
+	 * @see ScriptProcessorService#process
 	 */
 	// NB: Widened visibility from AbstractModuleInfo.
 	@Override
 	public void parseParameters() {
 		clearParameters();
-		appendReturnValue = true;
-
-		try (final BufferedReader in = script == null ? //
-			new BufferedReader(new FileReader(getPath())) : getReader()) //
-		{
-			while (true) {
-				final String line = in.readLine();
-				if (line == null) break;
-
-				// NB: Scan for lines containing an '@' with no prior alphameric
-				// characters. This assumes that only non-alphanumeric characters can
-				// be used as comment line markers.
-				if (line.matches("^[^\\w]*@.*")) {
-					final int at = line.indexOf('@');
-					parseParam(line.substring(at + 1));
-				}
-				else if (line.matches(".*\\w.*")) break;
-			}
-
-			if (appendReturnValue) addReturnValue();
+		try {
+			scriptProcessorService.process(this);
 		}
 		catch (final IOException exc) {
-			log.error("Error reading script: " + path, exc);
-		}
-		catch (final ScriptException exc) {
-			log.error("Invalid parameter syntax for script: " + path, exc);
+			// TODO: Consider a better error handling approach.
+			throw new RuntimeException(exc);
 		}
 	}
 
@@ -452,143 +370,6 @@ private String path(final URL u, final String p) {
 		return u == null ? null : u.getPath();
 	}
 
-	private void parseParam(final String param) throws ScriptException {
-		final int lParen = param.indexOf("(");
-		final int rParen = param.lastIndexOf(")");
-		if (rParen < lParen) {
-			throw new ScriptException("Invalid parameter: " + param);
-		}
-		if (lParen < 0) parseParam(param, parseAttrs("()"));
-		else {
-			final String cutParam =
-				param.substring(0, lParen) + param.substring(rParen + 1);
-			final String attrs = param.substring(lParen + 1, rParen);
-			parseParam(cutParam, parseAttrs(attrs));
-		}
-	}
-
-	private void parseParam(final String param,
-		final Map<String, Object> attrs) throws ScriptException
-	{
-		final String[] tokens = param.trim().split("[ \t\n]+");
-		checkValid(tokens.length >= 1, param);
-		final String typeName, varName;
-		if (isIOType(tokens[0])) {
-			// assume syntax: <IOType> <type> <varName>
-			checkValid(tokens.length >= 3, param);
-			attrs.put("type", tokens[0]);
-			typeName = tokens[1];
-			varName = tokens[2];
-		}
-		else {
-			// assume syntax: <type> <varName>
-			checkValid(tokens.length >= 2, param);
-			typeName = tokens[0];
-			varName = tokens[1];
-		}
-		final Class<?> type = scriptService.lookupClass(typeName);
-		addItem(varName, type, attrs, true);
-
-		if (ScriptModule.RETURN_VALUE.equals(varName)) {
-			// NB: The return value variable is declared as an explicit OUTPUT.
-			// So we should not append the return value as an extra output.
-			appendReturnValue = false;
-		}
-	}
-
-	/** Parses a comma-delimited list of {@code key=value} pairs into a map. */
-	private Map<String, Object> parseAttrs(final String attrs) {
-		return parser.parse(attrs, false).asMap();
-	}
-
-	private boolean isIOType(final String token) {
-		return convertService.convert(token, ItemIO.class) != null;
-	}
-
-	private void checkValid(final boolean valid, final String param)
-		throws ScriptException
-	{
-		if (!valid) throw new ScriptException("Invalid parameter: " + param);
-	}
-
-	/** Adds an output for the value returned by the script itself. */
-	private void addReturnValue() {
-		final HashMap<String, Object> attrs = new HashMap<>();
-		attrs.put("type", "OUTPUT");
-		addItem(ScriptModule.RETURN_VALUE, Object.class, attrs, false);
-	}
-
-	private <T> void addItem(final String name, final Class<T> type,
-		final Map<String, Object> attrs, final boolean explicit)
-	{
-		final DefaultMutableModuleItem<T> item =
-			new DefaultMutableModuleItem<>(this, name, type);
-		for (final String key : attrs.keySet()) {
-			final Object value = attrs.get(key);
-			assignAttribute(item, key, value);
-		}
-		if (item.isInput()) registerInput(item);
-		if (item.isOutput()) {
-			registerOutput(item);
-			// NB: Only append the return value as an extra
-			// output when no explicit outputs are declared.
-			if (explicit) appendReturnValue = false;
-		}
-	}
-
-	private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
-		final String k, final Object v)
-	{
-		// CTR: There must be an easier way to do this.
-		// Just compile the thing using javac? Or parse via javascript, maybe?
-		if (is(k, "callback")) item.setCallback(as(v, String.class));
-		else if (is(k, "choices")) item.setChoices(asList(v, item.getType()));
-		else if (is(k, "columns")) item.setColumnCount(as(v, int.class));
-		else if (is(k, "description")) item.setDescription(as(v, String.class));
-		else if (is(k, "initializer")) item.setInitializer(as(v, String.class));
-		else if (is(k, "validater")) item.setValidater(as(v, String.class));
-		else if (is(k, "type")) item.setIOType(as(v, ItemIO.class));
-		else if (is(k, "label")) item.setLabel(as(v, String.class));
-		else if (is(k, "max")) item.setMaximumValue(as(v, item.getType()));
-		else if (is(k, "min")) item.setMinimumValue(as(v, item.getType()));
-		else if (is(k, "name")) item.setName(as(v, String.class));
-		else if (is(k, "persist")) item.setPersisted(as(v, boolean.class));
-		else if (is(k, "persistKey")) item.setPersistKey(as(v, String.class));
-		else if (is(k, "required")) item.setRequired(as(v, boolean.class));
-		else if (is(k, "softMax")) item.setSoftMaximum(as(v, item.getType()));
-		else if (is(k, "softMin")) item.setSoftMinimum(as(v, item.getType()));
-		else if (is(k, "stepSize")) item.setStepSize(as(v, double.class));
-		else if (is(k, "style")) item.setWidgetStyle(as(v, String.class));
-		else if (is(k, "visibility")) item.setVisibility(as(v, ItemVisibility.class));
-		else if (is(k, "value")) item.setDefaultValue(as(v, item.getType()));
-		else item.set(k, v.toString());
-	}
-
-	/** Super terse comparison helper method. */
-	private boolean is(final String key, final String desired) {
-		return desired.equalsIgnoreCase(key);
-	}
-
-	/** Super terse conversion helper method. */
-	private <T> T as(final Object v, final Class<T> type) {
-		final T converted = convertService.convert(v, type);
-		if (converted != null) return converted;
-		// NB: Attempt to convert via string.
-		// This is useful in cases where a weird type of object came back
-		// (e.g., org.scijava.parse.eval.Unresolved), but which happens to have a
-		// nice string representation which ultimately is expressible as the type.
-		return convertService.convert(v.toString(), type);
-	}
-
-	private <T> List<T> asList(final Object v, final Class<T> type) {
-		final ArrayList<T> result = new ArrayList<>();
-		final List<?> list = as(v, List.class);
-		for (final Object item : list) {
-			result.add(as(item, type));
-		}
-		return result;
-	}
-
 	/**
 	 * Read entire contents of a Reader and return as String.
 	 *
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
new file mode 100644
index 000000000..9652e3f77
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -0,0 +1,286 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.script.ScriptException;
+
+import org.scijava.ItemIO;
+import org.scijava.ItemVisibility;
+import org.scijava.command.Command;
+import org.scijava.convert.ConvertService;
+import org.scijava.log.LogService;
+import org.scijava.module.DefaultMutableModuleItem;
+import org.scijava.parse.ParseService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.script.ScriptInfo;
+import org.scijava.script.ScriptModule;
+import org.scijava.script.ScriptService;
+
+/**
+ * A {@link ScriptProcessor} which parses the script's input and output
+ * parameters from the script header.
+ * <p>
+ * SciJava's scripting framework supports specifying @{@link Parameter}-style
+ * inputs and outputs in a preamble. The format is a simplified version of the
+ * Java @{@link Parameter} annotation syntax. The following syntaxes are
+ * supported:
+ * </p>
+ * <ul>
+ * <li>{@code // @<type> <varName>}</li>
+ * <li>{@code // @<type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}
+ * </li>
+ * <li>{@code // @<IOType> <type> <varName>}</li>
+ * <li>{@code // @<IOType>(<attr1>=<value1>, ..., <attrN>=<valueN>) <type>
+ * <varName>}</li>
+ * </ul>
+ * <p>
+ * Where:
+ * </p>
+ * <ul>
+ * <li>{@code //} = the comment style of the scripting language, so that the
+ * parameter line is ignored by the script engine itself.</li>
+ * <li>{@code <IOType>} = one of {@code INPUT}, {@code OUTPUT}, or {@code BOTH}.
+ * </li>
+ * <li>{@code <varName>} = the name of the input or output variable.</li>
+ * <li>{@code <type>} = the Java {@link Class} of the variable.</li>
+ * <li>{@code <attr*>} = an attribute key.</li>
+ * <li>{@code <value*>} = an attribute value.</li>
+ * </ul>
+ * <p>
+ * See the @{@link Parameter} annotation for a list of valid attributes.
+ * </p>
+ * <p>
+ * Here are a few examples:
+ * </p>
+ * <ul>
+ * <li>{@code // @Dataset dataset}</li>
+ * <li>{@code // @double(type=OUTPUT) result}</li>
+ * <li>{@code // @BOTH ImageDisplay display}</li>
+ * <li>{@code // @INPUT(persist=false, visibility=INVISIBLE) boolean verbose}
+ * </li>
+ * </ul>
+ * <p>
+ * Parameters will be parsed and filled just like @{@link Parameter}-annotated
+ * fields in {@link Command}s.
+ * </p>
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = ScriptProcessor.class)
+public class ParameterScriptProcessor implements ScriptProcessor {
+
+	@Parameter
+	private ScriptService scriptService;
+
+	@Parameter
+	private ConvertService convertService;
+
+	@Parameter
+	private ParseService parser;
+
+	@Parameter
+	private LogService log;
+
+	private ScriptInfo info;
+	private boolean header = true;
+
+	// -- ScriptProcessor methods --
+
+	@Override
+	public void begin(final ScriptInfo scriptInfo) {
+		info = scriptInfo;
+		info.setReturnValueAppended(true);
+	}
+
+	@Override
+	public void process(final String line) {
+		if (header) {
+			// NB: Check if line contains an '@' with no prior alphameric
+			// characters. This assumes that only non-alphanumeric characters can
+			// be used as comment line markers.
+			if (line.matches("^[^\\w]*@.*")) {
+				final int at = line.indexOf('@');
+				parseParam(line.substring(at + 1));
+			}
+			else if (line.matches(".*\\w.*")) header = false;
+		}
+	}
+
+	@Override
+	public void end() {
+		if (info.isReturnValueAppended()) {
+			// add an output for the value returned by the script itself
+			final HashMap<String, Object> attrs = new HashMap<>();
+			attrs.put("type", "OUTPUT");
+			addItem(ScriptModule.RETURN_VALUE, Object.class, attrs, false);
+		}
+	}
+
+	// -- Helper methods --
+
+	private void parseParam(final String param) {
+		final int lParen = param.indexOf("(");
+		final int rParen = param.lastIndexOf(")");
+		if (rParen < lParen) { warnInvalid(param); return; }
+		if (lParen < 0) parseParam(param, parseAttrs("()"));
+		else {
+			final String cutParam =
+				param.substring(0, lParen) + param.substring(rParen + 1);
+			final String attrs = param.substring(lParen + 1, rParen);
+			parseParam(cutParam, parseAttrs(attrs));
+		}
+	}
+
+	private void parseParam(final String param, final Map<String, Object> attrs) {
+		final String[] tokens = param.trim().split("[ \t\n]+");
+		if (tokens.length < 1) { warnInvalid(param); return; }
+		final String typeName, varName;
+		if (isIOType(tokens[0])) {
+			// assume syntax: <IOType> <type> <varName>
+			if (tokens.length < 3) { warnInvalid(param); return; }
+			attrs.put("type", tokens[0]);
+			typeName = tokens[1];
+			varName = tokens[2];
+		}
+		else {
+			// assume syntax: <type> <varName>
+			if (tokens.length < 2) { warnInvalid(param); return; }
+			typeName = tokens[0];
+			varName = tokens[1];
+		}
+		try {
+			final Class<?> type = scriptService.lookupClass(typeName);
+			addItem(varName, type, attrs, true);
+		}
+		catch (final ScriptException exc) {
+			log.warn("Invalid class: " + typeName, exc);
+			return;
+		}
+
+		if (ScriptModule.RETURN_VALUE.equals(varName)) {
+			// NB: The return value variable is declared as an explicit parameter.
+			// So we should not append the return value as an extra output.
+			info.setReturnValueAppended(false);
+		}
+	}
+
+	/** Parses a comma-delimited list of {@code key=value} pairs into a map. */
+	private Map<String, Object> parseAttrs(final String attrs) {
+		return parser.parse(attrs, false).asMap();
+	}
+
+	private boolean isIOType(final String token) {
+		return convertService.convert(token, ItemIO.class) != null;
+	}
+
+	private void warnInvalid(final String param) {
+		log.warn("Ignoring invalid parameter: " + param);
+	}
+
+	private <T> void addItem(final String name, final Class<T> type,
+		final Map<String, Object> attrs, final boolean explicit)
+	{
+		final DefaultMutableModuleItem<T> item =
+			new DefaultMutableModuleItem<>(info, name, type);
+		for (final String key : attrs.keySet()) {
+			final Object value = attrs.get(key);
+			assignAttribute(item, key, value);
+		}
+		if (item.isInput()) info.registerInput(item);
+		if (item.isOutput()) {
+			info.registerOutput(item);
+			// NB: Only append the return value as an extra
+			// output when no explicit outputs are declared.
+			if (explicit) info.setReturnValueAppended(false);
+		}
+	}
+
+	private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
+		final String k, final Object v)
+	{
+		// CTR: There must be an easier way to do this.
+		// Just compile the thing using javac? Or parse via javascript, maybe?
+		if (is(k, "callback")) item.setCallback(as(v, String.class));
+		else if (is(k, "choices")) item.setChoices(asList(v, item.getType()));
+		else if (is(k, "columns")) item.setColumnCount(as(v, int.class));
+		else if (is(k, "description")) item.setDescription(as(v, String.class));
+		else if (is(k, "initializer")) item.setInitializer(as(v, String.class));
+		else if (is(k, "validater")) item.setValidater(as(v, String.class));
+		else if (is(k, "type")) item.setIOType(as(v, ItemIO.class));
+		else if (is(k, "label")) item.setLabel(as(v, String.class));
+		else if (is(k, "max")) item.setMaximumValue(as(v, item.getType()));
+		else if (is(k, "min")) item.setMinimumValue(as(v, item.getType()));
+		else if (is(k, "name")) item.setName(as(v, String.class));
+		else if (is(k, "persist")) item.setPersisted(as(v, boolean.class));
+		else if (is(k, "persistKey")) item.setPersistKey(as(v, String.class));
+		else if (is(k, "required")) item.setRequired(as(v, boolean.class));
+		else if (is(k, "softMax")) item.setSoftMaximum(as(v, item.getType()));
+		else if (is(k, "softMin")) item.setSoftMinimum(as(v, item.getType()));
+		else if (is(k, "stepSize")) item.setStepSize(as(v, double.class));
+		else if (is(k, "style")) item.setWidgetStyle(as(v, String.class));
+		else if (is(k, "visibility")) item.setVisibility(as(v, ItemVisibility.class));
+		else if (is(k, "value")) item.setDefaultValue(as(v, item.getType()));
+		else item.set(k, v.toString());
+	}
+
+	/** Super terse comparison helper method. */
+	private boolean is(final String key, final String desired) {
+		return desired.equalsIgnoreCase(key);
+	}
+
+	/** Super terse conversion helper method. */
+	private <T> T as(final Object v, final Class<T> type) {
+		final T converted = convertService.convert(v, type);
+		if (converted != null) return converted;
+		// NB: Attempt to convert via string.
+		// This is useful in cases where a weird type of object came back
+		// (e.g., org.scijava.parse.eval.Unresolved), but which happens to have a
+		// nice string representation which ultimately is expressible as the type.
+		return convertService.convert(v.toString(), type);
+	}
+
+	private <T> List<T> asList(final Object v, final Class<T> type) {
+		final ArrayList<T> result = new ArrayList<>();
+		final List<?> list = as(v, List.class);
+		for (final Object item : list) {
+			result.add(as(item, type));
+		}
+		return result;
+	}
+
+}

From 347b484a79f4d080ab224cd2c89dd14e0cd04bdf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 23 May 2017 19:04:39 -0500
Subject: [PATCH 0488/1208] Add script processor for shebang syntax

This lets a script declare its own intended language.

See:
https://github.com/hadim/scijava-jupyter-kernel/issues/51#issuecomment-301816226
---
 .../process/ShebangScriptProcessor.java       | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/process/ShebangScriptProcessor.java

diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
new file mode 100644
index 000000000..63dc09db3
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -0,0 +1,78 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.script.ScriptInfo;
+import org.scijava.script.ScriptLanguage;
+import org.scijava.script.ScriptService;
+
+/**
+ * A {@link ScriptProcessor} which looks for a {@code #!} at the beginning of a
+ * script, and set the language accordingly.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = ScriptProcessor.class)
+public class ShebangScriptProcessor implements ScriptProcessor {
+
+	@Parameter
+	private ScriptService scriptService;
+
+	@Parameter
+	private LogService log;
+
+	private ScriptInfo info;
+	private boolean first = true;
+
+	// -- ScriptProcessor methods --
+
+	@Override
+	public void begin(final ScriptInfo scriptInfo) {
+		info = scriptInfo;
+	}
+
+	@Override
+	public void process(final String line) {
+		if (!first) return;
+		if (line.startsWith("#!")) {
+			// shebang!
+			final String langName = line.substring(2);
+			final ScriptLanguage lang = scriptService.getLanguageByName(langName);
+			if (lang != null) info.setLanguage(lang);
+			else log.warn("Unknown script language: " + langName);
+		}
+		first = false;
+	}
+}
\ No newline at end of file

From 1541cf1075c6ec826e4e95ca447e6d005f257cae Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 23 May 2017 20:44:33 -0500
Subject: [PATCH 0489/1208] Parse a new style of parameter syntax

See:
https://github.com/scijava/scijava-common/pull/265#issuecomment-302124612
---
 .../process/ParameterScriptProcessor.java     | 44 +++++++++++--------
 .../org/scijava/script/ScriptInfoTest.java    | 36 ++++++++++++++-
 2 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index 9652e3f77..c65e713c0 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -61,25 +61,24 @@
  * supported:
  * </p>
  * <ul>
- * <li>{@code // @<type> <varName>}</li>
- * <li>{@code // @<type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}
- * </li>
- * <li>{@code // @<IOType> <type> <varName>}</li>
- * <li>{@code // @<IOType>(<attr1>=<value1>, ..., <attrN>=<valueN>) <type>
+ * <li>{@code #@<type> <varName>}</li>
+ * <li>{@code #@<type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}</li>
+ * <li>{@code #@<IOType> <type> <varName>}</li>
+ * <li>{@code #@<IOType>(<attr1>=<value1>, ..., <attrN>=<valueN>) <type>
  * <varName>}</li>
  * </ul>
  * <p>
  * Where:
  * </p>
  * <ul>
- * <li>{@code //} = the comment style of the scripting language, so that the
+ * <li>{@code #@} - signals a special script processing instruction, so that the
  * parameter line is ignored by the script engine itself.</li>
- * <li>{@code <IOType>} = one of {@code INPUT}, {@code OUTPUT}, or {@code BOTH}.
+ * <li>{@code <IOType>} - one of {@code INPUT}, {@code OUTPUT}, or {@code BOTH}.
  * </li>
- * <li>{@code <varName>} = the name of the input or output variable.</li>
- * <li>{@code <type>} = the Java {@link Class} of the variable.</li>
- * <li>{@code <attr*>} = an attribute key.</li>
- * <li>{@code <value*>} = an attribute value.</li>
+ * <li>{@code <varName>} - the name of the input or output variable.</li>
+ * <li>{@code <type>} - the Java {@link Class} of the variable.</li>
+ * <li>{@code <attr*>} - an attribute key.</li>
+ * <li>{@code <value*>} - an attribute value.</li>
  * </ul>
  * <p>
  * See the @{@link Parameter} annotation for a list of valid attributes.
@@ -88,10 +87,10 @@
  * Here are a few examples:
  * </p>
  * <ul>
- * <li>{@code // @Dataset dataset}</li>
- * <li>{@code // @double(type=OUTPUT) result}</li>
- * <li>{@code // @BOTH ImageDisplay display}</li>
- * <li>{@code // @INPUT(persist=false, visibility=INVISIBLE) boolean verbose}
+ * <li>{@code #@Dataset dataset}</li>
+ * <li>{@code #@double(type=OUTPUT) result}</li>
+ * <li>{@code #@BOTH ImageDisplay display}</li>
+ * <li>{@code #@INPUT(persist=false, visibility=INVISIBLE) boolean verbose}
  * </li>
  * </ul>
  * <p>
@@ -129,6 +128,14 @@ public void begin(final ScriptInfo scriptInfo) {
 
 	@Override
 	public void process(final String line) {
+		// parse new-style parameters starting with @# anywhere in the script.
+		if (line.matches("^#@.*")) {
+			final int at = line.indexOf('@');
+			parseParam(line.substring(at + 1));
+			return;
+		}
+
+		// parse old-style parameters in the initial script header
 		if (header) {
 			// NB: Check if line contains an '@' with no prior alphameric
 			// characters. This assumes that only non-alphanumeric characters can
@@ -170,10 +177,11 @@ private void parseParam(final String param, final Map<String, Object> attrs) {
 		final String[] tokens = param.trim().split("[ \t\n]+");
 		if (tokens.length < 1) { warnInvalid(param); return; }
 		final String typeName, varName;
-		if (isIOType(tokens[0])) {
+		final String maybeIOType = tokens[0].toUpperCase();
+		if (isIOType(maybeIOType)) {
 			// assume syntax: <IOType> <type> <varName>
 			if (tokens.length < 3) { warnInvalid(param); return; }
-			attrs.put("type", tokens[0]);
+			attrs.put("type", maybeIOType);
 			typeName = tokens[1];
 			varName = tokens[2];
 		}
@@ -205,7 +213,7 @@ private Map<String, Object> parseAttrs(final String attrs) {
 	}
 
 	private boolean isIOType(final String token) {
-		return convertService.convert(token, ItemIO.class) != null;
+		return convertService.convert(token.toUpperCase(), ItemIO.class) != null;
 	}
 
 	private void warnInvalid(final String param) {
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 8d022f748..7e99b439e 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -87,6 +87,41 @@ public static void tearDown() {
 
 	// -- Tests --
 
+	/** Tests whether new-style parameter syntax are parsed correctly. */
+	@Test
+	public void testNewStyle() throws Exception {
+		final String script = "" + //
+			"##########\n" + //
+			"# Inputs #\n" + //
+			"##########\n" + //
+			"#@input int stuff\n" + //
+			"#@input int things\n" + //
+			"\n" + //
+			"###########\n" + //
+			"# Credits #\n" + //
+			"###########\n" + //
+			"Brought to you by:\n" + //
+			"person@example.com\n" + //
+			"\n" + //
+			"###########\n" + //
+			"# Outputs #\n" + //
+			"###########\n" + //
+			"#@output String blackHoles\n" +
+			"#@output String revelations\n" +
+			"\n" + //
+			"THE END!\n";
+		final ScriptModule scriptModule =
+			scriptService.run("newStyle.bsizes", script, true).get();
+
+		final Object output = scriptModule.getReturnValue();
+
+		if (output == null) fail("null result");
+		else if (!(output instanceof Integer)) {
+			fail("result is a " + output.getClass().getName());
+		}
+		else assertEquals(4, ((Integer) output).intValue());
+	}
+
 	/**
 	 * Tests that the return value <em>is</em> appended as an extra output when no
 	 * explicit outputs were declared.
@@ -122,7 +157,6 @@ public void testReturnValueExcluded() throws Exception {
 		assertFalse(outputs.containsKey(ScriptModule.RETURN_VALUE));
 	}
 
-
 	/**
 	 * Ensures parameters are parsed correctly from scripts, even in the presence
 	 * of noise like e-mail addresses.

From e57683baf15a106f65ce68c197adc55f1cecd07d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 May 2017 07:35:19 -0500
Subject: [PATCH 0490/1208] Add a callback mechanism for script execution

The intended use case is for ScriptProcessor plugins to use it when they
need to do something every time (or deferred until the first time) a
script executes. Initially, this will be useful for dependency grabbing.
---
 .../java/org/scijava/script/ScriptInfo.java   | 17 ++++++
 .../java/org/scijava/script/ScriptModule.java |  8 ++-
 .../script/process/ScriptCallback.java        | 52 +++++++++++++++++++
 3 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/script/process/ScriptCallback.java

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index fb3859b2b..954a6594e 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -40,6 +40,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -52,6 +53,7 @@
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
 import org.scijava.script.process.ParameterScriptProcessor;
+import org.scijava.script.process.ScriptCallback;
 import org.scijava.script.process.ScriptProcessorService;
 import org.scijava.util.DigestUtils;
 import org.scijava.util.FileUtils;
@@ -88,6 +90,9 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	/** Script language in which the script should be executed. */
 	private ScriptLanguage scriptLanguage;
 
+	/** Routines to be invoked prior to script execution. */
+	private ArrayList<ScriptCallback> callbacks;
+
 	/**
 	 * Creates a script metadata object which describes the given script file.
 	 * 
@@ -245,6 +250,18 @@ public void setReturnValueAppended(final boolean appendReturnValue) {
 		this.appendReturnValue = appendReturnValue;
 	}
 
+	/**
+	 * Gets the list of routines which should be invoked each time the script is
+	 * about to execute.
+	 * 
+	 * @return Reference to the mutable list of {@link Runnable} objects which the
+	 *         {@link ScriptModule} will run prior to executing the script itself.
+	 */
+	public List<ScriptCallback> callbacks() {
+		if (callbacks == null) callbacks = new ArrayList<>();
+		return callbacks;
+	}
+
 	// -- AbstractModuleInfo methods --
 
 	/**
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index d00b7ab5e..80a5d928a 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -50,6 +50,7 @@
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
+import org.scijava.script.process.ScriptCallback;
 
 /**
  * A {@link Module} which executes a script.
@@ -149,9 +150,14 @@ public void run() {
 			engine.put(name, getInput(name));
 		}
 
-		// execute script!
 		returnValue = null;
 		try {
+			// invoke the callbacks
+			for (final ScriptCallback c : getInfo().callbacks()) {
+				c.invoke(this);
+			}
+
+			// execute script!
 			final Reader reader = getInfo().getReader();
 			if (reader == null) returnValue = engine.eval(new FileReader(path));
 			else returnValue = engine.eval(reader);
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
new file mode 100644
index 000000000..fa6f8f0ed
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import javax.script.ScriptException;
+
+import org.scijava.script.ScriptModule;
+
+/**
+ * A routine which will be invoked just prior to script execution.
+ *
+ * @author Curtis Rueden
+ */
+public interface ScriptCallback {
+
+	/**
+	 * Invokes the callback routine.
+	 * 
+	 * @param module The {@link ScriptModule} instance which will
+	 *          execute the script.
+	 */
+	void invoke(final ScriptModule module) throws ScriptException;
+}

From 3f89bd015244b2078bf06b8198f14673a5f40d77 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 May 2017 09:55:29 -0500
Subject: [PATCH 0491/1208] Allow script processors to modify the script

In particular, we want the #@ processing directives to disappear from
the executed version of the script, since they are invalid syntax for
many of the script languages.

This change gives ScriptProcessor plugins the flexibility to modify each
line of the script however they choose, although our initial use case
here will simply blank out lines which have been handled.

What processors should not do is change the number of lines; we want the
line numbers in error messages to match those of the original script.
---
 .../java/org/scijava/script/ScriptInfo.java   | 15 +++++-
 .../java/org/scijava/script/ScriptModule.java |  6 +--
 .../process/ParameterScriptProcessor.java     | 49 ++++++++++---------
 .../script/process/ScriptProcessor.java       |  2 +-
 .../process/ScriptProcessorService.java       | 12 +++--
 .../process/ShebangScriptProcessor.java       |  8 +--
 6 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 954a6594e..bee3b1c06 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -84,6 +84,9 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	@Parameter
 	private ScriptProcessorService scriptProcessorService;
 
+	/** Final version of the script, after script processing. */
+	private String processedScript;
+
 	/** True iff the return value should be appended as an output. */
 	private boolean appendReturnValue;
 
@@ -216,6 +219,16 @@ public BufferedReader getReader() {
 		return new BufferedReader(new StringReader(script), PARAM_CHAR_MAX);
 	}
 
+	/**
+	 * Gets the script contents <em>after</em> script processing.
+	 * 
+	 * @return The processed script.
+	 * @see ScriptProcessorService#process
+	 */
+	public String getProcessedScript() {
+		return processedScript;
+	}
+
 	/** Gets the scripting language of the script. */
 	public ScriptLanguage getLanguage() {
 		if (scriptLanguage == null) {
@@ -275,7 +288,7 @@ public List<ScriptCallback> callbacks() {
 	public void parseParameters() {
 		clearParameters();
 		try {
-			scriptProcessorService.process(this);
+			processedScript = scriptProcessorService.process(this);
 		}
 		catch (final IOException exc) {
 			// TODO: Consider a better error handling approach.
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 80a5d928a..5ed0f39a6 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -31,10 +31,8 @@
 
 package org.scijava.script;
 
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.Reader;
 import java.io.Writer;
 
 import javax.script.ScriptContext;
@@ -158,9 +156,7 @@ public void run() {
 			}
 
 			// execute script!
-			final Reader reader = getInfo().getReader();
-			if (reader == null) returnValue = engine.eval(new FileReader(path));
-			else returnValue = engine.eval(reader);
+			returnValue = engine.eval(getInfo().getProcessedScript());
 		}
 		catch (Throwable e) {
 			while (e instanceof ScriptException && e.getCause() != null) {
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index c65e713c0..d7c50d2b0 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -127,12 +127,11 @@ public void begin(final ScriptInfo scriptInfo) {
 	}
 
 	@Override
-	public void process(final String line) {
+	public String process(final String line) {
 		// parse new-style parameters starting with @# anywhere in the script.
 		if (line.matches("^#@.*")) {
 			final int at = line.indexOf('@');
-			parseParam(line.substring(at + 1));
-			return;
+			return process(line, line.substring(at + 1));
 		}
 
 		// parse old-style parameters in the initial script header
@@ -142,10 +141,12 @@ public void process(final String line) {
 			// be used as comment line markers.
 			if (line.matches("^[^\\w]*@.*")) {
 				final int at = line.indexOf('@');
-				parseParam(line.substring(at + 1));
+				return process(line, line.substring(at + 1));
 			}
 			else if (line.matches(".*\\w.*")) header = false;
 		}
+
+		return line;
 	}
 
 	@Override
@@ -160,34 +161,40 @@ public void end() {
 
 	// -- Helper methods --
 
-	private void parseParam(final String param) {
+	private String process(final String line, final String param) {
+		if (parseParam(param)) return "";
+		log.warn("Ignoring invalid parameter: " + param);
+		return line;
+	}
+
+	private boolean parseParam(final String param) {
 		final int lParen = param.indexOf("(");
 		final int rParen = param.lastIndexOf(")");
-		if (rParen < lParen) { warnInvalid(param); return; }
-		if (lParen < 0) parseParam(param, parseAttrs("()"));
-		else {
-			final String cutParam =
-				param.substring(0, lParen) + param.substring(rParen + 1);
-			final String attrs = param.substring(lParen + 1, rParen);
-			parseParam(cutParam, parseAttrs(attrs));
-		}
+		if (rParen < lParen) return false;
+		if (lParen < 0) return parseParam(param, parseAttrs("()"));
+		final String cutParam =
+			param.substring(0, lParen) + param.substring(rParen + 1);
+		final String attrs = param.substring(lParen + 1, rParen);
+		return parseParam(cutParam, parseAttrs(attrs));
 	}
 
-	private void parseParam(final String param, final Map<String, Object> attrs) {
+	private boolean parseParam(final String param,
+		final Map<String, Object> attrs)
+	{
 		final String[] tokens = param.trim().split("[ \t\n]+");
-		if (tokens.length < 1) { warnInvalid(param); return; }
+		if (tokens.length < 1) return false;
 		final String typeName, varName;
 		final String maybeIOType = tokens[0].toUpperCase();
 		if (isIOType(maybeIOType)) {
 			// assume syntax: <IOType> <type> <varName>
-			if (tokens.length < 3) { warnInvalid(param); return; }
+			if (tokens.length < 3) return false;
 			attrs.put("type", maybeIOType);
 			typeName = tokens[1];
 			varName = tokens[2];
 		}
 		else {
 			// assume syntax: <type> <varName>
-			if (tokens.length < 2) { warnInvalid(param); return; }
+			if (tokens.length < 2) return false;
 			typeName = tokens[0];
 			varName = tokens[1];
 		}
@@ -197,7 +204,7 @@ private void parseParam(final String param, final Map<String, Object> attrs) {
 		}
 		catch (final ScriptException exc) {
 			log.warn("Invalid class: " + typeName, exc);
-			return;
+			return false;
 		}
 
 		if (ScriptModule.RETURN_VALUE.equals(varName)) {
@@ -205,6 +212,8 @@ private void parseParam(final String param, final Map<String, Object> attrs) {
 			// So we should not append the return value as an extra output.
 			info.setReturnValueAppended(false);
 		}
+
+		return true;
 	}
 
 	/** Parses a comma-delimited list of {@code key=value} pairs into a map. */
@@ -216,10 +225,6 @@ private boolean isIOType(final String token) {
 		return convertService.convert(token.toUpperCase(), ItemIO.class) != null;
 	}
 
-	private void warnInvalid(final String param) {
-		log.warn("Ignoring invalid parameter: " + param);
-	}
-
 	private <T> void addItem(final String name, final Class<T> type,
 		final Map<String, Object> attrs, final boolean explicit)
 	{
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index 3d412d074..e89ca7150 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -48,7 +48,7 @@
 public interface ScriptProcessor extends SingletonPlugin {
 
 	void begin(ScriptInfo info);
-	void process(String line);
+	String process(String line);
 	default void end() {}
 
 }
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 2f1d431cf..202071f62 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -56,7 +56,7 @@ public interface ScriptProcessorService extends
 	 * Invokes all {@link ScriptProcessor} plugins on the given script, line by
 	 * line in sequence.
 	 */
-	default void process(final ScriptInfo info) throws IOException {
+	default String process(final ScriptInfo info) throws IOException {
 		final List<ScriptProcessor> processors = getPlugins().stream().map(
 			p -> pluginService().createInstance(p)).collect(Collectors.toList());
 
@@ -69,19 +69,25 @@ default void process(final ScriptInfo info) throws IOException {
 			p.begin(info);
 		}
 
+		final StringBuilder sb = new StringBuilder();
+
 		try (final BufferedReader in = reader) {
 			while (true) {
-				final String line = in.readLine();
+				String line = in.readLine();
 				if (line == null) break;
 				for (final ScriptProcessor p : processors) {
-					p.process(line);
+					line = p.process(line);
 				}
+				sb.append(line);
+				sb.append("\n");
 			}
 		}
 
 		for (final ScriptProcessor p : processors) {
 			p.end();
 		}
+
+		return sb.toString();
 	}
 
 	// -- PTService methods --
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index 63dc09db3..f1b75d546 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -64,15 +64,17 @@ public void begin(final ScriptInfo scriptInfo) {
 	}
 
 	@Override
-	public void process(final String line) {
-		if (!first) return;
+	public String process(final String line) {
+		if (!first) return line;
+		first = false;
 		if (line.startsWith("#!")) {
 			// shebang!
 			final String langName = line.substring(2);
 			final ScriptLanguage lang = scriptService.getLanguageByName(langName);
 			if (lang != null) info.setLanguage(lang);
 			else log.warn("Unknown script language: " + langName);
+			return "";
 		}
-		first = false;
+		return line;
 	}
 }
\ No newline at end of file

From e5e496d297b9a3d7e32a772dd1cda03a3663edf0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 May 2017 10:09:40 -0500
Subject: [PATCH 0492/1208] ScriptInfoTest: test script modification

---
 src/test/java/org/scijava/script/ScriptInfoTest.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 7e99b439e..a5b0e6029 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -113,6 +113,10 @@ public void testNewStyle() throws Exception {
 		final ScriptModule scriptModule =
 			scriptService.run("newStyle.bsizes", script, true).get();
 
+		final String expectedProcessed = script.replaceAll("#@.*", "");
+		final String actualProcessed = scriptModule.getInfo().getProcessedScript();
+		assertEquals(expectedProcessed, actualProcessed);
+
 		final Object output = scriptModule.getReturnValue();
 
 		if (output == null) fail("null result");

From 8896894ea52465c77d8816a321c4aa1e5e634b19 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 May 2017 12:56:53 -0500
Subject: [PATCH 0493/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9a0b01354..3700d7ab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.64.0-SNAPSHOT</version>
+	<version>2.64.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From cc99b9ba3f2e8bb556055ac808b8f4a7500d5132 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Jun 2017 21:05:44 -0500
Subject: [PATCH 0494/1208] POM: fix Chris Allan ID

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3700d7ab0..e0beb5f14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 		</contributor>
 		<contributor>
 			<name>Chris Allan</name>
-			<properties><id>callan</id></properties>
+			<properties><id>chris-allan</id></properties>
 		</contributor>
 		<contributor>
 			<name>Barry DeZonia</name>

From 7f9bcccd4b55cf1eb1765639ab5cbbfcb92e18e1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 12 Jun 2017 12:42:02 -0500
Subject: [PATCH 0495/1208] Parameter: deprecate columns() method

---
 src/main/java/org/scijava/plugin/Parameter.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index c8591c48a..21edaa358 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -158,12 +158,6 @@
 	/** Defines the step size to use (numeric parameters only). */
 	String stepSize() default "";
 
-	/**
-	 * Defines the width of the input field in characters (text field parameters
-	 * only).
-	 */
-	int columns() default 6;
-
 	/** Defines the list of possible values (multiple choice text fields only). */
 	String[] choices() default {};
 
@@ -173,4 +167,7 @@
 	 */
 	Attr[] attrs() default {};
 
+	/** @deprecated Replaced by {@link #style()}. */
+	@Deprecated
+	int columns() default 6;
 }

From 75382b65c9517814332541d1c9b9ac5dde17f9b9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 19 Jun 2017 15:30:54 +0200
Subject: [PATCH 0496/1208] PrefService: never let key or value be null

The Java Preferences API hates nulls:

    public void put(String key, String value) {
        if (key==null || value==null)
            throw new NullPointerException();
	...
---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 288d2f2dc..d03423e55 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -653,6 +653,7 @@ private String safeName(final String name) {
 		 * </ul>
 		 */
 		private String makeSafe(final String s, final int max) {
+			if (s == null) return ""; // Java Preferences API hates nulls.
 			final int len = s.length();
 			if (len < max) return s;
 			return "..." + s.substring(len - max + 3, len);

From 526b7163b9ae7442c74cfe184be7eae2798bb2ad Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 14 Dec 2016 02:50:36 +0100
Subject: [PATCH 0497/1208] AbstractLogService: fix typo in javadoc

---
 src/main/java/org/scijava/log/AbstractLogService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 69eddd8c0..748cac6a2 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -38,7 +38,7 @@
 import org.scijava.service.AbstractService;
 
 /**
- * Base class for {@link LogService} implementationst.
+ * Base class for {@link LogService} implementations.
  *
  * @author Johannes Schindelin
  */

From 294f37c5500437701a4e4a7dcc1eb9e16c0b5355 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 14 Dec 2016 02:53:18 +0100
Subject: [PATCH 0498/1208] AbstractLogService: fix incorrect comment

The default level went back and forth between INFO
and WARN a couple of times, but it is currently INFO.
---
 src/main/java/org/scijava/log/AbstractLogService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 748cac6a2..037975724 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -78,7 +78,7 @@ public AbstractLogService() {
 		if (level >= 0) setLevel(level);
 
 		if (getLevel() == 0) {
-			// use the default, which is WARN unless the DEBUG env. variable is set
+			// use the default, which is INFO unless the DEBUG env. variable is set
 			setLevel(System.getenv("DEBUG") == null ? INFO : DEBUG);
 		}
 

From 8138f114485ab4bd3743abfdb3d9c86f981d39ad Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 16:59:05 +0100
Subject: [PATCH 0499/1208] AbstractLogService: refactor duplicate code

---
 .../java/org/scijava/log/AbstractLogService.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 037975724..44f9fea29 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -46,7 +46,7 @@ public abstract class AbstractLogService extends AbstractService implements
 	LogService
 {
 
-	private int currentLevel = System.getenv("DEBUG") == null ? INFO : DEBUG;
+	private int currentLevel = levelFromEnvironment();
 
 	private final Map<String, Integer> classAndPackageLevels =
 		new HashMap<>();
@@ -77,10 +77,8 @@ public AbstractLogService() {
 		final int level = level(logProp);
 		if (level >= 0) setLevel(level);
 
-		if (getLevel() == 0) {
-			// use the default, which is INFO unless the DEBUG env. variable is set
-			setLevel(System.getenv("DEBUG") == null ? INFO : DEBUG);
-		}
+		if (getLevel() == 0)
+			setLevel(levelFromEnvironment());
 
 		// populate custom class- and package-specific log level properties
 		final String logLevelPrefix = LOG_LEVEL_PROPERTY + ":";
@@ -297,4 +295,9 @@ private String parentPackage(final String classOrPackageName) {
 		return classOrPackageName.substring(0, dot);
 	}
 
+	private int levelFromEnvironment() {
+		// use the default, which is INFO unless the DEBUG env. variable is set
+		return System.getenv("DEBUG") == null ? INFO : DEBUG;
+	}
+
 }

From 7cccfac373d7f34fc5288ccaeccf0f3030ee2fe7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Jun 2017 17:35:05 +0200
Subject: [PATCH 0500/1208] AnnotationProcessor: it works with Java 7 & 8, too

The SupportedSourceVersion indicates the _newest_ release of Java
supported by the processor. SciJava supports Java 8 and earlier.
---
 .../java/org/scijava/annotations/AnnotationProcessor.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 0f96bab4f..472f57335 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -70,11 +70,11 @@
 import org.scijava.annotations.AbstractIndexWriter.StreamFactory;
 
 /**
- * The annotation processor for use with Java 6 and above.
+ * The annotation processor for use with Java 8 and earlier.
  * 
  * @author Johannes Schindelin
  */
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes("*")
 public class AnnotationProcessor extends AbstractProcessor {
 

From 596813c198d3f6eb77efac458a4d3dd71cfcfaf6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 3 Jul 2016 10:34:04 -0500
Subject: [PATCH 0501/1208] Do runtime type checking in Typed.supports method

There are situations where we cannot solely rely on the compiler.
For example, with DataHandle plugins, the generic parameter L is
heterogeneous, so we need to actually check the type of the data.

I tried to make this the default implementation of the Typed interface
itself, but ran into problems with calling super.supports in downstream
classes; apparently, you cannot directly reference default interface
methods by writing e.g. Typed.super.supports(...)? Strange.
---
 .../java/org/scijava/plugin/AbstractTypedPlugin.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index e8b3ff338..ac29ee129 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -43,5 +43,15 @@
 public abstract class AbstractTypedPlugin<D> extends AbstractRichPlugin
 	implements TypedPlugin<D>
 {
-	// NB: No implementation needed.
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final D data) {
+		// NB: Even though the compiler will often guarantee that only data
+		// of type T is provided here, we still need the runtime check
+		// for cases where the exact type is not known to compiler --
+		// e.g., if the object was manufactured by reflection.
+		return getType().isInstance(data);
+	}
+
 }

From 28700f4676fda5d8a676ae2bc2c8bee31b0698e0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Jul 2016 23:27:43 -0500
Subject: [PATCH 0502/1208] Add NIOService for working with NIO classes

Migrated from the NIOService of SCIFIO, which was previously
adapted from the NIOByteBufferProvider class of Bio-Formats.
---
 .../org/scijava/io/nio/DefaultNIOService.java | 119 ++++++++++++++++++
 .../java/org/scijava/io/nio/NIOService.java   |  73 +++++++++++
 .../java/org/scijava/ContextCreationTest.java |   1 +
 3 files changed, 193 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/nio/DefaultNIOService.java
 create mode 100644 src/main/java/org/scijava/io/nio/NIOService.java

diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
new file mode 100644
index 000000000..9a631daf6
--- /dev/null
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -0,0 +1,119 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.nio;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.AbstractService;
+import org.scijava.service.Service;
+
+/**
+ * Default service for working with the {@link java.nio} package, particularly
+ * NIO {@link ByteBuffer} objects.
+ * 
+ * @author Chris Allan
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultNIOService extends AbstractService implements NIOService {
+
+	// -- Fields --
+
+	@Parameter
+	private LogService log;
+
+	/** Whether or not we are to use memory mapped I/O. */
+	private final boolean useMappedByteBuffer = Boolean.parseBoolean(System
+		.getProperty("mappedBuffers"));
+
+	// -- NIOService API methods --
+
+	@Override
+	public ByteBuffer allocate(final FileChannel channel, final MapMode mapMode,
+		final long bufferStartPosition, final int newSize) throws IOException
+	{
+		log.debug("NIO: allocate: mapped=" + useMappedByteBuffer + ", start=" +
+			bufferStartPosition + ", size=" + newSize);
+		if (useMappedByteBuffer) {
+			return allocateMappedByteBuffer(channel, mapMode, bufferStartPosition,
+				newSize);
+		}
+		return allocateDirect(channel, bufferStartPosition, newSize);
+	}
+
+	// -- Helper methods --
+
+	/**
+	 * Allocates memory and copies the desired file data into it.
+	 * 
+	 * @param channel File channel to allocate or map byte buffers from.
+	 * @param bufferStartPosition The absolute position of the start of the
+	 *          buffer.
+	 * @param newSize The buffer size.
+	 * @return A newly allocated NIO byte buffer.
+	 * @throws IOException If there is an issue aligning or allocating the buffer.
+	 */
+	private ByteBuffer allocateDirect(final FileChannel channel,
+		final long bufferStartPosition, final int newSize) throws IOException
+	{
+		final ByteBuffer buffer = ByteBuffer.allocate(newSize);
+		channel.read(buffer, bufferStartPosition);
+		return buffer;
+	}
+
+	/**
+	 * Memory maps the desired file data into memory.
+	 * 
+	 * @param channel File channel to allocate or map byte buffers from.
+	 * @param mapMode The map mode. Required but only used if memory mapped I/O is
+	 *          to occur.
+	 * @param bufferStartPosition The absolute position of the start of the
+	 *          buffer.
+	 * @param newSize The buffer size.
+	 * @return A newly mapped NIO byte buffer.
+	 * @throws IOException If there is an issue mapping, aligning or allocating
+	 *           the buffer.
+	 */
+	private ByteBuffer allocateMappedByteBuffer(final FileChannel channel,
+		final MapMode mapMode, final long bufferStartPosition, final int newSize)
+		throws IOException
+	{
+		return channel.map(mapMode, bufferStartPosition, newSize);
+	}
+
+}
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
new file mode 100644
index 000000000..0c6865045
--- /dev/null
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -0,0 +1,73 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.nio;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for services that work with the {@link java.nio} package,
+ * particularly NIO {@link ByteBuffer} objects.
+ * 
+ * @author Chris Allan
+ * @author Curtis Rueden
+ */
+public interface NIOService extends SciJavaService {
+
+	/**
+	 * Allocates or maps the desired file data into memory.
+	 * <p>
+	 * This method provides a facade to byte buffer allocation that enables
+	 * <code>FileChannel.map()</code> usage on platforms where it's unlikely to
+	 * give us problems and heap allocation where it is.
+	 * </p>
+	 * 
+	 * @param channel File channel to allocate or map byte buffers from.
+	 * @param mapMode The map mode. Required but only used if memory mapped I/O is
+	 *          to occur.
+	 * @param bufferStartPosition The absolute position of the start of the
+	 *          buffer.
+	 * @param newSize The buffer size.
+	 * @return A newly allocated or mapped NIO byte buffer.
+	 * @see "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5092131"
+	 * @see "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6417205"
+	 * @throws IOException If there is an issue mapping, aligning or allocating
+	 *           the buffer.
+	 */
+	ByteBuffer allocate(FileChannel channel, MapMode mapMode,
+		long bufferStartPosition, int newSize) throws IOException;
+
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 5dc0ed1b4..449fcc26f 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -98,6 +98,7 @@ public void testFull() {
 				org.scijava.io.DefaultDataHandleService.class,
 				org.scijava.io.DefaultIOService.class,
 				org.scijava.io.DefaultRecentFileService.class,
+				org.scijava.io.nio.DefaultNIOService.class,
 				org.scijava.main.DefaultMainService.class,
 				org.scijava.menu.DefaultMenuService.class,
 				org.scijava.module.DefaultModuleService.class,

From ac6a54ae9a00a379fd3539dba130fc8da844d24f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 7 Jul 2017 15:18:13 -0500
Subject: [PATCH 0503/1208] Reorganize the org.scijava.io classes

This moves Location stuff to org.scijava.io.location,
and DataHandle stuff to org.scijava.io.handle.

It breaks backwards compatibility, but the Location API was not being
used by any SJC-based systems yet. We make the change now to minimize
future damage.
---
 src/main/java/org/scijava/io/IOService.java                | 2 --
 .../org/scijava/io/{ => handle}/AbstractDataHandle.java    | 3 ++-
 src/main/java/org/scijava/io/{ => handle}/DataHandle.java  | 3 ++-
 .../org/scijava/io/{ => handle}/DataHandleInputStream.java | 4 +++-
 .../scijava/io/{ => handle}/DataHandleOutputStream.java    | 4 +++-
 .../org/scijava/io/{ => handle}/DataHandleService.java     | 4 +++-
 .../scijava/io/{ => handle}/DefaultDataHandleService.java  | 3 ++-
 src/main/java/org/scijava/io/{ => handle}/FileHandle.java  | 3 ++-
 .../org/scijava/io/{ => location}/AbstractLocation.java    | 2 +-
 .../java/org/scijava/io/{ => location}/BytesLocation.java  | 2 +-
 .../java/org/scijava/io/{ => location}/FileLocation.java   | 2 +-
 src/main/java/org/scijava/io/{ => location}/Location.java  | 4 +++-
 .../java/org/scijava/io/{ => location}/URILocation.java    | 2 +-
 .../java/org/scijava/io/{ => location}/URLLocation.java    | 2 +-
 src/test/java/org/scijava/ContextCreationTest.java         | 2 +-
 .../java/org/scijava/io/{ => handle}/DataHandleTest.java   | 5 ++++-
 .../java/org/scijava/io/{ => handle}/FileHandleTest.java   | 7 ++++++-
 .../org/scijava/io/{ => location}/BytesLocationTest.java   | 3 ++-
 .../org/scijava/io/{ => location}/FileLocationTest.java    | 3 ++-
 .../org/scijava/io/{ => location}/URILocationTest.java     | 3 ++-
 .../org/scijava/io/{ => location}/URLLocationTest.java     | 3 ++-
 21 files changed, 44 insertions(+), 22 deletions(-)
 rename src/main/java/org/scijava/io/{ => handle}/AbstractDataHandle.java (96%)
 rename src/main/java/org/scijava/io/{ => handle}/DataHandle.java (99%)
 rename src/main/java/org/scijava/io/{ => handle}/DataHandleInputStream.java (97%)
 rename src/main/java/org/scijava/io/{ => handle}/DataHandleOutputStream.java (97%)
 rename src/main/java/org/scijava/io/{ => handle}/DataHandleService.java (95%)
 rename src/main/java/org/scijava/io/{ => handle}/DefaultDataHandleService.java (96%)
 rename src/main/java/org/scijava/io/{ => handle}/FileHandle.java (98%)
 rename src/main/java/org/scijava/io/{ => location}/AbstractLocation.java (98%)
 rename src/main/java/org/scijava/io/{ => location}/BytesLocation.java (98%)
 rename src/main/java/org/scijava/io/{ => location}/FileLocation.java (98%)
 rename src/main/java/org/scijava/io/{ => location}/Location.java (96%)
 rename src/main/java/org/scijava/io/{ => location}/URILocation.java (99%)
 rename src/main/java/org/scijava/io/{ => location}/URLLocation.java (98%)
 rename src/test/java/org/scijava/io/{ => handle}/DataHandleTest.java (97%)
 rename src/test/java/org/scijava/io/{ => handle}/FileHandleTest.java (91%)
 rename src/test/java/org/scijava/io/{ => location}/BytesLocationTest.java (97%)
 rename src/test/java/org/scijava/io/{ => location}/FileLocationTest.java (96%)
 rename src/test/java/org/scijava/io/{ => location}/URILocationTest.java (96%)
 rename src/test/java/org/scijava/io/{ => location}/URLLocationTest.java (96%)

diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index a4f284680..3774de692 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -40,8 +40,6 @@
  * Interface for high-level data I/O: opening and saving data.
  * 
  * @author Curtis Rueden
- * @see DataHandleService
- * @see Location
  */
 public interface IOService extends HandlerService<String, IOPlugin<?>>,
 	SciJavaService
diff --git a/src/main/java/org/scijava/io/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
similarity index 96%
rename from src/main/java/org/scijava/io/AbstractDataHandle.java
rename to src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index 7a30a6d3b..b072df9ad 100644
--- a/src/main/java/org/scijava/io/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -29,10 +29,11 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
 import java.nio.ByteOrder;
 
+import org.scijava.io.location.Location;
 import org.scijava.plugin.AbstractWrapperPlugin;
 
 /**
diff --git a/src/main/java/org/scijava/io/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
similarity index 99%
rename from src/main/java/org/scijava/io/DataHandle.java
rename to src/main/java/org/scijava/io/handle/DataHandle.java
index f058d9241..9f6d1e3dc 100644
--- a/src/main/java/org/scijava/io/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
 import java.io.Closeable;
 import java.io.DataInput;
@@ -39,6 +39,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
+import org.scijava.io.location.Location;
 import org.scijava.plugin.WrapperPlugin;
 
 /**
diff --git a/src/main/java/org/scijava/io/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
similarity index 97%
rename from src/main/java/org/scijava/io/DataHandleInputStream.java
rename to src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index 6b2e21e4a..2a215c69a 100644
--- a/src/main/java/org/scijava/io/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -29,11 +29,13 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.scijava.io.location.Location;
+
 /**
  * {@link InputStream} backed by a {@link DataHandle}.
  * 
diff --git a/src/main/java/org/scijava/io/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
similarity index 97%
rename from src/main/java/org/scijava/io/DataHandleOutputStream.java
rename to src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index 6f876694d..c2320281f 100644
--- a/src/main/java/org/scijava/io/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -29,11 +29,13 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.scijava.io.location.Location;
+
 /**
  * {@link OutputStream} backed by a {@link DataHandle}.
  * 
diff --git a/src/main/java/org/scijava/io/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
similarity index 95%
rename from src/main/java/org/scijava/io/DataHandleService.java
rename to src/main/java/org/scijava/io/handle/DataHandleService.java
index 723461870..5ed20cfc0 100644
--- a/src/main/java/org/scijava/io/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -29,8 +29,10 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
+import org.scijava.io.IOService;
+import org.scijava.io.location.Location;
 import org.scijava.plugin.WrapperService;
 import org.scijava.service.SciJavaService;
 
diff --git a/src/main/java/org/scijava/io/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
similarity index 96%
rename from src/main/java/org/scijava/io/DefaultDataHandleService.java
rename to src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index dc98ce28f..02123344a 100644
--- a/src/main/java/org/scijava/io/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -29,8 +29,9 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
+import org.scijava.io.location.Location;
 import org.scijava.plugin.AbstractWrapperService;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
diff --git a/src/main/java/org/scijava/io/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
similarity index 98%
rename from src/main/java/org/scijava/io/FileHandle.java
rename to src/main/java/org/scijava/io/handle/FileHandle.java
index f3ac1f422..8d60a27ee 100644
--- a/src/main/java/org/scijava/io/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -29,11 +29,12 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import org.scijava.io.location.FileLocation;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/src/main/java/org/scijava/io/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
similarity index 98%
rename from src/main/java/org/scijava/io/AbstractLocation.java
rename to src/main/java/org/scijava/io/location/AbstractLocation.java
index 8937d3847..89d1402e3 100644
--- a/src/main/java/org/scijava/io/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 /**
  * Abstract base class for {@link Location} implementations.
diff --git a/src/main/java/org/scijava/io/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
similarity index 98%
rename from src/main/java/org/scijava/io/BytesLocation.java
rename to src/main/java/org/scijava/io/location/BytesLocation.java
index 8070dc225..dc41fbade 100644
--- a/src/main/java/org/scijava/io/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/org/scijava/io/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
similarity index 98%
rename from src/main/java/org/scijava/io/FileLocation.java
rename to src/main/java/org/scijava/io/location/FileLocation.java
index 3d93ee12c..31a331bd8 100644
--- a/src/main/java/org/scijava/io/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import java.io.File;
 import java.net.URI;
diff --git a/src/main/java/org/scijava/io/Location.java b/src/main/java/org/scijava/io/location/Location.java
similarity index 96%
rename from src/main/java/org/scijava/io/Location.java
rename to src/main/java/org/scijava/io/location/Location.java
index 34b79f63b..ec2e7c363 100644
--- a/src/main/java/org/scijava/io/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -29,10 +29,12 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import java.net.URI;
 
+import org.scijava.io.handle.DataHandle;
+
 /**
  * A <em>location</em> is a data descriptor, such as a file on disk, a remote
  * URL, or a database connection.
diff --git a/src/main/java/org/scijava/io/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
similarity index 99%
rename from src/main/java/org/scijava/io/URILocation.java
rename to src/main/java/org/scijava/io/location/URILocation.java
index 819fb2282..1c4045955 100644
--- a/src/main/java/org/scijava/io/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/src/main/java/org/scijava/io/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
similarity index 98%
rename from src/main/java/org/scijava/io/URLLocation.java
rename to src/main/java/org/scijava/io/location/URLLocation.java
index 1b7490894..24789ff14 100644
--- a/src/main/java/org/scijava/io/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 449fcc26f..6f364ddfc 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -95,9 +95,9 @@ public void testFull() {
 				org.scijava.display.DefaultDisplayService.class,
 				org.scijava.event.DefaultEventHistory.class,
 				org.scijava.input.DefaultInputService.class,
-				org.scijava.io.DefaultDataHandleService.class,
 				org.scijava.io.DefaultIOService.class,
 				org.scijava.io.DefaultRecentFileService.class,
+				org.scijava.io.handle.DefaultDataHandleService.class,
 				org.scijava.io.nio.DefaultNIOService.class,
 				org.scijava.main.DefaultMainService.class,
 				org.scijava.menu.DefaultMenuService.class,
diff --git a/src/test/java/org/scijava/io/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
similarity index 97%
rename from src/test/java/org/scijava/io/DataHandleTest.java
rename to src/test/java/org/scijava/io/handle/DataHandleTest.java
index 185f47881..c91b7c4ea 100644
--- a/src/test/java/org/scijava/io/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
 import static org.junit.Assert.assertEquals;
 
@@ -41,6 +41,9 @@
 
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleService;
+import org.scijava.io.location.Location;
 import org.scijava.util.Bytes;
 
 /**
diff --git a/src/test/java/org/scijava/io/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
similarity index 91%
rename from src/test/java/org/scijava/io/FileHandleTest.java
rename to src/test/java/org/scijava/io/handle/FileHandleTest.java
index ed8effa58..fd754a673 100644
--- a/src/test/java/org/scijava/io/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -29,12 +29,17 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.handle;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.FileHandle;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
+
 /**
  * Tests {@link FileHandle}.
  *
diff --git a/src/test/java/org/scijava/io/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
similarity index 97%
rename from src/test/java/org/scijava/io/BytesLocationTest.java
rename to src/test/java/org/scijava/io/location/BytesLocationTest.java
index 014dff813..b406e76eb 100644
--- a/src/test/java/org/scijava/io/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -29,12 +29,13 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
+import org.scijava.io.location.BytesLocation;
 
 /**
  * Tests {@link BytesLocation}.
diff --git a/src/test/java/org/scijava/io/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
similarity index 96%
rename from src/test/java/org/scijava/io/FileLocationTest.java
rename to src/test/java/org/scijava/io/location/FileLocationTest.java
index 60b95e1b0..1c68568f6 100644
--- a/src/test/java/org/scijava/io/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -29,13 +29,14 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 
 import org.junit.Test;
+import org.scijava.io.location.FileLocation;
 
 /**
  * Tests {@link FileLocation}.
diff --git a/src/test/java/org/scijava/io/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
similarity index 96%
rename from src/test/java/org/scijava/io/URILocationTest.java
rename to src/test/java/org/scijava/io/location/URILocationTest.java
index 866837b04..251242f3e 100644
--- a/src/test/java/org/scijava/io/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
@@ -39,6 +39,7 @@
 import java.util.Map;
 
 import org.junit.Test;
+import org.scijava.io.location.URILocation;
 
 /**
  * Tests {@link URILocation}.
diff --git a/src/test/java/org/scijava/io/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
similarity index 96%
rename from src/test/java/org/scijava/io/URLLocationTest.java
rename to src/test/java/org/scijava/io/location/URLLocationTest.java
index 0fde7d087..191102fe4 100644
--- a/src/test/java/org/scijava/io/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -29,7 +29,7 @@
  * #L%
  */
 
-package org.scijava.io;
+package org.scijava.io.location;
 
 import static org.junit.Assert.assertSame;
 
@@ -37,6 +37,7 @@
 import java.net.URL;
 
 import org.junit.Test;
+import org.scijava.io.location.URLLocation;
 
 /**
  * Tests {@link URLLocation}.

From 195438da5fa9ce4c2da7283925af3473f9ff555e Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 13:48:43 +0100
Subject: [PATCH 0504/1208] Location: tweak javadoc

Clarify that locations can be read and/or write.
---
 src/main/java/org/scijava/io/location/Location.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index ec2e7c363..7dc000855 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -44,7 +44,7 @@
  * resource identifier</a> ({@link URI}), a location identifies <em>where</em>
  * the data resides, without necessarily specifying <em>how</em> to access that
  * data. The {@link DataHandle} interface defines a plugin that knows how to
- * provide a stream of bytes for a particular kind of location.
+ * read and/or write bytes for a particular kind of location.
  * </p>
  * 
  * @author Curtis Rueden

From b87dd694c31ca4a779de731d7cc2034bb2fc4071 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 17:04:12 +0100
Subject: [PATCH 0505/1208] Location: add getName() method

The name returned is meant as an analogue to a file name
and might be used for meta-data purposes.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 src/main/java/org/scijava/io/location/Location.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index 7dc000855..da96a1f98 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -48,6 +48,7 @@
  * </p>
  * 
  * @author Curtis Rueden
+ * @author Gabriel Einsdorf
  */
 public interface Location {
 
@@ -59,4 +60,13 @@ default URI getURI() {
 		return null;
 	}
 
+	/**
+	 * Gets the name of the object addressed by this location, or an empty string
+	 * if it has no name.
+	 */
+	default String getName() {
+		final URI uri = getURI();
+		return uri == null ? "" : uri.toString();
+	}
+
 }

From 64aa6873fb38b3e994c0e901d659f89ddb07e87b Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 15 Mar 2017 15:22:30 +0100
Subject: [PATCH 0506/1208] AbstractLocation: add hashCode() and equals()

Locations need to be properly distinguishable. This change makes it
feasible to put Location objects into a HashMap and to compare them
using the equals() method.
---
 .../scijava/io/location/AbstractLocation.java | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index 89d1402e3..2d9d238e2 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -31,11 +31,30 @@
 
 package org.scijava.io.location;
 
+import java.util.Objects;
+
 /**
  * Abstract base class for {@link Location} implementations.
  * 
  * @author Curtis Rueden
  */
 public abstract class AbstractLocation implements Location {
-	// NB: No implementation needed.
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((getURI() == null) ? 0 : getURI().hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(final Object obj) {
+		if (obj == this) return true;
+		if (obj == null) return false;
+		if (getClass() != obj.getClass()) return false;
+		final Location other = (Location) obj;
+		return Objects.equals(getURI(), other.getURI());
+	}
+
 }

From fd5bf70618eed48fce1cf0fc780e98921f2d86fa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 3 Jul 2016 11:10:10 -0500
Subject: [PATCH 0507/1208] DataHandle: update some javadoc

We avoid the term "pointer" (especially "file pointer").
DataHandle plugins are more general than just files.
---
 .../java/org/scijava/io/handle/DataHandle.java     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 9f6d1e3dc..768b2801e 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -126,8 +126,8 @@ default int read(final ByteBuffer buf, final int len) throws IOException {
 	}
 
 	/**
-	 * Sets the stream pointer offset, measured from the beginning of the stream,
-	 * at which the next read or write occurs.
+	 * Sets the stream offset, measured from the beginning of the stream, at which
+	 * the next read or write occurs.
 	 */
 	void seek(long pos) throws IOException;
 
@@ -203,9 +203,8 @@ default String findString(final String... terminators) throws IOException {
 	 * Reads or skips a string ending with one of the given terminating
 	 * substrings.
 	 * 
-	 * @param saveString Whether to collect the string from the current file
-	 *          pointer to the terminating bytes, and return it. If false, returns
-	 *          null.
+	 * @param saveString Whether to collect the string from the current offset to
+	 *          the terminating bytes, and return it. If false, returns null.
 	 * @param terminators The strings for which to search.
 	 * @throws IOException If saveString flag is set and the maximum search length
 	 *           (512 MB) is exceeded.
@@ -239,9 +238,8 @@ default String findString(final int blockSize, final String... terminators)
 	 * Reads or skips a string ending with one of the given terminating
 	 * substrings, using the specified block size for buffering.
 	 * 
-	 * @param saveString Whether to collect the string from the current file
-	 *          pointer to the terminating bytes, and return it. If false, returns
-	 *          null.
+	 * @param saveString Whether to collect the string from the current offset
+	 *          to the terminating bytes, and return it. If false, returns null.
 	 * @param blockSize The block size to use when reading bytes in chunks.
 	 * @param terminators The strings for which to search.
 	 * @throws IOException If saveString flag is set and the maximum search length

From c134f4afe31deed764fd5d6d22982f3034b1cd66 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Jul 2016 23:04:28 -0500
Subject: [PATCH 0508/1208] DataHandle: provide some default implementations

---
 .../org/scijava/io/handle/DataHandle.java     | 102 +++++++++++++++++-
 1 file changed, 101 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 768b2801e..3fae84f1b 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -331,7 +331,9 @@ default String findString(final boolean saveString, final int blockSize,
 	 * @return the next byte of data, or -1 if the end of the stream is reached.
 	 * @throws IOException - if an I/O error occurs.
 	 */
-	int read() throws IOException;
+	default int read() throws IOException {
+		return offset() < length() ? readByte() & 0xff : -1;
+	}
 
 	/**
 	 * Reads up to b.length bytes of data from the stream into an array of bytes.
@@ -369,4 +371,102 @@ default long skip(final long n) throws IOException {
 		return num;
 	}
 
+	// -- DataInput methods --
+
+	@Override
+	default boolean readBoolean() throws IOException {
+		return readByte() != 0;
+	}
+
+	@Override
+	default void readFully(final byte[] b) throws IOException {
+		readFully(b, 0, b.length);
+	}
+
+	@Override
+	default int readUnsignedByte() throws IOException {
+		return readByte() & 0xff;
+	}
+
+	@Override
+	default int readUnsignedShort() throws IOException {
+		return readShort() & 0xffff;
+	}
+
+	@Override
+	default String readLine() throws IOException {
+		// NB: Code adapted from java.io.RandomAccessFile.readLine().
+
+		final StringBuffer input = new StringBuffer();
+		int c = -1;
+		boolean eol = false;
+
+		while (!eol) {
+			switch (c = read()) {
+				case -1:
+				case '\n':
+					eol = true;
+					break;
+				case '\r':
+					eol = true;
+					long cur = offset();
+					if (read() != '\n') seek(cur);
+					break;
+				default:
+					input.append((char)c);
+					break;
+			}
+		}
+
+		if (c == -1 && input.length() == 0) {
+			return null;
+		}
+		return input.toString();
+	}
+
+	@Override
+	default String readUTF() throws IOException {
+		final int length = readUnsignedShort();
+		final byte[] b = new byte[length];
+		read(b);
+		return new String(b, "UTF-8");
+	}
+
+	@Override
+	default int skipBytes(final int n) throws IOException {
+		final int skipped = (int) Math.min(n, length() - offset());
+		if (skipped < 0) return 0;
+		seek(offset() + skipped);
+		return skipped;
+	}
+
+	// -- DataOutput methods --
+
+	@Override
+	default void write(final byte[] b) throws IOException {
+		write(b, 0, b.length);
+	}
+
+	@Override
+	default void writeBoolean(final boolean v) throws IOException {
+		write(v ? 1 : 0);
+	}
+
+	@Override
+	default void writeByte(final int v) throws IOException {
+		write(v);
+	}
+
+	@Override
+	default void writeBytes(final String s) throws IOException {
+		write(s.getBytes("UTF-8"));
+	}
+
+	@Override
+	default void writeUTF(final String str) throws IOException {
+		final byte[] b = str.getBytes("UTF-8");
+		writeShort(b.length);
+		write(b);
+	}
+
 }

From 05a0d2bed4a7dfe4804403a136f5a20a0a16659c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Jul 2016 23:12:43 -0500
Subject: [PATCH 0509/1208] DataHandle: add a mutator for the length

In SCIFIO and Bio-Formats, this was a feature of the AbstractNIOHandle.
But there is no reason to limit it to NIO-flavored handles only.
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 8 ++++++++
 src/main/java/org/scijava/io/handle/FileHandle.java | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 3fae84f1b..adb88b394 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -66,6 +66,14 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	/** Returns the length of the stream. */
 	long length() throws IOException;
 
+	/**
+	 * Sets the new length of the handle.
+	 * 
+	 * @param length New length.
+	 * @throws IOException If there is an error changing the handle's length.
+	 */
+	void setLength(long length) throws IOException;
+
 	/**
 	 * Returns the current order of the stream.
 	 * 
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 8d60a27ee..944e384d5 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -83,6 +83,11 @@ public long length() throws IOException {
 		return raf().length();
 	}
 
+	@Override
+	public void setLength(final long length) throws IOException {
+		raf().setLength(length);
+	}
+
 	@Override
 	public int read() throws IOException {
 		return raf().read();

From efec596db50a5715326082bd654dca745f17b2ed Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Jul 2016 23:15:24 -0500
Subject: [PATCH 0510/1208] DataHandle: add ensureWritable method

In SCIFIO and Bio-Formats, this was present as the method
AbstractNIOHandle#validateLength.

But there is no reason to limit it to NIO-flavored handles only.

We use the name ensureWritable for clarity, and for symmetry
with a future ensureReadable method.
---
 .../org/scijava/io/handle/DataHandle.java     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index adb88b394..3f52f1705 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -74,6 +74,25 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 */
 	void setLength(long length) throws IOException;
 
+	/**
+	 * Ensures that the handle has the correct length to be written to and extends
+	 * it as required.
+	 * 
+	 * @param count Number of bytes to write.
+	 * @return {@code true} if the handle's length was sufficient, or
+	 *         {@code false} if the handle's length required an extension.
+	 * @throws IOException If something goes wrong with the check, or there is an
+	 *           error changing the handle's length.
+	 */
+	default boolean ensureWritable(final long count) throws IOException {
+		final long minLength = offset() + count;
+		if (length() < minLength) {
+			setLength(minLength);
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * Returns the current order of the stream.
 	 * 

From e36a8fa44ae4ad3be080b4e1e4a02fd657ab4382 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 20:56:55 -0500
Subject: [PATCH 0511/1208] DataHandle: add available and ensureReadable

---
 .../org/scijava/io/handle/DataHandle.java     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 3f52f1705..efdb804ae 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -34,6 +34,7 @@
 import java.io.Closeable;
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
@@ -74,6 +75,32 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 */
 	void setLength(long length) throws IOException;
 
+	/**
+	 * Verifies that the handle has sufficient bytes available to read, returning
+	 * the actual number of bytes which will be possible to read, which might
+	 * be less than the requested value.
+	 * 
+	 * @param count Number of bytes to read.
+	 * @return The actual number of bytes available to be read.
+	 * @throws IOException If something goes wrong with the check.
+	 */
+	default long available(final long count) throws IOException {
+		final long remain = length() - offset();
+		return remain < count ? remain : count;
+	}
+
+	/**
+	 * Ensures that the handle has sufficient bytes available to read.
+	 * 
+	 * @param count Number of bytes to read.
+	 * @see #available(long)
+	 * @throws EOFException If there are insufficient bytes available.
+	 * @throws IOException If something goes wrong with the check.
+	 */
+	default void ensureReadable(final long count) throws IOException {
+		if (available(count) < count) throw new EOFException();
+	}
+
 	/**
 	 * Ensures that the handle has the correct length to be written to and extends
 	 * it as required.

From 6c87eb06d5417e91c3eef92540c39f54318a17ae Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 15:49:50 -0500
Subject: [PATCH 0512/1208] DataHandle: add more default method impls

---
 .../org/scijava/io/handle/DataHandle.java     | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index efdb804ae..52d27fe35 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -442,11 +442,68 @@ default int readUnsignedByte() throws IOException {
 		return readByte() & 0xff;
 	}
 
+	@Override
+	default short readShort() throws IOException {
+		final int ch1 = read();
+		final int ch2 = read();
+		if ((ch1 | ch2) < 0) throw new EOFException();
+		return (short) ((ch1 << 8) + (ch2 << 0));
+	}
+
 	@Override
 	default int readUnsignedShort() throws IOException {
 		return readShort() & 0xffff;
 	}
 
+	@Override
+	default char readChar() throws IOException {
+		return (char) readShort();
+	}
+
+	@Override
+	default int readInt() throws IOException {
+		int ch1 = read();
+		int ch2 = read();
+		int ch3 = read();
+		int ch4 = read();
+		if ((ch1 | ch2 | ch3 | ch4) < 0) throw new EOFException();
+		return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0));
+	}
+
+	@Override
+	default long readLong() throws IOException {
+		int ch1 = read();
+		int ch2 = read();
+		int ch3 = read();
+		int ch4 = read();
+		int ch5 = read();
+		int ch6 = read();
+		int ch7 = read();
+		int ch8 = read();
+		if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0) {
+			throw new EOFException();
+		}
+		// TODO: Double check this inconsistent code.
+		return ((long) ch1 << 56) + //
+			((long) (ch2 & 255) << 48) + //
+			((long) (ch3 & 255) << 40) + //
+			((long) (ch4 & 255) << 32) + //
+			((long) (ch5 & 255) << 24) + //
+			((ch6 & 255) << 16) + //
+			((ch7 & 255) << 8) + //
+			((ch8 & 255) << 0);
+	}
+
+	@Override
+	default float readFloat() throws IOException {
+		return Float.intBitsToFloat(readInt());
+	}
+
+	@Override
+	default double readDouble() throws IOException {
+		return Double.longBitsToDouble(readLong());
+	}
+
 	@Override
 	default String readLine() throws IOException {
 		// NB: Code adapted from java.io.RandomAccessFile.readLine().
@@ -511,6 +568,42 @@ default void writeByte(final int v) throws IOException {
 		write(v);
 	}
 
+	@Override
+	default void writeChar(final int v) throws IOException {
+		write((v >>> 8) & 0xFF);
+		write((v >>> 0) & 0xFF);
+	}
+
+	@Override
+	default void writeInt(final int v) throws IOException {
+		write((v >>> 24) & 0xFF);
+		write((v >>> 16) & 0xFF);
+		write((v >>> 8) & 0xFF);
+		write((v >>> 0) & 0xFF);
+	}
+
+	@Override
+	default void writeLong(final long v) throws IOException {
+		write((byte) (v >>> 56));
+		write((byte) (v >>> 48));
+		write((byte) (v >>> 40));
+		write((byte) (v >>> 32));
+		write((byte) (v >>> 24));
+		write((byte) (v >>> 16));
+		write((byte) (v >>> 8));
+		write((byte) (v >>> 0));
+	}
+
+	@Override
+	default void writeFloat(final float v) throws IOException {
+		writeInt(Float.floatToIntBits(v));
+	}
+
+	@Override
+	default void writeDouble(final double v) throws IOException {
+		writeLong(Double.doubleToLongBits(v));
+	}
+
 	@Override
 	default void writeBytes(final String s) throws IOException {
 		write(s.getBytes("UTF-8"));

From fc853ff1acb6f15b7348ec9aaa503c44fb955dcb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 15:51:10 -0500
Subject: [PATCH 0513/1208] DataHandle: improve class javadoc

---
 src/main/java/org/scijava/io/handle/DataHandle.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 52d27fe35..ae0143c26 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -44,8 +44,8 @@
 import org.scijava.plugin.WrapperPlugin;
 
 /**
- * A <em>data handle</em> is a plugin which provides access to bytes in a data
- * stream (e.g., files or arrays), identified by a {@link Location}.
+ * A <em>data handle</em> is a plugin which provides both streaming and random
+ * access to bytes at a {@link Location} (e.g., files or arrays).
  * 
  * @author Curtis Rueden
  * @see DataHandleInputStream

From b948c95431cdd15ecd2dcf31db357d83ac749442 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 15:51:54 -0500
Subject: [PATCH 0514/1208] DataHandle: tweak getOrder() javadoc

---
 src/main/java/org/scijava/io/handle/DataHandle.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index ae0143c26..e6809d90f 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -120,11 +120,7 @@ default boolean ensureWritable(final long count) throws IOException {
 		return true;
 	}
 
-	/**
-	 * Returns the current order of the stream.
-	 * 
-	 * @return See above.
-	 */
+	/** Returns the byte order of the stream. */
 	ByteOrder getOrder();
 
 	/** Gets the endianness of the stream. */

From 9dabafa5be25ca92922378478e48998eeacb18f5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 15:53:41 -0500
Subject: [PATCH 0515/1208] DataHandle: relocate the seek method

It is the mutator which goes with offset(), so should be adjacent to it.
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index e6809d90f..545580da0 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -64,6 +64,12 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	/** Returns the current offset in the stream. */
 	long offset() throws IOException;
 
+	/**
+	 * Sets the stream offset, measured from the beginning of the stream, at which
+	 * the next read or write occurs.
+	 */
+	void seek(long pos) throws IOException;
+
 	/** Returns the length of the stream. */
 	long length() throws IOException;
 
@@ -175,12 +181,6 @@ default int read(final ByteBuffer buf, final int len) throws IOException {
 		return n;
 	}
 
-	/**
-	 * Sets the stream offset, measured from the beginning of the stream, at which
-	 * the next read or write occurs.
-	 */
-	void seek(long pos) throws IOException;
-
 	/**
 	 * Writes up to {@code buf.remaining()} bytes of data from the given
 	 * {@link ByteBuffer} to the stream.

From 90f2d418f76d1b6dcaa87d967f8cc5ffb4ad3604 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 15:55:07 -0500
Subject: [PATCH 0516/1208] DataHandle: relocate the isLittleEndian() method

It belongs immediately before the (to be renamed) setOrder(boolean).
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 545580da0..779923800 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -129,11 +129,6 @@ default boolean ensureWritable(final long count) throws IOException {
 	/** Returns the byte order of the stream. */
 	ByteOrder getOrder();
 
-	/** Gets the endianness of the stream. */
-	default boolean isLittleEndian() {
-		return getOrder() == ByteOrder.LITTLE_ENDIAN;
-	}
-
 	/**
 	 * Sets the byte order of the stream.
 	 * 
@@ -141,6 +136,11 @@ default boolean isLittleEndian() {
 	 */
 	void setOrder(ByteOrder order);
 
+	/** Gets the endianness of the stream. */
+	default boolean isLittleEndian() {
+		return getOrder() == ByteOrder.LITTLE_ENDIAN;
+	}
+
 	/** Sets the endianness of the stream. */
 	default void setOrder(final boolean little) {
 		setOrder(little ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);

From d6a4271687c02d2d2132d9f2097b0a8400fe3606 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 15:56:23 -0500
Subject: [PATCH 0517/1208] DataHandle: fix up the endianness API

Now we have both isLittleEndian() and isBigEndian() accessors,
and the setOrder(boolean) method is now setLittleEndian(boolean).
---
 .../org/scijava/io/handle/DataHandle.java     | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 779923800..dd87f5a67 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -136,13 +136,32 @@ default boolean ensureWritable(final long count) throws IOException {
 	 */
 	void setOrder(ByteOrder order);
 
-	/** Gets the endianness of the stream. */
+	/**
+	 * Returns true iff the stream's order is {@link ByteOrder#BIG_ENDIAN}.
+	 * 
+	 * @see #getOrder()
+	 */
+	default boolean isBigEndian() {
+		return getOrder() == ByteOrder.BIG_ENDIAN;
+	}
+
+	/**
+	 * Returns true iff the stream's order is {@link ByteOrder#LITTLE_ENDIAN}.
+	 * 
+	 * @see #getOrder()
+	 */
 	default boolean isLittleEndian() {
 		return getOrder() == ByteOrder.LITTLE_ENDIAN;
 	}
 
-	/** Sets the endianness of the stream. */
-	default void setOrder(final boolean little) {
+	/**
+	 * Sets the endianness of the stream.
+	 * 
+	 * @param little If true, sets the order to {@link ByteOrder#LITTLE_ENDIAN};
+	 *          otherwise, sets the order to {@link ByteOrder#BIG_ENDIAN}.
+	 * @see #setOrder(ByteOrder)
+	 */
+	default void setLittleEndian(final boolean little) {
 		setOrder(little ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN);
 	}
 

From aa6f96237927bec4ba678c016ca423e7c6332712 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:07:13 -0500
Subject: [PATCH 0518/1208] DataHandle: tweak comment

---
 src/main/java/org/scijava/io/handle/DataHandle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index dd87f5a67..52c8c1971 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -521,7 +521,7 @@ default double readDouble() throws IOException {
 
 	@Override
 	default String readLine() throws IOException {
-		// NB: Code adapted from java.io.RandomAccessFile.readLine().
+		// NB: Adapted from java.io.RandomAccessFile.readLine().
 
 		final StringBuffer input = new StringBuffer();
 		int c = -1;

From b2e9316cfb7e7ebf7cec2e124dffb6cf8f2a9668 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:07:43 -0500
Subject: [PATCH 0519/1208] DataHandle: tweak readString, skip and skipBytes

They can lean on the available(long) method.
---
 .../org/scijava/io/handle/DataHandle.java     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 52c8c1971..81a217a49 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -234,10 +234,9 @@ default String readCString() throws IOException {
 	}
 
 	/** Reads a string of up to length n. */
-	default String readString(int n) throws IOException {
-		final long avail = length() - offset();
-		if (n > avail) n = (int) avail;
-		final byte[] b = new byte[n];
+	default String readString(final int n) throws IOException {
+		final int r = (int) available(n);
+		final byte[] b = new byte[r];
 		readFully(b);
 		return new String(b, getEncoding());
 	}
@@ -433,11 +432,10 @@ default int read(byte[] b) throws IOException {
 	 * @throws IOException - if an I/O error occurs.
 	 */
 	default long skip(final long n) throws IOException {
-		if (n < 0) return 0;
-		final long remain = length() - offset();
-		final long num = n < remain ? n : remain;
-		seek(offset() + num);
-		return num;
+		final long skip = available(n);
+		if (skip <= 0) return 0;
+		seek(offset() + skip);
+		return skip;
 	}
 
 	// -- DataInput methods --
@@ -560,10 +558,11 @@ default String readUTF() throws IOException {
 
 	@Override
 	default int skipBytes(final int n) throws IOException {
-		final int skipped = (int) Math.min(n, length() - offset());
-		if (skipped < 0) return 0;
-		seek(offset() + skipped);
-		return skipped;
+		// NB: Cast here is safe since the value of n bounds the result to an int.
+		final int skip = (int) available(n);
+		if (skip < 0) return 0;
+		seek(offset() + skip);
+		return skip;
 	}
 
 	// -- DataOutput methods --

From 6f2994fd7fa4c00ac5a3166708cede1a1d3d5e6a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:10:02 -0500
Subject: [PATCH 0520/1208] DataHandle: relocate DataInput methods

Now they match their declared order in DataInput.
---
 .../org/scijava/io/handle/DataHandle.java     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 81a217a49..6cf3147da 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -441,13 +441,22 @@ default long skip(final long n) throws IOException {
 	// -- DataInput methods --
 
 	@Override
-	default boolean readBoolean() throws IOException {
-		return readByte() != 0;
+	default void readFully(final byte[] b) throws IOException {
+		readFully(b, 0, b.length);
 	}
 
 	@Override
-	default void readFully(final byte[] b) throws IOException {
-		readFully(b, 0, b.length);
+	default int skipBytes(final int n) throws IOException {
+		// NB: Cast here is safe since the value of n bounds the result to an int.
+		final int skip = (int) available(n);
+		if (skip < 0) return 0;
+		seek(offset() + skip);
+		return skip;
+	}
+
+	@Override
+	default boolean readBoolean() throws IOException {
+		return readByte() != 0;
 	}
 
 	@Override
@@ -556,15 +565,6 @@ default String readUTF() throws IOException {
 		return new String(b, "UTF-8");
 	}
 
-	@Override
-	default int skipBytes(final int n) throws IOException {
-		// NB: Cast here is safe since the value of n bounds the result to an int.
-		final int skip = (int) available(n);
-		if (skip < 0) return 0;
-		seek(offset() + skip);
-		return skip;
-	}
-
 	// -- DataOutput methods --
 
 	@Override

From daa914594be635b6d176dd6e412aa53d1e6b17bb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:12:48 -0500
Subject: [PATCH 0521/1208] DataHandle: add readFully(byte[], int, int) impl

---
 .../java/org/scijava/io/handle/DataHandle.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 6cf3147da..9b697b90d 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -33,6 +33,7 @@
 
 import java.io.Closeable;
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.EOFException;
 import java.io.IOException;
@@ -445,6 +446,20 @@ default void readFully(final byte[] b) throws IOException {
 		readFully(b, 0, b.length);
 	}
 
+	@Override
+	default void readFully(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		// NB: Adapted from java.io.DataInputStream.readFully(byte[], int, int).
+		if (len < 0) throw new IndexOutOfBoundsException();
+		int n = 0;
+		while (n < len) {
+			int count = read(b, off + n, len - n);
+			if (count < 0) throw new EOFException();
+			n += count;
+		}
+	}
+
 	@Override
 	default int skipBytes(final int n) throws IOException {
 		// NB: Cast here is safe since the value of n bounds the result to an int.

From 2e11aff8993812cb94e450c35d00bfbdcc1eb207 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:29:38 -0500
Subject: [PATCH 0522/1208] DataHandle: improve readUTF implementation

Better to lean on the Java standard library here.
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 9b697b90d..0fea60ecc 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -574,10 +574,7 @@ default String readLine() throws IOException {
 
 	@Override
 	default String readUTF() throws IOException {
-		final int length = readUnsignedShort();
-		final byte[] b = new byte[length];
-		read(b);
-		return new String(b, "UTF-8");
+		return DataInputStream.readUTF(this);
 	}
 
 	// -- DataOutput methods --

From 21881a9f13b62199803ec670b03bb7bc0e73ab1a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:31:11 -0500
Subject: [PATCH 0523/1208] DataHandle: add more default DataOutput methods

---
 .../java/org/scijava/io/handle/DataHandle.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 0fea60ecc..c5d0e86cb 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -594,6 +594,12 @@ default void writeByte(final int v) throws IOException {
 		write(v);
 	}
 
+	@Override
+	default void writeShort(final int v) throws IOException {
+		write((v >>> 8) & 0xFF);
+		write((v >>> 0) & 0xFF);
+	}
+
 	@Override
 	default void writeChar(final int v) throws IOException {
 		write((v >>> 8) & 0xFF);
@@ -635,6 +641,16 @@ default void writeBytes(final String s) throws IOException {
 		write(s.getBytes("UTF-8"));
 	}
 
+	@Override
+	default void writeChars(final String s) throws IOException {
+		final int len = s.length();
+		for (int i = 0 ; i < len ; i++) {
+			final int v = s.charAt(i);
+			write((v >>> 8) & 0xFF);
+			write((v >>> 0) & 0xFF);
+		}
+	}
+
 	@Override
 	default void writeUTF(final String str) throws IOException {
 		final byte[] b = str.getBytes("UTF-8");

From 02b18b9fd303995c59ccd9579b0091c7c760d5ac Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:48:38 -0500
Subject: [PATCH 0524/1208] Add a utility class which knows how to write UTF

The whole thing exists only to work around the fact that
DataOutputStream.writeUTF(String, DataOutput), which is the method we
really need, has package-protected access. This utility class grabs that
method via reflection, makes it accessible, and caches the reference.
---
 .../org/scijava/io/handle/DataHandles.java    | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/DataHandles.java

diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
new file mode 100644
index 000000000..47be40ebc
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -0,0 +1,110 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Utility methods for working with {@link DataHandle}s.
+ * 
+ * @author Curtis Rueden
+ */
+public final class DataHandles {
+
+	private static Method utfMethod;
+
+	private DataHandles() {
+		// Prevent instantiation of utility class.
+	}
+
+	/**
+	 * Writes a string to the specified DataOutput using modified UTF-8 encoding
+	 * in a machine-independent manner.
+	 * <p>
+	 * First, two bytes are written to out as if by the {@code writeShort} method
+	 * giving the number of bytes to follow. This value is the number of bytes
+	 * actually written out, not the length of the string. Following the length,
+	 * each character of the string is output, in sequence, using the modified
+	 * UTF-8 encoding for the character. If no exception is thrown, the counter
+	 * {@code written} is incremented by the total number of bytes written to the
+	 * output stream. This will be at least two plus the length of {@code str},
+	 * and at most two plus thrice the length of {@code str}.
+	 * </p>
+	 *
+	 * @param str a string to be written.
+	 * @param out destination to write to
+	 * @return The number of bytes written out.
+	 * @throws IOException if an I/O error occurs.
+	 */
+	public static int writeUTF(final String str, final DataOutput out)
+		throws IOException
+	{
+		// HACK: Strangely, DataOutputStream.writeUTF(String, DataOutput)
+		// has package-private access. We work around it via reflection.
+		try {
+			return (Integer) utfMethod().invoke(null, str, out);
+		}
+		catch (final IllegalAccessException | IllegalArgumentException
+				| InvocationTargetException exc)
+		{
+			throw new IllegalStateException(
+				"Cannot invoke DataOutputStream.writeUTF(String, DataOutput)", exc);
+		}
+	}
+
+	// -- Helper methods --
+
+	/** Gets the {@link #utfMethod} field, initializing if needed. */
+	private static Method utfMethod() {
+		if (utfMethod == null) initUTFMethod();
+		return utfMethod;
+	}
+
+	/** Initializes the {@link #utfMethod} field. */
+	private static synchronized void initUTFMethod() {
+		if (utfMethod != null) return;
+		try {
+			final Method m = DataOutputStream.class.getDeclaredMethod("writeUTF",
+				String.class, DataOutput.class);
+			m.setAccessible(true);
+			utfMethod = m;
+		}
+		catch (final NoSuchMethodException | SecurityException exc) {
+			throw new IllegalStateException(
+				"No usable DataOutputStream.writeUTF(String, DataOutput)", exc);
+		}
+	}
+}

From e702e9195d878477eae011f70fdaff708ecf125c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Jun 2017 16:52:35 -0500
Subject: [PATCH 0525/1208] DataHandle: simplify writeUTF method

Now it leans on the Java standard library (indirectly).
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index c5d0e86cb..7f7f39f03 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -653,9 +653,7 @@ default void writeChars(final String s) throws IOException {
 
 	@Override
 	default void writeUTF(final String str) throws IOException {
-		final byte[] b = str.getBytes("UTF-8");
-		writeShort(b.length);
-		write(b);
+		DataHandles.writeUTF(str, this);
 	}
 
 }

From 5b1d44f591b232a8c8560de344af9fbd088f2c04 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 14:33:27 +0100
Subject: [PATCH 0526/1208] DataHandle: improve javadoc

---
 .../org/scijava/io/handle/DataHandle.java     | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 7f7f39f03..7aa5fe255 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -71,7 +71,7 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 */
 	void seek(long pos) throws IOException;
 
-	/** Returns the length of the stream. */
+	/** Returns the length of the data in bytes. */
 	long length() throws IOException;
 
 	/**
@@ -83,12 +83,31 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	void setLength(long length) throws IOException;
 
 	/**
-	 * Verifies that the handle has sufficient bytes available to read, returning
-	 * the actual number of bytes which will be possible to read, which might
-	 * be less than the requested value.
+	 * Gets the number of bytes which can be safely read from, or written to, the
+	 * data handle, bounded by the specified number of bytes.
+	 * <p>
+	 * In the case of reading, attempting to read the returned number of bytes is
+	 * guaranteed not to throw {@link EOFException}. However, be aware that the
+	 * following methods <em>might still process fewer bytes</em> than indicated
+	 * by this method:
+	 * </p>
+	 * <ul>
+	 * <li>{@link #read(ByteBuffer)}</li>
+	 * <li>{@link #read(ByteBuffer, int)}</li>
+	 * <li>{@link #read(byte[])}</li>
+	 * <li>{@link #read(byte[], int, int)}</li>
+	 * <li>{@link #skip(long)}</li>
+	 * <li>{@link #skipBytes(int)}</li>
+	 * </ul>
+	 * <p>
+	 * In the case of writing, attempting to write the returned number of bytes is
+	 * guaranteed not to expand the length of the handle; i.e., the write will
+	 * only overwrite bytes already within the handle's bounds.
+	 * </p>
 	 * 
-	 * @param count Number of bytes to read.
-	 * @return The actual number of bytes available to be read.
+	 * @param count Desired number of bytes to read/write.
+	 * @return The actual number of bytes which could be safely read/written,
+	 *         which might be less than the requested value.
 	 * @throws IOException If something goes wrong with the check.
 	 */
 	default long available(final long count) throws IOException {
@@ -109,8 +128,8 @@ default void ensureReadable(final long count) throws IOException {
 	}
 
 	/**
-	 * Ensures that the handle has the correct length to be written to and extends
-	 * it as required.
+	 * Ensures that the handle has the correct length to be written to, and
+	 * extends it as required.
 	 * 
 	 * @param count Number of bytes to write.
 	 * @return {@code true} if the handle's length was sufficient, or
@@ -202,7 +221,7 @@ default int read(final ByteBuffer buf, final int len) throws IOException {
 	}
 
 	/**
-	 * Writes up to {@code buf.remaining()} bytes of data from the given
+	 * Writes {@code buf.remaining()} bytes of data from the given
 	 * {@link ByteBuffer} to the stream.
 	 */
 	default void write(final ByteBuffer buf) throws IOException {
@@ -210,7 +229,8 @@ default void write(final ByteBuffer buf) throws IOException {
 	}
 
 	/**
-	 * Writes up to len bytes of data from the given ByteBuffer to the stream.
+	 * Writes {@code len} bytes of data from the given {@link ByteBuffer} to the
+	 * stream.
 	 */
 	default void write(final ByteBuffer buf, final int len)
 		throws IOException
@@ -227,7 +247,6 @@ default void write(final ByteBuffer buf, final int len)
 		}
 	}
 
-
 	/** Reads a string of arbitrary length, terminated by a null char. */
 	default String readCString() throws IOException {
 		final String line = findString("\0");

From 795295b64a09c647a24363b2144a4a2c72061948 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 20 Mar 2017 15:53:50 +0100
Subject: [PATCH 0527/1208] DataHandle: add writeLine(String) method

This is analogous to readLine().
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 7aa5fe255..f71b3df28 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -411,6 +411,17 @@ default String findString(final boolean saveString, final int blockSize,
 		return saveString ? out.toString() : null;
 	}
 
+	/**
+	 * Writes the provided string, followed by a newline character.
+	 *
+	 * @param string The string to write.
+	 * @throws IOException If an I/O error occurs.
+	 */
+	default void writeLine(final String string) throws IOException {
+		writeBytes(string);
+		writeBytes("\n");
+	}
+
 	// -- InputStream look-alikes --
 
 	/**

From d978412359ffabb27d8989e797b77bae0e565637 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 7 Jul 2017 14:15:48 +0200
Subject: [PATCH 0528/1208] DataHandle: improve javadoc

---
 .../org/scijava/io/handle/DataHandle.java     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index f71b3df28..9f2afe5ba 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -83,7 +83,7 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	void setLength(long length) throws IOException;
 
 	/**
-	 * Gets the number of bytes which can be safely read from, or written to, the
+	 * Gets the number of bytes which can be read from, or written to, the
 	 * data handle, bounded by the specified number of bytes.
 	 * <p>
 	 * In the case of reading, attempting to read the returned number of bytes is
@@ -104,9 +104,9 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 * guaranteed not to expand the length of the handle; i.e., the write will
 	 * only overwrite bytes already within the handle's bounds.
 	 * </p>
-	 * 
+	 *
 	 * @param count Desired number of bytes to read/write.
-	 * @return The actual number of bytes which could be safely read/written,
+	 * @return The actual number of bytes which could be read/written,
 	 *         which might be less than the requested value.
 	 * @throws IOException If something goes wrong with the check.
 	 */
@@ -151,14 +151,14 @@ default boolean ensureWritable(final long count) throws IOException {
 
 	/**
 	 * Sets the byte order of the stream.
-	 * 
+	 *
 	 * @param order Order to set.
 	 */
 	void setOrder(ByteOrder order);
 
 	/**
 	 * Returns true iff the stream's order is {@link ByteOrder#BIG_ENDIAN}.
-	 * 
+	 *
 	 * @see #getOrder()
 	 */
 	default boolean isBigEndian() {
@@ -167,7 +167,7 @@ default boolean isBigEndian() {
 
 	/**
 	 * Returns true iff the stream's order is {@link ByteOrder#LITTLE_ENDIAN}.
-	 * 
+	 *
 	 * @see #getOrder()
 	 */
 	default boolean isLittleEndian() {
@@ -176,7 +176,7 @@ default boolean isLittleEndian() {
 
 	/**
 	 * Sets the endianness of the stream.
-	 * 
+	 *
 	 * @param little If true, sets the order to {@link ByteOrder#LITTLE_ENDIAN};
 	 *          otherwise, sets the order to {@link ByteOrder#BIG_ENDIAN}.
 	 * @see #setOrder(ByteOrder)
@@ -290,7 +290,7 @@ default String findString(final String... terminators) throws IOException {
 	/**
 	 * Reads or skips a string ending with one of the given terminating
 	 * substrings.
-	 * 
+	 *
 	 * @param saveString Whether to collect the string from the current offset to
 	 *          the terminating bytes, and return it. If false, returns null.
 	 * @param terminators The strings for which to search.
@@ -309,7 +309,7 @@ default String findString(final boolean saveString,
 	/**
 	 * Reads a string ending with one of the given terminating substrings, using
 	 * the specified block size for buffering.
-	 * 
+	 *
 	 * @param blockSize The block size to use when reading bytes in chunks.
 	 * @param terminators The strings for which to search.
 	 * @return The string from the initial position through the end of the
@@ -325,9 +325,9 @@ default String findString(final int blockSize, final String... terminators)
 	/**
 	 * Reads or skips a string ending with one of the given terminating
 	 * substrings, using the specified block size for buffering.
-	 * 
-	 * @param saveString Whether to collect the string from the current offset
-	 *          to the terminating bytes, and return it. If false, returns null.
+	 *
+	 * @param saveString Whether to collect the string from the current offset to
+	 *          the terminating bytes, and return it. If false, returns null.
 	 * @param blockSize The block size to use when reading bytes in chunks.
 	 * @param terminators The strings for which to search.
 	 * @throws IOException If saveString flag is set and the maximum search length
@@ -354,8 +354,8 @@ default String findString(final boolean saveString, final int blockSize,
 		}
 
 		@SuppressWarnings("resource")
-		final InputStreamReader in =
-			new InputStreamReader(new DataHandleInputStream<>(this), getEncoding());
+		final InputStreamReader in = new InputStreamReader(
+			new DataHandleInputStream<>(this), getEncoding());
 		final char[] buf = new char[blockSize];
 		long loc = 0;
 		while (loc < maxLen && offset() < length() - 1) {
@@ -426,7 +426,7 @@ default void writeLine(final String string) throws IOException {
 
 	/**
 	 * Reads the next byte of data from the stream.
-	 * 
+	 *
 	 * @return the next byte of data, or -1 if the end of the stream is reached.
 	 * @throws IOException - if an I/O error occurs.
 	 */
@@ -436,7 +436,7 @@ default int read() throws IOException {
 
 	/**
 	 * Reads up to b.length bytes of data from the stream into an array of bytes.
-	 * 
+	 *
 	 * @return the total number of bytes read into the buffer.
 	 */
 	default int read(byte[] b) throws IOException {
@@ -445,7 +445,7 @@ default int read(byte[] b) throws IOException {
 
 	/**
 	 * Reads up to len bytes of data from the stream into an array of bytes.
-	 * 
+	 *
 	 * @return the total number of bytes read into the buffer.
 	 */
 	int read(byte[] b, int off, int len) throws IOException;
@@ -457,7 +457,7 @@ default int read(byte[] b) throws IOException {
 	 * of a number of conditions; reaching end of file before {@code n} bytes have
 	 * been skipped is only one possibility. The actual number of bytes skipped is
 	 * returned. If {@code n} is negative, no bytes are skipped.
-	 * 
+	 *
 	 * @param n - the number of bytes to be skipped.
 	 * @return the actual number of bytes skipped.
 	 * @throws IOException - if an I/O error occurs.
@@ -591,7 +591,7 @@ default String readLine() throws IOException {
 					if (read() != '\n') seek(cur);
 					break;
 				default:
-					input.append((char)c);
+					input.append((char) c);
 					break;
 			}
 		}
@@ -674,7 +674,7 @@ default void writeBytes(final String s) throws IOException {
 	@Override
 	default void writeChars(final String s) throws IOException {
 		final int len = s.length();
-		for (int i = 0 ; i < len ; i++) {
+		for (int i = 0; i < len; i++) {
 			final int v = s.charAt(i);
 			write((v >>> 8) & 0xFF);
 			write((v >>> 0) & 0xFF);

From 4251229c24d4f7e05c7be011c5d318b656800383 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 7 Jul 2017 15:41:28 -0500
Subject: [PATCH 0529/1208] DataHandle: make some minor style tweaks

---
 src/main/java/org/scijava/io/handle/DataHandle.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 9f2afe5ba..e184a5232 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -439,12 +439,13 @@ default int read() throws IOException {
 	 *
 	 * @return the total number of bytes read into the buffer.
 	 */
-	default int read(byte[] b) throws IOException {
+	default int read(final byte[] b) throws IOException {
 		return read(b, 0, b.length);
 	}
 
 	/**
-	 * Reads up to len bytes of data from the stream into an array of bytes.
+	 * Reads up to {@code len} bytes of data from the stream into an array of
+	 * bytes.
 	 *
 	 * @return the total number of bytes read into the buffer.
 	 */

From 8b065baff3a41c919f6a862f5cef602c12fa06ba Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 5 Jul 2017 17:08:08 +0200
Subject: [PATCH 0530/1208] DataHandle: remove built-in references to java.nio

The java.nio package is not available on all JVMs, so
its use must be optional on top of the base API layer.
---
 .../scijava/io/handle/AbstractDataHandle.java |  2 -
 .../org/scijava/io/handle/DataHandle.java     | 64 ++-----------------
 .../org/scijava/io/handle/DataHandleTest.java |  9 +--
 3 files changed, 5 insertions(+), 70 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index b072df9ad..ac0e4b7a8 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -31,8 +31,6 @@
 
 package org.scijava.io.handle;
 
-import java.nio.ByteOrder;
-
 import org.scijava.io.location.Location;
 import org.scijava.plugin.AbstractWrapperPlugin;
 
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index e184a5232..4c3b845d8 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -38,8 +38,6 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 import org.scijava.io.location.Location;
 import org.scijava.plugin.WrapperPlugin;
@@ -56,6 +54,10 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	DataInput, DataOutput, Closeable
 {
 
+	public enum ByteOrder {
+		LITTLE_ENDIAN, BIG_ENDIAN
+	}
+
 	/** Default block size to use when searching through the stream. */
 	int DEFAULT_BLOCK_SIZE = 256 * 1024; // 256 KB
 
@@ -92,8 +94,6 @@ public interface DataHandle<L extends Location> extends WrapperPlugin<L>,
 	 * by this method:
 	 * </p>
 	 * <ul>
-	 * <li>{@link #read(ByteBuffer)}</li>
-	 * <li>{@link #read(ByteBuffer, int)}</li>
 	 * <li>{@link #read(byte[])}</li>
 	 * <li>{@link #read(byte[], int, int)}</li>
 	 * <li>{@link #skip(long)}</li>
@@ -191,62 +191,6 @@ default void setLittleEndian(final boolean little) {
 	/** Sets the native encoding of the stream. */
 	void setEncoding(String encoding);
 
-	/**
-	 * Reads up to {@code buf.remaining()} bytes of data from the stream into a
-	 * {@link ByteBuffer}.
-	 */
-	default int read(final ByteBuffer buf) throws IOException {
-		return read(buf, buf.remaining());
-	}
-
-	/**
-	 * Reads up to {@code len} bytes of data from the stream into a
-	 * {@link ByteBuffer}.
-	 * 
-	 * @return the total number of bytes read into the buffer.
-	 */
-	default int read(final ByteBuffer buf, final int len) throws IOException {
-		final int n;
-		if (buf.hasArray()) {
-			// read directly into the array
-			n = read(buf.array(), buf.arrayOffset(), len);
-		}
-		else {
-			// read into a temporary array, then copy
-			final byte[] b = new byte[len];
-			n = read(b);
-			buf.put(b, 0, n);
-		}
-		return n;
-	}
-
-	/**
-	 * Writes {@code buf.remaining()} bytes of data from the given
-	 * {@link ByteBuffer} to the stream.
-	 */
-	default void write(final ByteBuffer buf) throws IOException {
-		write(buf, buf.remaining());
-	}
-
-	/**
-	 * Writes {@code len} bytes of data from the given {@link ByteBuffer} to the
-	 * stream.
-	 */
-	default void write(final ByteBuffer buf, final int len)
-		throws IOException
-	{
-		if (buf.hasArray()) {
-			// write directly from the buffer's array
-			write(buf.array(), buf.arrayOffset(), len);
-		}
-		else {
-			// copy into a temporary array, then write
-			final byte[] b = new byte[len];
-			buf.get(b);
-			write(b);
-		}
-	}
-
 	/** Reads a string of arbitrary length, terminated by a null char. */
 	default String readCString() throws IOException {
 		final String line = findString("\0");
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index c91b7c4ea..5a3069940 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -35,13 +35,12 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.Arrays;
 
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandle.ByteOrder;
 import org.scijava.io.handle.DataHandleService;
 import org.scijava.io.location.Location;
 import org.scijava.util.Bytes;
@@ -113,12 +112,6 @@ protected <L extends Location> void checkReads(final DataHandle<L> handle)
 		handle.seek(1);
 		assertBytesMatch(1, handle.read(buf), buf);
 
-		// test read(ByteBuffer)
-		Arrays.fill(buf, (byte) 0);
-		final ByteBuffer byteBuffer = ByteBuffer.wrap(buf);
-		handle.seek(2);
-		assertBytesMatch(2, handle.read(byteBuffer), byteBuffer.array());
-
 		// test readByte()
 		handle.seek(0);
 		for (int i = 0; i < BYTES.length; i++) {

From a4edc83a2aceaa3d50b8758a9574c1738a9c004d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 7 Jul 2017 14:29:25 -0500
Subject: [PATCH 0531/1208] DataHandle: add missing final keywords

---
 src/main/java/org/scijava/io/handle/DataHandle.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 4c3b845d8..8652adab5 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -429,7 +429,7 @@ default void readFully(final byte[] b, final int off, final int len)
 		if (len < 0) throw new IndexOutOfBoundsException();
 		int n = 0;
 		while (n < len) {
-			int count = read(b, off + n, len - n);
+			final int count = read(b, off + n, len - n);
 			if (count < 0) throw new EOFException();
 			n += count;
 		}
@@ -532,7 +532,7 @@ default String readLine() throws IOException {
 					break;
 				case '\r':
 					eol = true;
-					long cur = offset();
+					final long cur = offset();
 					if (read() != '\n') seek(cur);
 					break;
 				default:

From 82ccbdbb01f7acc5a7b5e939cc72263588fd5d71 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 7 Jul 2017 14:29:32 -0500
Subject: [PATCH 0532/1208] DataHandle: remove end-of-class blank line

---
 src/main/java/org/scijava/io/handle/DataHandle.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 8652adab5..e9531f9e2 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -630,5 +630,4 @@ default void writeChars(final String s) throws IOException {
 	default void writeUTF(final String str) throws IOException {
 		DataHandles.writeUTF(str, this);
 	}
-
 }

From 9c0a1da3c56e96b9531bd10d867814c5a8f1c714 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 5 Jul 2017 17:09:02 +0200
Subject: [PATCH 0533/1208] DataHandle: make reads & writes respect endianness

---
 .../org/scijava/io/handle/DataHandle.java     | 158 +++++++++++++-----
 1 file changed, 115 insertions(+), 43 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index e9531f9e2..591f2ae4d 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -456,10 +456,18 @@ default int readUnsignedByte() throws IOException {
 
 	@Override
 	default short readShort() throws IOException {
-		final int ch1 = read();
-		final int ch2 = read();
-		if ((ch1 | ch2) < 0) throw new EOFException();
-		return (short) ((ch1 << 8) + (ch2 << 0));
+		final int ch0;
+		final int ch1;
+		if (isBigEndian()) {
+			ch0 = read();
+			ch1 = read();
+		}
+		else {
+			ch1 = read();
+			ch0 = read();
+		}
+		if ((ch0 | ch1) < 0) throw new EOFException();
+		return (short) ((ch0 << 8) + (ch1 << 0));
 	}
 
 	@Override
@@ -474,36 +482,68 @@ default char readChar() throws IOException {
 
 	@Override
 	default int readInt() throws IOException {
-		int ch1 = read();
-		int ch2 = read();
-		int ch3 = read();
-		int ch4 = read();
-		if ((ch1 | ch2 | ch3 | ch4) < 0) throw new EOFException();
-		return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0));
+		final int ch0;
+		final int ch1;
+		final int ch2;
+		final int ch3;
+		if (isBigEndian()) {
+			ch0 = read();
+			ch1 = read();
+			ch2 = read();
+			ch3 = read();
+		}
+		else {
+			ch3 = read();
+			ch2 = read();
+			ch1 = read();
+			ch0 = read();
+		}
+		if ((ch0 | ch1 | ch2 | ch3) < 0) throw new EOFException();
+		return ((ch0 << 24) + (ch1 << 16) + (ch2 << 8) + (ch3 << 0));
 	}
 
 	@Override
 	default long readLong() throws IOException {
-		int ch1 = read();
-		int ch2 = read();
-		int ch3 = read();
-		int ch4 = read();
-		int ch5 = read();
-		int ch6 = read();
-		int ch7 = read();
-		int ch8 = read();
-		if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0) {
+		final int ch0;
+		final int ch1;
+		final int ch2;
+		final int ch3;
+		final int ch4;
+		final int ch5;
+		final int ch6;
+		final int ch7;
+		if (isBigEndian()) {
+			ch0 = read();
+			ch1 = read();
+			ch2 = read();
+			ch3 = read();
+			ch4 = read();
+			ch5 = read();
+			ch6 = read();
+			ch7 = read();
+		}
+		else {
+			ch7 = read();
+			ch6 = read();
+			ch5 = read();
+			ch4 = read();
+			ch3 = read();
+			ch2 = read();
+			ch1 = read();
+			ch0 = read();
+		}
+		if ((ch0 | ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7) < 0) {
 			throw new EOFException();
 		}
 		// TODO: Double check this inconsistent code.
-		return ((long) ch1 << 56) + //
-			((long) (ch2 & 255) << 48) + //
-			((long) (ch3 & 255) << 40) + //
-			((long) (ch4 & 255) << 32) + //
-			((long) (ch5 & 255) << 24) + //
-			((ch6 & 255) << 16) + //
-			((ch7 & 255) << 8) + //
-			((ch8 & 255) << 0);
+		return ((long) ch0 << 56) + //
+			((long) (ch1 & 255) << 48) + //
+			((long) (ch2 & 255) << 40) + //
+			((long) (ch3 & 255) << 32) + //
+			((long) (ch4 & 255) << 24) + //
+			((ch5 & 255) << 16) + //
+			((ch6 & 255) << 8) + //
+			((ch7 & 255) << 0);
 	}
 
 	@Override
@@ -571,34 +611,66 @@ default void writeByte(final int v) throws IOException {
 
 	@Override
 	default void writeShort(final int v) throws IOException {
-		write((v >>> 8) & 0xFF);
-		write((v >>> 0) & 0xFF);
+		if (isBigEndian()) {
+			write((v >>> 8) & 0xFF);
+			write((v >>> 0) & 0xFF);
+		}
+		else {
+			write((v >>> 0) & 0xFF);
+			write((v >>> 8) & 0xFF);
+		}
 	}
 
 	@Override
 	default void writeChar(final int v) throws IOException {
-		write((v >>> 8) & 0xFF);
-		write((v >>> 0) & 0xFF);
+		if (isBigEndian()) {
+			write((v >>> 8) & 0xFF);
+			write((v >>> 0) & 0xFF);
+		}
+		else {
+			write((v >>> 0) & 0xFF);
+			write((v >>> 8) & 0xFF);
+		}
 	}
 
 	@Override
 	default void writeInt(final int v) throws IOException {
-		write((v >>> 24) & 0xFF);
-		write((v >>> 16) & 0xFF);
-		write((v >>> 8) & 0xFF);
-		write((v >>> 0) & 0xFF);
+		if (isBigEndian()) {
+			write((v >>> 24) & 0xFF);
+			write((v >>> 16) & 0xFF);
+			write((v >>> 8) & 0xFF);
+			write((v >>> 0) & 0xFF);
+		}
+		else {
+			write((v >>> 0) & 0xFF);
+			write((v >>> 8) & 0xFF);
+			write((v >>> 16) & 0xFF);
+			write((v >>> 24) & 0xFF);
+		}
 	}
 
 	@Override
 	default void writeLong(final long v) throws IOException {
-		write((byte) (v >>> 56));
-		write((byte) (v >>> 48));
-		write((byte) (v >>> 40));
-		write((byte) (v >>> 32));
-		write((byte) (v >>> 24));
-		write((byte) (v >>> 16));
-		write((byte) (v >>> 8));
-		write((byte) (v >>> 0));
+		if (isBigEndian()) {
+			write((byte) (v >>> 56));
+			write((byte) (v >>> 48));
+			write((byte) (v >>> 40));
+			write((byte) (v >>> 32));
+			write((byte) (v >>> 24));
+			write((byte) (v >>> 16));
+			write((byte) (v >>> 8));
+			write((byte) (v >>> 0));
+		}
+		else {
+			write((byte) (v >>> 0));
+			write((byte) (v >>> 8));
+			write((byte) (v >>> 16));
+			write((byte) (v >>> 24));
+			write((byte) (v >>> 32));
+			write((byte) (v >>> 40));
+			write((byte) (v >>> 48));
+			write((byte) (v >>> 56));
+		}
 	}
 
 	@Override

From 1b1c6628226fa5cb59bb8ba4dccf830523f48d3e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Jul 2016 22:33:32 -0500
Subject: [PATCH 0534/1208] FileHandle: fix double-checked locking

---
 src/main/java/org/scijava/io/handle/FileHandle.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 944e384d5..e64739fa8 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -285,6 +285,7 @@ private RandomAccessFile raf() throws IOException {
 	}
 
 	private synchronized void initRAF() throws IOException {
+		if (raf != null) return;
 		raf = new RandomAccessFile(get().getFile(), getMode());
 	}
 

From f9191404639d515ed50e9bc374c04804f4b288f1 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 15:49:44 +0100
Subject: [PATCH 0535/1208] FileHandle: Add constructor accepting an URI

---
 src/main/java/org/scijava/io/location/FileLocation.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 31a331bd8..447b23a6e 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -51,6 +51,10 @@ public FileLocation(final String path) {
 		this(new File(path));
 	}
 
+	public FileLocation(final URI path) {
+		this(new File(path));
+	}
+
 	// -- FileLocation methods --
 
 	/** Gets the associated {@link File}. */

From 8176c921a9ead88a1d2859f88ff3ef7a825db9c8 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 17:08:15 +0100
Subject: [PATCH 0536/1208] FileHandle: implement getName()

---
 src/main/java/org/scijava/io/location/FileLocation.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 447b23a6e..5092167ec 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -69,4 +69,9 @@ public URI getURI() {
 		return getFile().toURI();
 	}
 
+	@Override
+	public String getName() {
+		return file.getName();
+	}
+
 }

From a66f1ed05adade05f26c98dbe5dd9efc3a6edbf4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 5 Jul 2016 17:43:39 -0500
Subject: [PATCH 0537/1208] Add DummyLocation and DummyHandle

---
 .../org/scijava/io/handle/DummyHandle.java    | 126 ++++++++++++++++++
 .../scijava/io/location/DummyLocation.java    |  43 ++++++
 2 files changed, 169 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/DummyHandle.java
 create mode 100644 src/main/java/org/scijava/io/location/DummyLocation.java

diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
new file mode 100644
index 000000000..5b072723a
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -0,0 +1,126 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.scijava.io.location.DummyLocation;
+import org.scijava.plugin.Plugin;
+
+/**
+ * A {@link DataHandle} which reads all zeroes, and writes no actual data.
+ *
+ * @author Curtis Rueden
+ */
+@Plugin(type = DataHandle.class)
+public class DummyHandle extends AbstractDataHandle<DummyLocation> {
+
+	// -- Fields --
+
+	private long offset;
+	private long length;
+
+	// -- DataHandle methods --
+
+	@Override
+	public long offset() throws IOException {
+		return offset;
+	}
+
+	@Override
+	public void seek(final long pos) throws IOException {
+		if (pos > length()) setLength(pos);
+		offset = pos;
+	}
+
+	@Override
+	public long length() throws IOException {
+		return length;
+	}
+
+	@Override
+	public void setLength(final long length) throws IOException {
+		this.length = length;
+	}
+
+	// -- DataInput methods --
+
+	@Override
+	public byte readByte() throws IOException {
+		final long r = available(1);
+		if (r <= 0) return -1;
+		offset++;
+		return 0;
+	}
+
+	@Override
+	public int read(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		final int r = (int) available(len);
+		offset += r;
+		Arrays.fill(b, off, off + r, (byte) 0);
+		return r;
+	}
+
+	// -- DataOutput methods --
+
+	@Override
+	public void write(final int v) throws IOException {
+		ensureWritable(1);
+		offset++;
+	}
+
+	@Override
+	public void write(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		ensureWritable(len);
+		offset += len;
+	}
+
+	// -- Closeable methods --
+
+	@Override
+	public void close() {
+		// NB: No action needed.
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public Class<DummyLocation> getType() {
+		return DummyLocation.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
new file mode 100644
index 000000000..d2db80c9b
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import org.scijava.io.location.AbstractLocation;
+
+/**
+ * {@link Location} backed by nothing whatsoever.
+ *
+ * @author Curtis Rueden
+ */
+public class DummyLocation extends AbstractLocation {
+	// NB: No implementation needed.
+}

From e78194a16d971c8a00a96a5f1fd7b530d362c292 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 18:45:57 +0100
Subject: [PATCH 0538/1208] Add ByteBank: generic self-growing byte stores

Provides two implementations:

- ByteArrayByteBank: backed by org.scijava.util.ByteArray
- ByteBufferByteBank: backed by java.nio.ByteBuffer

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/io/ByteArrayByteBank.java     | 143 +++++++++++++++
 src/main/java/org/scijava/io/ByteBank.java    | 163 ++++++++++++++++++
 .../scijava/io/nio/ByteBufferByteBank.java    | 163 ++++++++++++++++++
 3 files changed, 469 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/ByteArrayByteBank.java
 create mode 100644 src/main/java/org/scijava/io/ByteBank.java
 create mode 100644 src/main/java/org/scijava/io/nio/ByteBufferByteBank.java

diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
new file mode 100644
index 000000000..f65e8deef
--- /dev/null
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -0,0 +1,143 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io;
+
+import org.scijava.util.ByteArray;
+
+/**
+ * {@link ByteBank} implementation backed by a {@link ByteArray}. Self-growing
+ * up to a maximum capacity of {@link Integer#MAX_VALUE}
+ *
+ * @author Gabriel Einsdorf
+ */
+public class ByteArrayByteBank implements ByteBank {
+
+	private final ByteArray buffer;
+	private long maxBufferedPos = -1;
+
+	/**
+	 * Creates a {@link ByteArrayByteBank}
+	 */
+	public ByteArrayByteBank() {
+		buffer = new ByteArray();
+	}
+
+	/**
+	 * Creates a {@link ByteArrayByteBank} with the specified initial capacity
+	 *
+	 * @param initialCapacity the initial capacity of this {@link ByteBank}
+	 */
+	public ByteArrayByteBank(final int initialCapacity) {
+		buffer = new ByteArray(initialCapacity);
+	}
+
+	/**
+	 * Creates a {@link ByteArrayByteBank} that wraps the specified
+	 * {@link ByteArray}.
+	 *
+	 * @param bytes the {@link ByteArray} to wrap
+	 */
+	public ByteArrayByteBank(final ByteArray bytes) {
+		buffer = bytes;
+		bytes.size();
+	}
+
+	/**
+	 * Creates a {@link ByteArrayByteBank} that wraps the provided byte array
+	 *
+	 * @param bytes the bytes to wrap
+	 */
+	public ByteArrayByteBank(final byte[] bytes) {
+		buffer = new ByteArray(bytes);
+		maxBufferedPos = bytes.length;
+	}
+
+	@Override
+	public long getMaxBufferSize() {
+		return Integer.MAX_VALUE;
+	}
+
+	@Override
+	public void setBytes(final long startpos, final byte[] bytes,
+		final int offset, final int length)
+	{
+		// ensure we have space
+		checkWritePos(startpos, startpos + length);
+		final int neededCapacity = (int) (Math.max(maxBufferedPos, 0) + length);
+		buffer.ensureCapacity(neededCapacity);
+
+		// copy the data
+		System.arraycopy(bytes, offset, buffer.getArray(), (int) startpos, length);
+		buffer.setSize(neededCapacity);
+		updateMaxPos(startpos + length);
+	}
+
+	@Override
+	public void setByte(final long pos, final byte b) {
+		checkWritePos(pos, pos);
+		buffer.setValue((int) pos, b);
+		updateMaxPos(pos);
+	}
+
+	private void updateMaxPos(final long pos) {
+		maxBufferedPos = pos > maxBufferedPos ? pos : maxBufferedPos;
+	}
+
+	@Override
+	public void clear() {
+		buffer.clear();
+		maxBufferedPos = 0;
+	}
+
+	@Override
+	public byte getByte(final long pos) {
+		checkReadPos(pos, pos);
+		// the buffer might contain bytes with negative value
+		// we need to flip the sign to positive to satisfy the method contract
+		return buffer.getValue((int) pos);
+	}
+
+	@Override
+	public int getBytes(final long startPos, final byte[] b, final int offset,
+		final int length)
+	{
+		checkReadPos(startPos, startPos + length);
+		final int readLength = (int) Math.min(getMaxPos() - startPos, length);
+		System.arraycopy(buffer.getArray(), (int) startPos, b, offset, readLength);
+		return readLength;
+	}
+
+	@Override
+	public long getMaxPos() {
+		return maxBufferedPos;
+	}
+}
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
new file mode 100644
index 000000000..bf4748a13
--- /dev/null
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -0,0 +1,163 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io;
+
+/**
+ * A {@link ByteBank} is a self-growing buffer over arbitrary bytes.
+ *
+ * @author Gabriel Einsdorf
+ */
+public interface ByteBank {
+
+	/**
+	 * @param pos the position to read from
+	 * @return the byte at the given position
+	 */
+	public byte getByte(long pos);
+
+	/**
+	 * @param startPos the position in the buffer to start reading from
+	 * @param bytes the byte array to read into
+	 * @return the number of bytes read
+	 */
+	default int getBytes(long startPos, byte[] bytes) {
+		return getBytes(startPos, bytes, 0, bytes.length);
+	}
+
+	/**
+	 * @param startPos the position in the buffer to start reading from
+	 * @param bytes the byte array to read into
+	 * @param offset the offset in the bytes array
+	 * @param length the number of elements to read into the bytes array
+	 * @return number of bytes read
+	 */
+	int getBytes(long startPos, byte[] bytes, int offset, int length);
+
+	/**
+	 * Sets the bytes starting form the given position to the values form the
+	 * provided array.
+	 *
+	 * @param startPos the position in the buffer to start writing from
+	 * @param bytes the byte array to write
+	 * @param offset the offset in the bytes array
+	 * @param length the number of bytes to read
+	 */
+	void setBytes(long startPos, byte[] bytes, int offset, int length);
+
+	/**
+	 * Appends the given bytes to the buffer
+	 *
+	 * @param bytes the array containing the bytes to append to the buffer
+	 * @param length the number of elements to append from the bytes array
+	 */
+	default void appendBytes(byte[] bytes, int length) {
+		setBytes(getMaxPos() + 1, bytes, 0, length);
+	}
+
+	/**
+	 * Check if we can read from the specified range
+	 *
+	 * @param start the start position of the range
+	 * @param end the end position of the range
+	 */
+	default void checkReadPos(final long start, final long end) {
+		basicRangeCheck(start, end);
+		if (start > getMaxPos()) {
+			throw new IndexOutOfBoundsException("Requested position: " + start +
+				" is larger than the maximally buffered postion: " + getMaxPos());
+		}
+	}
+
+	/**
+	 * Check if we can write to the specified range
+	 *
+	 * @param start the start position of the range
+	 * @param end the end position of the range
+	 * @throws IndexOutOfBoundsException if
+	 */
+	default void checkWritePos(final long start, final long end) {
+		if (start > getMaxPos() + 1) { // we can't have holes in the buffer
+			throw new IndexOutOfBoundsException("Requested start position: " + start +
+				" would leave a hole in the buffer, largest legal position is: " +
+				getMaxPos() + 1);
+		}
+		if (end < start) {
+			throw new IllegalArgumentException(
+				"Invalid range, end is smaller than start!");
+		}
+		if (end > getMaxBufferSize()) {
+			throw new IndexOutOfBoundsException("Requested postion " + end +
+				" is larger than the maximal buffer size: " + getMaxPos());
+		}
+	}
+
+	/**
+	 * Ensures that the requested range satisfies basic sanity criteria.
+	 *
+	 * @param start the start of the range
+	 * @param end the end of the range
+	 */
+	default void basicRangeCheck(final long start, final long end) {
+		if (start > getMaxPos()) {
+			throw new IndexOutOfBoundsException("Requested postion " + start +
+				" is larger than the maximal buffer size: " + getMaxPos());
+		}
+		if (end < start) {
+			throw new IllegalArgumentException(
+				"Invalid range, end is smaller than start!");
+		}
+	}
+
+	/**
+	 * Clears the buffer
+	 */
+	void clear();
+
+	/**
+	 * @return the position of the last byte in this ByteBank
+	 */
+	long getMaxPos();
+
+	/**
+	 * Sets the byte at the given position
+	 *
+	 * @param pos the position
+	 * @param b the value to set
+	 */
+	void setByte(long pos, byte b);
+
+	/**
+	 * @return the maximal size of the buffer
+	 */
+	long getMaxBufferSize();
+
+}
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
new file mode 100644
index 000000000..25fda9bbe
--- /dev/null
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -0,0 +1,163 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.nio;
+
+import java.nio.ByteBuffer;
+import java.util.function.Function;
+
+import org.scijava.io.ByteBank;
+
+/**
+ * A {@link ByteBank} backed by a {@link ByteBuffer}. Self-growing up to a
+ * maximal capacity of {@link Integer#MAX_VALUE}
+ *
+ * @author Gabriel Einsdorf
+ */
+public class ByteBufferByteBank implements ByteBank {
+
+	private static final int DEFAULT_CAPACITY = 10_000;
+
+	private ByteBuffer buffer;
+
+	private int maxBufferedPos = -1;
+
+	private Function<Integer, ByteBuffer> provider;
+
+	public ByteBufferByteBank() {
+		provider = ByteBuffer::allocate;
+		buffer = provider.apply(DEFAULT_CAPACITY);
+	}
+
+	public ByteBufferByteBank(final Function<Integer, ByteBuffer> provider) {
+		this.provider = provider;
+		buffer = provider.apply(DEFAULT_CAPACITY);
+	}
+
+	public ByteBufferByteBank(final Function<Integer, ByteBuffer> provider,
+		final int initialCapacity)
+	{
+		this.provider = provider;
+		buffer = provider.apply(initialCapacity);
+	}
+
+	public ByteBufferByteBank(final int initialCapacity) {
+		provider = ByteBuffer::allocate;
+		buffer = provider.apply(initialCapacity);
+	}
+
+	@Override
+	public long getMaxBufferSize() {
+		return Integer.MAX_VALUE;
+	}
+
+	@Override
+	public void setBytes(final long startpos, final byte[] bytes,
+		final int offset, final int length)
+	{
+		// ensure we have space
+		checkWritePos(startpos, startpos + length);
+		final int neededCapacity = Math.max(maxBufferedPos, 0) + length;
+		ensureCapacity(neededCapacity);
+
+		// copy the data
+		buffer.position((int) startpos);
+		buffer.put(bytes, offset, length);
+
+		// update the maxpos
+		updateMaxPos(startpos + length);
+	}
+
+	@Override
+	public void setByte(final long pos, final byte b) {
+		checkWritePos(pos, pos);
+		buffer.put((int) pos, b);
+		updateMaxPos(pos);
+	}
+
+	private void updateMaxPos(final long pos) {
+		maxBufferedPos = (int) (pos > maxBufferedPos ? pos : maxBufferedPos);
+	}
+
+	@Override
+	public void clear() {
+		buffer.clear();
+		maxBufferedPos = 0;
+	}
+
+	@Override
+	public byte getByte(final long pos) {
+		checkReadPos(pos, pos);
+		// the buffer might contain bytes with negative value
+		// we need to flip the sign to positive to satisfy the contract of this
+		// method
+		return buffer.get((int) pos);
+	}
+
+	@Override
+	public int getBytes(final long startPos, final byte[] b, final int offset,
+		final int length)
+	{
+		checkReadPos(startPos, startPos + length);
+		buffer.position((int) startPos);
+		buffer.get(b, offset, length);
+
+		return length;
+	}
+
+	@Override
+	public long getMaxPos() {
+		return maxBufferedPos;
+	}
+
+	private void ensureCapacity(final int minCapacity) {
+		final int oldCapacity = buffer.capacity();
+		if (minCapacity <= oldCapacity) return; // no need to grow
+
+		// grow the array by up to 50% (plus a small constant)
+		final int growth = Math.min(oldCapacity / 2 + 16, Integer.MAX_VALUE);
+		final int newCapacity;
+		if (growth > Integer.MAX_VALUE - oldCapacity) {
+			// growth would push array over the maximum array size
+			newCapacity = Integer.MAX_VALUE;
+		}
+		else newCapacity = oldCapacity + growth;
+		// ensure the array grows by at least the requested minimum capacity
+		final int newLength = Math.max(minCapacity, newCapacity);
+
+		// copy the data into a new array
+		buffer.position(0);
+		final ByteBuffer newBuffer = ByteBuffer.allocate(newLength);
+		newBuffer.order(buffer.order());
+		newBuffer.put(buffer);
+		buffer = newBuffer;
+	}
+}

From 85f202b1418aea2c39d4cdb95ad3eccf3af07278 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 15 Mar 2017 19:45:16 +0100
Subject: [PATCH 0539/1208] BytesLocation: add hashCode() and equals()

---
 .../java/org/scijava/io/location/BytesLocation.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index dc41fbade..85e253f9f 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -61,4 +61,15 @@ public ByteBuffer getByteBuffer() {
 		return bytes;
 	}
 
+	// -- Object methods --
+
+	@Override
+	public int hashCode() {
+		return System.identityHashCode(this);
+	}
+
+	@Override
+	public boolean equals(final Object obj) {
+		return obj == this;
+	}
 }

From 1951551cb67e51925f522a4aa8b8e3c3bceb1556 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 7 Jul 2017 17:04:23 -0500
Subject: [PATCH 0540/1208] BytesLocation: fix comment

---
 src/main/java/org/scijava/io/location/BytesLocation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 85e253f9f..bb2f37c97 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -54,7 +54,7 @@ public BytesLocation(final byte[] bytes, final int offset, final int length) {
 		this(ByteBuffer.wrap(bytes, offset, length));
 	}
 
-	// -- ByteArrayLocation methods --
+	// -- BytesLocation methods --
 
 	/** Gets the associated {@link ByteBuffer}. */
 	public ByteBuffer getByteBuffer() {

From b459699b6a50fda609e57eb30d6e3fa3e2fa1752 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 7 Jul 2017 17:05:33 -0500
Subject: [PATCH 0541/1208] BytesLocation: use ByteBank for backing bytes

This is more flexible than ByteBuffer, since ByteBank is resizable.
---
 .../scijava/io/location/BytesLocation.java    | 56 ++++++++++++++++---
 .../io/location/BytesLocationTest.java        | 26 +++++----
 2 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index bb2f37c97..2fbb03928 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -31,33 +31,71 @@
 
 package org.scijava.io.location;
 
-import java.nio.ByteBuffer;
+import org.scijava.io.ByteArrayByteBank;
+import org.scijava.io.ByteBank;
+import org.scijava.util.ByteArray;
 
 /**
- * {@link Location} backed by a {@link ByteBuffer}.
+ * {@link Location} backed by a {@link ByteBank}.
  *
  * @author Curtis Rueden
+ * @author Gabriel Einsdorf
  */
 public class BytesLocation extends AbstractLocation {
 
-	private final ByteBuffer bytes;
+	private final ByteBank bytes;
 
-	public BytesLocation(final ByteBuffer bytes) {
+	/**
+	 * Creates a {@link BytesLocation} backed by the specified
+	 * {@link ByteBank}.
+	 *
+	 * @param bytes the {@link ByteBank} that will back this {@link Location}
+	 */
+	public BytesLocation(final ByteBank bytes) {
 		this.bytes = bytes;
 	}
 
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank}
+	 * with the specified initial capacity.
+	 */
+	public BytesLocation(final int initialCapacity) {
+		this.bytes = new ByteArrayByteBank(initialCapacity);
+	}
+
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank}
+	 * that wraps the specified {@link ByteArray}.
+	 */
+	public BytesLocation(final ByteArray bytes) {
+		this.bytes = new ByteArrayByteBank(bytes);
+	}
+
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank}
+	 * which wraps the specified array.
+	 *
+	 * @param bytes the array to wrap
+	 */
 	public BytesLocation(final byte[] bytes) {
-		this(ByteBuffer.wrap(bytes));
+		this.bytes = new ByteArrayByteBank(bytes);
 	}
 
-	public BytesLocation(final byte[] bytes, final int offset, final int length) {
-		this(ByteBuffer.wrap(bytes, offset, length));
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank} with
+	 * the specified initial capacity.
+	 */
+	public BytesLocation(final byte[] bytes, final int offset,
+		final int length)
+	{
+		this.bytes = new ByteArrayByteBank(length);
+		this.bytes.setBytes(0l, bytes, offset, length);
 	}
 
 	// -- BytesLocation methods --
 
-	/** Gets the associated {@link ByteBuffer}. */
-	public ByteBuffer getByteBuffer() {
+	/** Gets the backing {@link ByteBank}. */
+	public ByteBank getByteBank() {
 		return bytes;
 	}
 
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index b406e76eb..d35e9559e 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -31,11 +31,10 @@
 
 package org.scijava.io.location;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
-import org.scijava.io.location.BytesLocation;
 
 /**
  * Tests {@link BytesLocation}.
@@ -47,22 +46,29 @@ public class BytesLocationTest {
 	/** Tests {@link BytesLocation#BytesLocation(byte[])}. */
 	@Test
 	public void testBytes() {
-		final byte[] digits = {3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5, 8, 9, 7, 9};
+		final byte[] digits = { 3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5, 8, 9, 7, 9 };
 		final BytesLocation loc = new BytesLocation(digits);
-		assertSame(digits, loc.getByteBuffer().array());
-		assertEquals(0, loc.getByteBuffer().position());
-		assertEquals(digits.length, loc.getByteBuffer().remaining());
+
+		final byte[] testDigits = new byte[digits.length];
+		loc.getByteBank().getBytes(0, testDigits);
+		assertEquals(digits.length, loc.getByteBank().getMaxPos());
+		assertArrayEquals(digits, testDigits);
 	}
 
 	/** Tests {@link BytesLocation#BytesLocation(byte[], int, int)}. */
 	@Test
 	public void testBytesOffsetLength() {
-		final byte[] digits = {3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5, 8, 9, 7, 9};
+		final byte[] digits = { 3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5, 8, 9, 7, 9 };
 		final int offset = 3, length = 5;
 		final BytesLocation loc = new BytesLocation(digits, offset, length);
-		assertSame(digits, loc.getByteBuffer().array());
-		assertEquals(offset, loc.getByteBuffer().position());
-		assertEquals(length, loc.getByteBuffer().remaining());
+
+		final byte[] testDigits = new byte[digits.length];
+		loc.getByteBank().getBytes(0, testDigits);
+		assertEquals(length, loc.getByteBank().getMaxPos());
+
+		final byte[] expectedDigits = new byte[digits.length];
+		System.arraycopy(digits, offset, expectedDigits, 0, length);
+		assertArrayEquals(expectedDigits, testDigits);
 	}
 
 }

From 433849cf543f4800896ba22993cefc763c683f83 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Jul 2016 23:17:54 -0500
Subject: [PATCH 0542/1208] Add BytesHandle for working with BytesLocations

---
 .../org/scijava/io/handle/BytesHandle.java    | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/BytesHandle.java

diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
new file mode 100644
index 000000000..a375008bd
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -0,0 +1,160 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import org.scijava.io.ByteBank;
+import org.scijava.io.location.BytesLocation;
+import org.scijava.plugin.Plugin;
+
+/**
+ * {@link DataHandle} for a {@link BytesLocation}.
+ * 
+ * @author Curtis Rueden
+ * @author Melissa Linkert
+ * @author Gabriel Einsdorf
+ */
+@Plugin(type = DataHandle.class)
+public class BytesHandle extends AbstractDataHandle<BytesLocation> {
+
+	private long offset = 0;
+
+	// -- DataHandle methods --
+
+	@Override
+	public long offset() {
+		return offset;
+	}
+
+	@Override
+	public long length() {
+		return bytes().getMaxPos();
+	}
+
+	@Override
+	public void setLength(final long length) throws IOException {
+		// check if new length is legal
+		bytes().basicRangeCheck(0, length);
+		// TODO update the maxLength?
+	}
+
+	@Override
+	public int read(final byte[] b, final int off, int len) throws IOException {
+		if (offset + len > length()) {
+			len = (int) (length() - offset);
+		}
+		bytes().getBytes(offset, b, off, len);
+		offset += len;
+		return len;
+	}
+
+	@Override
+	public void seek(final long pos) throws IOException {
+		if (pos > length()) setLength(pos);
+		offset = pos;
+	}
+
+	// -- DataInput methods --
+
+	@Override
+	public byte readByte() throws IOException {
+		ensureReadable(1);
+		try {
+			// we need to convert the bytes into the range 0-255
+			return bytes().getByte(offset++);
+		}
+		catch (final Exception e) {
+			throw eofException(e);
+		}
+	}
+
+	@Override
+	public void readFully(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		ensureReadable(len);
+		try {
+			bytes().getBytes(offset, b, off, len);
+			offset += len;
+		}
+		catch (final Exception e) {
+			throw eofException(e);
+		}
+	}
+
+	// -- DataOutput methods --
+
+	@Override
+	public void write(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		ensureWritable(len);
+		bytes().setBytes(offset, b, off, len);
+		offset += len;
+	}
+
+	@Override
+	public void write(final int b) throws IOException {
+		ensureWritable(1);
+		bytes().setByte(offset, (byte) b);
+		offset++;
+	}
+
+	// -- Closeable methods --
+
+	@Override
+	public void close() {
+		// NB: No action needed.
+	}
+
+	// -- Typed methods --
+
+	@Override
+	public Class<BytesLocation> getType() {
+		return BytesLocation.class;
+	}
+
+	// -- Helper methods --
+
+	private ByteBank bytes() {
+		return get().getByteBank();
+	}
+
+	private EOFException eofException(final Throwable cause) {
+		final EOFException eof = new EOFException();
+		eof.initCause(cause);
+		return eof;
+	}
+
+}

From 11df0fdea901afd0d4b6c502d2007703a255b37b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 3 Jul 2016 10:13:47 -0500
Subject: [PATCH 0543/1208] Add unit tests for BytesHandle

---
 .../org/scijava/io/handle/BytesHandle.java    |  6 +-
 .../scijava/io/location/BytesLocation.java    |  4 +-
 .../scijava/io/handle/BytesHandleTest.java    | 59 +++++++++++++++++++
 3 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/org/scijava/io/handle/BytesHandleTest.java

diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index a375008bd..0b65ded64 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.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
@@ -40,7 +40,7 @@
 
 /**
  * {@link DataHandle} for a {@link BytesLocation}.
- * 
+ *
  * @author Curtis Rueden
  * @author Melissa Linkert
  * @author Gabriel Einsdorf
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 2fbb03928..aecf8edb6 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.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
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
new file mode 100644
index 000000000..3fafa0d6c
--- /dev/null
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -0,0 +1,59 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.scijava.io.location.BytesLocation;
+import org.scijava.io.location.Location;
+
+/**
+ * Tests {@link BytesHandle}.
+ *
+ * @author Curtis Rueden
+ */
+public class BytesHandleTest extends DataHandleTest {
+
+	@Override
+	public Class<? extends DataHandle<?>> getExpectedHandleType() {
+		return BytesHandle.class;
+	}
+
+	@Override
+	public Location createLocation() throws IOException {
+		final ByteArrayOutputStream out = new ByteArrayOutputStream();
+		populateData(out);
+		return new BytesLocation(out.toByteArray());
+	}
+
+}

From 966c71cc1b757fd320b89ce0cc68c6813e2feaf2 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 14:50:53 +0100
Subject: [PATCH 0544/1208] Add support for read-only and write-only handles

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 src/main/java/org/scijava/io/ByteBank.java       |  6 ++++++
 .../java/org/scijava/io/handle/BytesHandle.java  | 10 ++++++++++
 .../java/org/scijava/io/handle/DataHandle.java   | 16 +++++++++++++---
 .../java/org/scijava/io/handle/DummyHandle.java  | 10 ++++++++++
 .../java/org/scijava/io/handle/FileHandle.java   | 10 ++++++++++
 .../org/scijava/io/nio/ByteBufferByteBank.java   | 11 +++++++++++
 6 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index bf4748a13..c5a567f60 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -160,4 +160,10 @@ default void basicRangeCheck(final long start, final long end) {
 	 */
 	long getMaxBufferSize();
 
+	/**
+	 * @return True iff the buffer is read-only.
+	 */
+	default boolean isReadOnly() {
+		return false;
+	}
 }
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 0b65ded64..813a99944 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -85,6 +85,16 @@ public void seek(final long pos) throws IOException {
 		offset = pos;
 	}
 
+	@Override
+	public boolean isReadable() {
+		return true;
+	}
+
+	@Override
+	public boolean isWritable() {
+		return !bytes().isReadOnly();
+	}
+
 	// -- DataInput methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 591f2ae4d..78e9ed376 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -115,15 +115,23 @@ default long available(final long count) throws IOException {
 		return remain < count ? remain : count;
 	}
 
+	/** Gets whether reading from this handle is supported. */
+	boolean isReadable();
+
+	/** Gets whether writing to this handle is supported. */
+	boolean isWritable();
+
 	/**
 	 * Ensures that the handle has sufficient bytes available to read.
 	 * 
 	 * @param count Number of bytes to read.
 	 * @see #available(long)
 	 * @throws EOFException If there are insufficient bytes available.
-	 * @throws IOException If something goes wrong with the check.
+	 * @throws IOException If the handle is write-only, or something goes wrong
+	 *           with the check.
 	 */
 	default void ensureReadable(final long count) throws IOException {
+		if (!isReadable()) throw new IOException("This handle is write-only.");
 		if (available(count) < count) throw new EOFException();
 	}
 
@@ -134,10 +142,12 @@ default void ensureReadable(final long count) throws IOException {
 	 * @param count Number of bytes to write.
 	 * @return {@code true} if the handle's length was sufficient, or
 	 *         {@code false} if the handle's length required an extension.
-	 * @throws IOException If something goes wrong with the check, or there is an
-	 *           error changing the handle's length.
+	 * @throws IOException If the handle is read-only, or something goes wrong
+	 *           with the check, or there is an error changing the handle's
+	 *           length.
 	 */
 	default boolean ensureWritable(final long count) throws IOException {
+		if (!isWritable()) throw new IOException("This handle is read-only.");
 		final long minLength = offset() + count;
 		if (length() < minLength) {
 			setLength(minLength);
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 5b072723a..1578a6b8c 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -73,6 +73,16 @@ public void setLength(final long length) throws IOException {
 		this.length = length;
 	}
 
+	@Override
+	public boolean isReadable() {
+		return true;
+	}
+
+	@Override
+	public boolean isWritable() {
+		return true;
+	}
+
 	// -- DataInput methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index e64739fa8..5541c064c 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -88,6 +88,16 @@ public void setLength(final long length) throws IOException {
 		raf().setLength(length);
 	}
 
+	@Override
+	public boolean isReadable() {
+		return getMode().contains("r");
+	}
+
+	@Override
+	public boolean isWritable() {
+		return getMode().contains("w");
+	}
+
 	@Override
 	public int read() throws IOException {
 		return raf().read();
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 25fda9bbe..0c2f84cff 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -138,6 +138,17 @@ public long getMaxPos() {
 		return maxBufferedPos;
 	}
 
+	@Override
+	public boolean isReadOnly() {
+		// NB: Some ByteBuffers are read-only. But there is no API to check it.
+		// Therefore, we make a "best effort" guess based on known read-only types.
+		// Since these read-only types are not public, we compare class names rather
+		// than checking for type equality or using instanceof.
+		final String className = buffer.getClass().getName();
+		return className.equals("java.nio.HeapByteBufferR") ||
+			className.equals("java.nio.DirectByteBufferR");
+	}
+
 	private void ensureCapacity(final int minCapacity) {
 		final int oldCapacity = buffer.capacity();
 		if (minCapacity <= oldCapacity) return; // no need to grow

From 969cf3a85d076439e58e6946ad0cedd71242a4f6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 10 Jul 2017 14:58:26 -0500
Subject: [PATCH 0545/1208] ByteBufferByteBank: test support for read-only

---
 .../io/nio/ByteBufferByteBankTest.java        | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java

diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
new file mode 100644
index 000000000..382110314
--- /dev/null
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.nio;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.nio.ByteBuffer;
+
+import org.junit.Test;
+
+/**
+ * Tests {@link ByteBufferByteBank}.
+ *
+ * @author Curtis Rueden
+ */
+public class ByteBufferByteBankTest {
+
+	@Test
+	public void testReadOnlyDefault() {
+		final ByteBufferByteBank bank = new ByteBufferByteBank();
+		assertFalse(bank.isReadOnly());
+	}
+
+	@Test
+	public void testReadOnlyAllocate() {
+		final ByteBufferByteBank bank = new ByteBufferByteBank(
+			ByteBuffer::allocate);
+		assertFalse(bank.isReadOnly());
+
+		final ByteBufferByteBank readOnlyBank = new ByteBufferByteBank(
+			capacity -> ByteBuffer.allocate(capacity).asReadOnlyBuffer());
+		assertTrue(readOnlyBank.isReadOnly());
+	}
+
+	@Test
+	public void testReadOnlyAllocateDirect() {
+		final ByteBufferByteBank bank = new ByteBufferByteBank(
+			ByteBuffer::allocateDirect);
+		assertFalse(bank.isReadOnly());
+
+		final ByteBufferByteBank readOnlyBank = new ByteBufferByteBank(
+			capacity -> ByteBuffer.allocateDirect(capacity).asReadOnlyBuffer());
+		assertTrue(readOnlyBank.isReadOnly());
+	}
+}

From 6c7aab83cdaeacdca9128df6d9f6b60a68f6d250 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 11 Jul 2017 12:13:20 -0500
Subject: [PATCH 0546/1208] Location: improve javadoc of getName() method

---
 src/main/java/org/scijava/io/location/Location.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index da96a1f98..db9dc146d 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -61,8 +61,13 @@ default URI getURI() {
 	}
 
 	/**
-	 * Gets the name of the object addressed by this location, or an empty string
-	 * if it has no name.
+	 * Gets a (typically short) name expressing this location. This string is not
+	 * intended to unambiguously identify the location, but rather act as a
+	 * friendly, human-readable name. The precise behavior will depend on the
+	 * implementation, but as an example, a file-based location could return the
+	 * name of the associated file without its full path.
+	 *
+	 * @return The name, or an empty string if no name is available.
 	 */
 	default String getName() {
 		final URI uri = getURI();

From 27657aea13b30ee836c19eafd0d8e0d6ea1e5fd1 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Thu, 2 Mar 2017 10:05:52 +0100
Subject: [PATCH 0547/1208] Add RemoteLocation interface and abstract class

A RemoteLocation is not located on the current machine. We need the
ability to set a connection timeout for such locations, to prevent them
from halting the whole program.
---
 .../io/location/AbstractRemoteLocation.java   | 57 +++++++++++++++++++
 .../scijava/io/location/RemoteLocation.java   | 55 ++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
 create mode 100644 src/main/java/org/scijava/io/location/RemoteLocation.java

diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
new file mode 100644
index 000000000..4aeba9d6b
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+/**
+ * Abstract base class for {@link RemoteLocation} implementations.
+ *
+ * @author Gabriel Einsdorf
+ */
+public abstract class AbstractRemoteLocation extends AbstractLocation implements
+	RemoteLocation
+{
+
+	/**
+	 * The {@link RemoteLocation}s timeout in milliseconds.
+	 */
+	private long timeout = 15_000l;
+
+	@Override
+	public long getTimeout() {
+		return timeout;
+	}
+
+	@Override
+	public void setTimeout(final long timeout) {
+		this.timeout = timeout;
+	}
+}
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
new file mode 100644
index 000000000..ed5d43617
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+/**
+ * A {@link Location} which resides on a remote machine.
+ * 
+ * @author Gabriel Einsdorf
+ */
+public interface RemoteLocation extends Location {
+
+	/**
+	 * Sets the connection timeout for this location.
+	 * 
+	 * @param timeout The timeout in milliseconds.
+	 */
+	void setTimeout(long timeout);
+
+	/**
+	 * Gets the connection timeout for this location.
+	 * 
+	 * @return The connection timeout in milliseconds.
+	 */
+	long getTimeout();
+
+}

From 09a59bc55371eb194cad76c542aa66e549a0e53c Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 18 Jul 2017 12:26:47 +0200
Subject: [PATCH 0548/1208] Add tests for ByteBank and fix uncovered Bugs

---
 .../org/scijava/io/ByteArrayByteBank.java     |  12 +-
 .../scijava/io/nio/ByteBufferByteBank.java    |  11 +-
 .../org/scijava/io/ByteArrayByteBankTest.java |  46 ++++++
 .../java/org/scijava/io/ByteBankTest.java     | 149 ++++++++++++++++++
 .../io/location/BytesLocationTest.java        |   2 +-
 .../io/nio/ByteBufferByteBankTest.java        |  28 +++-
 6 files changed, 240 insertions(+), 8 deletions(-)
 create mode 100644 src/test/java/org/scijava/io/ByteArrayByteBankTest.java
 create mode 100644 src/test/java/org/scijava/io/ByteBankTest.java

diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index f65e8deef..252500cb1 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -68,7 +68,7 @@ public ByteArrayByteBank(final int initialCapacity) {
 	 */
 	public ByteArrayByteBank(final ByteArray bytes) {
 		buffer = bytes;
-		bytes.size();
+		maxBufferedPos = bytes.size();
 	}
 
 	/**
@@ -98,12 +98,17 @@ public void setBytes(final long startpos, final byte[] bytes,
 		// copy the data
 		System.arraycopy(bytes, offset, buffer.getArray(), (int) startpos, length);
 		buffer.setSize(neededCapacity);
-		updateMaxPos(startpos + length);
+		updateMaxPos(startpos + length - 1);
 	}
 
 	@Override
 	public void setByte(final long pos, final byte b) {
 		checkWritePos(pos, pos);
+		buffer.ensureCapacity((int) pos);
+		// NB: update the size of the underlying buffer before appending to it
+		if (pos == buffer.size()) {
+			buffer.setSize((int) (pos + 1));
+		}
 		buffer.setValue((int) pos, b);
 		updateMaxPos(pos);
 	}
@@ -131,7 +136,8 @@ public int getBytes(final long startPos, final byte[] b, final int offset,
 		final int length)
 	{
 		checkReadPos(startPos, startPos + length);
-		final int readLength = (int) Math.min(getMaxPos() - startPos, length);
+		// ensure we don't try to read data which is not in the buffer
+		final int readLength = (int) Math.min(getMaxPos() - startPos + 1, length);
 		System.arraycopy(buffer.getArray(), (int) startPos, b, offset, readLength);
 		return readLength;
 	}
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 0c2f84cff..8245aa663 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -93,12 +93,15 @@ public void setBytes(final long startpos, final byte[] bytes,
 		buffer.put(bytes, offset, length);
 
 		// update the maxpos
-		updateMaxPos(startpos + length);
+		updateMaxPos(startpos + length - 1);
 	}
 
 	@Override
 	public void setByte(final long pos, final byte b) {
 		checkWritePos(pos, pos);
+		if (pos == buffer.capacity()) {
+			ensureCapacity((int) pos + 1);
+		}
 		buffer.put((int) pos, b);
 		updateMaxPos(pos);
 	}
@@ -127,10 +130,12 @@ public int getBytes(final long startPos, final byte[] b, final int offset,
 		final int length)
 	{
 		checkReadPos(startPos, startPos + length);
+		// ensure we don't try to read data which is not in the buffer
+		final int readLength = (int) Math.min(getMaxPos() - startPos + 1, length);
 		buffer.position((int) startPos);
-		buffer.get(b, offset, length);
+		buffer.get(b, offset, readLength);
 
-		return length;
+		return readLength;
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
new file mode 100644
index 000000000..483f4c260
--- /dev/null
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -0,0 +1,46 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io;
+
+/**
+ * Tests {@link ByteArrayByteBank}
+ *
+ * @author Gabriel Einsdorf
+ * @see ByteBankTest
+ */
+public class ByteArrayByteBankTest extends ByteBankTest {
+
+	@Override
+	public ByteBank createByteBank() {
+		return new ByteArrayByteBank();
+	}
+}
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
new file mode 100644
index 000000000..219306c1a
--- /dev/null
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -0,0 +1,149 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Abstract superclass for testing {@link ByteBank} implementations.
+ *
+ * @author Gabriel Einsdorf
+ */
+public abstract class ByteBankTest {
+
+	private static byte[] testBytes = { 0, -1, 2, -3, 4, 120, -128, 127, 32, 42 };
+	private ByteBank bank;
+
+	/**
+	 * @return the ByteBank implementation to test
+	 */
+	public abstract ByteBank createByteBank();
+
+	@Before
+	public void setup() {
+		bank = createByteBank();
+	}
+
+	@Test
+	public void testSetGetBytesArray() {
+		// read in full array
+		bank.setBytes(0l, testBytes.clone(), 0, testBytes.length);
+
+		// read out full array
+		assertEqualRead(testBytes.length, 0);
+		assertEqualRead(testBytes.length - 4, 2);
+	}
+
+	@Test
+	public void testSetGetBytesPartialArray() {
+		// read in the partial array
+		bank.setBytes(0l, testBytes, 0, testBytes.length - 4);
+
+		// read out the partial array
+		assertEqualRead(testBytes.length - 4, 0);
+		assertEqualRead(testBytes.length - 4, 2);
+	}
+
+	@Test
+	public void testSetGetByte() {
+		final int numElements = 200_000;
+		for (int i = 0; i < numElements; i++) {
+			bank.setByte(i, (byte) i);
+		}
+
+		for (int i = 0; i < numElements; i++) {
+			assertEquals((byte) i, bank.getByte(i));
+		}
+	}
+
+	@Test
+	public void testClear() {
+		bank.setBytes(0, testBytes, 0, testBytes.length);
+		assertEquals(testBytes.length - 1, bank.getMaxPos());
+
+		bank.clear();
+		assertEquals(0, bank.getMaxPos());
+	}
+
+	@Test
+	public void testAppendBytes() {
+		// simple append
+		bank.appendBytes(testBytes, testBytes.length);
+		assertEqualRead(testBytes.length, 0);
+
+		// append to buffer that already contains data
+		bank.clear();
+		bank.setByte(0l, (byte) 42);
+		bank.setByte(1l, (byte) 43);
+		bank.appendBytes(testBytes, testBytes.length);
+
+		final byte[] expected = new byte[testBytes.length + 2];
+		expected[0] = 42;
+		expected[1] = 43;
+		System.arraycopy(testBytes, 0, expected, 2, testBytes.length);
+
+		final byte[] actuals = new byte[expected.length];
+		bank.getBytes(0, actuals);
+
+		assertArrayEquals(expected, actuals);
+	}
+
+	/**
+	 * Asserts that {@link #bank} contains the same bytes as {@link #testBytes},
+	 * allows to specify an offset.
+	 *
+	 * @param length how many bytes (starting from the offset) of
+	 *          {@link #testBytes} are tested, this allows to test partial reads.
+	 * @param offset the offset position
+	 */
+	private void assertEqualRead(final int length, final int offset) {
+		// read from offset up to the length of the given array
+		final byte[] bytes = new byte[length];
+		final int read = bank.getBytes(offset, bytes);
+
+		final byte[] expected = new byte[length];
+		System.arraycopy(testBytes, offset, expected, 0, read);
+		assertArrayEquals(expected, bytes);
+
+		// read from offset to offset
+		final byte[] offsetBytes = new byte[testBytes.length];
+		final int readOffset = bank.getBytes(offset, offsetBytes, offset, length);
+
+		final byte[] offsetExpected = new byte[testBytes.length];
+		System.arraycopy(testBytes, offset, offsetExpected, offset, readOffset);
+		assertArrayEquals(expected, bytes);
+	}
+}
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index d35e9559e..b88eb36cd 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -64,7 +64,7 @@ public void testBytesOffsetLength() {
 
 		final byte[] testDigits = new byte[digits.length];
 		loc.getByteBank().getBytes(0, testDigits);
-		assertEquals(length, loc.getByteBank().getMaxPos());
+		assertEquals(length - 1, loc.getByteBank().getMaxPos());
 
 		final byte[] expectedDigits = new byte[digits.length];
 		System.arraycopy(digits, offset, expectedDigits, 0, length);
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 382110314..3efb7ca7f 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -35,15 +35,41 @@
 import static org.junit.Assert.assertTrue;
 
 import java.nio.ByteBuffer;
+import java.util.function.Function;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.scijava.io.ByteBank;
+import org.scijava.io.ByteBankTest;
 
 /**
  * Tests {@link ByteBufferByteBank}.
  *
  * @author Curtis Rueden
+ * @author Gabriel Einsdorf
+ * @see ByteBankTest
  */
-public class ByteBufferByteBankTest {
+@RunWith(Parameterized.class)
+public class ByteBufferByteBankTest extends ByteBankTest {
+
+	@Parameter
+	public Function<Integer, ByteBuffer> supplier;
+
+	@Parameters
+	public static Object[] params() {
+		final Function<Integer, ByteBuffer> alloc = ByteBuffer::allocate;
+		final Function<Integer, ByteBuffer> allocDirect =
+			ByteBuffer::allocateDirect;
+		return new Function[] { alloc, allocDirect };
+	}
+
+	@Override
+	public ByteBank createByteBank() {
+		return new ByteBufferByteBank(supplier);
+	}
 
 	@Test
 	public void testReadOnlyDefault() {

From 66af2f6716b9816173d0e7ce246db13999f9661d Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 18 Jul 2017 12:32:19 +0200
Subject: [PATCH 0549/1208] ByteBank: add appendBytes method with offset

---
 src/main/java/org/scijava/io/ByteBank.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index c5a567f60..e97b15bfe 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -80,7 +80,18 @@ default int getBytes(long startPos, byte[] bytes) {
 	 * @param length the number of elements to append from the bytes array
 	 */
 	default void appendBytes(byte[] bytes, int length) {
-		setBytes(getMaxPos() + 1, bytes, 0, length);
+		appendBytes(bytes, 0, length);
+	}
+
+	/**
+	 * Appends the given bytes to the buffer
+	 *
+	 * @param bytes the array containing the bytes to append to the buffer
+	 * @param offset the offset in the bytes array
+	 * @param length the number of elements to append from the bytes array
+	 */
+	default void appendBytes(byte[] bytes, int offset, int length) {
+		setBytes(getMaxPos() + 1, bytes, offset, length);
 	}
 
 	/**

From 133142ad79862847482807533a06c48b927f9cb3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 20 Jul 2017 12:41:35 -0500
Subject: [PATCH 0550/1208] Typed: do runtime type checking in default method

See 596813c198d3f6eb77efac458a4d3dd71cfcfaf6.
---
 src/main/java/org/scijava/Typed.java               | 14 +++++++++-----
 .../org/scijava/plugin/AbstractTypedPlugin.java    |  9 +++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index e76d0fc93..e650fc98e 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -42,13 +42,17 @@ public interface Typed<T> {
 	/**
 	 * Gets whether this object is compatible with the given data object.
 	 * <p>
-	 * By default, this method will return {@code true} always, since the type is
-	 * known to be compatible. But individual implementations may have other
-	 * requirements beyond class assignability.
+	 * By default, this method will return {@code true} iff the data is assignable
+	 * to the associated type given by {@link #getType()}. But individual
+	 * implementations may have other requirements beyond class assignability.
 	 * </p>
 	 */
-	default boolean supports(@SuppressWarnings("unused") T data) {
-		return true;
+	default boolean supports(final T data) {
+		// NB: Even though the compiler will often guarantee that only data
+		// of type T is provided here, we still need the runtime check
+		// for cases where the exact type is not known to compiler --
+		// e.g., if the object was manufactured by reflection.
+		return getType().isInstance(data);
 	}
 
 	/** Gets the type associated with the object. */
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index ac29ee129..75fe7a7c5 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -47,11 +47,8 @@ public abstract class AbstractTypedPlugin<D> extends AbstractRichPlugin
 
 	@Override
 	public boolean supports(final D data) {
-		// NB: Even though the compiler will often guarantee that only data
-		// of type T is provided here, we still need the runtime check
-		// for cases where the exact type is not known to compiler --
-		// e.g., if the object was manufactured by reflection.
-		return getType().isInstance(data);
+		// NB: Overridden just for backwards compatibility, so that
+		// downstream classes which call super.supports continue to work.
+		return TypedPlugin.super.supports(data);
 	}
-
 }

From fde1871750adefcb52acde15761299115a348b66 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 20 Jul 2017 12:57:22 -0500
Subject: [PATCH 0551/1208] Make input widgets call the right supports method

We want them to call InputWidget.supports(WidgetModel),
not AbstractTypedPlugin.supports(WidgetModel).

Hooray for multiple inheritance!

Closes #283.
---
 src/main/java/org/scijava/widget/AbstractInputWidget.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 0a95225ac..321dd2a1a 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -67,4 +67,11 @@ public void set(final WidgetModel model) {
 	public WidgetModel get() {
 		return widgetModel;
 	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final WidgetModel data) {
+		return InputWidget.super.supports(data);
+	}
 }

From 72a7e372328d8d6f98d7b059794d7471a17add2d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 20 Jul 2017 13:09:46 -0500
Subject: [PATCH 0552/1208] Update copyright and license headers

University of Konstanz and KNIME GmbH have contributed significant
amounts of code to SciJava Common, and are joint copyright holders.
---
 LICENSE.txt                                           |  5 +++--
 pom.xml                                               |  5 +++--
 src/it/apt-test/pom.xml                               |  5 +++--
 src/it/apt-test/setup.bsh                             |  5 +++--
 .../java/org/scijava/annotation/its/Annotated.java    |  5 +++--
 .../org/scijava/annotation/its/CustomAnnotation.java  |  5 +++--
 src/it/apt-test/verify.bsh                            |  5 +++--
 src/it/settings.xml                                   |  5 +++--
 src/main/java/org/scijava/AbstractBasicDetails.java   |  5 +++--
 src/main/java/org/scijava/AbstractContextual.java     |  5 +++--
 src/main/java/org/scijava/AbstractGateway.java        |  5 +++--
 src/main/java/org/scijava/AbstractUIDetails.java      |  5 +++--
 src/main/java/org/scijava/BasicDetails.java           |  5 +++--
 src/main/java/org/scijava/Cancelable.java             |  5 +++--
 src/main/java/org/scijava/Context.java                |  5 +++--
 src/main/java/org/scijava/Contextual.java             |  5 +++--
 src/main/java/org/scijava/Disposable.java             |  5 +++--
 src/main/java/org/scijava/Gateway.java                |  5 +++--
 src/main/java/org/scijava/Identifiable.java           |  5 +++--
 src/main/java/org/scijava/Initializable.java          |  5 +++--
 src/main/java/org/scijava/Instantiable.java           |  5 +++--
 src/main/java/org/scijava/InstantiableException.java  |  5 +++--
 src/main/java/org/scijava/ItemIO.java                 |  5 +++--
 src/main/java/org/scijava/ItemVisibility.java         |  5 +++--
 src/main/java/org/scijava/Locatable.java              |  5 +++--
 src/main/java/org/scijava/MenuEntry.java              |  5 +++--
 src/main/java/org/scijava/MenuPath.java               |  5 +++--
 src/main/java/org/scijava/Named.java                  |  5 +++--
 src/main/java/org/scijava/NoSuchServiceException.java |  5 +++--
 src/main/java/org/scijava/NullContextException.java   |  5 +++--
 src/main/java/org/scijava/Optional.java               |  5 +++--
 src/main/java/org/scijava/Prioritized.java            |  5 +++--
 src/main/java/org/scijava/Priority.java               |  5 +++--
 src/main/java/org/scijava/SciJava.java                |  5 +++--
 src/main/java/org/scijava/Typed.java                  |  5 +++--
 src/main/java/org/scijava/UIDetails.java              |  5 +++--
 src/main/java/org/scijava/Validated.java              |  5 +++--
 src/main/java/org/scijava/ValidityProblem.java        |  5 +++--
 src/main/java/org/scijava/Versioned.java              |  5 +++--
 .../org/scijava/annotations/AbstractIndexWriter.java  |  5 +++--
 .../org/scijava/annotations/AnnotationCombiner.java   |  5 +++--
 .../org/scijava/annotations/AnnotationProcessor.java  |  5 +++--
 .../org/scijava/annotations/ByteCodeAnalyzer.java     |  5 +++--
 .../org/scijava/annotations/DirectoryIndexer.java     |  5 +++--
 .../java/org/scijava/annotations/EclipseHelper.java   |  5 +++--
 src/main/java/org/scijava/annotations/Index.java      |  5 +++--
 src/main/java/org/scijava/annotations/IndexItem.java  |  5 +++--
 .../java/org/scijava/annotations/IndexReader.java     |  5 +++--
 src/main/java/org/scijava/annotations/Indexable.java  |  5 +++--
 .../org/scijava/annotations/legacy/LegacyReader.java  |  5 +++--
 src/main/java/org/scijava/app/AbstractApp.java        |  5 +++--
 src/main/java/org/scijava/app/App.java                |  5 +++--
 src/main/java/org/scijava/app/AppService.java         |  5 +++--
 src/main/java/org/scijava/app/DefaultAppService.java  |  5 +++--
 .../java/org/scijava/app/DefaultStatusService.java    |  5 +++--
 src/main/java/org/scijava/app/SciJavaApp.java         |  5 +++--
 src/main/java/org/scijava/app/StatusService.java      |  5 +++--
 src/main/java/org/scijava/app/event/StatusEvent.java  |  5 +++--
 src/main/java/org/scijava/cache/CacheService.java     |  5 +++--
 .../java/org/scijava/cache/DefaultCacheService.java   |  5 +++--
 src/main/java/org/scijava/command/Command.java        |  5 +++--
 src/main/java/org/scijava/command/CommandInfo.java    |  5 +++--
 src/main/java/org/scijava/command/CommandModule.java  |  5 +++--
 .../java/org/scijava/command/CommandModuleItem.java   |  5 +++--
 src/main/java/org/scijava/command/CommandService.java |  5 +++--
 src/main/java/org/scijava/command/ContextCommand.java |  5 +++--
 .../org/scijava/command/DefaultCommandService.java    |  5 +++--
 src/main/java/org/scijava/command/DynamicCommand.java |  5 +++--
 .../java/org/scijava/command/DynamicCommandInfo.java  |  5 +++--
 src/main/java/org/scijava/command/Interactive.java    |  5 +++--
 .../java/org/scijava/command/InteractiveCommand.java  |  5 +++--
 src/main/java/org/scijava/command/ModuleCommand.java  |  5 +++--
 src/main/java/org/scijava/command/Previewable.java    |  5 +++--
 .../org/scijava/command/UnimplementedCommand.java     |  5 +++--
 .../java/org/scijava/command/console/RunArgument.java |  5 +++--
 .../org/scijava/command/run/CommandCodeRunner.java    |  5 +++--
 .../org/scijava/console/AbstractConsoleArgument.java  |  5 +++--
 .../java/org/scijava/console/ConsoleArgument.java     |  5 +++--
 src/main/java/org/scijava/console/ConsoleService.java |  5 +++--
 src/main/java/org/scijava/console/ConsoleUtils.java   |  5 +++--
 .../org/scijava/console/DefaultConsoleService.java    |  5 +++--
 .../java/org/scijava/console/MultiOutputStream.java   |  5 +++--
 .../java/org/scijava/console/MultiPrintStream.java    |  5 +++--
 src/main/java/org/scijava/console/OutputEvent.java    |  5 +++--
 src/main/java/org/scijava/console/OutputListener.java |  5 +++--
 .../org/scijava/console/SystemPropertyArgument.java   |  5 +++--
 .../org/scijava/convert/AbstractConvertService.java   |  5 +++--
 .../java/org/scijava/convert/AbstractConverter.java   |  5 +++--
 .../java/org/scijava/convert/ArrayConverters.java     |  5 +++--
 .../java/org/scijava/convert/CastingConverter.java    |  5 +++--
 .../java/org/scijava/convert/ConversionRequest.java   |  5 +++--
 src/main/java/org/scijava/convert/ConvertService.java |  5 +++--
 src/main/java/org/scijava/convert/Converter.java      |  5 +++--
 .../org/scijava/convert/DefaultConvertService.java    |  5 +++--
 .../java/org/scijava/convert/DefaultConverter.java    |  5 +++--
 src/main/java/org/scijava/convert/NullConverter.java  |  5 +++--
 .../java/org/scijava/convert/NumberConverters.java    |  5 +++--
 .../scijava/convert/NumberToBigDecimalConverter.java  |  5 +++--
 .../scijava/convert/NumberToBigIntegerConverter.java  |  5 +++--
 .../org/scijava/convert/NumberToDoubleConverter.java  |  5 +++--
 .../org/scijava/convert/NumberToFloatConverter.java   |  5 +++--
 .../org/scijava/convert/NumberToIntegerConverter.java |  5 +++--
 .../org/scijava/convert/NumberToLongConverter.java    |  5 +++--
 .../org/scijava/convert/NumberToNumberConverter.java  |  5 +++--
 .../org/scijava/convert/NumberToShortConverter.java   |  5 +++--
 .../org/scijava/convert/PrimitiveArrayUnwrapper.java  |  5 +++--
 .../org/scijava/convert/PrimitiveArrayWrapper.java    |  5 +++--
 .../java/org/scijava/display/AbstractDisplay.java     |  5 +++--
 .../scijava/display/ActiveDisplayPreprocessor.java    |  5 +++--
 src/main/java/org/scijava/display/DefaultDisplay.java |  5 +++--
 .../org/scijava/display/DefaultDisplayService.java    |  5 +++--
 .../java/org/scijava/display/DefaultTextDisplay.java  |  5 +++--
 src/main/java/org/scijava/display/Display.java        |  5 +++--
 .../org/scijava/display/DisplayPostprocessor.java     |  5 +++--
 src/main/java/org/scijava/display/DisplayService.java |  5 +++--
 src/main/java/org/scijava/display/Displayable.java    |  5 +++--
 src/main/java/org/scijava/display/TextDisplay.java    |  5 +++--
 .../scijava/display/event/DisplayActivatedEvent.java  |  5 +++--
 .../scijava/display/event/DisplayCreatedEvent.java    |  5 +++--
 .../scijava/display/event/DisplayDeletedEvent.java    |  5 +++--
 .../java/org/scijava/display/event/DisplayEvent.java  |  5 +++--
 .../scijava/display/event/DisplayUpdatedEvent.java    |  5 +++--
 .../org/scijava/display/event/input/InputEvent.java   |  5 +++--
 .../java/org/scijava/display/event/input/KyEvent.java |  5 +++--
 .../scijava/display/event/input/KyPressedEvent.java   |  5 +++--
 .../scijava/display/event/input/KyReleasedEvent.java  |  5 +++--
 .../org/scijava/display/event/input/KyTypedEvent.java |  5 +++--
 .../scijava/display/event/input/MsButtonEvent.java    |  5 +++--
 .../scijava/display/event/input/MsClickedEvent.java   |  5 +++--
 .../scijava/display/event/input/MsDraggedEvent.java   |  5 +++--
 .../scijava/display/event/input/MsEnteredEvent.java   |  5 +++--
 .../java/org/scijava/display/event/input/MsEvent.java |  5 +++--
 .../scijava/display/event/input/MsExitedEvent.java    |  5 +++--
 .../org/scijava/display/event/input/MsMovedEvent.java |  5 +++--
 .../scijava/display/event/input/MsPressedEvent.java   |  5 +++--
 .../scijava/display/event/input/MsReleasedEvent.java  |  5 +++--
 .../org/scijava/display/event/input/MsWheelEvent.java |  5 +++--
 .../display/event/window/WinActivatedEvent.java       |  5 +++--
 .../scijava/display/event/window/WinClosedEvent.java  |  5 +++--
 .../scijava/display/event/window/WinClosingEvent.java |  5 +++--
 .../display/event/window/WinDeactivatedEvent.java     |  5 +++--
 .../display/event/window/WinDeiconifiedEvent.java     |  5 +++--
 .../org/scijava/display/event/window/WinEvent.java    |  5 +++--
 .../display/event/window/WinIconifiedEvent.java       |  5 +++--
 .../scijava/display/event/window/WinOpenedEvent.java  |  5 +++--
 .../java/org/scijava/event/ContextDisposingEvent.java |  5 +++--
 src/main/java/org/scijava/event/DefaultEventBus.java  |  5 +++--
 .../java/org/scijava/event/DefaultEventHistory.java   |  5 +++--
 .../java/org/scijava/event/DefaultEventService.java   |  5 +++--
 src/main/java/org/scijava/event/EventDetails.java     |  5 +++--
 src/main/java/org/scijava/event/EventHandler.java     |  5 +++--
 src/main/java/org/scijava/event/EventHistory.java     |  5 +++--
 .../java/org/scijava/event/EventHistoryListener.java  |  5 +++--
 src/main/java/org/scijava/event/EventService.java     |  5 +++--
 src/main/java/org/scijava/event/EventSubscriber.java  |  5 +++--
 src/main/java/org/scijava/event/SciJavaEvent.java     |  5 +++--
 src/main/java/org/scijava/input/Accelerator.java      |  5 +++--
 .../java/org/scijava/input/DefaultInputService.java   |  5 +++--
 src/main/java/org/scijava/input/InputModifiers.java   |  5 +++--
 src/main/java/org/scijava/input/InputService.java     |  5 +++--
 src/main/java/org/scijava/input/KeyCode.java          |  5 +++--
 src/main/java/org/scijava/input/MouseCursor.java      |  5 +++--
 src/main/java/org/scijava/io/AbstractIOPlugin.java    |  5 +++--
 src/main/java/org/scijava/io/ByteArrayByteBank.java   |  9 +++++----
 src/main/java/org/scijava/io/ByteBank.java            |  9 +++++----
 src/main/java/org/scijava/io/DefaultIOService.java    |  5 +++--
 .../java/org/scijava/io/DefaultRecentFileService.java |  5 +++--
 src/main/java/org/scijava/io/IOPlugin.java            |  5 +++--
 src/main/java/org/scijava/io/IOService.java           |  5 +++--
 src/main/java/org/scijava/io/RecentFileService.java   |  5 +++--
 .../java/org/scijava/io/console/OpenArgument.java     |  5 +++--
 .../java/org/scijava/io/event/DataOpenedEvent.java    |  5 +++--
 .../java/org/scijava/io/event/DataSavedEvent.java     |  5 +++--
 src/main/java/org/scijava/io/event/IOEvent.java       |  5 +++--
 .../org/scijava/io/handle/AbstractDataHandle.java     |  5 +++--
 src/main/java/org/scijava/io/handle/BytesHandle.java  | 11 ++++++-----
 src/main/java/org/scijava/io/handle/DataHandle.java   |  5 +++--
 .../org/scijava/io/handle/DataHandleInputStream.java  |  5 +++--
 .../org/scijava/io/handle/DataHandleOutputStream.java |  5 +++--
 .../java/org/scijava/io/handle/DataHandleService.java |  5 +++--
 src/main/java/org/scijava/io/handle/DataHandles.java  |  5 +++--
 .../scijava/io/handle/DefaultDataHandleService.java   |  5 +++--
 src/main/java/org/scijava/io/handle/DummyHandle.java  |  9 +++++----
 src/main/java/org/scijava/io/handle/FileHandle.java   |  5 +++--
 .../org/scijava/io/location/AbstractLocation.java     |  5 +++--
 .../scijava/io/location/AbstractRemoteLocation.java   |  9 +++++----
 .../java/org/scijava/io/location/BytesLocation.java   |  9 +++++----
 .../java/org/scijava/io/location/DummyLocation.java   | 11 ++++++-----
 .../java/org/scijava/io/location/FileLocation.java    |  5 +++--
 src/main/java/org/scijava/io/location/Location.java   |  5 +++--
 .../java/org/scijava/io/location/RemoteLocation.java  |  5 +++--
 .../java/org/scijava/io/location/URILocation.java     |  5 +++--
 .../java/org/scijava/io/location/URLLocation.java     |  5 +++--
 .../java/org/scijava/io/nio/ByteBufferByteBank.java   |  9 +++++----
 .../java/org/scijava/io/nio/DefaultNIOService.java    |  7 ++++---
 src/main/java/org/scijava/io/nio/NIOService.java      |  7 ++++---
 src/main/java/org/scijava/log/AbstractLogService.java |  5 +++--
 .../scijava/log/DefaultUncaughtExceptionHandler.java  |  5 +++--
 src/main/java/org/scijava/log/LogService.java         |  5 +++--
 src/main/java/org/scijava/log/Logged.java             |  5 +++--
 src/main/java/org/scijava/log/StderrLogService.java   |  5 +++--
 .../java/org/scijava/main/DefaultMainService.java     |  5 +++--
 src/main/java/org/scijava/main/MainService.java       |  5 +++--
 .../java/org/scijava/main/console/MainArgument.java   |  5 +++--
 .../java/org/scijava/main/run/MainCodeRunner.java     |  5 +++--
 .../java/org/scijava/menu/AbstractMenuCreator.java    |  5 +++--
 .../java/org/scijava/menu/DefaultMenuService.java     |  5 +++--
 src/main/java/org/scijava/menu/MenuConstants.java     |  5 +++--
 src/main/java/org/scijava/menu/MenuCreator.java       |  5 +++--
 src/main/java/org/scijava/menu/MenuService.java       |  5 +++--
 src/main/java/org/scijava/menu/ShadowMenu.java        |  5 +++--
 .../java/org/scijava/menu/ShadowMenuIterator.java     |  5 +++--
 src/main/java/org/scijava/menu/event/MenuEvent.java   |  5 +++--
 .../java/org/scijava/menu/event/MenusAddedEvent.java  |  5 +++--
 .../org/scijava/menu/event/MenusRemovedEvent.java     |  5 +++--
 .../org/scijava/menu/event/MenusUpdatedEvent.java     |  5 +++--
 src/main/java/org/scijava/module/AbstractModule.java  |  5 +++--
 .../java/org/scijava/module/AbstractModuleInfo.java   |  5 +++--
 .../java/org/scijava/module/AbstractModuleItem.java   |  5 +++--
 .../java/org/scijava/module/DefaultModuleService.java |  5 +++--
 .../java/org/scijava/module/DefaultMutableModule.java |  5 +++--
 .../org/scijava/module/DefaultMutableModuleInfo.java  |  5 +++--
 .../org/scijava/module/DefaultMutableModuleItem.java  |  5 +++--
 .../java/org/scijava/module/MethodCallException.java  |  5 +++--
 src/main/java/org/scijava/module/MethodRef.java       |  5 +++--
 src/main/java/org/scijava/module/Module.java          |  5 +++--
 .../org/scijava/module/ModuleCanceledException.java   |  5 +++--
 src/main/java/org/scijava/module/ModuleException.java |  5 +++--
 src/main/java/org/scijava/module/ModuleIndex.java     |  5 +++--
 src/main/java/org/scijava/module/ModuleInfo.java      |  5 +++--
 src/main/java/org/scijava/module/ModuleItem.java      |  5 +++--
 src/main/java/org/scijava/module/ModuleRunner.java    |  5 +++--
 src/main/java/org/scijava/module/ModuleService.java   |  5 +++--
 src/main/java/org/scijava/module/MutableModule.java   |  5 +++--
 .../java/org/scijava/module/MutableModuleInfo.java    |  5 +++--
 .../java/org/scijava/module/MutableModuleItem.java    |  5 +++--
 .../org/scijava/module/event/ModuleCanceledEvent.java |  5 +++--
 .../java/org/scijava/module/event/ModuleEvent.java    |  5 +++--
 .../org/scijava/module/event/ModuleExecutedEvent.java |  5 +++--
 .../scijava/module/event/ModuleExecutingEvent.java    |  5 +++--
 .../scijava/module/event/ModuleExecutionEvent.java    |  5 +++--
 .../org/scijava/module/event/ModuleFinishedEvent.java |  5 +++--
 .../scijava/module/event/ModulePostprocessEvent.java  |  5 +++--
 .../scijava/module/event/ModulePreprocessEvent.java   |  5 +++--
 .../org/scijava/module/event/ModuleProcessEvent.java  |  5 +++--
 .../org/scijava/module/event/ModuleStartedEvent.java  |  5 +++--
 .../org/scijava/module/event/ModulesAddedEvent.java   |  5 +++--
 .../org/scijava/module/event/ModulesListEvent.java    |  5 +++--
 .../org/scijava/module/event/ModulesRemovedEvent.java |  5 +++--
 .../org/scijava/module/event/ModulesUpdatedEvent.java |  5 +++--
 .../module/process/AbstractPostprocessorPlugin.java   |  5 +++--
 .../module/process/AbstractPreprocessorPlugin.java    |  5 +++--
 .../process/AbstractSingleInputPreprocessor.java      |  5 +++--
 .../module/process/CheckInputsPreprocessor.java       |  5 +++--
 .../scijava/module/process/DebugPostprocessor.java    |  5 +++--
 .../org/scijava/module/process/DebugPreprocessor.java |  5 +++--
 .../module/process/DefaultValuePreprocessor.java      |  5 +++--
 .../scijava/module/process/GatewayPreprocessor.java   |  5 +++--
 .../org/scijava/module/process/InitPreprocessor.java  |  5 +++--
 .../module/process/LoadInputsPreprocessor.java        |  5 +++--
 .../scijava/module/process/ModulePostprocessor.java   |  5 +++--
 .../scijava/module/process/ModulePreprocessor.java    |  5 +++--
 .../org/scijava/module/process/ModuleProcessor.java   |  5 +++--
 .../scijava/module/process/PostprocessorPlugin.java   |  5 +++--
 .../scijava/module/process/PreprocessorPlugin.java    |  5 +++--
 .../module/process/SaveInputsPreprocessor.java        |  5 +++--
 .../scijava/module/process/ServicePreprocessor.java   |  5 +++--
 .../scijava/module/process/ValidityPreprocessor.java  |  5 +++--
 .../java/org/scijava/module/run/ModuleCodeRunner.java |  5 +++--
 .../java/org/scijava/object/DefaultObjectService.java |  5 +++--
 src/main/java/org/scijava/object/LazyObjects.java     |  5 +++--
 src/main/java/org/scijava/object/ObjectIndex.java     |  5 +++--
 src/main/java/org/scijava/object/ObjectService.java   |  5 +++--
 .../java/org/scijava/object/SortedObjectIndex.java    |  5 +++--
 src/main/java/org/scijava/object/event/ListEvent.java |  5 +++--
 .../org/scijava/object/event/ObjectCreatedEvent.java  |  5 +++--
 .../org/scijava/object/event/ObjectDeletedEvent.java  |  5 +++--
 .../java/org/scijava/object/event/ObjectEvent.java    |  5 +++--
 .../org/scijava/object/event/ObjectModifiedEvent.java |  5 +++--
 .../org/scijava/object/event/ObjectsAddedEvent.java   |  5 +++--
 .../org/scijava/object/event/ObjectsListEvent.java    |  5 +++--
 .../org/scijava/object/event/ObjectsRemovedEvent.java |  5 +++--
 .../org/scijava/options/DefaultOptionsService.java    |  5 +++--
 src/main/java/org/scijava/options/OptionsPlugin.java  |  5 +++--
 src/main/java/org/scijava/options/OptionsService.java |  5 +++--
 .../java/org/scijava/options/event/OptionsEvent.java  |  5 +++--
 .../java/org/scijava/parse/DefaultParseService.java   |  5 +++--
 src/main/java/org/scijava/parse/Item.java             |  5 +++--
 src/main/java/org/scijava/parse/Items.java            |  5 +++--
 src/main/java/org/scijava/parse/ParseService.java     |  5 +++--
 .../java/org/scijava/platform/AbstractPlatform.java   |  5 +++--
 .../java/org/scijava/platform/AppEventService.java    |  5 +++--
 .../org/scijava/platform/DefaultAppEventService.java  |  5 +++--
 .../java/org/scijava/platform/DefaultPlatform.java    |  5 +++--
 .../org/scijava/platform/DefaultPlatformService.java  |  5 +++--
 src/main/java/org/scijava/platform/Platform.java      |  5 +++--
 .../java/org/scijava/platform/PlatformService.java    |  5 +++--
 .../org/scijava/platform/event/AppAboutEvent.java     |  5 +++--
 .../org/scijava/platform/event/AppFocusEvent.java     |  5 +++--
 .../scijava/platform/event/AppMenusCreatedEvent.java  |  5 +++--
 .../org/scijava/platform/event/AppOpenFilesEvent.java |  5 +++--
 .../scijava/platform/event/AppPreferencesEvent.java   |  5 +++--
 .../org/scijava/platform/event/AppPrintEvent.java     |  5 +++--
 .../java/org/scijava/platform/event/AppQuitEvent.java |  5 +++--
 .../org/scijava/platform/event/AppReOpenEvent.java    |  5 +++--
 .../scijava/platform/event/AppScreenSleepEvent.java   |  5 +++--
 .../org/scijava/platform/event/AppSleepEvent.java     |  5 +++--
 .../scijava/platform/event/AppSystemSleepEvent.java   |  5 +++--
 .../scijava/platform/event/AppUserSessionEvent.java   |  5 +++--
 .../org/scijava/platform/event/AppVisibleEvent.java   |  5 +++--
 .../org/scijava/platform/event/ApplicationEvent.java  |  5 +++--
 .../org/scijava/plugin/AbstractHandlerPlugin.java     |  5 +++--
 .../org/scijava/plugin/AbstractHandlerService.java    |  5 +++--
 .../java/org/scijava/plugin/AbstractPTService.java    |  5 +++--
 .../java/org/scijava/plugin/AbstractRichPlugin.java   |  5 +++--
 .../org/scijava/plugin/AbstractSingletonService.java  |  5 +++--
 .../java/org/scijava/plugin/AbstractTypedPlugin.java  |  5 +++--
 .../java/org/scijava/plugin/AbstractTypedService.java |  5 +++--
 .../org/scijava/plugin/AbstractWrapperPlugin.java     |  5 +++--
 .../org/scijava/plugin/AbstractWrapperService.java    |  5 +++--
 src/main/java/org/scijava/plugin/Attr.java            |  5 +++--
 .../java/org/scijava/plugin/DefaultPluginFinder.java  |  5 +++--
 .../java/org/scijava/plugin/DefaultPluginService.java |  5 +++--
 src/main/java/org/scijava/plugin/HandlerPlugin.java   |  5 +++--
 src/main/java/org/scijava/plugin/HandlerService.java  |  5 +++--
 src/main/java/org/scijava/plugin/HasPluginInfo.java   |  5 +++--
 src/main/java/org/scijava/plugin/Menu.java            |  5 +++--
 src/main/java/org/scijava/plugin/PTService.java       |  5 +++--
 src/main/java/org/scijava/plugin/Parameter.java       |  5 +++--
 src/main/java/org/scijava/plugin/Plugin.java          |  5 +++--
 src/main/java/org/scijava/plugin/PluginFinder.java    |  5 +++--
 src/main/java/org/scijava/plugin/PluginIndex.java     |  5 +++--
 src/main/java/org/scijava/plugin/PluginInfo.java      |  5 +++--
 src/main/java/org/scijava/plugin/PluginService.java   |  5 +++--
 src/main/java/org/scijava/plugin/RichPlugin.java      |  5 +++--
 src/main/java/org/scijava/plugin/SciJavaPlugin.java   |  5 +++--
 src/main/java/org/scijava/plugin/SingletonPlugin.java |  5 +++--
 .../java/org/scijava/plugin/SingletonService.java     |  5 +++--
 src/main/java/org/scijava/plugin/SortablePlugin.java  |  5 +++--
 src/main/java/org/scijava/plugin/TypedPlugin.java     |  5 +++--
 src/main/java/org/scijava/plugin/TypedService.java    |  5 +++--
 src/main/java/org/scijava/plugin/WrapperPlugin.java   |  5 +++--
 src/main/java/org/scijava/plugin/WrapperService.java  |  5 +++--
 .../org/scijava/plugin/event/PluginsAddedEvent.java   |  5 +++--
 .../org/scijava/plugin/event/PluginsListEvent.java    |  5 +++--
 .../org/scijava/plugin/event/PluginsRemovedEvent.java |  5 +++--
 .../java/org/scijava/prefs/AbstractPrefService.java   |  5 +++--
 .../java/org/scijava/prefs/DefaultPrefService.java    |  5 +++--
 src/main/java/org/scijava/prefs/PrefService.java      |  5 +++--
 src/main/java/org/scijava/run/AbstractCodeRunner.java |  5 +++--
 src/main/java/org/scijava/run/CodeRunner.java         |  5 +++--
 src/main/java/org/scijava/run/DefaultRunService.java  |  5 +++--
 src/main/java/org/scijava/run/RunService.java         |  5 +++--
 .../java/org/scijava/run/console/RunArgument.java     |  5 +++--
 .../org/scijava/script/AbstractAutoCompleter.java     |  5 +++--
 .../org/scijava/script/AbstractScriptContext.java     |  5 +++--
 .../java/org/scijava/script/AbstractScriptEngine.java |  5 +++--
 .../java/org/scijava/script/AbstractScriptHeader.java |  5 +++--
 .../org/scijava/script/AbstractScriptLanguage.java    |  5 +++--
 .../java/org/scijava/script/AdaptedScriptEngine.java  |  5 +++--
 .../org/scijava/script/AdaptedScriptLanguage.java     |  5 +++--
 src/main/java/org/scijava/script/AutoCompleter.java   |  5 +++--
 .../java/org/scijava/script/AutoCompletionResult.java |  5 +++--
 src/main/java/org/scijava/script/CodeGenerator.java   |  5 +++--
 .../java/org/scijava/script/CodeGeneratorJava.java    |  5 +++--
 .../java/org/scijava/script/DefaultAutoCompleter.java |  5 +++--
 .../scijava/script/DefaultScriptHeaderService.java    |  5 +++--
 .../org/scijava/script/DefaultScriptInterpreter.java  |  5 +++--
 .../java/org/scijava/script/DefaultScriptService.java |  5 +++--
 .../java/org/scijava/script/InvocationObject.java     |  5 +++--
 src/main/java/org/scijava/script/ParameterObject.java |  5 +++--
 src/main/java/org/scijava/script/ScriptFinder.java    |  5 +++--
 src/main/java/org/scijava/script/ScriptHeader.java    |  5 +++--
 .../java/org/scijava/script/ScriptHeaderService.java  |  5 +++--
 src/main/java/org/scijava/script/ScriptInfo.java      |  5 +++--
 .../java/org/scijava/script/ScriptInterpreter.java    |  5 +++--
 src/main/java/org/scijava/script/ScriptLanguage.java  |  5 +++--
 .../java/org/scijava/script/ScriptLanguageIndex.java  |  5 +++--
 src/main/java/org/scijava/script/ScriptModule.java    |  5 +++--
 src/main/java/org/scijava/script/ScriptREPL.java      |  5 +++--
 src/main/java/org/scijava/script/ScriptService.java   |  5 +++--
 .../org/scijava/script/console/RunScriptArgument.java |  5 +++--
 .../java/org/scijava/script/io/ScriptIOPlugin.java    |  5 +++--
 .../script/process/DefaultScriptProcessorService.java |  5 +++--
 .../script/process/ParameterScriptProcessor.java      |  5 +++--
 .../org/scijava/script/process/ScriptCallback.java    |  5 +++--
 .../org/scijava/script/process/ScriptProcessor.java   |  5 +++--
 .../script/process/ScriptProcessorService.java        |  5 +++--
 .../script/process/ShebangScriptProcessor.java        |  7 ++++---
 .../java/org/scijava/script/run/ScriptCodeRunner.java |  5 +++--
 .../java/org/scijava/service/AbstractService.java     |  5 +++--
 src/main/java/org/scijava/service/SciJavaService.java |  5 +++--
 src/main/java/org/scijava/service/Service.java        |  5 +++--
 src/main/java/org/scijava/service/ServiceHelper.java  |  5 +++--
 src/main/java/org/scijava/service/ServiceIndex.java   |  5 +++--
 .../scijava/service/event/ServicesLoadedEvent.java    |  5 +++--
 src/main/java/org/scijava/test/TestUtils.java         |  5 +++--
 .../java/org/scijava/text/AbstractTextFormat.java     |  5 +++--
 .../java/org/scijava/text/DefaultTextService.java     |  5 +++--
 src/main/java/org/scijava/text/TextFormat.java        |  5 +++--
 src/main/java/org/scijava/text/TextService.java       |  5 +++--
 src/main/java/org/scijava/text/io/TextIOPlugin.java   |  5 +++--
 .../java/org/scijava/thread/DefaultThreadService.java |  5 +++--
 src/main/java/org/scijava/thread/ThreadService.java   |  5 +++--
 src/main/java/org/scijava/tool/AbstractTool.java      |  5 +++--
 src/main/java/org/scijava/tool/CustomDrawnTool.java   |  5 +++--
 .../java/org/scijava/tool/DefaultToolService.java     |  5 +++--
 src/main/java/org/scijava/tool/DummyTool.java         |  5 +++--
 src/main/java/org/scijava/tool/IconDrawer.java        |  5 +++--
 src/main/java/org/scijava/tool/IconService.java       |  5 +++--
 src/main/java/org/scijava/tool/Tool.java              |  5 +++--
 src/main/java/org/scijava/tool/ToolService.java       |  5 +++--
 .../org/scijava/tool/event/ToolActivatedEvent.java    |  5 +++--
 .../org/scijava/tool/event/ToolDeactivatedEvent.java  |  5 +++--
 src/main/java/org/scijava/tool/event/ToolEvent.java   |  5 +++--
 src/main/java/org/scijava/ui/ARGBPlane.java           |  5 +++--
 .../org/scijava/ui/AbstractInputHarvesterPlugin.java  |  5 +++--
 .../java/org/scijava/ui/AbstractUIInputWidget.java    |  5 +++--
 .../java/org/scijava/ui/AbstractUserInterface.java    |  5 +++--
 src/main/java/org/scijava/ui/ApplicationFrame.java    |  5 +++--
 src/main/java/org/scijava/ui/Arrangeable.java         |  5 +++--
 src/main/java/org/scijava/ui/CloseConfirmable.java    |  5 +++--
 src/main/java/org/scijava/ui/DefaultUIService.java    |  5 +++--
 src/main/java/org/scijava/ui/Desktop.java             |  5 +++--
 src/main/java/org/scijava/ui/DialogPrompt.java        |  5 +++--
 src/main/java/org/scijava/ui/FilePreprocessor.java    |  5 +++--
 src/main/java/org/scijava/ui/StatusBar.java           |  5 +++--
 src/main/java/org/scijava/ui/SystemClipboard.java     |  5 +++--
 src/main/java/org/scijava/ui/ToolBar.java             |  5 +++--
 src/main/java/org/scijava/ui/UIPreprocessor.java      |  5 +++--
 src/main/java/org/scijava/ui/UIService.java           |  5 +++--
 src/main/java/org/scijava/ui/UserInterface.java       |  5 +++--
 .../org/scijava/ui/console/AbstractConsolePane.java   |  5 +++--
 src/main/java/org/scijava/ui/console/ConsolePane.java |  5 +++--
 .../java/org/scijava/ui/console/HeadlessArgument.java |  5 +++--
 .../java/org/scijava/ui/console/ShowUIArgument.java   |  5 +++--
 src/main/java/org/scijava/ui/console/UIArgument.java  |  5 +++--
 .../org/scijava/ui/dnd/AbstractDragAndDropData.java   |  5 +++--
 .../scijava/ui/dnd/AbstractDragAndDropHandler.java    |  5 +++--
 .../org/scijava/ui/dnd/DefaultDragAndDropData.java    |  5 +++--
 .../org/scijava/ui/dnd/DefaultDragAndDropService.java |  5 +++--
 src/main/java/org/scijava/ui/dnd/DragAndDropData.java |  5 +++--
 .../java/org/scijava/ui/dnd/DragAndDropHandler.java   |  5 +++--
 .../java/org/scijava/ui/dnd/DragAndDropService.java   |  5 +++--
 .../org/scijava/ui/dnd/FileDragAndDropHandler.java    |  5 +++--
 .../org/scijava/ui/dnd/ListDragAndDropHandler.java    |  5 +++--
 src/main/java/org/scijava/ui/dnd/MIMEType.java        |  5 +++--
 .../scijava/ui/dnd/ScriptFileDragAndDropHandler.java  |  5 +++--
 .../org/scijava/ui/dnd/event/DragAndDropEvent.java    |  5 +++--
 .../java/org/scijava/ui/dnd/event/DragEnterEvent.java |  5 +++--
 .../java/org/scijava/ui/dnd/event/DragExitEvent.java  |  5 +++--
 .../java/org/scijava/ui/dnd/event/DragOverEvent.java  |  5 +++--
 src/main/java/org/scijava/ui/dnd/event/DropEvent.java |  5 +++--
 src/main/java/org/scijava/ui/event/UIEvent.java       |  5 +++--
 src/main/java/org/scijava/ui/event/UIShownEvent.java  |  5 +++--
 .../scijava/ui/headless/HeadlessDisplayViewer.java    |  5 +++--
 src/main/java/org/scijava/ui/headless/HeadlessUI.java |  5 +++--
 .../java/org/scijava/ui/headlessUI/HeadlessUI.java    |  5 +++--
 .../org/scijava/ui/viewer/AbstractDisplayViewer.java  |  5 +++--
 src/main/java/org/scijava/ui/viewer/DisplayPanel.java |  5 +++--
 .../java/org/scijava/ui/viewer/DisplayViewer.java     |  5 +++--
 .../java/org/scijava/ui/viewer/DisplayWindow.java     |  5 +++--
 .../ui/viewer/text/AbstractTextDisplayViewer.java     |  5 +++--
 .../org/scijava/ui/viewer/text/TextDisplayPanel.java  |  5 +++--
 .../org/scijava/ui/viewer/text/TextDisplayViewer.java |  5 +++--
 .../java/org/scijava/util/AbstractPrimitiveArray.java |  5 +++--
 src/main/java/org/scijava/util/AppUtils.java          |  5 +++--
 src/main/java/org/scijava/util/ArrayUtils.java        |  5 +++--
 src/main/java/org/scijava/util/BoolArray.java         |  5 +++--
 src/main/java/org/scijava/util/ByteArray.java         |  5 +++--
 src/main/java/org/scijava/util/Bytes.java             |  5 +++--
 src/main/java/org/scijava/util/CharArray.java         |  5 +++--
 src/main/java/org/scijava/util/CheckSezpoz.java       |  5 +++--
 src/main/java/org/scijava/util/ClassUtils.java        |  5 +++--
 src/main/java/org/scijava/util/ColorRGB.java          |  5 +++--
 src/main/java/org/scijava/util/ColorRGBA.java         |  5 +++--
 src/main/java/org/scijava/util/Colors.java            |  5 +++--
 .../java/org/scijava/util/CombineAnnotations.java     |  5 +++--
 src/main/java/org/scijava/util/Combiner.java          |  5 +++--
 src/main/java/org/scijava/util/ConversionUtils.java   |  5 +++--
 src/main/java/org/scijava/util/DebugUtils.java        |  5 +++--
 src/main/java/org/scijava/util/DigestUtils.java       |  5 +++--
 src/main/java/org/scijava/util/DoubleArray.java       |  5 +++--
 src/main/java/org/scijava/util/FileUtils.java         |  5 +++--
 src/main/java/org/scijava/util/FloatArray.java        |  5 +++--
 src/main/java/org/scijava/util/GenericUtils.java      |  5 +++--
 src/main/java/org/scijava/util/IntArray.java          |  5 +++--
 src/main/java/org/scijava/util/IntCoords.java         |  5 +++--
 src/main/java/org/scijava/util/IntRect.java           |  5 +++--
 src/main/java/org/scijava/util/IteratorPlus.java      |  5 +++--
 src/main/java/org/scijava/util/LastRecentlyUsed.java  |  5 +++--
 src/main/java/org/scijava/util/LineOutputStream.java  |  5 +++--
 src/main/java/org/scijava/util/ListUtils.java         |  5 +++--
 src/main/java/org/scijava/util/LongArray.java         |  5 +++--
 src/main/java/org/scijava/util/Manifest.java          |  5 +++--
 .../java/org/scijava/util/MersenneTwisterFast.java    |  5 +++--
 src/main/java/org/scijava/util/MetaInfCombiner.java   |  5 +++--
 src/main/java/org/scijava/util/MirrorWebsite.java     |  5 +++--
 src/main/java/org/scijava/util/MiscUtils.java         |  5 +++--
 src/main/java/org/scijava/util/NumberUtils.java       |  5 +++--
 src/main/java/org/scijava/util/ObjectArray.java       |  5 +++--
 src/main/java/org/scijava/util/POM.java               |  5 +++--
 src/main/java/org/scijava/util/PlatformUtils.java     |  5 +++--
 src/main/java/org/scijava/util/Prefs.java             |  5 +++--
 src/main/java/org/scijava/util/PrimitiveArray.java    |  5 +++--
 src/main/java/org/scijava/util/ProcessUtils.java      |  5 +++--
 src/main/java/org/scijava/util/Query.java             |  5 +++--
 src/main/java/org/scijava/util/ReadInto.java          |  5 +++--
 src/main/java/org/scijava/util/RealCoords.java        |  5 +++--
 src/main/java/org/scijava/util/RealRect.java          |  5 +++--
 src/main/java/org/scijava/util/ReflectException.java  |  5 +++--
 src/main/java/org/scijava/util/ReflectedUniverse.java |  5 +++--
 src/main/java/org/scijava/util/ServiceCombiner.java   |  5 +++--
 src/main/java/org/scijava/util/ShortArray.java        |  5 +++--
 src/main/java/org/scijava/util/Sizable.java           |  5 +++--
 src/main/java/org/scijava/util/SizableArrayList.java  |  5 +++--
 src/main/java/org/scijava/util/StringMaker.java       |  5 +++--
 src/main/java/org/scijava/util/StringUtils.java       |  5 +++--
 src/main/java/org/scijava/util/Timing.java            |  5 +++--
 src/main/java/org/scijava/util/TunePlayer.java        |  5 +++--
 src/main/java/org/scijava/util/UnitUtils.java         |  5 +++--
 src/main/java/org/scijava/util/VersionUtils.java      |  5 +++--
 src/main/java/org/scijava/util/XML.java               |  5 +++--
 .../org/scijava/welcome/DefaultWelcomeService.java    |  5 +++--
 src/main/java/org/scijava/welcome/WelcomeService.java |  5 +++--
 .../java/org/scijava/welcome/event/WelcomeEvent.java  |  5 +++--
 .../org/scijava/widget/AbstractInputHarvester.java    |  5 +++--
 .../java/org/scijava/widget/AbstractInputPanel.java   |  5 +++--
 .../java/org/scijava/widget/AbstractInputWidget.java  |  5 +++--
 src/main/java/org/scijava/widget/Button.java          |  5 +++--
 src/main/java/org/scijava/widget/ButtonWidget.java    |  5 +++--
 src/main/java/org/scijava/widget/ChoiceWidget.java    |  5 +++--
 src/main/java/org/scijava/widget/ColorWidget.java     |  5 +++--
 src/main/java/org/scijava/widget/DateWidget.java      |  5 +++--
 .../java/org/scijava/widget/DefaultWidgetModel.java   |  5 +++--
 .../java/org/scijava/widget/DefaultWidgetService.java |  5 +++--
 src/main/java/org/scijava/widget/FileWidget.java      |  5 +++--
 src/main/java/org/scijava/widget/InputHarvester.java  |  5 +++--
 src/main/java/org/scijava/widget/InputPanel.java      |  5 +++--
 src/main/java/org/scijava/widget/InputWidget.java     |  5 +++--
 src/main/java/org/scijava/widget/MessageWidget.java   |  5 +++--
 src/main/java/org/scijava/widget/NumberWidget.java    |  5 +++--
 src/main/java/org/scijava/widget/ObjectWidget.java    |  5 +++--
 src/main/java/org/scijava/widget/TextWidget.java      |  5 +++--
 src/main/java/org/scijava/widget/ToggleWidget.java    |  5 +++--
 src/main/java/org/scijava/widget/UIComponent.java     |  5 +++--
 src/main/java/org/scijava/widget/WidgetModel.java     |  5 +++--
 src/main/java/org/scijava/widget/WidgetService.java   |  5 +++--
 src/test/java/org/scijava/ContextCreationTest.java    |  5 +++--
 src/test/java/org/scijava/ContextInjectionTest.java   |  5 +++--
 src/test/java/org/scijava/annotations/AnnotatedA.java |  5 +++--
 src/test/java/org/scijava/annotations/AnnotatedB.java |  5 +++--
 src/test/java/org/scijava/annotations/AnnotatedC.java |  5 +++--
 src/test/java/org/scijava/annotations/AnnotatedD.java |  5 +++--
 .../org/scijava/annotations/AnnotatedInnerClass.java  |  5 +++--
 src/test/java/org/scijava/annotations/Complex.java    |  5 +++--
 .../org/scijava/annotations/DirectoryIndexerTest.java |  5 +++--
 .../org/scijava/annotations/EclipseHelperTest.java    |  5 +++--
 src/test/java/org/scijava/annotations/Fruit.java      |  5 +++--
 src/test/java/org/scijava/annotations/LegacyTest.java |  5 +++--
 src/test/java/org/scijava/annotations/Simple.java     |  5 +++--
 src/test/java/org/scijava/app/StatusServiceTest.java  |  5 +++--
 .../java/org/scijava/command/CommandInfoTest.java     |  5 +++--
 .../java/org/scijava/command/CommandModuleTest.java   |  5 +++--
 .../java/org/scijava/command/CommandServiceTest.java  |  5 +++--
 .../java/org/scijava/command/InvalidCommandTest.java  |  5 +++--
 .../scijava/command/run/CommandCodeRunnerTest.java    |  5 +++--
 .../java/org/scijava/console/ConsoleServiceTest.java  |  5 +++--
 .../scijava/console/SystemPropertyArgumentTest.java   |  5 +++--
 .../scijava/convert/AbstractNumberConverterTests.java |  5 +++--
 .../convert/BigIntegerToBigDecimalConverterTest.java  |  5 +++--
 .../convert/ByteToBigDecimalConverterTest.java        |  5 +++--
 .../convert/ByteToBigIntegerConverterTest.java        |  5 +++--
 .../scijava/convert/ByteToDoubleConverterTest.java    |  5 +++--
 .../org/scijava/convert/ByteToFloatConverterTest.java |  5 +++--
 .../scijava/convert/ByteToIntegerConverterTest.java   |  5 +++--
 .../org/scijava/convert/ByteToLongConverterTest.java  |  5 +++--
 .../org/scijava/convert/ByteToShortConverterTest.java |  5 +++--
 .../java/org/scijava/convert/ConvertServiceTest.java  |  5 +++--
 src/test/java/org/scijava/convert/ConverterTest.java  |  5 +++--
 .../convert/DoubleToBigDecimalConverterTest.java      |  5 +++--
 .../convert/FloatToBigDecimalConverterTest.java       |  5 +++--
 .../scijava/convert/FloatToDoubleConverterTest.java   |  5 +++--
 .../convert/IntegerToBigDecimalConverterTest.java     |  5 +++--
 .../convert/IntegerToBigIntegerConverterTest.java     |  5 +++--
 .../scijava/convert/IntegerToDoubleConverterTest.java |  5 +++--
 .../scijava/convert/IntegerToLongConverterTest.java   |  5 +++--
 .../convert/LongToBigDecimalConverterTest.java        |  5 +++--
 .../convert/LongToBigIntegerConverterTest.java        |  5 +++--
 .../convert/ShortToBigDecimalConverterTest.java       |  5 +++--
 .../convert/ShortToBigIntegerConverterTest.java       |  5 +++--
 .../scijava/convert/ShortToDoubleConverterTest.java   |  5 +++--
 .../scijava/convert/ShortToFloatConverterTest.java    |  5 +++--
 .../scijava/convert/ShortToIntegerConverterTest.java  |  5 +++--
 .../org/scijava/convert/ShortToLongConverterTest.java |  5 +++--
 src/test/java/org/scijava/display/DisplayTest.java    |  5 +++--
 src/test/java/org/scijava/event/EventServiceTest.java |  5 +++--
 .../java/org/scijava/io/ByteArrayByteBankTest.java    | 11 ++++++-----
 src/test/java/org/scijava/io/ByteBankTest.java        | 11 ++++++-----
 .../java/org/scijava/io/handle/BytesHandleTest.java   |  7 ++++---
 .../java/org/scijava/io/handle/DataHandleTest.java    |  5 +++--
 .../java/org/scijava/io/handle/FileHandleTest.java    |  5 +++--
 .../org/scijava/io/location/BytesLocationTest.java    |  5 +++--
 .../org/scijava/io/location/FileLocationTest.java     |  5 +++--
 .../java/org/scijava/io/location/URILocationTest.java |  5 +++--
 .../java/org/scijava/io/location/URLLocationTest.java |  5 +++--
 .../org/scijava/io/nio/ByteBufferByteBankTest.java    | 11 ++++++-----
 src/test/java/org/scijava/log/LogServiceTest.java     |  5 +++--
 src/test/java/org/scijava/main/MainServiceTest.java   |  5 +++--
 .../java/org/scijava/main/run/MainCodeRunnerTest.java |  5 +++--
 src/test/java/org/scijava/menu/MenuServiceTest.java   |  5 +++--
 src/test/java/org/scijava/menu/ShadowMenuTest.java    |  5 +++--
 .../java/org/scijava/module/ModuleServiceTest.java    |  5 +++--
 .../org/scijava/module/run/ModuleCodeRunnerTest.java  |  5 +++--
 src/test/java/org/scijava/object/ObjectIndexTest.java |  5 +++--
 .../org/scijava/object/SortedObjectIndexTest.java     |  5 +++--
 src/test/java/org/scijava/options/OptionsTest.java    |  5 +++--
 src/test/java/org/scijava/parse/ParseServiceTest.java |  5 +++--
 .../java/org/scijava/plugin/PluginFinderTest.java     |  5 +++--
 src/test/java/org/scijava/plugin/PluginIndexTest.java |  5 +++--
 src/test/java/org/scijava/plugin/PluginInfoTest.java  |  5 +++--
 src/test/java/org/scijava/prefs/PrefServiceTest.java  |  5 +++--
 src/test/java/org/scijava/run/RunServiceTest.java     |  5 +++--
 .../scijava/script/AbstractScriptLanguageTest.java    |  5 +++--
 .../java/org/scijava/script/ScriptEngineTest.java     |  5 +++--
 .../java/org/scijava/script/ScriptFinderTest.java     |  5 +++--
 src/test/java/org/scijava/script/ScriptInfoTest.java  |  5 +++--
 .../java/org/scijava/script/ScriptServiceTest.java    |  5 +++--
 .../java/org/scijava/service/ServiceIndexTest.java    |  5 +++--
 .../java/org/scijava/test/AbstractSciJavaTest.java    |  5 +++--
 src/test/java/org/scijava/test/TestUtilsTest.java     |  5 +++--
 .../java/org/scijava/thread/ThreadServiceTest.java    |  5 +++--
 src/test/java/org/scijava/ui/UIServiceTest.java       |  5 +++--
 src/test/java/org/scijava/util/AppUtilsTest.java      |  5 +++--
 src/test/java/org/scijava/util/ArrayUtilsTest.java    |  5 +++--
 src/test/java/org/scijava/util/BoolArrayTest.java     |  5 +++--
 src/test/java/org/scijava/util/ByteArrayTest.java     |  5 +++--
 src/test/java/org/scijava/util/CharArrayTest.java     |  5 +++--
 src/test/java/org/scijava/util/ClassUtilsTest.java    |  5 +++--
 src/test/java/org/scijava/util/ColorRGBTest.java      |  5 +++--
 .../java/org/scijava/util/ConversionUtilsTest.java    |  5 +++--
 src/test/java/org/scijava/util/DigestUtilsTest.java   |  5 +++--
 src/test/java/org/scijava/util/DoubleArrayTest.java   |  5 +++--
 src/test/java/org/scijava/util/FileUtilsTest.java     |  5 +++--
 src/test/java/org/scijava/util/FloatArrayTest.java    |  5 +++--
 src/test/java/org/scijava/util/GenericUtilsTest.java  |  5 +++--
 src/test/java/org/scijava/util/IntArrayTest.java      |  5 +++--
 .../java/org/scijava/util/LastRecentlyUsedTest.java   |  5 +++--
 src/test/java/org/scijava/util/LongArrayTest.java     |  5 +++--
 src/test/java/org/scijava/util/ObjectArrayTest.java   |  5 +++--
 src/test/java/org/scijava/util/POMTest.java           |  5 +++--
 .../java/org/scijava/util/PrimitiveArrayTest.java     |  5 +++--
 src/test/java/org/scijava/util/ProcessUtilsTest.java  |  5 +++--
 src/test/java/org/scijava/util/ShortArrayTest.java    |  5 +++--
 src/test/java/org/scijava/util/StringUtilsTest.java   |  5 +++--
 src/test/java/org/scijava/util/UnitUtilsTest.java     |  5 +++--
 656 files changed, 1999 insertions(+), 1343 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index aaa28e8b4..82d98ebc1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,7 @@
 Copyright (c) 2009 - 2017, Board of Regents of the University of
-Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
-Institute of Molecular Cell Biology and Genetics.
+Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+Institute of Molecular Cell Biology and Genetics, University of
+Konstanz, and KNIME GmbH.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/pom.xml b/pom.xml
index e0beb5f14..34dab8406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,8 +159,9 @@
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>
 		<license.copyrightOwners>Board of Regents of the University of
-Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
-Institute of Molecular Cell Biology and Genetics.</license.copyrightOwners>
+Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+Institute of Molecular Cell Biology and Genetics, University of
+Konstanz, and KNIME GmbH.</license.copyrightOwners>
 	</properties>
 
 	<dependencies>
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index fba517e29..1647ef3ed 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -4,8 +4,9 @@
   SciJava Common shared library for SciJava software.
   %%
   Copyright (C) 2009 - 2017 Board of Regents of the University of
-  Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
-  Institute of Molecular Cell Biology and Genetics.
+  Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+  Institute of Molecular Cell Biology and Genetics, University of
+  Konstanz, and KNIME GmbH.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 86549ce6d..563bf2b67 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index 466bd78c3..aeb8b9cd5 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index a21cd5344..1ef8c4510 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index edc3dfab2..84696a531 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index d4ee30ac3..f7dc233e8 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -4,8 +4,9 @@
   SciJava Common shared library for SciJava software.
   %%
   Copyright (C) 2009 - 2017 Board of Regents of the University of
-  Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
-  Institute of Molecular Cell Biology and Genetics.
+  Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+  Institute of Molecular Cell Biology and Genetics, University of
+  Konstanz, and KNIME GmbH.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index df0bcba15..a956f0b48 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index 768ce4986..d11fb2c6f 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index a4980d63d..8b686230a 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 2c81d5f31..3cb0f0fca 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index 4dd50a1a9..98884ff15 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 030ba023a..fd8aae923 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index e74971f46..a240ff78e 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 9821c0dd7..682abfefe 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index 0a86dfbce..9ec7aeec2 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index e74b7188e..2b5633aa9 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index 116ee2775..0d88f23a4 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index ce331d0df..c29b5fb0b 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index 041ffa413..d67cf1298 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index 1af1cef0c..7b1f55900 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index 96b7b49da..febcc8629 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index db5e7db88..da4e594d4 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index aff02fe28..a10968865 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index f2fc2b8f1..e29db087b 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 1771a7e8b..1f102a42c 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index 654fce4ab..f97542944 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index b291f021d..bf2bc79f6 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index ce05a776b..c0509c937 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 1dddc3441..c96fc8892 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 416ae93f6..13f6f600c 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 019ae17bf..74a44cc20 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index 927cbb224..ebf387171 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index e650fc98e..a5e28f0df 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 3545d6ce8..998742226 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index 7b006ffed..efa4acf93 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index ea8b3b121..10e8bf159 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index 233510e35..36aabaea6 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 0f8a06221..c87d1da55 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index a4f02935f..4d399d8ea 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 472f57335..4a7907a1b 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 933ce8197..7ef216860 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index b292d9831..145252203 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 80cad4334..053103e8c 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index 84ae391d1..23348cd80 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index 31d849867..b047e8075 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index ef8a2a576..d716978ae 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 69e26bcc1..2916d0a78 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index acf3c3d29..11d0929aa 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 6a79a67ff..14003cc24 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index 5f5c4979d..641c12778 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 884b0aea5..34c3dc4b9 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 52bb33ca4..918501003 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 43a5e58b0..a58987ed2 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index ef758592f..51da39f7a 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 67cccf86d..c0f20dd08 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index d8a3005e2..1866e18a6 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index c0ab8850b..24c592a0f 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 87bcc909a..c5f952499 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 19f5f1de4..1843cf1be 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 222237422..9dcdc710b 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 6542022b6..b675c59a5 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 10c0c7b78..01bc4d1af 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 7a4feb704..589da8fe8 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index 3ce3ec96d..2754d4f7f 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index 2e344365a..d35905b6b 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index aa81671c0..ae88e949a 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index b47e64d91..a45f4b1ac 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index bb41ca906..74ad4cfee 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index 920ad4047..117485838 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index 14bdb641a..4abc0fee1 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 6d062edf4..8ee57832d 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 8bc9448f5..74530bcec 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index c2a8ce8bb..a6673e243 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index f0ecfcb9b..25024e0da 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 4711e5d18..cde13bf0d 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index 49bd88590..4e645ced5 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 7e9a9be58..52c6ec14a 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 47c712b62..6b366a860 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 99b9867b0..3ff2c2f89 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 855947bdf..ab1197ce5 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 72fae4aea..659f52b9f 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index d3bc2c5e7..663d51de7 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index 1641542f0..f3657c1ca 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index ef812d1ef..c174d5aec 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 3938415f3..b15c52de0 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 080788ae8..3b1a299c5 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 9837b58a0..803486705 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index a611d67f2..ba71f9d6b 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 14c1ae26f..961351b0b 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 39d950e1e..49bf952ee 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index f918d4ee0..195fa4b07 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index 71c2d47ec..2176e0398 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index b3f091258..c95c01ea8 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 5eb02c50a..a1f4c3ced 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index 98f636b60..e7827463f 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index e55b2db61..74f4fecb1 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 5080cb153..daf688867 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index cbc2e9f24..49bd310aa 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index 8da2cf802..dacd8496c 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index ab230327c..5d43e22a1 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index ed8846725..e22864ed6 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index a47ff573a..e74049a25 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 9c6a83448..1714eeae0 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index c0a564c05..d407fcb99 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index ab31f5359..46a07a4ed 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index e9156d608..f4eff12aa 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 5406ba4ec..49793247b 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index a891da42c..210108cb4 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index e383301fe..a8e0e6ade 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index acf37864e..b2249003b 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index 810350a13..e51c819bf 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index bee7ccb7a..c48bad430 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 2f50512c4..204b72608 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index 6236703b8..c57d69244 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 600e4a729..46be07e94 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 89ab73888..4edf3e210 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index f7a632a17..56202566b 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index 978ff2296..30a461d51 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index a533eaf74..a604634fd 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index 2df034dc3..dbac42c23 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index fab6bcc83..8ef95d6a1 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index a019dc780..93f8741f6 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 089dd17e2..d86783a0c 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 128e10b50..81f003f47 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index e3071db3b..52354fc5a 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index d6ca4f712..737edb758 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 6110f6330..206cdea81 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index 765c73e73..a1d73920f 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index 2bbe67f53..c68ca8fce 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index 7b4238bdb..ffc1cd08c 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index 8f1a9864f..b0ea0b037 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index f702b1927..e0d7045a8 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index ba6f9d7ab..4c3e3fd99 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 0efacbe71..7fdbc15f8 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 73f93a14f..c0da07dc4 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index a63bae0d0..e070b45a4 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 8638eb469..11bb065a3 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index 331f82b72..51b9e6402 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index fbb144fe4..d3f994aef 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 12a830f82..68a182f04 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index ad9ad56ab..6eda6b191 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 8cede75c9..910acbadc 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index c2ffa1794..1b4bd8b09 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index bbe3fba40..26b9b7bcf 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 4ebb70883..7d262054c 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 4b468cd09..7835f5087 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index f7e924b46..9de3dc332 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index 3336f4da9..94db61dcd 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index fc549034e..386713bc6 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index 706ac59f3..6d0dbc100 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index a5426bb76..b74804836 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index efe3b1179..4d046e5a7 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index 79c328cf6..1233b0913 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index e644763e8..f61edc56b 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index c3976e9b8..5ac542926 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 5c485330c..32317193e 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index 91fce4bc5..b6a8567e6 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index 215256789..a3541422d 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index e70e63222..430f97f0c 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index cc87247e6..833298a89 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 1574e109c..6053405d8 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index 252500cb1..172b2d933 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -3,18 +3,19 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index e97b15bfe..5c5551ecb 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -3,18 +3,19 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 2e6cdc63b..70ac00020 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 62506bb26..8bda3c537 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 7de3cc315..42781e9a6 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 3774de692..3858229a9 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index 6eb0e68cd..e7ab47cae 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 6f0c7947e..23180281a 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 08df4c44e..08ac7c0ef 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index 73e21c01a..45691849f 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 83bb16f7b..2c21cd076 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index ac0e4b7a8..2d2258ab2 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 813a99944..56d62a92e 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,19 +2,20 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 78e9ed376..f02b18c17 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index 2a215c69a..d96cfed49 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index c2320281f..8291985ba 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index 5ed20cfc0..97175e4d9 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index 47be40ebc..f3c598ce8 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index 02123344a..b2bf44b98 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 1578a6b8c..bfbcf3a2f 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -3,18 +3,19 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 5541c064c..5db88ba18 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index 2d9d238e2..3d614d162 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index 4aeba9d6b..5a5873ed3 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -3,18 +3,19 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index aecf8edb6..49c1b07cd 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -3,18 +3,19 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index d2db80c9b..2601d3132 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,19 +2,20 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 5092167ec..aa9a383df 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index db9dc146d..ad42bf3cb 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index ed5d43617..94cc2155b 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 1c4045955..8ea6531cc 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index 24789ff14..14b96a4b0 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 8245aa663..80a84459c 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -3,18 +3,19 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 9a631daf6..29785ec49 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,9 +2,10 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index 0c6865045..1d67b0a66 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,9 +2,10 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 44f9fea29..ff2545be0 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index ab28a4515..8130547f2 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index c86563871..bae7381e3 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index cb73be8c5..ee9db5e02 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index f79baab50..53e8e913b 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index f8fcfc99d..48af811df 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index d865ec95c..c4a4ac2d0 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index d33c64121..793fdce2c 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 153d5303d..8a359cd49 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index d3835cdca..b88dd28db 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 99e6c8c9e..e231a8819 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index 6ee40aa5f..680b52f86 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index 84691ad71..ebda18708 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index b0b611c13..02747467d 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 529ba1f81..35613098e 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index bb1784cba..e4ae4883c 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index e3220196f..220a8389f 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index c22b02cf6..7474e77a1 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index b1a1ac583..c8fb8c1df 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index c7063001f..75ac1d5a0 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index e50a162e7..ca13bf3db 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index ffd48cf37..87d792c96 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index e7ce1f0d2..c58024cda 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index f7a7f7a46..ec3c1e0dd 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index c368a602c..c1cc84d16 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index ff6a07fb1..6654c616d 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 363388587..afa563749 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index 25058c382..970958312 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index 35d44b0dd..acfa908b4 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 3cb81187e..567602335 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index 1eb8c6b8f..82ae29ef9 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 01d8612f8..2355db95b 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index b4a8e146d..83da593d6 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index f6972555d..3a454338d 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 6def93c65..5b6b43fdb 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index a3a1253b6..d95e123f0 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 165d83ffe..9267c0070 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 63771f2ca..83d746362 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index b4b6d3ca1..aec08d912 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index c546fb8ef..4c2f132fd 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index e6955c597..80bf49ba9 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index f17936668..4303c40d4 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index 095ee07b6..58dc9e41c 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index e24bd4f4f..9589e788a 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 1dcc35616..5c5ed02ef 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index 294cd8637..5ab4b856f 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 95b2379a1..98a0b2a27 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index b81f1ffa1..ab8ef93ea 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 55305f2af..4f42cc3d3 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index 7a5df739f..52647be4e 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index d695e8d27..8fa1c18de 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 2bd2b150d..140ee62c0 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index cc9038d05..f37774673 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index 3278acceb..067cad90f 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index cc33882a2..7f6231b28 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index a0f3e4ab1..b1c049a80 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index a6f69dc0d..91abbb0a9 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index 117a1e7fe..c07a0644c 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 368702df6..bbac93103 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index 43f4498ac..3fc40644b 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 6d1cecf01..d9100b87d 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 3cc9d45ac..98d439e30 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index a853ba785..ec12b65c0 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index 426be0bed..c9d1632b9 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index 7f991b220..9f3d29ae4 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index 7f7df3348..e40a7b21c 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 5bda98f14..01daf5446 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index e86f1b471..e8f346b8b 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index 8ab370ef5..b7081968d 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 0784574c1..9d202b55c 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index d268eb8b2..0e8943887 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index 2ccb94e36..a72db98b9 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 3f4fc437f..e34b1b800 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 7567a4630..46f162ab0 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 715ef0887..39037e700 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index f172e3822..04c174cb5 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 5b8833a85..e24922b21 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index ab5de4579..690ff025d 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index 20043b4fa..ee97f715a 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index a2f823b7e..6d7ea3c52 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index 7e96da519..1cda244d8 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index f4265bad5..5b4d8e68a 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 03cb59af2..44b289518 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index 990622fc4..a924dcf5c 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index 86eee883e..699cc48b0 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 47df9da30..20b505c6a 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 5d1b9fc9f..706eb0579 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 0c432e835..c217a5c14 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index 84a7ee761..199478d05 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index b01199d23..6e2712b02 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 457a19ac9..3e5f5384e 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index e58f0fec9..c08d40764 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index 687ef817d..a1a47320c 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 68cc81156..870893e6f 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index 4364fa93d..e0437cd04 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index aa030cd95..12dad7a43 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index 807b8d871..50a4f74a6 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 630672060..7be138eb7 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index 9b6b11047..b0ded7629 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 1b19de6fa..840e03c46 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 65282f726..53f56d85d 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 19f58943a..7bc964bdb 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 4e2cac09f..a4364de88 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index cc29c24c4..72b90558b 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index b4d81c1e3..bc6e98bc4 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index 71bc04fd0..494372e96 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index da6acd058..b89404a7d 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index dee21cabd..6f8f3ff08 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index 6e0f9a291..db1fe918b 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index 4c0a273b5..4396d87d7 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index 7c9d6de2b..a8545571b 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index d0a1386d3..81c23b321 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index 60c9e6825..8adcbb90d 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 133d763c8..88d6d71fb 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 365fc1d11..0114a3231 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index ebbd663df..358baa2f5 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index 0e18aca5a..a0bd36719 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 07c44d43f..03145e616 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 3aa264d28..c1f4460ea 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index 65fdf2a13..b5791f769 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 75fe7a7c5..52b82ef2c 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 4e5fc5029..7c71dfd51 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index dae79f675..ca7cfafad 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 2e4b933d9..4795a5810 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index 5c8f262e4..08aac65da 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index e258bff85..3081cd34e 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 16c94a132..dc61d9ab7 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index 1c0700565..9dfe36a7a 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 21724b2a1..21eaf4e80 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 804a325d9..4e359bd91 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index 63a3285ba..9b031c836 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 36a128498..990535a43 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index 21edaa358..d2f84472b 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index 3a3223574..88598721f 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index ab261521b..59310b635 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index bba5410be..78866bbe8 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index d9ad9141a..ad6ef747c 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index f68c4db65..c7154f5a5 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index ce7ced233..33ab3e9f4 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 65da01d77..cfcda7d6a 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 84f0f41b0..8be6a7b9a 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index bf22ba95c..8784d34b2 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index 0ba87ea57..e031af5bb 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index 806f04016..2e451c992 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index f8cb8e887..11c5a1b0b 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index 9ed8c969d..06ad76eaa 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index 98dc1dc68..6e4483e02 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index d15e620b3..ed19ddcf5 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index 8e78e58b7..3fd7a5d32 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index a5dd1deb0..d4636239a 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 401632185..350fe27b1 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index d03423e55..225a909ef 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 3e9c2429b..79de5cd4c 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index b1382ec8d..8bacf6a95 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index c8124ee67..56fe2954b 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index 67366a0e0..b8aee1b27 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 7b287413c..ab6ca65be 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 5e2d5673d..ffb036613 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index 05956001a..981653d9c 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index 46b475f0e..7b8409a03 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index ab6ab7de7..cdbb2252d 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 1f5c6f9e1..819d79c8d 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index 5f52e9ac7..cd29ceb33 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index 97bd240ee..e69de8bf3 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index f0344cdb9..8ab47cfb4 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index 55590081e..220e78589 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index ec48da96c..e3f777d36 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index 12591841a..b8a0e9266 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 1dba40118..8c2db2675 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index 9d2681d79..f20e3ee25 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index 9281fd122..4d2ac2050 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 4a2599713..f6610d7f9 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index f63eb7938..b7535b8b3 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 639c33833..85886a494 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 5073e147c..8f6f68af5 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index d51709bbc..0422b2aca 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index 3e61a9fd9..3872e1e3f 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index 1adb82576..25d8b08c5 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index bee3b1c06..bc165fa5b 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index 9c08ebcf5..782bb0d71 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 2cdb474e1..ff6f81d11 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index f032b8356..755f43bbd 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 5ed0f39a6..3766c56c6 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 7ff8c1a07..6c5ac208c 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 4a5f10fb8..a8c4209c4 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index 4b9ad3ba6..f8b99c3b9 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index 14810c80a..d85817af8 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index 3cbce02e3..0e9f2d998 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index d7c50d2b0..f38b5e45b 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index fa6f8f0ed..5d060704f 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index e89ca7150..ba1143eb7 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 202071f62..2f7598bf1 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index f1b75d546..1d93df16b 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -77,4 +78,4 @@ public String process(final String line) {
 		}
 		return line;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index b56d24831..02df88c75 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index dab8524d7..0a5e7c631 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index eaa461ba0..5887eec55 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index a8e2d6827..3260f6205 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 1a684c034..22e9503a7 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index 23f48642e..e512c2a0f 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index 93f8588fd..8c06ba6d0 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index fd7e48eee..f32fd2fda 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 032dae0af..c02394f10 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index 80e23acbc..34ef2479a 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 3aa6122c8..6e483d3b1 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 3d16e46e3..16b18d1c6 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 5311ba524..f894343ce 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index f16ec6beb..34dac1f10 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index 9ae680fc2..e33011885 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index b28ddd785..f233701ba 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 1bd46df11..3b9c6cd32 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index 47e1c89a7..cb714e30f 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index 208f8b497..508c35b16 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index ab95d0f8d..6e2c26d27 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index ecb572f53..48b5b2ae8 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index 43267f76a..8e32d696b 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 4dca68db9..29065b2f7 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 55fb9e038..70df3662f 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 62a895a5c..9eab6bd6c 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 0062595c6..1ea60d802 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index 370c4668e..0b6681e37 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index f7c566aed..6b078bdb5 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index c76edb136..96505d1ff 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index b625f5d0f..f7f5e8a7b 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index 761bd52ef..ddbde1e27 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index 9a3649fab..49f2b6d64 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index c1e7f905e..fb81cb57d 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 8b88490ca..687d59dd1 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index e2fd8df81..710d440c4 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index 97b921a15..d0e0ec607 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index bed279e2b..2bb916e29 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 4d4a20f11..ea09442f9 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index ca9f8d925..4bbd7e490 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index d63910601..f4ef6f875 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index 2449bb517..c9ec13caf 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 1c6a2d15e..c23006b0e 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index d041fabc9..84fd2210b 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index da45ed875..bc029ea35 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index ab6866f4b..7f373bf10 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index 2272eb14b..012fa2fe0 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index 9294b94f7..206899067 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index 29345595d..adb428492 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 9a1939671..643bcbfba 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index da0213cca..15f675082 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index 1886ddcdf..8a0012b07 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index 19d875485..0c7355dd7 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index 9195070f0..cbad90cde 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 3ca4e88bb..6f65c0a73 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index 15522d4cb..c52b28565 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 9b989496d..4ad74aafe 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index dcd1e7581..7e92f190e 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 3a084bb38..2600b161d 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index 5546dea09..c3e49ee08 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index df48275e2..429f6903a 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index d3effdcf3..d89ef6ef9 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 47b241366..57a93a2bb 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index a0fbff395..c2a3ff8b2 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index d68710044..f91dada1b 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index da808fa0e..2a03183dd 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index e176d238e..1cd8b54d5 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index c3f11f2c9..62576cc9a 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 188a6b952..aa1737ae7 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 25b21c871..90e4105f6 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index bbbfb511e..d949a3312 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index 1b7e1d628..5edabe84f 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index f8fd52a74..35e8e8216 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index a7ae16b15..d170758fe 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index 3abc8f587..c9d9cea64 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index eff753250..26702b2bb 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 5c64f9c6a..2a8c44b51 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index 492ced3c7..0c91b9454 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index c8ed71cf8..332ad819d 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 06a67b80a..0e168567c 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 80ce58772..8a02aed89 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index 85f59844e..69617306a 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index 7be781de3..edfeff177 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index 94e8f10c1..3c2914f25 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index 1a207272c..f394a860e 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index cd18e2500..e25eebca3 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 9895caf95..3151f7f62 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index cb124a382..7b9b1d038 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index ce96ba8b1..f9f3fe292 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index fc7e6deee..4e2a95057 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index c3397a45c..062182c15 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 00439911c..ea1decd9c 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index e0c6e34a7..0c7c6a268 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 0b568e776..725a7628d 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index 244abd2ae..2108fb609 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index f916dd5db..0daccf5e7 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index 22244a61f..26464d35e 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index e0a6ae873..df6165ccb 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 6800f7929..3c6014ded 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index eb4bce513..0501616a3 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index d6a674e13..a96c98e39 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index 6abf6562d..56a4319dd 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 64f5679ce..731bd74a0 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index 21cab3510..1ef4e99e4 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index aef0f63b6..1c169f351 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index 3c3a6ad56..c0ac04d1f 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index cbf701e9f..e30f0b85c 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 03b5dca30..a3a8707b3 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 75418f949..6f274e50e 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index 2f21226eb..e59621e4e 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 9502f7894..428b4e819 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 95f7207a2..4f7aa6cac 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index febf6bdaa..88ec606c0 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 85b403b3c..9458301f8 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index 3ffcf9c59..acd9459ba 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index c7919fb9c..f9d13609f 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index c1c9d47dd..192498e89 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index 6e09e202a..8dee1e5c8 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index a2cabad05..d0cba28ba 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 8f43b9070..297465013 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index a75303756..32bf04be0 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index 0c90c0e4b..bb5c9e6f4 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index 9c9d621ca..241f50373 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 2f7f1d6fa..2a2fe9554 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index 8422b4b5f..5efa456d6 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 4f6fea077..444ed8e21 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index 936e4b0ed..863a08c06 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index db572380d..925b90ce1 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 3e3bf8385..6b6a389ae 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 0d77ce1bc..9a09e5939 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 15641e7dd..3b6eaa1e9 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index f5acd838b..4a4d54db2 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 8446802c6..9fa762fc7 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index c1ae21e45..5266c2300 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 3fce35ced..6e6a9d65f 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 2be5c30ea..725b7d9f5 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index f4fa9470d..d3e97197f 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index 513895055..9d3f656fe 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index a9bf541de..fefc9bb47 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index ce65e8c2c..24006c63e 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 321dd2a1a..2557f9714 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index 6b9340c08..99d62816e 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index 53181eb71..56129404e 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index bfd15d7c8..b956c764f 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 6e539f14f..22b1f6d6d 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index 477a86aa4..fc60b932d 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 395def82f..7650b1065 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 78d0ae3f6..f80fc641b 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index 5ba0c5dd5..f31c2ac28 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 4370cbd8a..92f1c5fea 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 81c4d508f..1087924f7 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 19cd7030a..3f3b2ad43 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 42492607b..9d8bc2234 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index 423de683e..a48567eac 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index f6da02732..fd7ce5ce2 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index f8d76bb4d..a89b49446 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index bf13ebdff..04c00a6f9 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 1647d4db7..ab06587a9 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 52cbcc1bd..2bb202e46 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index b1fbedc5a..85c73afbe 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 6f364ddfc..36cda8ba9 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index d7369f2dd..53aa7ab40 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 92836407d..27c4f1db9 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index 7a7dae9d7..a8644a6c9 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index fe4b360a8..b4d0bb2de 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index d63e3cae7..ac122ff03 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 0387fdfe8..f5133e5be 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index d9b960dd3..b7881c1b3 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index a9c84b302..249511a57 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index c56a4f1ad..d2f663f35 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index 9abcc4fb3..75efc3e7a 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index 8ee5cc012..eeb2f5503 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index aadb9ab4d..709593d4b 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index d3fe9e66e..f5abb4730 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 35579a804..ded76ecd8 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 76ee6bba7..84f38b97c 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index 7b06c0451..95ae9aa22 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 94e25e694..2c4109a1e 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index c2284b95f..7a226ed43 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 84d552f6a..b292493a4 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index 22ad053e1..b9ebff3d7 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 3c15f173e..82fb0812b 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index fdac8b40f..b08cfeb84 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 9e96ff0b0..bac9855af 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index ca9cf8e5a..2356d46c4 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index 05f3ab842..fec333605 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 2cafe9404..8044c7f00 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 562a282e9..506a11fe9 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 4cd8dc2ae..79f58a1a0 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index e1c58e705..284c485d7 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 8985e0d58..8a08ab1a0 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 0d77baab4..b772378df 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index 5d8df5b77..d18d7b19a 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index 9350e6564..31085d0c6 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index beb7d5968..2d836e667 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 8788bab96..44e85680f 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index 8b7ba5235..9779a0a29 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index e0b2dc0a8..0f2c38533 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index d0f89e0df..fa242dd9b 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 879230b73..a5f7e7402 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index a5946bf21..c04794cb9 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index f6b140e44..436f2098f 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index 502e384fc..35be86ac7 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index 4409e6510..9b5f91830 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index 02288d693..b6b16a4f2 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 959e32105..407df7e84 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index d79cbd6b6..361438faf 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index 520948b1c..8b9081d6c 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index 2f346e2d8..a90e6adb0 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index 483f4c260..12c9572b1 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,19 +2,20 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index 219306c1a..4b99fd426 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,19 +2,20 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index 3fafa0d6c..03c536d55 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,9 +2,10 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 5a3069940..4208562cd 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index fd754a673..234efa90e 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index b88eb36cd..2b362f675 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index 1c68568f6..43bc8b0f7 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index 251242f3e..5298b1d6a 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index 191102fe4..1f74e1cb3 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 3efb7ca7f..a1c571107 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,19 +2,20 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 515e44a1d..04d8758ca 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index 542dd3cc9..76d1fd854 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index 8c74eec92..c361345df 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index bfaa74f23..f228f7d79 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 4962136a0..e0f06e0c3 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index 73a991970..08604b4e3 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index cdd88db72..8ad866534 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 08296c0da..6e662eef4 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 3b2ceb06d..255780dc6 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 46d4c1348..7ac1e4dd9 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index 1f0c40a34..fd24e86ac 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index f6db17850..cf3984c85 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index afe868fb9..59e881152 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 06f934666..140aaf6d1 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index c6dfdaa10..a9bd6ac4a 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index 55f35e89e..17a38ab2d 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index fd3f3f239..b9117d27c 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index 1f75dcfa6..8c72c5f8f 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index c24fad50c..d47d2d858 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index a5b0e6029..3c5c64ebc 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index 3e1c06711..01782d057 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index fd643e259..4712282c0 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index d2ab485fa..3bf06dde2 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index f8b7f94b6..181e3246b 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 9a29ead8e..576c5a9a5 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 03bae44f1..b54dfa540 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index 2fd9342ef..ea28c4f9a 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index 59b463ac2..7521d018c 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index f29d1d5ab..f94955de0 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index cdf6fc2f6..266bf2e01 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 8e31741ee..4983e6461 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 0dba2d7f2..a55dda743 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 02942c614..423a6d281 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 139fd015b..cadc051b2 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 4610931ae..4d0a837ff 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index ce980ff89..e90c6d053 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index 1d9c7a2e0..e241854fb 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index 4f8992c32..356df3e18 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/GenericUtilsTest.java b/src/test/java/org/scijava/util/GenericUtilsTest.java
index b39c2cc71..389370007 100644
--- a/src/test/java/org/scijava/util/GenericUtilsTest.java
+++ b/src/test/java/org/scijava/util/GenericUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index 43bd6b610..4f22647b5 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 46522d150..fd80647e2 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index 24df63313..d1063a581 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index ef8dad647..40dc5bd61 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index f8d2e3f6d..5ad61707e 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index 5446480e2..f4a5bfa72 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index 227703ca9..e8882c123 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index 4a3fd60c6..5cd7b6cb2 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 395b23db2..88089986b 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index f2d005c2c..e0f060eca 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -3,8 +3,9 @@
  * SciJava Common shared library for SciJava software.
  * %%
  * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From 6844914229c707d453721614aa74d21eeb64af5c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 12 Jul 2017 18:33:17 -0500
Subject: [PATCH 0553/1208] DummyLocation: organize imports

---
 src/main/java/org/scijava/io/location/DummyLocation.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index 2601d3132..564305b0b 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -32,8 +32,6 @@
 
 package org.scijava.io.location;
 
-import org.scijava.io.location.AbstractLocation;
-
 /**
  * {@link Location} backed by nothing whatsoever.
  *

From 598af216de07367881ccb85ec12825c3578440c5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 12 Jul 2017 21:33:10 -0500
Subject: [PATCH 0554/1208] Make the ByteBank consistent

Treatment and tracking of getMaxPos() was inconsistent in the codebase.

It has been renamed to size(), and reflects the index to the bank's END,
rather than the index of the last populated index. Personally, I find
this convention less confusing.
---
 .../org/scijava/io/ByteArrayByteBank.java     | 57 ++++++++++---------
 src/main/java/org/scijava/io/ByteBank.java    | 24 ++++----
 .../org/scijava/io/handle/BytesHandle.java    |  2 +-
 .../scijava/io/nio/ByteBufferByteBank.java    | 27 +++++----
 .../java/org/scijava/io/ByteBankTest.java     |  4 +-
 .../io/location/BytesLocationTest.java        |  4 +-
 6 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index 172b2d933..adfe93ff8 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -36,50 +36,49 @@
 
 /**
  * {@link ByteBank} implementation backed by a {@link ByteArray}. Self-growing
- * up to a maximum capacity of {@link Integer#MAX_VALUE}
+ * up to a maximum capacity of {@link Integer#MAX_VALUE}.
  *
  * @author Gabriel Einsdorf
  */
 public class ByteArrayByteBank implements ByteBank {
 
 	private final ByteArray buffer;
-	private long maxBufferedPos = -1;
+	private long size;
 
 	/**
-	 * Creates a {@link ByteArrayByteBank}
+	 * Creates a {@link ByteArrayByteBank}.
 	 */
 	public ByteArrayByteBank() {
-		buffer = new ByteArray();
+		this(new ByteArray());
 	}
 
 	/**
-	 * Creates a {@link ByteArrayByteBank} with the specified initial capacity
+	 * Creates a {@link ByteArrayByteBank} with the specified initial capacity.
 	 *
 	 * @param initialCapacity the initial capacity of this {@link ByteBank}
 	 */
 	public ByteArrayByteBank(final int initialCapacity) {
-		buffer = new ByteArray(initialCapacity);
+		this(new ByteArray(initialCapacity));
 	}
 
 	/**
-	 * Creates a {@link ByteArrayByteBank} that wraps the specified
-	 * {@link ByteArray}.
+	 * Creates a {@link ByteArrayByteBank} that wraps the provided byte array.
 	 *
-	 * @param bytes the {@link ByteArray} to wrap
+	 * @param bytes the bytes to wrap
 	 */
-	public ByteArrayByteBank(final ByteArray bytes) {
-		buffer = bytes;
-		maxBufferedPos = bytes.size();
+	public ByteArrayByteBank(final byte[] bytes) {
+		this(new ByteArray(bytes));
 	}
 
 	/**
-	 * Creates a {@link ByteArrayByteBank} that wraps the provided byte array
+	 * Creates a {@link ByteArrayByteBank} that wraps the specified
+	 * {@link ByteArray}.
 	 *
-	 * @param bytes the bytes to wrap
+	 * @param bytes the {@link ByteArray} to wrap
 	 */
-	public ByteArrayByteBank(final byte[] bytes) {
-		buffer = new ByteArray(bytes);
-		maxBufferedPos = bytes.length;
+	public ByteArrayByteBank(final ByteArray bytes) {
+		buffer = bytes;
+		size = bytes.size();
 	}
 
 	@Override
@@ -93,13 +92,13 @@ public void setBytes(final long startpos, final byte[] bytes,
 	{
 		// ensure we have space
 		checkWritePos(startpos, startpos + length);
-		final int neededCapacity = (int) (Math.max(maxBufferedPos, 0) + length);
+		final int neededCapacity = (int) (size + length);
 		buffer.ensureCapacity(neededCapacity);
 
 		// copy the data
 		System.arraycopy(bytes, offset, buffer.getArray(), (int) startpos, length);
 		buffer.setSize(neededCapacity);
-		updateMaxPos(startpos + length - 1);
+		updateSize(startpos + length);
 	}
 
 	@Override
@@ -111,17 +110,13 @@ public void setByte(final long pos, final byte b) {
 			buffer.setSize((int) (pos + 1));
 		}
 		buffer.setValue((int) pos, b);
-		updateMaxPos(pos);
-	}
-
-	private void updateMaxPos(final long pos) {
-		maxBufferedPos = pos > maxBufferedPos ? pos : maxBufferedPos;
+		updateSize(pos + 1);
 	}
 
 	@Override
 	public void clear() {
 		buffer.clear();
-		maxBufferedPos = 0;
+		size = 0;
 	}
 
 	@Override
@@ -138,13 +133,19 @@ public int getBytes(final long startPos, final byte[] b, final int offset,
 	{
 		checkReadPos(startPos, startPos + length);
 		// ensure we don't try to read data which is not in the buffer
-		final int readLength = (int) Math.min(getMaxPos() - startPos + 1, length);
+		final int readLength = (int) Math.min(size() - startPos, length);
 		System.arraycopy(buffer.getArray(), (int) startPos, b, offset, readLength);
 		return readLength;
 	}
 
 	@Override
-	public long getMaxPos() {
-		return maxBufferedPos;
+	public long size() {
+		return size;
+	}
+
+	// -- Helper methods --
+
+	private void updateSize(final long newSize) {
+		size = newSize > size ? newSize : size;
 	}
 }
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index 5c5551ecb..72b31271a 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -92,7 +92,7 @@ default void appendBytes(byte[] bytes, int length) {
 	 * @param length the number of elements to append from the bytes array
 	 */
 	default void appendBytes(byte[] bytes, int offset, int length) {
-		setBytes(getMaxPos() + 1, bytes, offset, length);
+		setBytes(size(), bytes, offset, length);
 	}
 
 	/**
@@ -103,9 +103,9 @@ default void appendBytes(byte[] bytes, int offset, int length) {
 	 */
 	default void checkReadPos(final long start, final long end) {
 		basicRangeCheck(start, end);
-		if (start > getMaxPos()) {
+		if (start > size()) {
 			throw new IndexOutOfBoundsException("Requested position: " + start +
-				" is larger than the maximally buffered postion: " + getMaxPos());
+				" is outside the buffer: " + size());
 		}
 	}
 
@@ -117,18 +117,18 @@ default void checkReadPos(final long start, final long end) {
 	 * @throws IndexOutOfBoundsException if
 	 */
 	default void checkWritePos(final long start, final long end) {
-		if (start > getMaxPos() + 1) { // we can't have holes in the buffer
+		if (start > size() + 1) { // we can't have holes in the buffer
 			throw new IndexOutOfBoundsException("Requested start position: " + start +
 				" would leave a hole in the buffer, largest legal position is: " +
-				getMaxPos() + 1);
+				size());
 		}
 		if (end < start) {
 			throw new IllegalArgumentException(
 				"Invalid range, end is smaller than start!");
 		}
 		if (end > getMaxBufferSize()) {
-			throw new IndexOutOfBoundsException("Requested postion " + end +
-				" is larger than the maximal buffer size: " + getMaxPos());
+			throw new IndexOutOfBoundsException("Requested position " + end +
+				" is larger than the maximal buffer size: " + getMaxBufferSize());
 		}
 	}
 
@@ -139,9 +139,9 @@ default void checkWritePos(final long start, final long end) {
 	 * @param end the end of the range
 	 */
 	default void basicRangeCheck(final long start, final long end) {
-		if (start > getMaxPos()) {
-			throw new IndexOutOfBoundsException("Requested postion " + start +
-				" is larger than the maximal buffer size: " + getMaxPos());
+		if (start > size()) {
+			throw new IndexOutOfBoundsException("Requested position: " + start +
+				" is outside the buffer: " + size());
 		}
 		if (end < start) {
 			throw new IllegalArgumentException(
@@ -155,9 +155,9 @@ default void basicRangeCheck(final long start, final long end) {
 	void clear();
 
 	/**
-	 * @return the position of the last byte in this ByteBank
+	 * @return the offset which follows the last byte stored in this ByteBank
 	 */
-	long getMaxPos();
+	long size();
 
 	/**
 	 * Sets the byte at the given position
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 56d62a92e..dc941f21b 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -60,7 +60,7 @@ public long offset() {
 
 	@Override
 	public long length() {
-		return bytes().getMaxPos();
+		return bytes().size();
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 80a84459c..a159185a8 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -49,7 +49,7 @@ public class ByteBufferByteBank implements ByteBank {
 
 	private ByteBuffer buffer;
 
-	private int maxBufferedPos = -1;
+	private int size;
 
 	private Function<Integer, ByteBuffer> provider;
 
@@ -86,7 +86,7 @@ public void setBytes(final long startpos, final byte[] bytes,
 	{
 		// ensure we have space
 		checkWritePos(startpos, startpos + length);
-		final int neededCapacity = Math.max(maxBufferedPos, 0) + length;
+		final int neededCapacity = size + length;
 		ensureCapacity(neededCapacity);
 
 		// copy the data
@@ -94,7 +94,7 @@ public void setBytes(final long startpos, final byte[] bytes,
 		buffer.put(bytes, offset, length);
 
 		// update the maxpos
-		updateMaxPos(startpos + length - 1);
+		updateSize(startpos + length);
 	}
 
 	@Override
@@ -104,17 +104,13 @@ public void setByte(final long pos, final byte b) {
 			ensureCapacity((int) pos + 1);
 		}
 		buffer.put((int) pos, b);
-		updateMaxPos(pos);
-	}
-
-	private void updateMaxPos(final long pos) {
-		maxBufferedPos = (int) (pos > maxBufferedPos ? pos : maxBufferedPos);
+		updateSize(pos + 1);
 	}
 
 	@Override
 	public void clear() {
 		buffer.clear();
-		maxBufferedPos = 0;
+		size = 0;
 	}
 
 	@Override
@@ -132,7 +128,7 @@ public int getBytes(final long startPos, final byte[] b, final int offset,
 	{
 		checkReadPos(startPos, startPos + length);
 		// ensure we don't try to read data which is not in the buffer
-		final int readLength = (int) Math.min(getMaxPos() - startPos + 1, length);
+		final int readLength = (int) Math.min(size() - startPos, length);
 		buffer.position((int) startPos);
 		buffer.get(b, offset, readLength);
 
@@ -140,8 +136,8 @@ public int getBytes(final long startPos, final byte[] b, final int offset,
 	}
 
 	@Override
-	public long getMaxPos() {
-		return maxBufferedPos;
+	public long size() {
+		return size;
 	}
 
 	@Override
@@ -155,6 +151,8 @@ public boolean isReadOnly() {
 			className.equals("java.nio.DirectByteBufferR");
 	}
 
+	// -- Helper methods --
+
 	private void ensureCapacity(final int minCapacity) {
 		final int oldCapacity = buffer.capacity();
 		if (minCapacity <= oldCapacity) return; // no need to grow
@@ -177,4 +175,9 @@ private void ensureCapacity(final int minCapacity) {
 		newBuffer.put(buffer);
 		buffer = newBuffer;
 	}
+
+	private void updateSize(final long newSize) {
+		size = (int) (newSize > size ? newSize : size);
+	}
+
 }
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index 4b99fd426..31a1dec5a 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -93,10 +93,10 @@ public void testSetGetByte() {
 	@Test
 	public void testClear() {
 		bank.setBytes(0, testBytes, 0, testBytes.length);
-		assertEquals(testBytes.length - 1, bank.getMaxPos());
+		assertEquals(testBytes.length, bank.size());
 
 		bank.clear();
-		assertEquals(0, bank.getMaxPos());
+		assertEquals(0, bank.size());
 	}
 
 	@Test
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index 2b362f675..f95144ca3 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -52,7 +52,7 @@ public void testBytes() {
 
 		final byte[] testDigits = new byte[digits.length];
 		loc.getByteBank().getBytes(0, testDigits);
-		assertEquals(digits.length, loc.getByteBank().getMaxPos());
+		assertEquals(digits.length, loc.getByteBank().size());
 		assertArrayEquals(digits, testDigits);
 	}
 
@@ -65,7 +65,7 @@ public void testBytesOffsetLength() {
 
 		final byte[] testDigits = new byte[digits.length];
 		loc.getByteBank().getBytes(0, testDigits);
-		assertEquals(length - 1, loc.getByteBank().getMaxPos());
+		assertEquals(length, loc.getByteBank().size());
 
 		final byte[] expectedDigits = new byte[digits.length];
 		System.arraycopy(digits, offset, expectedDigits, 0, length);

From b4849903ef8532123a90691ba284f38029d5e0d9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 6 Jul 2017 15:42:36 -0500
Subject: [PATCH 0555/1208] Add a TaskService to create & manage running tasks

---
 pom.xml                                       |   2 +-
 .../java/org/scijava/task/DefaultTask.java    | 181 ++++++++++++++++++
 .../org/scijava/task/DefaultTaskService.java  |  64 +++++++
 src/main/java/org/scijava/task/Task.java      | 108 +++++++++++
 .../java/org/scijava/task/TaskService.java    |  53 +++++
 .../org/scijava/task/event/TaskEvent.java     |  62 ++++++
 .../java/org/scijava/ContextCreationTest.java |   1 +
 .../org/scijava/task/TaskServiceTest.java     |  76 ++++++++
 8 files changed, 546 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/task/DefaultTask.java
 create mode 100644 src/main/java/org/scijava/task/DefaultTaskService.java
 create mode 100644 src/main/java/org/scijava/task/Task.java
 create mode 100644 src/main/java/org/scijava/task/TaskService.java
 create mode 100644 src/main/java/org/scijava/task/event/TaskEvent.java
 create mode 100644 src/test/java/org/scijava/task/TaskServiceTest.java

diff --git a/pom.xml b/pom.xml
index 34dab8406..d56a64bdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.64.1-SNAPSHOT</version>
+	<version>2.65.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
new file mode 100644
index 000000000..8042f511e
--- /dev/null
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -0,0 +1,181 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.task;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.scijava.event.EventService;
+import org.scijava.task.event.TaskEvent;
+import org.scijava.thread.ThreadService;
+
+/**
+ * Default implementation of {@link Task}. It launches code via the linked
+ * {@link ThreadService}, and reports status updates via the linked
+ * {@link EventService}.
+ *
+ * @author Curtis Rueden
+ */
+public class DefaultTask implements Task {
+
+	private final ThreadService threadService;
+	private final EventService eventService;
+
+	private Future<?> future;
+
+	private boolean canceled;
+	private String cancelReason;
+
+	private String status;
+	private long step;
+	private long max;
+
+	private String name;
+
+	/**
+	 * Creates a new task.
+	 * 
+	 * @param threadService Service to use for launching the task in its own
+	 *          thread. Required.
+	 * @param eventService Service to use for reporting status updates as
+	 *          {@link TaskEvent}s. May be null, in which case no events are
+	 *          reported.
+	 */
+	public DefaultTask(final ThreadService threadService,
+		final EventService eventService)
+	{
+		this.threadService = threadService;
+		this.eventService = eventService;
+	}
+
+	// -- Task methods --
+
+	@Override
+	public void run(final Runnable r) {
+		if (r == null) throw new NullPointerException();
+		future(r);
+	}
+
+	@Override
+	public void waitFor() throws InterruptedException, ExecutionException {
+		future().get();
+	}
+
+	@Override
+	public boolean isDone() {
+		return future != null && future.isDone();
+	}
+
+	@Override
+	public String getStatusMessage() {
+		return status;
+	}
+
+	@Override
+	public long getProgressValue() {
+		return step;
+	}
+
+	@Override
+	public long getProgressMaximum() {
+		return max;
+	}
+
+	@Override
+	public void setStatusMessage(final String status) {
+		this.status = status;
+		fireTaskEvent();
+	}
+
+	@Override
+	public void setProgressValue(final long step) {
+		this.step = step;
+		fireTaskEvent();
+	}
+
+	@Override
+	public void setProgressMaximum(final long max) {
+		this.max = max;
+		fireTaskEvent();
+	}
+
+	// -- Cancelable methods --
+
+	@Override
+	public boolean isCanceled() {
+		return canceled;
+	}
+
+	@Override
+	public void cancel(final String reason) {
+		canceled = true;
+		cancelReason = reason;
+	}
+
+	@Override
+	public String getCancelReason() {
+		return cancelReason;
+	}
+
+	// -- Named methods --
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public void setName(final String name) {
+		this.name = name;
+	}
+
+	// -- Helper methods --
+
+	private Future<?> future() {
+		return future(null);
+	}
+
+	private Future<?> future(final Runnable r) {
+		if (future == null) initFuture(r);
+		return future;
+	}
+
+	private synchronized void initFuture(final Runnable r) {
+		if (future != null) return;
+		if (r == null) throw new IllegalArgumentException("Must call run first");
+		future = threadService.run(r);
+	}
+
+	private void fireTaskEvent() {
+		if (eventService != null) eventService.publish(new TaskEvent(this));
+	}
+}
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
new file mode 100644
index 000000000..e99edfa3a
--- /dev/null
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -0,0 +1,64 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.task;
+
+import org.scijava.event.EventService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.AbstractService;
+import org.scijava.service.Service;
+import org.scijava.thread.ThreadService;
+
+/**
+ * Default implementation of {@link TaskService}.
+ *
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultTaskService extends AbstractService implements
+	TaskService
+{
+
+	@Parameter
+	private ThreadService threadService;
+
+	@Parameter(required = false)
+	private EventService eventService;
+
+	@Override
+	public Task createTask(String name) {
+		final DefaultTask task = new DefaultTask(threadService, eventService);
+		task.setName(name);
+		return task;
+	}
+}
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
new file mode 100644
index 000000000..958ec8d07
--- /dev/null
+++ b/src/main/java/org/scijava/task/Task.java
@@ -0,0 +1,108 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.task;
+
+import java.util.concurrent.ExecutionException;
+
+import org.scijava.Cancelable;
+import org.scijava.Named;
+
+/**
+ * A self-aware job which reports its status and progress as it runs.
+ *
+ * @author Curtis Rueden
+ */
+public interface Task extends Cancelable, Named {
+
+	/**
+	 * Starts running the task.
+	 *
+	 * @throws IllegalStateException if the task was already started.
+	 */
+	void run(Runnable r);
+
+	/**
+	 * Waits for the task to complete.
+	 *
+	 * @throws IllegalStateException if {@link #run} has not been called yet.
+	 * @throws InterruptedException if the task is interrupted.
+	 * @throws ExecutionException if the task throws an exception while running.
+	 */
+	void waitFor() throws InterruptedException, ExecutionException;
+
+	/** Checks whether the task has completed. */
+	boolean isDone();
+
+	/** Gets a status message describing what the task is currently doing. */
+	String getStatusMessage();
+
+	/**
+	 * Gets the step the task is currently performing.
+	 *
+	 * @return A value between 0 and {@link #getProgressMaximum()} inclusive.
+	 * @see #getProgressMaximum()
+	 */
+	long getProgressValue();
+
+	/**
+	 * Gets the number of steps the task performs in total.
+	 *
+	 * @return Total number of steps the task will perform, or 0 if unknown.
+	 * @see #getProgressValue()
+	 */
+	long getProgressMaximum();
+
+	/**
+	 * Sets the status message. Called by task implementors.
+	 *
+	 * @param status The message to set.
+	 * @see #getStatusMessage()
+	 */
+	void setStatusMessage(String status);
+
+	/**
+	 * Sets the current step. Called by task implementors.
+	 *
+	 * @param step The step vaule to set.
+	 * @see #getProgressValue()
+	 */
+	void setProgressValue(long step);
+
+	/**
+	 * Sets the total number of steps. Called by task implementors.
+	 *
+	 * @param max The step count to set.
+	 * @see #getProgressMaximum()
+	 */
+	void setProgressMaximum(long max);
+}
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
new file mode 100644
index 000000000..774f2ae98
--- /dev/null
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -0,0 +1,53 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.task;
+
+import org.scijava.service.SciJavaService;
+
+/**
+ * Service for working with {@link Task}s.
+ *
+ * @author Curtis Rueden
+ * @see Task
+ */
+public interface TaskService extends SciJavaService {
+
+	/**
+	 * Creates a new, empty {@link Task}. It is the responsibility of the caller
+	 * to then launch the task via the {@link Task#run(Runnable)} method.
+	 * 
+	 * @param name The task's name, to differentiate it from others.
+	 * @return A newly created task which awaits execution.
+	 */
+	Task createTask(String name);
+}
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
new file mode 100644
index 000000000..a8f3a02dd
--- /dev/null
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -0,0 +1,62 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.task.event;
+
+import org.scijava.event.SciJavaEvent;
+import org.scijava.task.Task;
+
+/**
+ * An event indicating a {@link Task} has been updated.
+ * 
+ * @author Curtis Rueden
+ */
+public class TaskEvent extends SciJavaEvent {
+
+	private final Task task;
+
+	public TaskEvent(final Task task) {
+		this.task = task;
+	}
+
+	// -- TaskEvent methods --
+
+	public Task getTask() {
+		return task;
+	}
+
+	// -- Object methods --
+
+	@Override
+	public String toString() {
+		return super.toString() + "\n\ttask = " + task;
+	}
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 36cda8ba9..5e6c0da45 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -112,6 +112,7 @@ public void testFull() {
 				org.scijava.run.DefaultRunService.class,
 				org.scijava.script.DefaultScriptHeaderService.class,
 				org.scijava.script.process.DefaultScriptProcessorService.class,
+				org.scijava.task.DefaultTaskService.class,
 				org.scijava.text.DefaultTextService.class,
 				org.scijava.thread.DefaultThreadService.class,
 				org.scijava.tool.DefaultToolService.class,
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
new file mode 100644
index 000000000..e9eb0e068
--- /dev/null
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -0,0 +1,76 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.task;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.ExecutionException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+
+/**
+ * Tests {@link TaskService}.
+ * 
+ * @author Curtis Rueden
+ */
+public class TaskServiceTest {
+
+	private TaskService taskService;
+
+	@Before
+	public void setUp() {
+		final Context ctx = new Context(TaskService.class);
+		taskService = ctx.service(TaskService.class);
+	}
+
+	@After
+	public void tearDown() {
+		taskService.context().dispose();
+	}
+
+	@Test
+	public void testTask() throws InterruptedException, ExecutionException {
+		final int[] result = new int[1];
+		final Task task = taskService.createTask("hello");
+		task.run(() -> {
+			task.setStatusMessage("Hello");
+			task.setProgressMaximum(10);
+			task.setProgressValue(5);
+			result[0] = 100;
+		});
+		task.waitFor();
+		assertEquals(100, result[0]);
+	}
+}

From 486fce3c8833dfdbdff3716c195da0c41a65aa8f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Jul 2017 11:51:31 -0500
Subject: [PATCH 0556/1208] DataHandle: move metadata query methods to the top

We will soon be adding a few more, such as exists() and lastModified().
It makes sense for these basic interrogation methods to be first.
---
 .../org/scijava/io/handle/BytesHandle.java    | 20 +++++++++----------
 .../org/scijava/io/handle/DataHandle.java     | 12 +++++------
 .../org/scijava/io/handle/DummyHandle.java    | 20 +++++++++----------
 .../org/scijava/io/handle/FileHandle.java     | 20 +++++++++----------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index dc941f21b..4b4ddeb58 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -53,6 +53,16 @@ public class BytesHandle extends AbstractDataHandle<BytesLocation> {
 
 	// -- DataHandle methods --
 
+	@Override
+	public boolean isReadable() {
+		return true;
+	}
+
+	@Override
+	public boolean isWritable() {
+		return !bytes().isReadOnly();
+	}
+
 	@Override
 	public long offset() {
 		return offset;
@@ -86,16 +96,6 @@ public void seek(final long pos) throws IOException {
 		offset = pos;
 	}
 
-	@Override
-	public boolean isReadable() {
-		return true;
-	}
-
-	@Override
-	public boolean isWritable() {
-		return !bytes().isReadOnly();
-	}
-
 	// -- DataInput methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index f02b18c17..f7f2fe7be 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -65,6 +65,12 @@ public enum ByteOrder {
 	/** Default bound on bytes to search when searching through the stream. */
 	int MAX_SEARCH_SIZE = 512 * 1024 * 1024; // 512 MB
 
+	/** Gets whether reading from this handle is supported. */
+	boolean isReadable();
+
+	/** Gets whether writing to this handle is supported. */
+	boolean isWritable();
+
 	/** Returns the current offset in the stream. */
 	long offset() throws IOException;
 
@@ -116,12 +122,6 @@ default long available(final long count) throws IOException {
 		return remain < count ? remain : count;
 	}
 
-	/** Gets whether reading from this handle is supported. */
-	boolean isReadable();
-
-	/** Gets whether writing to this handle is supported. */
-	boolean isWritable();
-
 	/**
 	 * Ensures that the handle has sufficient bytes available to read.
 	 * 
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index bfbcf3a2f..d1644168e 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -53,6 +53,16 @@ public class DummyHandle extends AbstractDataHandle<DummyLocation> {
 
 	// -- DataHandle methods --
 
+	@Override
+	public boolean isReadable() {
+		return true;
+	}
+
+	@Override
+	public boolean isWritable() {
+		return true;
+	}
+
 	@Override
 	public long offset() throws IOException {
 		return offset;
@@ -74,16 +84,6 @@ public void setLength(final long length) throws IOException {
 		this.length = length;
 	}
 
-	@Override
-	public boolean isReadable() {
-		return true;
-	}
-
-	@Override
-	public boolean isWritable() {
-		return true;
-	}
-
 	// -- DataInput methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 5db88ba18..d88d824e2 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -75,28 +75,28 @@ public void setMode(final String mode) {
 	// -- DataHandle methods --
 
 	@Override
-	public long offset() throws IOException {
-		return raf().getFilePointer();
+	public boolean isReadable() {
+		return getMode().contains("r");
 	}
 
 	@Override
-	public long length() throws IOException {
-		return raf().length();
+	public boolean isWritable() {
+		return getMode().contains("w");
 	}
 
 	@Override
-	public void setLength(final long length) throws IOException {
-		raf().setLength(length);
+	public long offset() throws IOException {
+		return raf().getFilePointer();
 	}
 
 	@Override
-	public boolean isReadable() {
-		return getMode().contains("r");
+	public long length() throws IOException {
+		return raf().length();
 	}
 
 	@Override
-	public boolean isWritable() {
-		return getMode().contains("w");
+	public void setLength(final long length) throws IOException {
+		raf().setLength(length);
 	}
 
 	@Override

From bb8f7912d8df58ee3d31a367e17100b4373fb1af Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Jul 2017 12:17:52 -0500
Subject: [PATCH 0557/1208] DummyHandle: remove unneeded throws clauses

We can narrow these method declarations, since they do not
actually ever throw IOException, and never will in the future.
---
 src/main/java/org/scijava/io/handle/DummyHandle.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index d1644168e..79e4f8e91 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -64,23 +64,23 @@ public boolean isWritable() {
 	}
 
 	@Override
-	public long offset() throws IOException {
+	public long offset() {
 		return offset;
 	}
 
 	@Override
-	public void seek(final long pos) throws IOException {
+	public void seek(final long pos) {
 		if (pos > length()) setLength(pos);
 		offset = pos;
 	}
 
 	@Override
-	public long length() throws IOException {
+	public long length() {
 		return length;
 	}
 
 	@Override
-	public void setLength(final long length) throws IOException {
+	public void setLength(final long length) {
 		this.length = length;
 	}
 

From 5e901657c6791cec6d1382a7f40d64ffcd34a96b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Jul 2017 12:25:32 -0500
Subject: [PATCH 0558/1208] ByteBank: add toByteArray methods

These copy the data (in whole or part) into a newly allocated byte[].
Just a convenience, but it's nice to have.
---
 src/main/java/org/scijava/io/ByteBank.java | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index 72b31271a..397b22133 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -36,6 +36,7 @@
  * A {@link ByteBank} is a self-growing buffer over arbitrary bytes.
  *
  * @author Gabriel Einsdorf
+ * @author Curtis Rueden
  */
 public interface ByteBank {
 
@@ -63,6 +64,36 @@ default int getBytes(long startPos, byte[] bytes) {
 	 */
 	int getBytes(long startPos, byte[] bytes, int offset, int length);
 
+	/**
+	 * Copies part of this buffer into a newly allocated byte array.
+	 * 
+	 * @param offset the initial position in the buffer
+	 * @param len the number of bytes to copy
+	 * @return The newly allocated byte array containing the data.
+	 */
+	default byte[] toByteArray(final long offset, final int len) {
+		if (offset < 0 || len < 0 || offset + len > size()) {
+			throw new IllegalArgumentException("Invalid range");
+		}
+		final byte[] bytes = new byte[len];
+		getBytes(offset, bytes);
+		return bytes;
+	}
+
+	/**
+	 * Copies this entire buffer into a newly allocated byte array.
+	 * 
+	 * @return The newly allocated byte array containing the data.
+	 */
+	default byte[] toByteArray() {
+		long max = size();
+		if (max > Integer.MAX_VALUE) {
+			throw new IllegalStateException(
+				"Byte bank is too large to store into a single byte[]");
+		}
+		return toByteArray(0, (int) max);
+	}
+
 	/**
 	 * Sets the bytes starting form the given position to the values form the
 	 * provided array.

From c59b3b0a70b624c6cb254395b582231873b01aa8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Jul 2017 15:17:01 -0500
Subject: [PATCH 0559/1208] DataHandle: add exists() method

---
 src/main/java/org/scijava/io/handle/BytesHandle.java | 5 +++++
 src/main/java/org/scijava/io/handle/DataHandle.java  | 8 ++++++++
 src/main/java/org/scijava/io/handle/DummyHandle.java | 6 +++++-
 src/main/java/org/scijava/io/handle/FileHandle.java  | 6 +++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 4b4ddeb58..7eb52dbd5 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -63,6 +63,11 @@ public boolean isWritable() {
 		return !bytes().isReadOnly();
 	}
 
+	@Override
+	public boolean exists() {
+		return true;
+	}
+
 	@Override
 	public long offset() {
 		return offset;
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index f7f2fe7be..418613265 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -71,6 +71,14 @@ public enum ByteOrder {
 	/** Gets whether writing to this handle is supported. */
 	boolean isWritable();
 
+	/**
+	 * Tests whether this handle's location actually exists at the source.
+	 * 
+	 * @return True if the location exists; false if not.
+	 * @throws IOException If something goes wrong with the existence check.
+	 */
+	boolean exists() throws IOException;
+
 	/** Returns the current offset in the stream. */
 	long offset() throws IOException;
 
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 79e4f8e91..2244c4692 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -63,6 +63,11 @@ public boolean isWritable() {
 		return true;
 	}
 
+	@Override
+	public boolean exists() {
+		return true;
+	}
+
 	@Override
 	public long offset() {
 		return offset;
@@ -133,5 +138,4 @@ public void close() {
 	public Class<DummyLocation> getType() {
 		return DummyLocation.class;
 	}
-
 }
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index d88d824e2..1c3348ce9 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -84,6 +84,11 @@ public boolean isWritable() {
 		return getMode().contains("w");
 	}
 
+	@Override
+	public boolean exists() {
+		return get().getFile().exists();
+	}
+
 	@Override
 	public long offset() throws IOException {
 		return raf().getFilePointer();
@@ -299,5 +304,4 @@ private synchronized void initRAF() throws IOException {
 		if (raf != null) return;
 		raf = new RandomAccessFile(get().getFile(), getMode());
 	}
-
 }

From f0a30f141b6f739b00c4fed19635ced443cebafb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Jul 2017 15:18:06 -0500
Subject: [PATCH 0560/1208] DataHandle: add lastModified() and checksum()

These are optional to support, returning null by default.
---
 .../org/scijava/io/handle/DataHandle.java     | 35 +++++++++++++++++++
 .../org/scijava/io/handle/FileHandle.java     |  7 ++++
 2 files changed, 42 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 418613265..b3aeeb985 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -39,6 +39,7 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Date;
 
 import org.scijava.io.location.Location;
 import org.scijava.plugin.WrapperPlugin;
@@ -79,6 +80,40 @@ public enum ByteOrder {
 	 */
 	boolean exists() throws IOException;
 
+	/**
+	 * Gets the last modified timestamp of the location.
+	 * 
+	 * @return The last modified timestamp, or null if the handle does not support
+	 *         this feature or if the location does not exist.
+	 * @throws IOException If something goes wrong with the last modified check.
+	 */
+	default Date lastModified() throws IOException {
+		return null;
+	}
+
+	/**
+	 * Gets a "fast" checksum which succinctly represents the contents of the data
+	 * stream. The term "fast" here refers to the idea that the checksum be
+	 * retrievable quickly, without actually performing a thorough computation
+	 * across the entire data stream. Typically, such a thing is feasible because
+	 * the checksum was calculated a priori; e.g., artifacts deployed to remote
+	 * Maven repositories are always deployed with corresponding checksum files.
+	 * <p>
+	 * No guarantee is made about the exact nature of the checksum (e.g., SHA-1 or
+	 * MD5), only that the value is deterministic for this particular location
+	 * with its current contents. In other words: if a checksum differs from a
+	 * previous inquiry, you can be sure the contents have changed; conversely, if
+	 * the checksum is still the same, the contents are highly likely to be
+	 * unchanged.
+	 * </p>
+	 * 
+	 * @return The checksum, or null if the handle does not support this feature.
+	 * @throws IOException If something goes wrong when accessing the checksum.
+	 */
+	default String checksum() throws IOException {
+		return null;
+	}
+
 	/** Returns the current offset in the stream. */
 	long offset() throws IOException;
 
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 1c3348ce9..02c16492e 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -34,6 +34,7 @@
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.Date;
 
 import org.scijava.io.location.FileLocation;
 import org.scijava.plugin.Plugin;
@@ -89,6 +90,12 @@ public boolean exists() {
 		return get().getFile().exists();
 	}
 
+	@Override
+	public Date lastModified() {
+		final long lastModified = get().getFile().lastModified();
+		return lastModified == 0 ? null : new Date(lastModified);
+	}
+
 	@Override
 	public long offset() throws IOException {
 		return raf().getFilePointer();

From 63cf9dc2b62a728bbe31a6feec077acd6e439202 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Jul 2017 16:34:06 -0500
Subject: [PATCH 0561/1208] DataHandle: return length -1 when non-existent

This avoids a problem where asking a FileHandle for its
length causes a previously non-existent file to be created.
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 6 +++++-
 src/main/java/org/scijava/io/handle/FileHandle.java | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index b3aeeb985..db48caeee 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -123,7 +123,11 @@ default String checksum() throws IOException {
 	 */
 	void seek(long pos) throws IOException;
 
-	/** Returns the length of the data in bytes. */
+	/**
+	 * Returns the length of the data in bytes.
+	 * 
+	 * @return The length, or -1 if the length is unknown.
+	 */
 	long length() throws IOException;
 
 	/**
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 02c16492e..d4a214121 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -103,7 +103,7 @@ public long offset() throws IOException {
 
 	@Override
 	public long length() throws IOException {
-		return raf().length();
+		return exists() ? raf().length() : -1;
 	}
 
 	@Override

From 71ef6d93e5d57b6f4ae1970ddb9b560269566daa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 6 Jul 2017 15:42:53 -0500
Subject: [PATCH 0562/1208] Add a DownloadService to manage remote downloads

---
 .../download/DefaultDownloadService.java      | 127 ++++++++++++++++++
 .../java/org/scijava/download/Download.java   |  48 +++++++
 .../org/scijava/download/DownloadService.java |  53 ++++++++
 .../java/org/scijava/ContextCreationTest.java |   1 +
 .../scijava/download/DownloadServiceTest.java | 107 +++++++++++++++
 5 files changed, 336 insertions(+)
 create mode 100644 src/main/java/org/scijava/download/DefaultDownloadService.java
 create mode 100644 src/main/java/org/scijava/download/Download.java
 create mode 100644 src/main/java/org/scijava/download/DownloadService.java
 create mode 100644 src/test/java/org/scijava/download/DownloadServiceTest.java

diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
new file mode 100644
index 000000000..3daf83111
--- /dev/null
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -0,0 +1,127 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.download;
+
+import java.io.IOException;
+
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleService;
+import org.scijava.io.location.Location;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.AbstractService;
+import org.scijava.service.Service;
+import org.scijava.task.Task;
+import org.scijava.task.TaskService;
+
+/**
+ * Default implementation of {@link DownloadService}.
+ *
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultDownloadService extends AbstractService implements
+	DownloadService
+{
+
+	@Parameter
+	private DataHandleService dataHandleService;
+
+	@Parameter
+	private TaskService taskService;
+
+	@Override
+	public Download download(final Location source, final Location destination) {
+		final Task task = taskService.createTask("Download");
+		final Download download = new Download() {
+
+			@Override
+			public Location source() {
+				return source;
+			}
+
+			@Override
+			public Location destination() {
+				return destination;
+			}
+
+			@Override
+			public Task task() {
+				return task;
+			}
+		};
+		task.run(() -> {
+			try (final DataHandle<Location> in = dataHandleService.create(source);
+					final DataHandle<Location> out = dataHandleService.create(
+						destination))
+			{
+				task.setStatusMessage("Downloading " + source.getURI());
+				copy(task, in, out);
+			}
+			catch (final IOException exc) {
+				// TODO: Improve error handling:
+				// 1. Consider a better exception handling design here.
+				// 2. Retry at least a few times if something goes wrong.
+				throw new RuntimeException(exc);
+			}
+		});
+		return download;
+	}
+
+	// -- Helper methods --
+
+	private void copy(final Task task, final DataHandle<Location> in,
+		final DataHandle<Location> out) throws IOException
+	{
+		long length;
+		try {
+			length = in.length();
+		}
+		catch (final IOException exc) {
+			// Assume unknown length.
+			length = 0;
+		}
+		if (length > 0) task.setProgressMaximum(length);
+
+		final int chunkSize = 64 * 1024; // TODO: Make size configurable.
+		final byte[] buf = new byte[chunkSize];
+		while (true) {
+			if (task.isCanceled()) return;
+			final int r = in.read(buf);
+			if (r <= 0) break; // EOF
+			if (task.isCanceled()) return;
+			out.write(buf, 0, r);
+			if (length > 0) task.setProgressValue(task.getProgressValue() + r);
+		}
+	}
+}
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
new file mode 100644
index 000000000..ef2e0b0e1
--- /dev/null
+++ b/src/main/java/org/scijava/download/Download.java
@@ -0,0 +1,48 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.download;
+
+import org.scijava.io.location.Location;
+import org.scijava.task.Task;
+
+/**
+ * Object representing an asynchronous download task.
+ *
+ * @author Curtis Rueden
+ * @see Task
+ */
+public interface Download {
+
+	Location source();
+	Location destination();
+	Task task();
+}
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
new file mode 100644
index 000000000..c508bcb55
--- /dev/null
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -0,0 +1,53 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.download;
+
+import org.scijava.io.location.Location;
+import org.scijava.service.SciJavaService;
+
+/**
+ * Service for managing retrieval of remote resources.
+ *
+ * @author Curtis Rueden
+ */
+public interface DownloadService extends SciJavaService {
+
+	/**
+	 * Downloads data from the given source, storing it into the given
+	 * destination.
+	 *
+	 * @param source The location of the needed data.
+	 * @param destination The location where the needed data should be stored.
+	 */
+	Download download(Location source, Location destination);
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 5e6c0da45..79b80affc 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -94,6 +94,7 @@ public void testFull() {
 				org.scijava.console.DefaultConsoleService.class,
 				org.scijava.convert.DefaultConvertService.class,
 				org.scijava.display.DefaultDisplayService.class,
+				org.scijava.download.DefaultDownloadService.class,
 				org.scijava.event.DefaultEventHistory.class,
 				org.scijava.input.DefaultInputService.class,
 				org.scijava.io.DefaultIOService.class,
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
new file mode 100644
index 000000000..c3ee5d24b
--- /dev/null
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -0,0 +1,107 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.download;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
+import org.scijava.util.FileUtils;
+import org.scijava.util.MersenneTwisterFast;
+
+/**
+ * Tests {@link DownloadService}.
+ * 
+ * @author Curtis Rueden
+ */
+public class DownloadServiceTest {
+
+	private DownloadService downloadService;
+
+	@Before
+	public void setUp() {
+		final Context ctx = new Context(DownloadService.class);
+		downloadService = ctx.service(DownloadService.class);
+	}
+
+	@After
+	public void tearDown() {
+		downloadService.context().dispose();
+	}
+
+	@Test
+	public void testDownload() throws IOException, InterruptedException,
+		ExecutionException
+	{
+		final byte[] data = randomBytes(0xbabebabe);
+
+		final String prefix = getClass().getName();
+		final File inFile = File.createTempFile(prefix, "testDownloadIn");
+		final File outFile = File.createTempFile(prefix, "testDownloadOut");
+
+		try {
+			FileUtils.writeFile(inFile, data);
+
+			final Location src = new FileLocation(inFile);
+			final Location dest = new FileLocation(outFile);
+
+			final Download download = downloadService.download(src, dest);
+			download.task().waitFor();
+
+			final byte[] result = FileUtils.readFile(outFile);
+			assertArrayEquals(data, result);
+		}
+		finally {
+			inFile.delete();
+			outFile.delete();
+		}
+	}
+
+	// -- Helper methods --
+
+	private byte[] randomBytes(final long seed) {
+		final MersenneTwisterFast r = new MersenneTwisterFast(seed);
+		final byte[] data = new byte[2938740];
+		for (int i = 0; i < data.length; i++) {
+			data[i] = r.nextByte();
+		}
+		return data;
+	}
+}

From 08bbe7229198f9d6339137d995325c751d403584 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 12 Jul 2017 19:32:16 -0500
Subject: [PATCH 0563/1208] DownloadService: add the ability to cache the data

---
 .../download/DefaultDownloadService.java      | 131 ++++++++++++---
 .../scijava/download/DiskLocationCache.java   | 126 ++++++++++++++
 .../org/scijava/download/DownloadService.java |  12 ++
 .../org/scijava/download/LocationCache.java   |  79 +++++++++
 .../scijava/download/MultiWriteHandle.java    | 158 ++++++++++++++++++
 .../scijava/download/DownloadServiceTest.java |  73 ++++++++
 6 files changed, 560 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/org/scijava/download/DiskLocationCache.java
 create mode 100644 src/main/java/org/scijava/download/LocationCache.java
 create mode 100644 src/main/java/org/scijava/download/MultiWriteHandle.java

diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index 3daf83111..85b697eab 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -33,6 +33,7 @@
 package org.scijava.download;
 
 import java.io.IOException;
+import java.util.Date;
 
 import org.scijava.io.handle.DataHandle;
 import org.scijava.io.handle.DataHandleService;
@@ -63,24 +64,7 @@ public class DefaultDownloadService extends AbstractService implements
 	@Override
 	public Download download(final Location source, final Location destination) {
 		final Task task = taskService.createTask("Download");
-		final Download download = new Download() {
-
-			@Override
-			public Location source() {
-				return source;
-			}
-
-			@Override
-			public Location destination() {
-				return destination;
-			}
-
-			@Override
-			public Task task() {
-				return task;
-			}
-		};
-		task.run(() -> {
+		return new DefaultDownload(source, destination, task, () -> {
 			try (final DataHandle<Location> in = dataHandleService.create(source);
 					final DataHandle<Location> out = dataHandleService.create(
 						destination))
@@ -95,7 +79,45 @@ public Task task() {
 				throw new RuntimeException(exc);
 			}
 		});
-		return download;
+	}
+
+	@Override
+	public Download download(final Location source, final Location destination,
+		final LocationCache cache)
+	{
+		if (cache == null || !cache.canCache(source)) {
+			// Caching this location is not supported.
+			return download(source, destination);
+		}
+
+		final Task task = taskService.createTask("Download");
+		return new DefaultDownload(source, destination, task, () -> {
+			final Location cached = cache.cachedLocation(source);
+			try (
+				final DataHandle<Location> sourceHandle = dataHandleService.create(source);
+				final DataHandle<Location> cachedHandle = dataHandleService.create(cached);
+				final DataHandle<Location> destHandle = dataHandleService.create(destination)
+			)
+			{
+				if (isCachedHandleValid(source, cache, sourceHandle, cachedHandle)) {
+					// The data is cached; download from the cached source instead.
+					task.setStatusMessage("Retrieving " + source.getURI());
+					copy(task, cachedHandle, destHandle);
+				}
+				else {
+					// Data is not yet cached; write to the destination _and_ the cache.
+					task.setStatusMessage("Downloading + caching " + source.getURI());
+					copy(task, sourceHandle, //
+						new MultiWriteHandle(cachedHandle, destHandle));
+				}
+			}
+			catch (final IOException exc) {
+				// TODO: Improve error handling:
+				// 1. Consider a better exception handling design here.
+				// 2. Retry at least a few times if something goes wrong.
+				throw new RuntimeException(exc);
+			}
+		});
 	}
 
 	// -- Helper methods --
@@ -124,4 +146,75 @@ private void copy(final Task task, final DataHandle<Location> in,
 			if (length > 0) task.setProgressValue(task.getProgressValue() + r);
 		}
 	}
+
+	private boolean isCachedHandleValid(final Location source,
+		final LocationCache cache, final DataHandle<Location> sourceHandle,
+		final DataHandle<Location> cachedHandle) throws IOException
+	{
+		if (!cachedHandle.exists()) return false; // No cached data is present.
+
+		// Compare data lengths.
+		final long sourceLen = sourceHandle.length();
+		final long cachedLen = cachedHandle.length();
+		if (sourceLen >= 0 && cachedLen >= 0 && sourceLen != cachedLen) {
+			// Original and cached sources report different lengths; cache is invalid.
+			return false;
+		}
+
+		// Compare last modified timestamps.
+		final Date sourceDate = sourceHandle.lastModified();
+		final Date cachedDate = cachedHandle.lastModified();
+		if (sourceDate != null && cachedDate != null && //
+			sourceDate.after(cachedDate))
+		{
+			// Source was changed after cache was written; cache is invalid.
+			return false;
+		}
+
+		// Compare checksums.
+		final String sourceChecksum = sourceHandle.checksum();
+		final String cachedChecksum = cache.loadChecksum(source);
+		if (sourceChecksum != null && cachedChecksum != null && //
+			!sourceChecksum.equals(cachedChecksum))
+		{
+			// Checksums do not match; cache is invalid.
+			return false;
+		}
+
+		// Everything matched; we're all good.
+		return true;
+	}
+
+	// -- Helper classes --
+
+	private class DefaultDownload implements Download {
+
+		private Location source;
+		private Location destination;
+		private Task task;
+
+		private DefaultDownload(final Location source, final Location destination,
+			final Task task, final Runnable r)
+		{
+			this.source = source;
+			this.destination = destination;
+			this.task = task;
+			task.run(r);
+		}
+
+		@Override
+		public Location source() {
+			return source;
+		}
+
+		@Override
+		public Location destination() {
+			return destination;
+		}
+
+		@Override
+		public Task task() {
+			return task;
+		}
+	}
 }
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
new file mode 100644
index 000000000..5ee047fa8
--- /dev/null
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -0,0 +1,126 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.download;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
+import org.scijava.util.DigestUtils;
+import org.scijava.util.FileUtils;
+
+/**
+ * A file-based implementation of {@link LocationCache}.
+ *
+ * @author Curtis Rueden
+ */
+public class DiskLocationCache implements LocationCache {
+
+	private File baseDir = new File(System.getProperty("user.home") +
+		File.separator + ".scijava" + File.separator + "cache" + File.separator);
+
+	private boolean cacheFileLocations;
+
+	// -- DiskLocationCache methods --
+
+	public File getBaseDirectory() {
+		return baseDir;
+	}
+
+	public void setBaseDirectory(final File baseDir) {
+		if (!baseDir.isDirectory()) {
+			throw new IllegalArgumentException("Not a directory: " + baseDir);
+		}
+		this.baseDir = baseDir;
+	}
+
+	public boolean isFileLocationCachingEnabled() {
+		return cacheFileLocations;
+	}
+
+	public void setFileLocationCachingEnabled(final boolean enabled) {
+		// NB: It is possible the input file is stored on a volume which is much
+		// slower than the local disk cache, so we make this setting configurable.
+		cacheFileLocations = enabled;
+	}
+
+	// -- LocationCache methods --
+
+	@Override
+	public boolean canCache(final Location source) {
+		if (source instanceof FileLocation && !isFileLocationCachingEnabled()) {
+			// The cache is not configured to cache files to other files.
+			return false;
+		}
+		return source.getURI() != null;
+	}
+
+	@Override
+	public Location cachedLocation(final Location source) {
+		if (!canCache(source)) {
+			throw new IllegalArgumentException("Uncacheable source: " + source);
+		}
+		return new FileLocation(cachedData(source));
+	}
+
+	@Override
+	public String loadChecksum(final Location source) throws IOException {
+		final File cachedChecksum = cachedChecksum(source);
+		if (!cachedChecksum.exists()) return null;
+		return DigestUtils.string(FileUtils.readFile(cachedChecksum));
+	}
+
+	@Override
+	public void saveChecksum(final Location source, final String checksum)
+		throws IOException
+	{
+		final File cachedChecksum = cachedChecksum(source);
+		FileUtils.writeFile(cachedChecksum, DigestUtils.bytes(checksum));
+	}
+
+	// -- Helper methods --
+
+	private File cachedData(final Location source) {
+		return cachedFile(source, ".data");
+	}
+
+	private File cachedChecksum(final Location source) {
+		return cachedFile(source, ".checksum");
+	}
+
+	private File cachedFile(final Location source, final String suffix) {
+		final String hexCode = Integer.toHexString(source.hashCode());
+		return new File(getBaseDirectory(), hexCode + suffix);
+	}
+}
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index c508bcb55..de74162f0 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -50,4 +50,16 @@ public interface DownloadService extends SciJavaService {
 	 * @param destination The location where the needed data should be stored.
 	 */
 	Download download(Location source, Location destination);
+
+	/**
+	 * Downloads data from the given source, storing it into the given
+	 * destination.
+	 *
+	 * @param source The location of the needed data.
+	 * @param destination The location where the needed data should be stored.
+	 * @param cache The cache from which already-downloaded data should be pulled
+	 *          preferentially, and to which newly-downloaded data should be
+	 *          stored for next time.
+	 */
+	Download download(Location source, Location destination, LocationCache cache);
 }
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
new file mode 100644
index 000000000..4f6b72471
--- /dev/null
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -0,0 +1,79 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.download;
+
+import java.io.IOException;
+
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.location.Location;
+
+/**
+ * An object which knows how to convert a slow (typically remote)
+ * {@link Location} to a faster (typically local) one.
+ *
+ * @author Curtis Rueden
+ */
+public interface LocationCache {
+
+	/** Gets whether the given location can be cached by this cache. */
+	boolean canCache(Location source);
+
+	/**
+	 * Gets the cache location of a given data source.
+	 *
+	 * @return A {@link Location} where the source data is, or would be, cached.
+	 * @throws IllegalArgumentException if the given source cannot be cached (see
+	 *           {@link #canCache}).
+	 */
+	Location cachedLocation(Location source);
+
+	/**
+	 * Loads the checksum value which corresponds to the cached location.
+	 *
+	 * @param source The source location for which the cached checksum is desired.
+	 * @return The loaded checksum, or null if one is not available.
+	 * @see DataHandle#checksum()
+	 * @throws IOException If something goes wrong accessing the checksum.
+	 */
+	String loadChecksum(Location source) throws IOException;
+
+	/**
+	 * Associates the given checksum value with the specified source location.
+	 *
+	 * @param source The source location for which the checksum should be cached.
+	 * @param checksum The checksum value to cache.
+	 * @see DataHandle#checksum()
+	 * @throws IOException If something goes wrong caching the checksum.
+	 */
+	void saveChecksum(Location source, String checksum) throws IOException;
+}
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
new file mode 100644
index 000000000..0f810c9c6
--- /dev/null
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -0,0 +1,158 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.download;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import org.scijava.io.handle.AbstractDataHandle;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.location.Location;
+
+/**
+ * {@link DataHandle} plugin for writing to multiple {@link DataHandle}s.
+ * 
+ * @author Curtis Rueden
+ */
+public class MultiWriteHandle extends AbstractDataHandle<Location> {
+
+	private final List<DataHandle<?>> handles;
+
+	public MultiWriteHandle(final DataHandle<?>... handles) {
+		this.handles = new ArrayList<>(Arrays.asList(handles));
+	}
+
+	// -- DataHandle methods --
+
+	@Override
+	public boolean isReadable() {
+		return false;
+	}
+
+	@Override
+	public boolean isWritable() {
+		boolean writable = true;
+		// NB: Somewhat arbitrarily, we are writable iff all our constituents are.
+		for (final DataHandle<?> h : handles)
+			writable &= h.isWritable();
+		return writable;
+	}
+
+	@Override
+	public boolean exists() throws IOException {
+		boolean exists = true;
+		// NB: Somewhat arbitrarily, we exist iff any of our constituents exist.
+		for (final DataHandle<?> h : handles)
+			exists |= h.isWritable();
+		return exists;
+	}
+
+	@Override
+	public Date lastModified() throws IOException {
+		for (final DataHandle<?> h : handles) {
+			final Date lastModified = h.lastModified();
+			if (lastModified != null) return lastModified;
+		}
+		return null;
+	}
+
+	@Override
+	public String checksum() throws IOException {
+		for (final DataHandle<?> h : handles) {
+			final String checksum = h.checksum();
+			if (checksum != null) return checksum;
+		}
+		return null;
+	}
+
+	@Override
+	public long offset() throws IOException {
+		return handles.get(0).offset();
+	}
+
+	@Override
+	public void seek(long pos) throws IOException {
+		// TODO: parallelStream().forEach() for performance.
+		for (final DataHandle<?> h : handles)
+			h.seek(pos);
+	}
+
+	@Override
+	public long length() throws IOException {
+		return handles.get(0).length();
+	}
+
+	@Override
+	public void setLength(long length) throws IOException {
+		for (final DataHandle<?> h : handles)
+			h.setLength(length);
+	}
+
+	@Override
+	public int read(byte[] b, int off, int len) throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public Class<Location> getType() {
+		return null;
+	}
+
+	@Override
+	public byte readByte() throws IOException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void write(final int b) throws IOException {
+		// TODO: parallelStream().forEach() for performance.
+		for (final DataHandle<?> h : handles)
+			h.write(b);
+	}
+
+	@Override
+	public void write(byte[] b, int off, int len) throws IOException {
+		// TODO: parallelStream().forEach() for performance.
+		for (final DataHandle<?> h : handles)
+			h.write(b, off, len);
+	}
+
+	@Override
+	public void close() throws IOException {
+		// TODO: parallelStream().forEach() for performance.
+		for (final DataHandle<?> h : handles)
+			h.close();
+	}
+}
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index c3ee5d24b..d7ca11eb8 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -32,6 +32,10 @@
 package org.scijava.download;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,8 +45,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.io.ByteBank;
+import org.scijava.io.location.BytesLocation;
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.test.TestUtils;
 import org.scijava.util.FileUtils;
 import org.scijava.util.MersenneTwisterFast;
 
@@ -94,6 +101,66 @@ public void testDownload() throws IOException, InterruptedException,
 		}
 	}
 
+	@Test
+	public void testDownloadCache() throws IOException, InterruptedException,
+		ExecutionException
+	{
+		// Create some data.
+		final byte[] data = randomBytes(0xcafecafe);
+
+		// Create source location.
+		final String prefix = getClass().getName();
+		final File inFile = File.createTempFile(prefix, "testDownloadCacheIn");
+		final Location src = new FileLocation(inFile);
+
+		// Create destination location.
+		final BytesLocation dest = new BytesLocation(data.length);
+
+		// Create a disk cache.
+		final File cacheDir = TestUtils.createTemporaryDirectory(
+			"testDownloadCacheBase", getClass());
+		final DiskLocationCache cache = new DiskLocationCache();
+		cache.setBaseDirectory(cacheDir);
+		cache.setFileLocationCachingEnabled(true);
+
+		try {
+			// Write the data to the source location.
+			FileUtils.writeFile(inFile, data);
+
+			// Sanity check: the cache should be empty.
+			assertNull(cache.loadChecksum(src));
+			final Location cachedSource = cache.cachedLocation(src);
+			assertTrue(cachedSource instanceof FileLocation);
+			final FileLocation cachedFile = (FileLocation) cachedSource;
+			assertFalse(cachedFile.getFile().exists());
+
+			// Download + cache the source.
+			final Download download = downloadService.download(src, dest, cache);
+			download.task().waitFor();
+
+			// Check that the data was read.
+			assertBytesEqual(data, dest.getByteBank());
+
+			// Check that the data was cached.
+			assertEquals(cachedSource, cache.cachedLocation(src));
+			assertTrue(cachedFile.getFile().exists());
+			final byte[] cachedData = FileUtils.readFile(cachedFile.getFile());
+			assertArrayEquals(data, cachedData);
+
+			// Check that the cache works, even after the source file is deleted.
+			inFile.delete();
+			assertFalse(inFile.exists());
+			final BytesLocation dest2 = new BytesLocation(data.length);
+			final Download download2 = downloadService.download(src, dest2, cache);
+			download2.task().waitFor();
+			assertBytesEqual(data, dest2.getByteBank());
+		}
+		finally {
+			if (inFile.exists()) inFile.delete();
+			FileUtils.deleteRecursively(cacheDir);
+		}
+	}
+
 	// -- Helper methods --
 
 	private byte[] randomBytes(final long seed) {
@@ -104,4 +171,10 @@ private byte[] randomBytes(final long seed) {
 		}
 		return data;
 	}
+
+	private void assertBytesEqual(byte[] data, ByteBank byteBank) {
+		for (int i=0; i<data.length; i++) {
+			assertEquals(data[i], byteBank.getByte(i));
+		}
+	}
 }

From 68aedd9619c200b577abe21c03e79e41f1e0c72e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Jul 2017 16:26:24 -0500
Subject: [PATCH 0564/1208] FileUtils: use try-with-resources

---
 src/main/java/org/scijava/util/FileUtils.java | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 0daccf5e7..f2f150bd4 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -152,10 +152,12 @@ public static byte[] readFile(final File file) throws IOException {
 		if (length > Integer.MAX_VALUE) {
 			throw new IllegalArgumentException("File too large");
 		}
-		final DataInputStream dis = new DataInputStream(new FileInputStream(file));
 		final byte[] bytes = new byte[(int) length];
-		dis.readFully(bytes);
-		dis.close();
+		try (final DataInputStream dis = new DataInputStream(new FileInputStream(
+			file)))
+		{
+			dis.readFully(bytes);
+		}
 		return bytes;
 	}
 
@@ -168,13 +170,9 @@ public static byte[] readFile(final File file) throws IOException {
 	public static void writeFile(final File file, final byte[] bytes)
 		throws IOException
 	{
-		final FileOutputStream out = new FileOutputStream(file);
-		try {
+		try (final FileOutputStream out = new FileOutputStream(file)) {
 			out.write(bytes);
 		}
-		finally {
-			out.close();
-		}
 	}
 
 	public static String stripFilenameVersion(final String filename) {
@@ -577,29 +575,29 @@ else if (protocol.equals("jar")) {
 
 				final JarURLConnection connection =
 					(JarURLConnection) new URL(baseURL).openConnection();
-				final JarFile jar = connection.getJarFile();
-				for (final JarEntry entry : new IteratorPlus<>(jar.entries())) {
-					final String urlEncoded =
-						new URI(null, null, entry.getName(), null).toString();
-					if (urlEncoded.length() > prefix.length() && // omit directory itself
-						urlEncoded.startsWith(prefix))
-					{
-						if (filesOnly && urlEncoded.endsWith("/")) {
-							// URL is directory; exclude it
-							continue;
-						}
-						if (!recurse) {
-							// check whether this URL is a *direct* child of the directory
-							final int slash = urlEncoded.indexOf("/", prefix.length());
-							if (slash >= 0 && slash != urlEncoded.length() - 1) {
-								// not a direct child
+				try (final JarFile jar = connection.getJarFile()) {
+					for (final JarEntry entry : new IteratorPlus<>(jar.entries())) {
+						final String urlEncoded =
+							new URI(null, null, entry.getName(), null).toString();
+						if (urlEncoded.length() > prefix.length() && // omit directory itself
+							urlEncoded.startsWith(prefix))
+						{
+							if (filesOnly && urlEncoded.endsWith("/")) {
+								// URL is directory; exclude it
 								continue;
 							}
+							if (!recurse) {
+								// check whether this URL is a *direct* child of the directory
+								final int slash = urlEncoded.indexOf("/", prefix.length());
+								if (slash >= 0 && slash != urlEncoded.length() - 1) {
+									// not a direct child
+									continue;
+								}
+							}
+							result.add(new URL(baseURL + urlEncoded));
 						}
-						result.add(new URL(baseURL + urlEncoded));
 					}
 				}
-				jar.close();
 			}
 			catch (final IOException e) {
 				e.printStackTrace();

From d9e7fd04db942455a039bce253ad787c2d599aef Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 20 Jul 2017 14:10:19 -0500
Subject: [PATCH 0565/1208] Improve the Priority constants

This addresses two issues:

1. They were redundantly named. Now e.g. Priority.LOW reads more nicely.
2. The FIRST and LAST constants were set to +Infinity and -Infinity,
   which meant it was mathematically to inject anything before or after,
   e.g. for testing or workaround purposes. The new FIRST and LAST
   constants are set to +1e300 and -1e300 respectively, so that it is
   still possible to bypass them in the rare cases where that is needed.
---
 .../java/org/scijava/AbstractUIDetails.java   |  2 +-
 src/main/java/org/scijava/Priority.java       | 66 ++++++++++++++++---
 src/main/java/org/scijava/app/SciJavaApp.java |  2 +-
 .../scijava/cache/DefaultCacheService.java    |  2 +-
 .../org/scijava/convert/ArrayConverters.java  | 32 ++++-----
 .../org/scijava/convert/CastingConverter.java |  2 +-
 .../org/scijava/convert/NullConverter.java    |  4 +-
 .../display/ActiveDisplayPreprocessor.java    |  2 +-
 .../org/scijava/display/DefaultDisplay.java   |  2 +-
 .../scijava/display/DefaultTextDisplay.java   |  2 +-
 .../scijava/display/DisplayPostprocessor.java |  2 +-
 .../scijava/event/DefaultEventService.java    |  2 +-
 .../org/scijava/log/StderrLogService.java     |  2 +-
 .../org/scijava/main/run/MainCodeRunner.java  |  2 +-
 .../module/process/DebugPostprocessor.java    |  2 +-
 .../module/process/DebugPreprocessor.java     |  2 +-
 .../process/DefaultValuePreprocessor.java     |  2 +-
 .../module/process/GatewayPreprocessor.java   |  2 +-
 .../module/process/InitPreprocessor.java      |  2 +-
 .../process/SaveInputsPreprocessor.java       |  4 +-
 .../module/process/ServicePreprocessor.java   |  2 +-
 .../module/process/ValidityPreprocessor.java  |  2 +-
 .../platform/DefaultAppEventService.java      |  2 +-
 .../org/scijava/platform/DefaultPlatform.java |  2 +-
 .../scijava/plugin/AbstractRichPlugin.java    |  2 +-
 src/main/java/org/scijava/plugin/Plugin.java  | 16 ++---
 .../scijava/script/DefaultScriptService.java  |  2 +-
 .../org/scijava/text/io/TextIOPlugin.java     |  2 +-
 .../java/org/scijava/ui/UIPreprocessor.java   |  2 +-
 .../ui/dnd/FileDragAndDropHandler.java        |  2 +-
 .../org/scijava/ui/headless/HeadlessUI.java   |  2 +-
 .../org/scijava/widget/InputHarvester.java    |  2 +-
 .../scijava/command/CommandModuleTest.java    |  2 +-
 .../scijava/console/ConsoleServiceTest.java   |  2 +-
 .../scijava/convert/ConvertServiceTest.java   |  2 +-
 .../org/scijava/plugin/PluginInfoTest.java    |  6 +-
 36 files changed, 118 insertions(+), 70 deletions(-)

diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 3cb0f0fca..6627efa85 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -51,7 +51,7 @@ public abstract class AbstractUIDetails extends AbstractBasicDetails implements
 	private String iconPath;
 
 	/** Sort priority of the object. */
-	private double priority = Priority.NORMAL_PRIORITY;
+	private double priority = Priority.NORMAL;
 
 	/** Whether the object can be selected in the user interface. */
 	private boolean selectable;
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 74a44cc20..628904e36 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -46,26 +46,45 @@ private Priority() {
 		// prevent instantiation of utility class
 	}
 
-	/** Priority for items that must be sorted first. */
-	public static final double FIRST_PRIORITY = Double.POSITIVE_INFINITY;
+	/**
+	 * Priority for items that must be sorted first.
+	 * <p>
+	 * Note that it <em>is</em> still possible to prioritize something earlier
+	 * than this value (e.g., for testing purposes), although doing so strongly
+	 * discouraged in production.
+	 * </p>
+	 */
+	public static final double FIRST = +1e300;
+
+	/** Priority for items that very strongly prefer to be sorted early. */
+	public static final double EXTREMELY_HIGH = +1000000;
 
 	/** Priority for items that strongly prefer to be sorted early. */
-	public static final double VERY_HIGH_PRIORITY = +10000;
+	public static final double VERY_HIGH = +10000;
 
 	/** Priority for items that prefer to be sorted earlier. */
-	public static final double HIGH_PRIORITY = +100;
+	public static final double HIGH = +100;
 
 	/** Default priority for items. */
-	public static final double NORMAL_PRIORITY = 0;
+	public static final double NORMAL = 0;
 
 	/** Priority for items that prefer to be sorted later. */
-	public static final double LOW_PRIORITY = -100;
+	public static final double LOW = -100;
 
 	/** Priority for items that strongly prefer to be sorted late. */
-	public static final double VERY_LOW_PRIORITY = -10000;
+	public static final double VERY_LOW = -10000;
 
-	/** Priority for items that must be sorted last. */
-	public static final double LAST_PRIORITY = Double.NEGATIVE_INFINITY;
+	/** Priority for items that very strongly prefer to be sorted late. */
+	public static final double EXTREMELY_LOW = -1000000;
+
+	/** Priority for items that must be sorted last.
+	 * <p>
+	 * Note that it <em>is</em> still possible to prioritize something later
+	 * than this value (e.g., for testing purposes), although doing so strongly
+	 * discouraged in production.
+	 * </p>
+	 */
+	public static final double LAST = -1e300;
 
 	/**
 	 * Compares two {@link Prioritized} objects.
@@ -109,4 +128,33 @@ public static boolean inject(final Object o, final double priority) {
 		return true;
 	}
 
+	// -- Deprecated --
+
+	/** @deprecated Use {@link #FIRST} instead. */
+	@Deprecated
+	public static final double FIRST_PRIORITY = Double.POSITIVE_INFINITY;
+
+	/** @deprecated Use {@link #VERY_HIGH} instead. */
+	@Deprecated
+	public static final double VERY_HIGH_PRIORITY = +10000;
+
+	/** @deprecated Use {@link #HIGH} instead. */
+	@Deprecated
+	public static final double HIGH_PRIORITY = +100;
+
+	/** @deprecated Use {@link #NORMAL} instead. */
+	@Deprecated
+	public static final double NORMAL_PRIORITY = 0;
+
+	/** @deprecated Use {@link #LOW} instead. */
+	@Deprecated
+	public static final double LOW_PRIORITY = -100;
+
+	/** @deprecated Use {@link #VERY_LOW} instead. */
+	@Deprecated
+	public static final double VERY_LOW_PRIORITY = -10000;
+
+	/** @deprecated Use {@link #LAST} instead. */
+	@Deprecated
+	public static final double LAST_PRIORITY = Double.NEGATIVE_INFINITY;
 }
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 51da39f7a..12c049697 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -42,7 +42,7 @@
  * @see AppService
  */
 @Plugin(type = App.class, name = SciJavaApp.NAME,
-	priority = Priority.LOW_PRIORITY)
+	priority = Priority.LOW)
 public class SciJavaApp extends AbstractApp {
 
 	public static final String NAME = "SciJava";
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index c5f952499..4111a45a6 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -43,7 +43,7 @@
 /**
  * Trivial {@link CacheService} implementation. Wraps a {@link WeakHashMap}
  */
-@Plugin(type = Service.class, priority = Priority.VERY_LOW_PRIORITY)
+@Plugin(type = Service.class, priority = Priority.VERY_LOW)
 public class DefaultCacheService extends AbstractService implements
 	CacheService
 {
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 803486705..70b0d927c 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -54,7 +54,7 @@ public class ArrayConverters {
 
 	// -- Integer array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class IntArrayWrapper extends
 		PrimitiveArrayWrapper<int[], Integer, IntArray>
 	{
@@ -70,7 +70,7 @@ public Class<int[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class IntArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<int[], Integer, IntArray>
 	{
@@ -88,7 +88,7 @@ public Class<IntArray> getInputType() {
 
 	// -- Byte array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class ByteArrayWrapper extends
 		PrimitiveArrayWrapper<byte[], Byte, ByteArray>
 	{
@@ -104,7 +104,7 @@ public Class<byte[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class ByteArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<byte[], Byte, ByteArray>
 	{
@@ -122,7 +122,7 @@ public Class<ByteArray> getInputType() {
 
 	// -- Bool array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class BoolArrayWrapper extends
 		PrimitiveArrayWrapper<boolean[], Boolean, BoolArray>
 	{
@@ -138,7 +138,7 @@ public Class<boolean[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class BoolArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<boolean[], Boolean, BoolArray>
 	{
@@ -156,7 +156,7 @@ public Class<BoolArray> getInputType() {
 
 	// -- Char array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class CharArrayWrapper extends
 		PrimitiveArrayWrapper<char[], Character, CharArray>
 	{
@@ -172,7 +172,7 @@ public Class<char[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class CharArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<char[], Character, CharArray>
 	{
@@ -190,7 +190,7 @@ public Class<CharArray> getInputType() {
 
 	// -- Short array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class ShortArrayWrapper extends
 		PrimitiveArrayWrapper<short[], Short, ShortArray>
 	{
@@ -206,7 +206,7 @@ public Class<short[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class ShortArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<short[], Short, ShortArray>
 	{
@@ -224,7 +224,7 @@ public Class<ShortArray> getInputType() {
 
 	// -- Float array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class FloatArrayWrapper extends
 		PrimitiveArrayWrapper<float[], Float, FloatArray>
 	{
@@ -240,7 +240,7 @@ public Class<float[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class FloatArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<float[], Float, FloatArray>
 	{
@@ -258,7 +258,7 @@ public Class<FloatArray> getInputType() {
 
 	// -- Double array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class DoubleArrayWrapper extends
 		PrimitiveArrayWrapper<double[], Double, DoubleArray>
 	{
@@ -274,7 +274,7 @@ public Class<double[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class DoubleArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<double[], Double, DoubleArray>
 	{
@@ -292,7 +292,7 @@ public Class<DoubleArray> getInputType() {
 
 	// -- Long array converters --
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class LongArrayWrapper extends
 		PrimitiveArrayWrapper<long[], Long, LongArray>
 	{
@@ -308,7 +308,7 @@ public Class<long[]> getInputType() {
 		}
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.HIGH)
 	public static class LongArrayUnwrapper extends
 		PrimitiveArrayUnwrapper<long[], Long, LongArray>
 	{
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index ba71f9d6b..0835d20d1 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -42,7 +42,7 @@
  *
  * @author Mark Hiner
  */
-@Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY)
+@Plugin(type = Converter.class, priority = Priority.FIRST)
 public class CastingConverter extends AbstractConverter<Object, Object> {
 
 	@SuppressWarnings("deprecation")
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index a1f4c3ced..e718404ce 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -43,7 +43,7 @@
  * basic casting when given a {@code null} source and returns {@code} null
  * directly when given a {@code} null destination.
  * <p>
- * By running at {@link Priority#FIRST_PRIORITY}, other converters should
+ * By running at {@link Priority#FIRST}, other converters should
  * not need to worry about {@code null} source or destination parameters.
  * </p>
  * <p>
@@ -54,7 +54,7 @@
  *
  * @author Mark Hiner
  */
-@Plugin(type = Converter.class, priority = Priority.FIRST_PRIORITY)
+@Plugin(type = Converter.class, priority = Priority.FIRST)
 public class NullConverter extends AbstractConverter<Object, Object> {
 
 	@Override
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 49793247b..73b92ebd5 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -54,7 +54,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = PreprocessorPlugin.class,
-	priority = Priority.VERY_HIGH_PRIORITY)
+	priority = Priority.VERY_HIGH)
 public class ActiveDisplayPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index 210108cb4..542a88f5b 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -39,7 +39,7 @@
 // using Object#toString()), but until it exists, discovery of this display
 // merely causes the UIService to eventually issue some warnings anyway
 // ("No suitable viewer found for display" and "No viewer found for display").
-//@Plugin(type = Display.class, priority = Priority.VERY_LOW_PRIORITY)
+//@Plugin(type = Display.class, priority = Priority.VERY_LOW)
 /**
  * Default display for objects, when no other displays are available.
  * 
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index b2249003b..35d9285ec 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -40,7 +40,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = Display.class, priority = Priority.LOW_PRIORITY)
+@Plugin(type = Display.class, priority = Priority.LOW)
 public class DefaultTextDisplay extends AbstractDisplay<String> implements
 	TextDisplay
 {
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index c48bad430..24009e12e 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -55,7 +55,7 @@
  * @author Barry DeZonia
  */
 @Plugin(type = PostprocessorPlugin.class,
-	priority = Priority.VERY_LOW_PRIORITY)
+	priority = Priority.VERY_LOW)
 public class DisplayPostprocessor extends AbstractPostprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 9de3dc332..07530827d 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -74,7 +74,7 @@ public class DefaultEventService extends AbstractService implements
 	 * {@code priority = DefaultEventService.PRIORITY + 1} or similar.
 	 * </p>
 	 */
-	public static final double PRIORITY = 10 * Priority.VERY_HIGH_PRIORITY;
+	public static final double PRIORITY = 10 * Priority.VERY_HIGH;
 
 	@Parameter
 	private LogService log;
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 53e8e913b..71ee982a3 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -47,7 +47,7 @@
  * @author Johannes Schindelin
  * @author Curtis Rueden
  */
-@Plugin(type = Service.class, priority = Priority.LOW_PRIORITY)
+@Plugin(type = Service.class, priority = Priority.LOW)
 public class StderrLogService extends AbstractLogService {
 
 	@Override
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 8a359cd49..96735f982 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -49,7 +49,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = CodeRunner.class, priority = Priority.LOW_PRIORITY)
+@Plugin(type = CodeRunner.class, priority = Priority.LOW)
 public class MainCodeRunner extends AbstractCodeRunner {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index bbac93103..2cc1e89e5 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -45,7 +45,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PostprocessorPlugin.class, priority = Priority.FIRST_PRIORITY)
+@Plugin(type = PostprocessorPlugin.class, priority = Priority.FIRST)
 public class DebugPostprocessor extends AbstractPostprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index 3fc40644b..aeede855e 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -43,7 +43,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class, priority = Priority.FIRST_PRIORITY)
+@Plugin(type = PreprocessorPlugin.class, priority = Priority.FIRST)
 public class DebugPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index d9100b87d..6044444b2 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -50,7 +50,7 @@
  *
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH_PRIORITY)
+@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH)
 public class DefaultValuePreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 98d439e30..08fdedb2b 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -54,7 +54,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = PreprocessorPlugin.class, //
-	priority = 2 * Priority.VERY_HIGH_PRIORITY)
+	priority = 2 * Priority.VERY_HIGH)
 public class GatewayPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index ec12b65c0..b71b961d8 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -48,7 +48,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class, priority = Priority.HIGH_PRIORITY)
+@Plugin(type = PreprocessorPlugin.class, priority = Priority.HIGH)
 public class InitPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 9d202b55c..9675a431b 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -51,10 +51,10 @@
  * @author Curtis Rueden
  */
 @Plugin(type = PreprocessorPlugin.class,
-	priority = Priority.VERY_LOW_PRIORITY - 1)
+	priority = Priority.VERY_LOW - 1)
 public class SaveInputsPreprocessor extends AbstractPreprocessorPlugin {
 
-	public static final double PRIORITY = Priority.VERY_LOW_PRIORITY - 1;
+	public static final double PRIORITY = Priority.VERY_LOW - 1;
 
 	@Parameter
 	private ModuleService moduleService;
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 0e8943887..51f496da6 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -63,7 +63,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = PreprocessorPlugin.class, //
-	priority = 2 * Priority.VERY_HIGH_PRIORITY)
+	priority = 2 * Priority.VERY_HIGH)
 public class ServicePreprocessor extends AbstractPreprocessorPlugin {
 
 	// -- ModuleProcessor methods --
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index a72db98b9..d8294a99e 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -45,7 +45,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = PreprocessorPlugin.class,
-	priority = 3 * Priority.VERY_HIGH_PRIORITY)
+	priority = 3 * Priority.VERY_HIGH)
 public class ValidityPreprocessor extends AbstractPreprocessorPlugin {
 
 	// -- ModuleProcessor methods --
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index 50a4f74a6..450710084 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -49,7 +49,7 @@
 
 /** @deprecated Use {@link AppService} and {@link App} instead. */
 @Deprecated
-@Plugin(type = Service.class, priority = Priority.LOW_PRIORITY)
+@Plugin(type = Service.class, priority = Priority.LOW)
 public class DefaultAppEventService extends AbstractService implements
 	AppEventService
 {
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 7be138eb7..2c2618082 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -45,7 +45,7 @@
  * @author Johannes Schindelin
  */
 @Plugin(type = Platform.class, name = "Default",
-	priority = Priority.VERY_LOW_PRIORITY)
+	priority = Priority.VERY_LOW)
 public class DefaultPlatform extends AbstractPlatform {
 
 	// -- PlatformHandler methods --
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index c1f4460ea..30b46b66d 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -45,7 +45,7 @@ public abstract class AbstractRichPlugin extends AbstractContextual implements
 {
 
 	/** The priority of the plugin. */
-	private double priority = Priority.NORMAL_PRIORITY;
+	private double priority = Priority.NORMAL;
 
 	/** The metadata associated with the plugin. */
 	private PluginInfo<?> info;
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index 88598721f..3a084f7ef 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -116,18 +116,18 @@
 	 * Any double value is allowed, but for convenience, there are some presets:
 	 * </p>
 	 * <ul>
-	 * <li>{@link Priority#FIRST_PRIORITY}</li>
-	 * <li>{@link Priority#VERY_HIGH_PRIORITY}</li>
-	 * <li>{@link Priority#HIGH_PRIORITY}</li>
-	 * <li>{@link Priority#NORMAL_PRIORITY}</li>
-	 * <li>{@link Priority#LOW_PRIORITY}</li>
-	 * <li>{@link Priority#VERY_LOW_PRIORITY}</li>
-	 * <li>{@link Priority#LAST_PRIORITY}</li>
+	 * <li>{@link Priority#FIRST}</li>
+	 * <li>{@link Priority#VERY_HIGH}</li>
+	 * <li>{@link Priority#HIGH}</li>
+	 * <li>{@link Priority#NORMAL}</li>
+	 * <li>{@link Priority#LOW}</li>
+	 * <li>{@link Priority#VERY_LOW}</li>
+	 * <li>{@link Priority#LAST}</li>
 	 * </ul>
 	 * 
 	 * @see org.scijava.service.Service
 	 */
-	double priority() default Priority.NORMAL_PRIORITY;
+	double priority() default Priority.NORMAL;
 
 	/**
 	 * Whether the plugin can be selected in the user interface. A plugin's
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index b7535b8b3..1ee08c1b4 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -75,7 +75,7 @@
  * @author Johannes Schindelin
  * @author Curtis Rueden
  */
-@Plugin(type = Service.class, priority = Priority.HIGH_PRIORITY)
+@Plugin(type = Service.class, priority = Priority.HIGH)
 public class DefaultScriptService extends
 	AbstractSingletonService<ScriptLanguage> implements ScriptService
 {
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index f894343ce..03b090046 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -48,7 +48,7 @@
  * @author Curtis Rueden
  * @see TextService
  */
-@Plugin(type = IOPlugin.class, priority = Priority.LOW_PRIORITY - 1)
+@Plugin(type = IOPlugin.class, priority = Priority.LOW - 1)
 public class TextIOPlugin extends AbstractIOPlugin<String> {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index c9ec13caf..b55dffbb2 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -46,7 +46,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH_PRIORITY)
+@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH)
 public class UIPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 4ad74aafe..e6116de21 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -49,7 +49,7 @@
  * @author Curtis Rueden
  * @author Barry DeZonia
  */
-@Plugin(type = DragAndDropHandler.class, priority = Priority.LOW_PRIORITY)
+@Plugin(type = DragAndDropHandler.class, priority = Priority.LOW)
 public class FileDragAndDropHandler extends
 	AbstractDragAndDropHandler<File>
 {
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index aa1737ae7..8b70fd54e 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -55,7 +55,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = UserInterface.class, name = HeadlessUI.NAME,
-	priority = Priority.VERY_LOW_PRIORITY)
+	priority = Priority.VERY_LOW)
 public class HeadlessUI extends AbstractRichPlugin implements UserInterface {
 
 	public static final String NAME = "headless";
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 92f1c5fea..6d4933790 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -57,7 +57,7 @@
  */
 public interface InputHarvester<P, W> {
 
-	double PRIORITY = Priority.VERY_LOW_PRIORITY;
+	double PRIORITY = Priority.VERY_LOW;
 
 	/**
 	 * Performs the harvesting process.
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 84f38b97c..a0ad8565c 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -251,7 +251,7 @@ public void run() {
 	 * populated.
 	 */
 	@Plugin(type = PreprocessorPlugin.class,
-		priority = Priority.VERY_HIGH_PRIORITY)
+		priority = Priority.VERY_HIGH)
 	public static class StuffPreprocessor extends AbstractPreprocessorPlugin {
 
 		@Override
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index b292493a4..c87eadcb8 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -220,7 +220,7 @@ private void assertOutputEvent(final Source source, final String output,
 
 	// -- Helper classes --
 
-	@Plugin(type = ConsoleArgument.class, priority = Priority.HIGH_PRIORITY)
+	@Plugin(type = ConsoleArgument.class, priority = Priority.HIGH)
 	public static class FooArgument extends AbstractConsoleArgument {
 
 		public FooArgument() {
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 8a08ab1a0..c506d0d92 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -703,7 +703,7 @@ public static enum Words {
 	 * input candidates for converting to {@link HisList}s. The actual conversion
 	 * methods are not implemented and are unnecessary.
 	 */
-	@Plugin(type = Converter.class, priority = Priority.LAST_PRIORITY)
+	@Plugin(type = Converter.class, priority = Priority.LAST)
 	public static class StringHisListConverter extends
 		AbstractConverter<String, HisList>
 	{
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 140aaf6d1..554cef02e 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -74,19 +74,19 @@ public static interface IceCream extends SciJavaPlugin {
 		// NB: Marker interface.
 	}
 
-	@Plugin(type = IceCream.class, priority = Priority.VERY_LOW_PRIORITY)
+	@Plugin(type = IceCream.class, priority = Priority.VERY_LOW)
 	public static class Flavorless implements SciJavaPlugin {
 		// NB: No implementation needed.
 	}
 
 	@Plugin(type = IceCream.class, name = "vanilla",
-		priority = Priority.LOW_PRIORITY)
+		priority = Priority.LOW)
 	public static class Vanilla implements SciJavaPlugin {
 		// NB: No implementation needed.
 	}
 
 	@Plugin(type = IceCream.class, name = "chocolate",
-		priority = Priority.VERY_HIGH_PRIORITY)
+		priority = Priority.VERY_HIGH)
 	public static class Chocolate implements IceCream {
 		// NB: No implementation needed.
 	}

From 3f2a5cb88313b980668d4d609e79a89a5b6c3a44 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 09:18:13 -0500
Subject: [PATCH 0566/1208] Switch DefaultConverter priority to extremely low

---
 src/main/java/org/scijava/convert/DefaultConverter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index c95c01ea8..bc75ac14a 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
 import org.scijava.util.ClassUtils;
@@ -55,7 +56,7 @@
  *
  * @author Mark Hiner
  */
-@Plugin(type = Converter.class)
+@Plugin(type = Converter.class, priority = Priority.EXTREMELY_LOW)
 public class DefaultConverter extends AbstractConverter<Object, Object> {
 
 	// -- ConversionHandler methods --

From fc76d53fb1c58feb26f3dea8e688fadc658a3536 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 13:37:35 -0500
Subject: [PATCH 0567/1208] Fix NullConverter javadoc

---
 src/main/java/org/scijava/convert/NullConverter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index e718404ce..7accf5983 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -40,8 +40,8 @@
 
 /**
  * {@link Converter} implementation for handling {@code null} values. Performs
- * basic casting when given a {@code null} source and returns {@code} null
- * directly when given a {@code} null destination.
+ * basic casting when given a {@code null} source and returns {@code null}
+ * directly when given a {@code null} destination.
  * <p>
  * By running at {@link Priority#FIRST}, other converters should
  * not need to worry about {@code null} source or destination parameters.

From b917b2148edb6db4c44a5432855e71238ff63aa0 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 09:51:17 -0500
Subject: [PATCH 0568/1208] Switch CastingConverter priority to extremely high

---
 src/main/java/org/scijava/convert/CastingConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 0835d20d1..4ba3ed38a 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -42,7 +42,7 @@
  *
  * @author Mark Hiner
  */
-@Plugin(type = Converter.class, priority = Priority.FIRST)
+@Plugin(type = Converter.class, priority = Priority.EXTREMELY_HIGH)
 public class CastingConverter extends AbstractConverter<Object, Object> {
 
 	@SuppressWarnings("deprecation")

From 1a4b024826c76b1e8aa7d4b0b867ef1d22d7f603 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 10:17:15 -0500
Subject: [PATCH 0569/1208] Fix NullConverter to match for both null src and
 dest

Before the NullConverter was only matched for null src Objects. This
converter still will not be matched if canConvert(Class<?>, Class<?>) is
called with a null source Class. Additionally, the ConverterTest has
been updated to reflect this change.
---
 src/main/java/org/scijava/convert/NullConverter.java | 11 ++++++-----
 src/test/java/org/scijava/convert/ConverterTest.java |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 7accf5983..72cf1de30 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -60,23 +60,24 @@ public class NullConverter extends AbstractConverter<Object, Object> {
 	@Override
 	public boolean canConvert(final ConversionRequest request) {
 		if (request == null) return false;
-		if (request.destType() == null && request.destClass() == null) return false;
-		return request.sourceObject() == null && request.sourceClass() == null;
+		return (request.destType() == null && request.destClass() == null) ||
+			(request.sourceObject() == null && request.sourceClass() == null);
 	}
 
 	@Override
 	public boolean canConvert(final Object src, final Type dest) {
-		return src == null && dest != null;
+		return src == null || dest == null;
 	}
 
 	@Override
 	public boolean canConvert(final Object src, final Class<?> dest) {
-		return src == null && dest != null;
+		return src == null || dest == null;
 	}
 
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
-		return src == null && dest != null;
+		if (src == null) return false;
+		return dest == null;
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index b772378df..177e9be69 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -67,7 +67,7 @@ public void testNullConverter() {
 		final NullConverter nc = new NullConverter();
 		assertFalse(nc.canConvert(Object.class, Object.class));
 		assertFalse(nc.canConvert(Object.class, (Type) Object.class));
-		assertTrue(nc.canConvert((Class<?>) null, Object.class));
+		assertFalse(nc.canConvert((Class<?>) null, Object.class));
 		assertTrue(nc.canConvert((Object) null, Object.class));
 		assertTrue(nc.canConvert((ConverterTest) null, ArrayList.class));
 		assertNull(nc.convert((Object) null, Object.class));

From ce7f98acc94fd70a0432543ec63fed1adf32e801 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 11:33:51 -0500
Subject: [PATCH 0570/1208] Add tests for ConvertService matching

---
 .../scijava/convert/ConvertServiceTest.java   | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index c506d0d92..b5962a657 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -40,7 +40,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -54,12 +56,22 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.Priority;
+import org.scijava.convert.ArrayConverters.ByteArrayWrapper;
+import org.scijava.convert.ArrayConverters.DoubleArrayUnwrapper;
+import org.scijava.convert.ArrayConverters.FloatArrayWrapper;
+import org.scijava.convert.ArrayConverters.LongArrayWrapper;
+import org.scijava.convert.ArrayConverters.ShortArrayUnwrapper;
+import org.scijava.convert.NumberConverters.ByteToLongConverter;
+import org.scijava.convert.NumberConverters.DoubleToBigDecimalConverter;
+import org.scijava.convert.NumberConverters.ShortToFloatConverter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.BoolArray;
+import org.scijava.util.ByteArray;
 import org.scijava.util.CharArray;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.DoubleArray;
 import org.scijava.util.FloatArray;
+import org.scijava.util.GenericUtils;
 import org.scijava.util.IntArray;
 import org.scijava.util.LongArray;
 import org.scijava.util.PrimitiveArray;
@@ -565,6 +577,126 @@ public void testGetCompatibleInputs() {
 		assertEquals(StringHisListConverter.S4, compatibleInputs.get(3));
 	}
 
+	/**
+	 * Tests that the {@link NullConverter} is chosen for null src and/or dest.
+	 */
+	@Test
+	public void testNullConverterMatching() {
+		final Converter<?, ?> c = convertService.getHandler(new ConversionRequest(
+			null, List.class));
+		assertEquals(NullConverter.class, c.getClass());
+
+		final Converter<?, ?> cc = convertService.getHandler(new ConversionRequest(
+			new Object(), (Class<?>) null));
+		assertEquals(NullConverter.class, cc.getClass());
+
+		final Converter<?, ?> ccc = convertService.getHandler(new ConversionRequest(
+			null, (Class<?>) null));
+		assertEquals(NullConverter.class, ccc.getClass());
+	}
+
+	/**
+	 * Tests the the appropriate wrapping ArrayConverter is chosen for converting
+	 * primitive arrays to scijava wrappers.
+	 */
+	@Test
+	public void testArrayConverterWrappingMatching() {
+		final byte[] b = new byte[] { -128, 0, 127 };
+		final long[] l = new long[] { 13, 17, -103209, 0, 6 };
+		final float[] f = new float[] { 12.125f, -0.0625f, 2.5f };
+
+		final Converter<?, ?> c = convertService.getHandler(b, ByteArray.class);
+		assertEquals(ByteArrayWrapper.class, c.getClass());
+
+		final Converter<?, ?> cc = convertService.getHandler(l, LongArray.class);
+		assertEquals(LongArrayWrapper.class, cc.getClass());
+
+		final Converter<?, ?> ccc = convertService.getHandler(f, FloatArray.class);
+		assertEquals(FloatArrayWrapper.class, ccc.getClass());
+	}
+
+	/**
+	 * Tests that the appropriate unwrapping ArrayConverter is chosen for
+	 * converting scijava arrays to primitive arrays.
+	 */
+	@Test
+	public void testArrayConverterUnwrappingMatching() {
+		final ShortArray s = new ShortArray();
+		final DoubleArray d = new DoubleArray();
+
+		final Converter<?, ?> c = convertService.getHandler(s, short[].class);
+		assertEquals(ShortArrayUnwrapper.class, c.getClass());
+
+		final Converter<?, ?> cc = convertService.getHandler(d, double[].class);
+		assertEquals(DoubleArrayUnwrapper.class, cc.getClass());
+	}
+
+	/**
+	 * Tests that the {@link CastingConverter} is called when casting is possible.
+	 */
+	@Test
+	public void testCastingConverterMatching() {
+		final ArrayList<Double> al = new ArrayList<>();
+
+		final Converter<?, ?> c = convertService.getHandler(al, Collection.class);
+		assertEquals(CastingConverter.class, c.getClass());
+	}
+
+	/**
+	 * Tests the that the appropriate {@link NumberToNumberConverter} is chosen.
+	 */
+	@Test
+	public void testNumberConverterMatching() {
+		final double d = -24312926.0625;
+		final byte b = 64;
+		final short s = 32625;
+
+		// Number converters only handle widening conversions
+		final Converter<?, ?> c = convertService.getHandler(d, BigDecimal.class);
+		assertEquals(DoubleToBigDecimalConverter.class, c.getClass());
+
+		final Converter<?, ?> cc = convertService.getHandler(b, long.class);
+		assertEquals(ByteToLongConverter.class, cc.getClass());
+
+		final Converter<?, ?> ccc = convertService.getHandler(s, float.class);
+		assertEquals(ShortToFloatConverter.class, ccc.getClass());
+	}
+
+	/**
+	 * Tests that the {@link DefaultConverter} is chosen when no other suitable
+	 * converter is available.
+	 */
+	@Test
+	public void testDefaultConverterMatching() {
+		final float f = 13624292.25f;
+		final List<String> l = new ArrayList<>();
+
+		// Narrowing number conversion
+		final Converter<?, ?> c = convertService.getHandler(f, byte.class);
+		assertEquals(DefaultConverter.class, c.getClass());
+
+		// List to Array
+		final Converter<?, ?> cc = convertService.getHandler(l, String[].class);
+		assertEquals(DefaultConverter.class, cc.getClass());
+
+		// Object to String
+		final Converter<?, ?> os = convertService.getHandler(new Object(),
+			String.class);
+		assertEquals(DefaultConverter.class, os.getClass());
+
+		// String to Character
+		final Converter<?, ?> ss = convertService.getHandler("hello", char.class);
+		assertEquals(DefaultConverter.class, ss.getClass());
+
+		// String to Enum
+		final Converter<?, ?> se = convertService.getHandler("bye", Words.class);
+		assertEquals(DefaultConverter.class, se.getClass());
+
+		// Source which can be wrapped as destination
+		final Converter<?, ?> w = convertService.getHandler(10122017l, Date.class);
+		assertEquals(DefaultConverter.class, w.getClass());
+	}
+
 // -- Helper Methods --
 
 	/**

From 2574a4ef3dc1df0bb96b4236920d43da8e29a31e Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 11:39:48 -0500
Subject: [PATCH 0571/1208] Fix typos in ConvertServiceTest

---
 src/test/java/org/scijava/convert/ConvertServiceTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index b5962a657..05884c385 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -147,7 +147,7 @@ public void testPrimitives() {
 	 */
 	@Test
 	public void testArrays() {
-		// Test that each primitive [] is compatible in either direciton with its
+		// Test that each primitive [] is compatible in either direction with its
 		// paired PrimitiveArray
 		testIntechangeable(int[].class, IntArray.class);
 		testIntechangeable(long[].class, LongArray.class);
@@ -157,7 +157,7 @@ public void testArrays() {
 		testIntechangeable(char[].class, CharArray.class);
 		testIntechangeable(boolean[].class, BoolArray.class);
 
-		// Test that primitive [] can not be convertied to mismatched PrimitiveArray
+		// Test that primitive [] can not be converted to mismatched PrimitiveArray
 		assertFalse(convertService.supports(int[].class, LongArray.class));
 
 		// Test that lists can be converted to any primitive []
@@ -883,7 +883,7 @@ public <T> T convert(Object src, Class<T> dest) {
 	// -- Helper methods --
 
 	/**
-	 * Verify bi-direciotnal conversion is supported between the two classes
+	 * Verify bi-directional conversion is supported between the two classes
 	 */
 	private void testIntechangeable(final Class<?> c1, final Class<?> c2) {
 		assertTrue(convertService.supports(c1, c2));

From 30291c50c38efef6d44e2981e997cf99d7781f73 Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 11:22:48 -0500
Subject: [PATCH 0572/1208] Remove unnecessary code from DefaultConverter

This also fixes the corresponding test. Since the NullConverter now
handles both null src and dest, the null logic was unnecessary.
Additionally, the casting logic was unnecessary due to the
CastingConverter. The array and number logic is still necessary, since
there's no converters for List to arrays and the number converters only
handle widening conversions.
---
 .../org/scijava/convert/DefaultConverter.java     | 15 +--------------
 .../java/org/scijava/convert/ConverterTest.java   |  4 ++--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index bc75ac14a..0507c2339 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -80,16 +80,9 @@ public Object convert(final Object src, final Type dest) {
 
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
-		if (dest == null) return null;
-		if (src == null) return ConversionUtils.getNullValue(dest);
-
 		// ensure type is well-behaved, rather than a primitive type
 		final Class<T> saneDest = ConversionUtils.getNonprimitiveType(dest);
 
-		// cast the existing object, if possible
-		if (ConversionUtils.canCast(src, saneDest)) return ConversionUtils.cast(
-			src, saneDest);
-
 		// Handle array types
 		if (isArray(dest)) {
 			@SuppressWarnings("unchecked")
@@ -302,15 +295,9 @@ public boolean canConvert(final Class<?> src, final Type dest) {
 	@Override
 	@Deprecated
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
-
-		if (src == null || dest == null) return true;
-
 		// ensure type is well-behaved, rather than a primitive type
 		final Class<?> saneDest = ConversionUtils.getNonprimitiveType(dest);
-		
-		// OK if the existing object can be casted
-		if (ConversionUtils.canCast(src, saneDest)) return true;
-		
+
 		// OK for numerical conversions
 		if (ConversionUtils.canCast(ConversionUtils.getNonprimitiveType(src),
 			Number.class) &&
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 177e9be69..25174a091 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -94,11 +94,11 @@ public void testCanConvert() {
 
 	@Test
 	public void testCanConvertToGenericCollection() {
-		final DefaultConverter dc = new DefaultConverter();
+		final CastingConverter cc = new CastingConverter();
 
 		final Field destField = ClassUtils.getField(getClass(), "collection");
 		final Type destType = GenericUtils.getFieldType(destField, getClass());
-		assertTrue(dc.canConvert(ArrayList.class, destType));
+		assertTrue(cc.canConvert(ArrayList.class, destType));
 	}
 
 	private static class NumberConverter extends AbstractConverter<Number, Number> {

From 556c6b29da3db61c32b5092a09115a706d3ed08f Mon Sep 17 00:00:00 2001
From: Alison Walter <awalter2@wisc.edu>
Date: Thu, 20 Jul 2017 13:33:23 -0500
Subject: [PATCH 0573/1208] Update DefaultConverter javadoc to list supported
 conversions

---
 .../java/org/scijava/convert/DefaultConverter.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 0507c2339..46c3e7159 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -53,6 +53,20 @@
 /**
  * Default {@link Converter} implementation. Provides useful conversion
  * functionality for many common conversion cases.
+ * <p>
+ * Supported conversions include:
+ * </p>
+ * <ul>
+ * <li>Object to Array</li>
+ * <li>Object to Collection</li>
+ * <li>Number to Number</li>
+ * <li>Object to String</li>
+ * <li>String to Character</li>
+ * <li>String to Enum</li>
+ * <li>Objects where the destination Class has a constructor which takes that
+ * Object
+ * </li>
+ * </ul>
  *
  * @author Mark Hiner
  */

From 9105fddd44b81918e63c880ccb0a174be586163e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 20 Jul 2017 14:20:31 -0500
Subject: [PATCH 0574/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d56a64bdb..91b5b993f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.65.0-SNAPSHOT</version>
+	<version>2.65.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 1495881e93e8095ee99ae6fa45afdff8a7ed7480 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Fri, 30 Jun 2017 12:20:43 +0200
Subject: [PATCH 0575/1208] Add method signatures and preprocessor to select
 multiple files

---
 .../java/org/scijava/ui/DefaultUIService.java | 13 ++++
 .../org/scijava/ui/FileListPreprocessor.java  | 64 +++++++++++++++++++
 src/main/java/org/scijava/ui/UIService.java   | 24 ++++++-
 .../java/org/scijava/ui/UserInterface.java    | 29 ++++++++-
 .../org/scijava/widget/FileListWidget.java    |  7 ++
 5 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/org/scijava/ui/FileListPreprocessor.java
 create mode 100644 src/main/java/org/scijava/widget/FileListWidget.java

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 687d59dd1..76aae7e50 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -33,6 +33,7 @@
 package org.scijava.ui;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -319,6 +320,18 @@ public File chooseFile(final File file, final String style) {
 		return ui == null ? null : ui.chooseFile(title, file, style);
 	}
 
+	@Override
+	public File[] chooseFiles(File[] files, FileFilter filter) {
+		final UserInterface ui = getDefaultUI();
+		return ui == null ? null : ui.chooseFiles(files, filter);
+	}
+	
+	@Override
+	public List<File> chooseFiles(List<File> fileList, FileFilter filter) {
+		final UserInterface ui = getDefaultUI();
+		return ui == null ? null : ui.chooseFiles(fileList, filter);
+	}
+
 	@Override
 	public void showContextMenu(final String menuRoot, final Display<?> display,
 		final int x, final int y)
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
new file mode 100644
index 000000000..3da89f95f
--- /dev/null
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -0,0 +1,64 @@
+package org.scijava.ui;
+
+import java.io.File;
+
+import org.scijava.module.Module;
+import org.scijava.module.ModuleItem;
+import org.scijava.module.process.AbstractPreprocessorPlugin;
+import org.scijava.module.process.PreprocessorPlugin;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.widget.InputHarvester;
+
+@Plugin(type = PreprocessorPlugin.class, priority = InputHarvester.PRIORITY + 1.0)
+public class FileListPreprocessor extends AbstractPreprocessorPlugin {
+
+	@Parameter(required = false)
+	private UIService uiService;
+
+	@Override
+	public void process(final Module module) {
+		if (uiService == null) return;
+		final ModuleItem<File[]> fileInput = getFilesInput(module);
+		if (fileInput == null) return;
+
+		final File[] files = fileInput.getValue(module);
+
+		// show file chooser dialog box
+		final File[] result = uiService.chooseFiles(files, null);
+		if (result == null) {
+			cancel("");
+			return;
+		}
+
+		fileInput.setValue(module, result);
+		module.resolveInput(fileInput.getName());
+	}
+
+	// -- Helper methods --
+
+	/**
+	 * Gets the single unresolved {@link File} input parameter. If there is not
+	 * exactly one unresolved {@link File} input parameter, or if there are other
+	 * types of unresolved parameters, this method returns null.
+	 */
+	private ModuleItem<File[]> getFilesInput(final Module module) {
+		ModuleItem<File[]> result = null;
+		for (final ModuleItem<?> input : module.getInfo().inputs()) {
+			if (module.isInputResolved(input.getName())) continue;
+			final Class<?> type = input.getType();
+			if (!File[].class.isAssignableFrom(type)) {
+				// not a File[] parameter; abort
+				return null;
+			}
+			if (result != null) {
+				// second File parameter; abort
+				return null;
+			}
+			@SuppressWarnings("unchecked")
+			final ModuleItem<File[]> fileInput = (ModuleItem<File[]>) input;
+			result = fileInput;
+		}
+		return result;
+	}
+}
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index c23006b0e..7191679dd 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -33,6 +33,7 @@
 package org.scijava.ui;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.util.List;
 
 import org.scijava.app.StatusService;
@@ -294,6 +295,28 @@ DialogPrompt.Result showDialog(String message, String title,
 	 */
 	File chooseFile(String title, File file, String style);
 
+	/**
+	 * Prompts the user to select one or multiple files.
+	 * <p>
+	 * The prompt is displayed in the default user interface.
+	 * </p>
+	 * 
+	 * @param files The initial value displayed in the file chooser prompt.
+	 * @param filter A filter allowing to restrict the choice of files
+	 */
+	File[] chooseFiles(File[] files, FileFilter filter);
+
+	/**
+	 * Prompts the user to select one or multiple files.
+	 * <p>
+	 * The prompt is displayed in the default user interface.
+	 * </p>
+	 * 
+	 * @param fileList The initial value displayed in the file chooser prompt.
+	 * @param filter A filter allowing to restrict the choice of files
+	 */
+	List<File> chooseFiles(List<File> fileList, FileFilter filter);
+
 	/**
 	 * Displays a popup context menu for the given display at the specified
 	 * position.
@@ -309,5 +332,4 @@ DialogPrompt.Result showDialog(String message, String title,
 	 * @see StatusService#getStatusMessage(String, StatusEvent)
 	 */
 	String getStatusMessage(StatusEvent statusEvent);
-
 }
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 84fd2210b..857090e3a 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -33,6 +33,9 @@
 package org.scijava.ui;
 
 import java.io.File;
+import java.io.FileFilter;
+import java.util.Arrays;
+import java.util.List;
 
 import org.scijava.Disposable;
 import org.scijava.display.Display;
@@ -185,6 +188,31 @@ default File chooseFile(String title, File file, String style) {
 		throw new UnsupportedOperationException();
 	}
 
+	/**
+	 * Prompts the user to choose a list of files.
+	 *
+	 * @param files The initial value displayed in the file chooser prompt.
+	 * @param filter A filter allowing to restrict file choice.
+	 * @return The selected {@link File}s chosen by the user, or null if prompt is not
+	 *         available
+	 */
+	default File[] chooseFiles(File[] files, FileFilter filter) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * Prompts the user to choose a list of files.
+	 *
+	 * @param fileList The initial value displayed in the file chooser prompt.
+	 * @param filter A filter allowing to restrict file choice.
+	 * @return The selected {@link File}s chosen by the user, or null if prompt is not
+	 *         available
+	 */
+	default List<File> chooseFiles(List<File> fileList, FileFilter filter) {
+		File[] files = fileList.toArray(new File[fileList.size()]);
+		return Arrays.asList(chooseFiles(files, filter));
+	}
+
 	/**
 	 * Displays a popup context menu for the given display at the specified
 	 * position.
@@ -199,5 +227,4 @@ default File chooseFile(String title, File file, String style) {
 
 	/** Returns true if this UI requires the EDT. */
 	boolean requiresEDT();
-
 }
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
new file mode 100644
index 000000000..c52097c0d
--- /dev/null
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -0,0 +1,7 @@
+package org.scijava.widget;
+
+import java.io.File;
+
+public interface FileListWidget<U> extends InputWidget<File[], U> {
+	// NB: No changes to interface.
+}

From de98dcf722c347419b3322b06ae329be755862c5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Jul 2017 10:14:17 +0200
Subject: [PATCH 0576/1208] Fix NullPointerException when chooseFiles returns
 null

---
 src/main/java/org/scijava/ui/UserInterface.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 857090e3a..544991cd5 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -193,8 +193,8 @@ default File chooseFile(String title, File file, String style) {
 	 *
 	 * @param files The initial value displayed in the file chooser prompt.
 	 * @param filter A filter allowing to restrict file choice.
-	 * @return The selected {@link File}s chosen by the user, or null if prompt is not
-	 *         available
+	 * @return The selected {@link File}s chosen by the user, or null if the
+	 *         user cancels the prompt.
 	 */
 	default File[] chooseFiles(File[] files, FileFilter filter) {
 		throw new UnsupportedOperationException();
@@ -205,12 +205,13 @@ default File[] chooseFiles(File[] files, FileFilter filter) {
 	 *
 	 * @param fileList The initial value displayed in the file chooser prompt.
 	 * @param filter A filter allowing to restrict file choice.
-	 * @return The selected {@link File}s chosen by the user, or null if prompt is not
-	 *         available
+	 * @return The selected {@link File}s chosen by the user, or null if the
+	 *         user cancels the prompt.
 	 */
 	default List<File> chooseFiles(List<File> fileList, FileFilter filter) {
-		File[] files = fileList.toArray(new File[fileList.size()]);
-		return Arrays.asList(chooseFiles(files, filter));
+		final File[] initialFiles = fileList.toArray(new File[fileList.size()]);
+		final File[] chosenFiles = chooseFiles(initialFiles, filter);
+		return chosenFiles == null ? null : Arrays.asList(chosenFiles);
 	}
 
 	/**

From baaaa55e3524ca99d18d0dd09d176a0db1dbbebc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Jul 2017 10:17:10 +0200
Subject: [PATCH 0577/1208] Add note about storing persisted values for list
 and array inputs

---
 src/main/java/org/scijava/module/DefaultModuleService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index ec3c1e0dd..2bcf13d24 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -297,6 +297,8 @@ public <T> void save(final ModuleItem<T> item, final T value) {
 			return;
 		}
 
+		// FIXME: Convert to string, instead of just calling toString.
+		// Otherwise many things (e.g. File[]) are persisted improperly.
 		final String sValue = value == null ? "" : value.toString();
 
 		// do not persist if object cannot be converted back from a string

From 4a877a0017a884da3abe6edd57f40ae0901d0243 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 25 Aug 2017 18:56:32 +0200
Subject: [PATCH 0578/1208] ByteBankTest: Add test for the toByteArrayMethod

---
 src/test/java/org/scijava/io/ByteBankTest.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index 31a1dec5a..60eaa7c1e 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -9,13 +9,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
@@ -68,6 +68,17 @@ public void testSetGetBytesArray() {
 		assertEqualRead(testBytes.length - 4, 2);
 	}
 
+	@Test
+	public void testToByteArray() {
+		// read in full array
+		bank.setBytes(0l, testBytes.clone(), 0, testBytes.length);
+
+		assertArrayEquals(testBytes, bank.toByteArray());
+
+		byte[] actuals = bank.toByteArray(0, testBytes.length);
+		assertArrayEquals(actuals, testBytes);
+	}
+
 	@Test
 	public void testSetGetBytesPartialArray() {
 		// read in the partial array

From 4b04c8bf9d0bee82666b775d60f1aae6741c43fa Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Thu, 13 Jul 2017 13:51:56 +0200
Subject: [PATCH 0579/1208] Location: change default name to non-empty string

This avoids confusion when the Location implementation does not
assign a name explicitly. Detecting that situation is now very easy.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../java/org/scijava/io/location/Location.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index ad42bf3cb..bec21e813 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -71,8 +71,20 @@ default URI getURI() {
 	 * @return The name, or an empty string if no name is available.
 	 */
 	default String getName() {
-		final URI uri = getURI();
-		return uri == null ? "" : uri.toString();
+		return defaultName();
 	}
 
+	/**
+	 * Gets the default name used when no explicit name is assigned.
+	 * <p>
+	 * Note: this is mostly intended for debugging, since most kinds of
+	 * {@code Location} will assign some non-default name. But in cases where that
+	 * does not occur, this value can be useful to detect the situation.
+	 * </p>
+	 * 
+	 * @return The default name string.
+	 */
+	default String defaultName() {
+		return "Location.defaultName";
+	}
 }

From 66781e9c0f3d02a66784f49e096582b8a70743a5 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 17 Jul 2017 13:42:10 +0200
Subject: [PATCH 0580/1208] Add BrowsableLocation interface

Some Locations support browsing for related Locations relative to
a given one. One use case for this is SCIFIO formats that need to
look for related files in a folder to be able to read an image.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../io/location/BrowsableLocation.java        | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/location/BrowsableLocation.java

diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
new file mode 100644
index 000000000..cd3daaccd
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -0,0 +1,103 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * A {@link Location} that offers methods to browse other locations relative to
+ * it.
+ *
+ * @author Gabriel Einsdorf
+ * @author Curtis Rueden
+ */
+public interface BrowsableLocation extends Location {
+
+	/**
+	 * Obtains a location pointing to the parent directory of this one.
+	 * 
+	 * @return the parent location of this one, or <code>null</code> if this
+	 *         location has no parent.
+	 * @throws IOException if something goes wrong obtaining the parent.
+	 */
+	BrowsableLocation parent() throws IOException;
+
+	/**
+	 * Obtains a collection of locations for whom this location is the parent.
+	 * Note that this will only succeed if calls to {@link #isDirectory()} on this
+	 * location return <code>true</code>.
+	 * 
+	 * @return A set containing the children of this location, or
+	 *         {@link Collections#EMPTY_SET} if this location has no children.
+	 * @throws IOException if something goes wrong obtaining the children.
+	 * @throws IllegalArgumentException if this location is not a directory (i.e.,
+	 *           {@link #isDirectory()} returns false).
+	 */
+	Set<BrowsableLocation> children() throws IOException;
+
+	/**
+	 * Obtains a location relative to this one, which will be configured
+	 * like the current location, but point to a the file specified by the
+	 * <code>path</code> parameter.
+	 *
+	 * @param path the relative path of the desired location.
+	 * @return A location that points to the specified file location.
+	 * @throws IOException if something goes wrong obtaining the sibling
+	 */
+	BrowsableLocation sibling(String path) throws IOException;
+
+	/**
+	 * Tests whether this location is a <b>directory</b>, meaning that it can have
+	 * children. It is recommended to use this method before calling
+	 * {@link #child(String)} or {@link #children()}, to ensure those calls
+	 * succeed.
+	 * 
+	 * @return True iff the location represents a directory.
+	 */
+	boolean isDirectory();
+
+	/**
+	 * Obtains a location with the given name, for whom this location is the
+	 * parent. Note that this will only succeed if calls to {@link #isDirectory()}
+	 * on this location return <code>true</code>.
+	 *
+	 * @param name the name of the child
+	 * @return a location pointing to the child
+	 * @throws IOException if something goes wrong obtaining the child.
+	 * @throws IllegalArgumentException if this location is not a directory (i.e.,
+	 *           {@link #isDirectory()} returns false).
+	 */
+	BrowsableLocation child(String name) throws IOException;
+}

From 62bf4a4601cc0536a8b94166e0f13e32d570cec8 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 17 Jul 2017 13:44:18 +0200
Subject: [PATCH 0581/1208] FileLocation: implement BrowsableLocation iface

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/io/location/FileLocation.java | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index aa9a383df..7790ae4ec 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -33,14 +33,21 @@
 package org.scijava.io.location;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * {@link Location} backed by a {@link File} on disk.
  *
  * @author Curtis Rueden
+ * @author Gabriel Einsdorf
  */
-public class FileLocation extends AbstractLocation {
+public class FileLocation extends AbstractLocation implements
+	BrowsableLocation
+{
 
 	private final File file;
 
@@ -75,4 +82,47 @@ public String getName() {
 		return file.getName();
 	}
 
+	// -- BrowsableLocation methods --
+
+	@Override
+	public FileLocation parent() throws IOException {
+		return new FileLocation(file.getParentFile());
+	}
+
+	@Override
+	public Set<BrowsableLocation> children() throws IOException {
+		validateDirectory();
+		final File[] files = file.listFiles();
+		if (files == null) return Collections.emptySet();
+
+		final Set<BrowsableLocation> out = new HashSet<>(files.length);
+		for (final File child : files) {
+			out.add(new FileLocation(child));
+		}
+		return out;
+	}
+
+	@Override
+	public FileLocation sibling(final String path) {
+		return new FileLocation(new File(file.getParentFile(), path));
+	}
+
+	@Override
+	public FileLocation child(final String name) {
+		validateDirectory();
+		return new FileLocation(new File(file, name));
+	}
+
+	@Override
+	public boolean isDirectory() {
+		return file.isDirectory();
+	}
+
+	// -- Helper methods --
+
+	private void validateDirectory() {
+		if (isDirectory()) return;
+		throw new IllegalArgumentException(
+			"This location does not point to a directory!");
+	}
 }

From 090f898183509e093e9a9d91d248b63b3f3597ed Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 28 Aug 2017 17:40:34 +0200
Subject: [PATCH 0582/1208] DataHandleTest: expose internal API to subclasses

The SciJava coding style strongly encourages private over protected
methods and fields:
https://imagej.net/Coding_style#Private_over_protected_fields_and_methods

However, for test scope things, the impact is less, and the promise of
API compatibility in the future according to SemVer does not exist.
So we are less concerned about breakages.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 src/test/java/org/scijava/io/handle/DataHandleTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 4208562cd..f15248c7c 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -53,7 +53,7 @@
  */
 public abstract class DataHandleTest {
 
-	private static final byte[] BYTES = { //
+	protected static final byte[] BYTES = { //
 		'H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '\n', //
 			9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, -128, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, //
 			125, 127, -127, -125, -3, -2, -1 };
@@ -208,9 +208,9 @@ protected <L extends Location> void checkWrites(final DataHandle<L> handle)
 		}
 	}
 
-	// -- Helper methods --
+	// -- Internal methods --
 
-	private void assertBytesMatch(final int offset, final int length,
+	protected void assertBytesMatch(final int offset, final int length,
 		final byte[] b)
 	{
 		assertEquals(length, b.length);
@@ -219,7 +219,7 @@ private void assertBytesMatch(final int offset, final int length,
 		}
 	}
 
-	private String msg(final int i) {
+	protected String msg(final int i) {
 		return "[" + i + "]:";
 	}
 

From fbfdd23e69efb40be962fefc223473138d065bdb Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 6 Sep 2017 17:36:09 +0200
Subject: [PATCH 0583/1208] Add missing licence header to FileListPreprocessor
 and FileListWidget

---
 .../org/scijava/ui/FileListPreprocessor.java  | 31 +++++++++++++++++++
 .../org/scijava/widget/FileListWidget.java    | 31 +++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index 3da89f95f..6cc5ae83f 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -1,3 +1,34 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.ui;
 
 import java.io.File;
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index c52097c0d..d76c3a1fe 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -1,3 +1,34 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.widget;
 
 import java.io.File;

From 9130c6af46472989e7219f7343dd5c475a5bd4a0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Sep 2017 12:54:24 -0500
Subject: [PATCH 0584/1208] Rename LogServiceTest to StderrLogServiceTest

It specifically tests the StderrLogService. The StderrLogService is the
de facto DefaultLogService at the moment, and the convention in other
places is for Default<Foo> to have a corresponding <Foo>Test rather than
a Default<Foo>Test. But we'll (perhaps temporarily) break the rule here
to make the git history cleaner for upcoming commits.
---
 .../log/{LogServiceTest.java => StderrLogServiceTest.java}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/test/java/org/scijava/log/{LogServiceTest.java => StderrLogServiceTest.java} (96%)

diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
similarity index 96%
rename from src/test/java/org/scijava/log/LogServiceTest.java
rename to src/test/java/org/scijava/log/StderrLogServiceTest.java
index 04d8758ca..30b3eb20f 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -38,11 +38,11 @@
 import org.junit.Test;
 
 /**
- * Tests {@link LogService}.
+ * Tests {@link StderrLogService}.
  * 
  * @author Johannes Schindelin
  */
-public class LogServiceTest {
+public class StderrLogServiceTest {
 	@Test
 	public void testDefaultLevel() {
 		final LogService log = new StderrLogService();

From 458488488b342368dbaaaa609ce8e1f8092afbef Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Mon, 4 Sep 2017 16:36:11 +0200
Subject: [PATCH 0585/1208] LogService: add tests for all current methods in
 AbstractLogService

---
 .../java/org/scijava/log/LogServiceTest.java  | 161 ++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 src/test/java/org/scijava/log/LogServiceTest.java

diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
new file mode 100644
index 000000000..70c2dc64d
--- /dev/null
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -0,0 +1,161 @@
+package org.scijava.log;
+
+import org.junit.Test;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests {@link LogService}.
+ *
+ * @author Matthias Arzt
+ */
+public class LogServiceTest {
+
+	@Test
+	public void testGetPrefix() {
+		TestableLogService logService = new TestableLogService();
+		assertEquals("[ERROR]", logService.getPrefix(LogService.ERROR));
+		assertEquals("[TRACE]", logService.getPrefix(LogService.TRACE));
+	}
+
+	@Test
+	public void testCompleteLogMethod() {
+		testCompleteLogMethod("ERROR", (logService, msg, t) -> logService.error(msg, t));
+		testCompleteLogMethod("WARN", (logService, msg, t) -> logService.warn(msg, t));
+		testCompleteLogMethod("INFO", (logService, msg, t) -> logService.info(msg, t));
+		testCompleteLogMethod("DEBUG", (logService, msg, t) -> logService.debug(msg, t));
+		testCompleteLogMethod("TRACE", (logService, msg, t) -> logService.trace(msg, t));
+	}
+
+	@Test
+	public void testMessageLogMethod() {
+		testMessageLogMethod("ERROR", (logService, msg) -> logService.error(msg));
+		testMessageLogMethod("WARN", (logService, msg) -> logService.warn(msg));
+		testMessageLogMethod("INFO", (logService, msg) -> logService.info(msg));
+		testMessageLogMethod("DEBUG", (logService, msg) -> logService.debug(msg));
+		testMessageLogMethod("TRACE", (logService, msg) -> logService.trace(msg));
+	}
+
+	@Test
+	public void testExceptionLogMethod() {
+		testExceptionLogMethod("ERROR", (logService, t) -> logService.error(t));
+		testExceptionLogMethod("WARN", (logService, t) -> logService.warn(t));
+		testExceptionLogMethod("INFO", (logService, t) -> logService.info(t));
+		testExceptionLogMethod("DEBUG", (logService, t) -> logService.debug(t));
+		testExceptionLogMethod("TRACE", (logService, t) -> logService.trace(t));
+	}
+
+	private void testCompleteLogMethod(String prefix, LogMethodCall logMethodCall) {
+		testLogMethod(prefix, logMethodCall, true, true);
+	}
+
+	private void testMessageLogMethod(String prefix, BiConsumer<LogService, Object> call) {
+		testLogMethod(prefix, (log, text, exception) -> call.accept(log, text), true, false);
+	}
+
+	private void testExceptionLogMethod(String prefix, BiConsumer<LogService, Throwable> call) {
+		testLogMethod(prefix, (log, text, exception) -> call.accept(log, exception), false, true);
+
+	}
+
+	private void testLogMethod(String prefix, LogMethodCall logMethodCall, boolean testMessage, boolean testException) {
+		// setup
+		TestableLogService logService = new TestableLogService();
+		logService.setLevel(LogService.TRACE);
+		String text = "Message";
+		NullPointerException exception = new NullPointerException();
+		// process
+		logMethodCall.run(logService, text, exception);
+		// test
+		if(testMessage) {
+			assertTrue(logService.message().contains(prefix));
+			assertTrue(logService.message().contains(text));
+		}
+		if(testException)
+			assertEquals(exception, logService.exception());
+	}
+
+	@Test
+	public void testSetLevel() {
+		TestableLogService logService = new TestableLogService();
+		logService.setLevel(LogService.TRACE);
+		assertEquals(LogService.TRACE, logService.getLevel());
+		logService.setLevel(LogService.ERROR);
+		assertEquals(LogService.ERROR, logService.getLevel());
+	}
+
+	@Test
+	public void testSetClassSpecificLevel() {
+		TestableLogService logService = new TestableLogService();
+		MyTestClass testClass = new MyTestClass(logService);
+		logService.setLevel(LogService.ERROR);
+		logService.setLevel(MyTestClass.class.getName(), LogService.TRACE);
+		assertEquals(LogService.ERROR, logService.getLevel());
+		assertEquals(LogService.TRACE, testClass.getLevel());
+	}
+
+	@Test
+	public void testIsWarn() {
+		testIsLevel(LogService.ERROR, LogService::isError);
+		testIsLevel(LogService.WARN, LogService::isWarn);
+		testIsLevel(LogService.INFO, LogService::isInfo);
+		testIsLevel(LogService.DEBUG, LogService::isDebug);
+		testIsLevel(LogService.TRACE, LogService::isTrace);
+	}
+
+	private void testIsLevel(int level, Function<LogService, Boolean> isLevel) {
+		TestableLogService logService = new TestableLogService();
+		logService.setLevel(LogService.NONE);
+		assertFalse(isLevel.apply(logService));
+		logService.setLevel(level);
+		assertTrue(isLevel.apply(logService));
+		logService.setLevel(LogService.TRACE);
+		assertTrue(isLevel.apply(logService));
+	}
+
+	// -- Helper classes --
+
+	private static class MyTestClass {
+
+		private final LogService log;
+
+		MyTestClass(LogService log) {
+			this.log = log;
+		}
+
+		int getLevel() {
+			return log.getLevel();
+		}
+	}
+
+	private interface LogMethodCall {
+		void run(LogService logService, Object text, Throwable exception);
+	}
+
+	private static class TestableLogService extends AbstractLogService {
+
+		String message = null;
+		Throwable exception = null;
+
+		public String message() {
+			return message;
+		}
+
+		public Throwable exception() {
+			return exception;
+		}
+
+		@Override
+		protected void log(String msg) {
+			this.message = msg;
+		}
+
+		@Override
+		protected void log(Throwable t) {
+			this.exception = t;
+		}
+	}
+}

From 3f624c72479be4daf724c9308c0e17a003f69671 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 16:53:04 +0100
Subject: [PATCH 0586/1208] LogService: Add LogLevel class to organize logging
 levels

---
 .../org/scijava/log/AbstractLogService.java   | 27 +++-----
 src/main/java/org/scijava/log/LogLevel.java   | 68 +++++++++++++++++++
 src/main/java/org/scijava/log/LogService.java | 26 +++++--
 .../org/scijava/log/StderrLogService.java     |  2 +-
 4 files changed, 98 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/org/scijava/log/LogLevel.java

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index ff2545be0..b4c42d6c2 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -107,27 +107,10 @@ protected void log(final int level, final Object msg, final Throwable t) {
 	}
 
 	protected void log(final int level, final Object msg) {
-		final String prefix = getPrefix(level);
+		final String prefix = LogLevel.prefix(level);
 		log((prefix == null ? "" : prefix + " ") + msg);
 	}
 
-	protected String getPrefix(final int level) {
-		switch (level) {
-			case ERROR:
-				return "[ERROR]";
-			case WARN:
-				return "[WARNING]";
-			case INFO:
-				return "[INFO]";
-			case DEBUG:
-				return "[DEBUG]";
-			case TRACE:
-				return "[TRACE]";
-			default:
-				return null;
-		}
-	}
-
 	// -- LogService methods --
 
 	@Override
@@ -255,6 +238,14 @@ public void setLevel(final String classOrPackageName, final int level) {
 		classAndPackageLevels.put(classOrPackageName, level);
 	}
 
+	// -- Deprecated --
+
+	/** @deprecated Use {@link LogLevel#prefix(int)} instead. */
+	@Deprecated
+	protected String getPrefix(final int level) {
+		return "[" + LogLevel.prefix(level) + "]";
+	}
+
 	// -- Helper methods --
 
 	/** Extracts the log level value from a string. */
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
new file mode 100644
index 000000000..b4fbf56ac
--- /dev/null
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+/**
+ * Constants for specifying a logger's level of verbosity.
+ * 
+ * @author Curtis Rueden
+ */
+public final class LogLevel {
+
+	private LogLevel() {
+		// prevent instantiation of utility class
+	}
+
+	public static final int NONE = 0;
+	public static final int ERROR = 1;
+	public static final int WARN = 2;
+	public static final int INFO = 3;
+	public static final int DEBUG = 4;
+	public static final int TRACE = 5;
+
+	public static String prefix(final int level) {
+		switch (level) {
+			case ERROR:
+				return "ERROR";
+			case WARN:
+				return "WARNING";
+			case INFO:
+				return "INFO";
+			case DEBUG:
+				return "DEBUG";
+			case TRACE:
+				return "TRACE";
+			default:
+				return "LEVEL" + level;
+		}
+	}
+}
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index bae7381e3..2330c3912 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -50,12 +50,26 @@ public interface LogService extends SciJavaService {
 	/** System property to set for overriding the default logging level. */
 	String LOG_LEVEL_PROPERTY = "scijava.log.level";
 
-	int NONE = 0;
-	int ERROR = 1;
-	int WARN = 2;
-	int INFO = 3;
-	int DEBUG = 4;
-	int TRACE = 5;
+	// -- Deprecated --
+
+	/** @deprecated Use {@link LogLevel#NONE}. */
+	@Deprecated
+	int NONE = LogLevel.NONE;
+	/** @deprecated Use {@link LogLevel#ERROR}. */
+	@Deprecated
+	int ERROR = LogLevel.ERROR;
+	/** @deprecated Use {@link LogLevel#WARN}. */
+	@Deprecated
+	int WARN = LogLevel.WARN;
+	/** @deprecated Use {@link LogLevel#INFO}. */
+	@Deprecated
+	int INFO = LogLevel.INFO;
+	/** @deprecated Use {@link LogLevel#DEBUG}. */
+	@Deprecated
+	int DEBUG = LogLevel.DEBUG;
+	/** @deprecated Use {@link LogLevel#TRACE}. */
+	@Deprecated
+	int TRACE = LogLevel.TRACE;
 
 	void debug(Object msg);
 
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 71ee982a3..b264a7ec0 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -52,7 +52,7 @@ public class StderrLogService extends AbstractLogService {
 
 	@Override
 	protected void log(final int level, final Object msg) {
-		final String prefix = getPrefix(level);
+		final String prefix = LogLevel.prefix(level);
 		final String message = (prefix == null ? "" : prefix + " ") + msg;
 		// NB: Emit severe messages to stderr, and less severe ones to stdout.
 		if (level <= WARN) System.err.println(message);

From 0caa53a718736f47d87c931853d44d1875f7a5bf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 16:59:43 +0100
Subject: [PATCH 0587/1208] AbstractLogService: migrate log level extraction to
 LogLevel class

---
 .../org/scijava/log/AbstractLogService.java   | 27 ++----------------
 src/main/java/org/scijava/log/LogLevel.java   | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index b4c42d6c2..ece2056e3 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/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()) {
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index b4fbf56ac..e38b85e80 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/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;
+	}
+
 }

From 2407a38fdec8e3dfcac6208507b7ecdbad7816e9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 17:00:32 +0100
Subject: [PATCH 0588/1208] LogService: stop using deprecated constants

---
 .../org/scijava/log/AbstractLogService.java   | 42 +++++++++----------
 .../org/scijava/log/StderrLogService.java     |  2 +-
 .../java/org/scijava/log/LogServiceTest.java  | 36 ++++++++--------
 .../org/scijava/log/StderrLogServiceTest.java |  5 ++-
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index ece2056e3..4cbd40bac 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -115,102 +115,102 @@ protected void log(final int level, final Object msg) {
 
 	@Override
 	public void debug(final Object msg) {
-		log(DEBUG, msg, null);
+		log(LogLevel.DEBUG, msg, null);
 	}
 
 	@Override
 	public void debug(final Throwable t) {
-		log(DEBUG, null, t);
+		log(LogLevel.DEBUG, null, t);
 	}
 
 	@Override
 	public void debug(final Object msg, final Throwable t) {
-		log(DEBUG, msg, t);
+		log(LogLevel.DEBUG, msg, t);
 	}
 
 	@Override
 	public void error(final Object msg) {
-		log(ERROR, msg, null);
+		log(LogLevel.ERROR, msg, null);
 	}
 
 	@Override
 	public void error(final Throwable t) {
-		log(ERROR, null, t);
+		log(LogLevel.ERROR, null, t);
 	}
 
 	@Override
 	public void error(final Object msg, final Throwable t) {
-		log(ERROR, msg, t);
+		log(LogLevel.ERROR, msg, t);
 	}
 
 	@Override
 	public void info(final Object msg) {
-		log(INFO, msg, null);
+		log(LogLevel.INFO, msg, null);
 	}
 
 	@Override
 	public void info(final Throwable t) {
-		log(INFO, null, t);
+		log(LogLevel.INFO, null, t);
 	}
 
 	@Override
 	public void info(final Object msg, final Throwable t) {
-		log(INFO, msg, t);
+		log(LogLevel.INFO, msg, t);
 	}
 
 	@Override
 	public void trace(final Object msg) {
-		log(TRACE, msg, null);
+		log(LogLevel.TRACE, msg, null);
 	}
 
 	@Override
 	public void trace(final Throwable t) {
-		log(TRACE, null, t);
+		log(LogLevel.TRACE, null, t);
 	}
 
 	@Override
 	public void trace(final Object msg, final Throwable t) {
-		log(TRACE, msg, t);
+		log(LogLevel.TRACE, msg, t);
 	}
 
 	@Override
 	public void warn(final Object msg) {
-		log(WARN, msg, null);
+		log(LogLevel.WARN, msg, null);
 	}
 
 	@Override
 	public void warn(final Throwable t) {
-		log(WARN, null, t);
+		log(LogLevel.WARN, null, t);
 	}
 
 	@Override
 	public void warn(final Object msg, final Throwable t) {
-		log(WARN, msg, t);
+		log(LogLevel.WARN, msg, t);
 	}
 
 	@Override
 	public boolean isDebug() {
-		return getLevel() >= DEBUG;
+		return getLevel() >= LogLevel.DEBUG;
 	}
 
 	@Override
 	public boolean isError() {
-		return getLevel() >= ERROR;
+		return getLevel() >= LogLevel.ERROR;
 	}
 
 	@Override
 	public boolean isInfo() {
-		return getLevel() >= INFO;
+		return getLevel() >= LogLevel.INFO;
 	}
 
 	@Override
 	public boolean isTrace() {
-		return getLevel() >= TRACE;
+		return getLevel() >= LogLevel.TRACE;
 	}
 
 	@Override
 	public boolean isWarn() {
-		return getLevel() >= WARN;
+		return getLevel() >= LogLevel.WARN;
 	}
 
 	@Override
@@ -266,7 +266,7 @@ private String parentPackage(final String classOrPackageName) {
 
 	private int levelFromEnvironment() {
 		// use the default, which is INFO unless the DEBUG env. variable is set
-		return System.getenv("DEBUG") == null ? INFO : DEBUG;
+		return System.getenv("DEBUG") == null ? LogLevel.INFO : LogLevel.DEBUG;
 	}
 
 }
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index b264a7ec0..253acc38f 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -55,7 +55,7 @@ protected void log(final int level, final Object msg) {
 		final String prefix = LogLevel.prefix(level);
 		final String message = (prefix == null ? "" : prefix + " ") + msg;
 		// NB: Emit severe messages to stderr, and less severe ones to stdout.
-		if (level <= WARN) System.err.println(message);
+		if (level <= LogLevel.WARN) System.err.println(message);
 		else System.out.println(message);
 	}
 
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 70c2dc64d..b54a9fc84 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -17,8 +17,8 @@ public class LogServiceTest {
 	@Test
 	public void testGetPrefix() {
 		TestableLogService logService = new TestableLogService();
-		assertEquals("[ERROR]", logService.getPrefix(LogService.ERROR));
-		assertEquals("[TRACE]", logService.getPrefix(LogService.TRACE));
+		assertEquals("[ERROR]", logService.getPrefix(LogLevel.ERROR));
+		assertEquals("[TRACE]", logService.getPrefix(LogLevel.TRACE));
 	}
 
 	@Test
@@ -64,7 +64,7 @@ private void testExceptionLogMethod(String prefix, BiConsumer<LogService, Throwa
 	private void testLogMethod(String prefix, LogMethodCall logMethodCall, boolean testMessage, boolean testException) {
 		// setup
 		TestableLogService logService = new TestableLogService();
-		logService.setLevel(LogService.TRACE);
+		logService.setLevel(LogLevel.TRACE);
 		String text = "Message";
 		NullPointerException exception = new NullPointerException();
 		// process
@@ -81,38 +81,38 @@ private void testLogMethod(String prefix, LogMethodCall logMethodCall, boolean t
 	@Test
 	public void testSetLevel() {
 		TestableLogService logService = new TestableLogService();
-		logService.setLevel(LogService.TRACE);
-		assertEquals(LogService.TRACE, logService.getLevel());
-		logService.setLevel(LogService.ERROR);
-		assertEquals(LogService.ERROR, logService.getLevel());
+		logService.setLevel(LogLevel.TRACE);
+		assertEquals(LogLevel.TRACE, logService.getLevel());
+		logService.setLevel(LogLevel.ERROR);
+		assertEquals(LogLevel.ERROR, logService.getLevel());
 	}
 
 	@Test
 	public void testSetClassSpecificLevel() {
 		TestableLogService logService = new TestableLogService();
 		MyTestClass testClass = new MyTestClass(logService);
-		logService.setLevel(LogService.ERROR);
-		logService.setLevel(MyTestClass.class.getName(), LogService.TRACE);
-		assertEquals(LogService.ERROR, logService.getLevel());
-		assertEquals(LogService.TRACE, testClass.getLevel());
+		logService.setLevel(LogLevel.ERROR);
+		logService.setLevel(MyTestClass.class.getName(), LogLevel.TRACE);
+		assertEquals(LogLevel.ERROR, logService.getLevel());
+		assertEquals(LogLevel.TRACE, testClass.getLevel());
 	}
 
 	@Test
 	public void testIsWarn() {
-		testIsLevel(LogService.ERROR, LogService::isError);
-		testIsLevel(LogService.WARN, LogService::isWarn);
-		testIsLevel(LogService.INFO, LogService::isInfo);
-		testIsLevel(LogService.DEBUG, LogService::isDebug);
-		testIsLevel(LogService.TRACE, LogService::isTrace);
+		testIsLevel(LogLevel.ERROR, LogService::isError);
+		testIsLevel(LogLevel.WARN, LogService::isWarn);
+		testIsLevel(LogLevel.INFO, LogService::isInfo);
+		testIsLevel(LogLevel.DEBUG, LogService::isDebug);
+		testIsLevel(LogLevel.TRACE, LogService::isTrace);
 	}
 
 	private void testIsLevel(int level, Function<LogService, Boolean> isLevel) {
 		TestableLogService logService = new TestableLogService();
-		logService.setLevel(LogService.NONE);
+		logService.setLevel(LogLevel.NONE);
 		assertFalse(isLevel.apply(logService));
 		logService.setLevel(level);
 		assertTrue(isLevel.apply(logService));
-		logService.setLevel(LogService.TRACE);
+		logService.setLevel(LogLevel.TRACE);
 		assertTrue(isLevel.apply(logService));
 	}
 
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index 30b3eb20f..381c41ecb 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -33,7 +33,7 @@
 package org.scijava.log;
 
 import static org.junit.Assert.assertTrue;
-import static org.scijava.log.LogService.WARN;
+import static org.scijava.log.LogLevel.WARN;
 
 import org.junit.Test;
 
@@ -47,6 +47,7 @@ public class StderrLogServiceTest {
 	public void testDefaultLevel() {
 		final LogService log = new StderrLogService();
 		int level = log.getLevel();
-		assertTrue("default level (" + level + ") is at least INFO(" + WARN + ")", level >= WARN);
+		assertTrue("default level (" + level + //
+			") is at least INFO(" + WARN + ")", level >= WARN);
 	}
 }

From 4af17fbf3651a2db425e71da7c3db3843d536568 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Fri, 8 Sep 2017 15:51:16 +0200
Subject: [PATCH 0589/1208] Allow feeding LogService config via Properties

And test that Properties-based configuration works.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/log/AbstractLogService.java   | 11 ++--
 .../java/org/scijava/log/LogServiceTest.java  | 57 +++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 4cbd40bac..333c1423c 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -71,10 +71,14 @@ public abstract class AbstractLogService extends AbstractService implements
 	// -- constructor --
 
 	public AbstractLogService() {
+		this(System.getProperties());
+	}
+
+	public AbstractLogService(final Properties properties) {
 		// check SciJava log level system properties for initial logging levels
 
 		// global log level property
-		final String logProp = System.getProperty(LOG_LEVEL_PROPERTY);
+		final String logProp = properties.getProperty(LOG_LEVEL_PROPERTY);
 		final int level = LogLevel.value(logProp);
 		if (level >= 0) setLevel(level);
 
@@ -83,14 +87,13 @@ public AbstractLogService() {
 
 		// populate custom class- and package-specific log level properties
 		final String logLevelPrefix = LOG_LEVEL_PROPERTY + ":";
-		final Properties props = System.getProperties();
-		for (final Object propKey : props.keySet()) {
+		for (final Object propKey : properties.keySet()) {
 			if (!(propKey instanceof String)) continue;
 			final String propName = (String) propKey;
 			if (!propName.startsWith(logLevelPrefix)) continue;
 			final String classOrPackageName =
 				propName.substring(logLevelPrefix.length());
-			setLevel(classOrPackageName, LogLevel.value(props.getProperty(propName)));
+			setLevel(classOrPackageName, LogLevel.value(properties.getProperty(propName)));
 		}
 
 	}
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index b54a9fc84..e3d11d085 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.Test;
 
+import java.util.Properties;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
@@ -116,6 +117,54 @@ private void testIsLevel(int level, Function<LogService, Boolean> isLevel) {
 		assertTrue(isLevel.apply(logService));
 	}
 
+	@Test
+	public void testDefaultLevel() {
+		assertEquals(LogLevel.INFO, new TestableLogService().getLevel());
+	}
+
+	@Test
+	public void testMainSystemProperty() {
+		Properties properties = new Properties();
+		properties.setProperty(LogService.LOG_LEVEL_PROPERTY, "error");
+		int level = new TestableLogService(properties).getLevel();
+		assertEquals(LogLevel.ERROR, level);
+	}
+
+	static class Dummy {
+		public static int getLevel(LogService log) {
+			return log.getLevel();
+		}
+	}
+
+	@Test
+	public void testClassLogLevel() {
+		final TestableLogService log = new TestableLogService();
+		log.setLevel(LogLevel.DEBUG);
+		log.setLevel(Dummy.class.getName(), LogLevel.ERROR);
+		int level = Dummy.getLevel(log);
+		assertEquals(LogLevel.ERROR, level);
+	}
+
+	@Test
+	public void testClassLogLevelViaProperties() {
+		Properties properties = new Properties();
+		properties.setProperty(LogService.LOG_LEVEL_PROPERTY + ":" + Dummy.class.getName(), LogLevel.prefix(LogLevel.ERROR));
+		properties.setProperty(LogService.LOG_LEVEL_PROPERTY + ":" + this.getClass().getName(), LogLevel.prefix(LogLevel.TRACE));
+		final LogService log = new TestableLogService(properties);
+		log.setLevel(LogLevel.DEBUG);
+		int level = Dummy.getLevel(log);
+		assertEquals(LogLevel.ERROR, level);
+	}
+
+	@Test
+	public void testPackageLogLevel() {
+		final LogService log = new TestableLogService();
+		log.setLevel("org.scijava.log", LogLevel.TRACE);
+		log.setLevel("xyz.foo.bar", LogLevel.ERROR);
+		int level = log.getLevel();
+		assertEquals(LogLevel.TRACE, level);
+	}
+
 	// -- Helper classes --
 
 	private static class MyTestClass {
@@ -140,6 +189,14 @@ private static class TestableLogService extends AbstractLogService {
 		String message = null;
 		Throwable exception = null;
 
+		public TestableLogService() {
+			this(new Properties());
+		}
+
+		public TestableLogService(Properties properties) {
+			super(properties);
+		}
+
 		public String message() {
 			return message;
 		}

From 2005e7ebca7736e8911f8bae61ae6ca0baa6b431 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Dec 2016 17:02:42 +0100
Subject: [PATCH 0590/1208] LogService: extract logging methods to a
 superinterface

We are going to add support for multiple Logger objects in the same
SciJava context. The LogService instance will itself be the default
Logger, but there will be others as well.
---
 src/main/java/org/scijava/log/LogService.java | 44 +---------
 src/main/java/org/scijava/log/Logger.java     | 88 +++++++++++++++++++
 2 files changed, 89 insertions(+), 43 deletions(-)
 create mode 100644 src/main/java/org/scijava/log/Logger.java

diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 2330c3912..6c9075908 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -45,7 +45,7 @@
  * 
  * @author Curtis Rueden
  */
-public interface LogService extends SciJavaService {
+public interface LogService extends SciJavaService, Logger {
 
 	/** System property to set for overriding the default logging level. */
 	String LOG_LEVEL_PROPERTY = "scijava.log.level";
@@ -71,48 +71,6 @@ public interface LogService extends SciJavaService {
 	@Deprecated
 	int TRACE = LogLevel.TRACE;
 
-	void debug(Object msg);
-
-	void debug(Throwable t);
-
-	void debug(Object msg, Throwable t);
-
-	void error(Object msg);
-
-	void error(Throwable t);
-
-	void error(Object msg, Throwable t);
-
-	void info(Object msg);
-
-	void info(Throwable t);
-
-	void info(Object msg, Throwable t);
-
-	void trace(Object msg);
-
-	void trace(Throwable t);
-
-	void trace(Object msg, Throwable t);
-
-	void warn(Object msg);
-
-	void warn(Throwable t);
-
-	void warn(Object msg, Throwable t);
-
-	boolean isDebug();
-
-	boolean isError();
-
-	boolean isInfo();
-
-	boolean isTrace();
-
-	boolean isWarn();
-
-	int getLevel();
-
 	void setLevel(int level);
 
 	void setLevel(String classOrPackageName, int level);
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
new file mode 100644
index 000000000..5e226c64b
--- /dev/null
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+/**
+ * Interface for objects which can produce log messages.
+ * <p>
+ * It provides methods for logging messages, exception stack traces and
+ * combinations of the two.
+ * </p>
+ * 
+ * @author Curtis Rueden
+ * @see LogLevel
+ * @see LogService
+ */
+public interface Logger {
+
+	void debug(Object msg);
+
+	void debug(Throwable t);
+
+	void debug(Object msg, Throwable t);
+
+	void error(Object msg);
+
+	void error(Throwable t);
+
+	void error(Object msg, Throwable t);
+
+	void info(Object msg);
+
+	void info(Throwable t);
+
+	void info(Object msg, Throwable t);
+
+	void trace(Object msg);
+
+	void trace(Throwable t);
+
+	void trace(Object msg, Throwable t);
+
+	void warn(Object msg);
+
+	void warn(Throwable t);
+
+	void warn(Object msg, Throwable t);
+
+	boolean isDebug();
+
+	boolean isError();
+
+	boolean isInfo();
+
+	boolean isTrace();
+
+	boolean isWarn();
+
+	int getLevel();
+}

From 3a530d06ad0f8c7b1a28e33fe17bb169e6617622 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 14 Dec 2016 03:10:06 +0100
Subject: [PATCH 0591/1208] Logger: funnel all logging through a single method

This change eliminates the various protected log methods of
AbstractLogService, in favor of a single method:

    alwaysLog(int level, Object message, Throwable t)

All other logging methods in the Logger interface now have default
implementations which funnel to this method, which should make it
simpler to implement this interface.

This change also introduces new methods for logging information at any
arbitrary log level:

    log(int level, Object message)
    log(int level, Throwable t)
    log(int level, Object message, Throwable t)

All level-specific logging methods now lean on these general-purpose log
methods, which do the level threshold check, and then call alwaysLog.
---
 .../org/scijava/log/AbstractLogService.java   | 136 +------------
 src/main/java/org/scijava/log/Logger.java     | 178 ++++++++++++++----
 .../org/scijava/log/StderrLogService.java     |  24 +--
 .../java/org/scijava/log/LogServiceTest.java  |   8 +-
 4 files changed, 144 insertions(+), 202 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 333c1423c..abd7cffb3 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -42,6 +42,7 @@
  * Base class for {@link LogService} implementations.
  *
  * @author Johannes Schindelin
+ * @author Curtis Rueden
  */
 public abstract class AbstractLogService extends AbstractService implements
 	LogService
@@ -52,22 +53,6 @@ public abstract class AbstractLogService extends AbstractService implements
 	private final Map<String, Integer> classAndPackageLevels =
 		new HashMap<>();
 
-	// -- abstract methods --
-
-	/**
-	 * Displays a message.
-	 *
-	 * @param msg the message to display.
-	 */
-	protected abstract void log(final String msg);
-
-	/**
-	 * Displays an exception.
-	 *
-	 * @param t the exception to display.
-	 */
-	protected abstract void log(final Throwable t);
-
 	// -- constructor --
 
 	public AbstractLogService() {
@@ -95,126 +80,9 @@ public AbstractLogService(final Properties properties) {
 				propName.substring(logLevelPrefix.length());
 			setLevel(classOrPackageName, LogLevel.value(properties.getProperty(propName)));
 		}
-
-	}
-
-	// -- helper methods --
-
-	protected void log(final int level, final Object msg, final Throwable t) {
-		if (level > getLevel()) return;
-
-		if (msg != null || t == null) {
-			log(level, msg);
-		}
-		if (t != null) log(t);
-	}
-
-	protected void log(final int level, final Object msg) {
-		final String prefix = LogLevel.prefix(level);
-		log((prefix == null ? "" : prefix + " ") + msg);
-	}
-
-	// -- LogService methods --
-
-	@Override
-	public void debug(final Object msg) {
-		log(LogLevel.DEBUG, msg, null);
-	}
-
-	@Override
-	public void debug(final Throwable t) {
-		log(LogLevel.DEBUG, null, t);
-	}
-
-	@Override
-	public void debug(final Object msg, final Throwable t) {
-		log(LogLevel.DEBUG, msg, t);
-	}
-
-	@Override
-	public void error(final Object msg) {
-		log(LogLevel.ERROR, msg, null);
-	}
-
-	@Override
-	public void error(final Throwable t) {
-		log(LogLevel.ERROR, null, t);
-	}
-
-	@Override
-	public void error(final Object msg, final Throwable t) {
-		log(LogLevel.ERROR, msg, t);
-	}
-
-	@Override
-	public void info(final Object msg) {
-		log(LogLevel.INFO, msg, null);
-	}
-
-	@Override
-	public void info(final Throwable t) {
-		log(LogLevel.INFO, null, t);
 	}
 
-	@Override
-	public void info(final Object msg, final Throwable t) {
-		log(LogLevel.INFO, msg, t);
-	}
-
-	@Override
-	public void trace(final Object msg) {
-		log(LogLevel.TRACE, msg, null);
-	}
-
-	@Override
-	public void trace(final Throwable t) {
-		log(LogLevel.TRACE, null, t);
-	}
-
-	@Override
-	public void trace(final Object msg, final Throwable t) {
-		log(LogLevel.TRACE, msg, t);
-	}
-
-	@Override
-	public void warn(final Object msg) {
-		log(LogLevel.WARN, msg, null);
-	}
-
-	@Override
-	public void warn(final Throwable t) {
-		log(LogLevel.WARN, null, t);
-	}
-
-	@Override
-	public void warn(final Object msg, final Throwable t) {
-		log(LogLevel.WARN, msg, t);
-	}
-
-	@Override
-	public boolean isDebug() {
-		return getLevel() >= LogLevel.DEBUG;
-	}
-
-	@Override
-	public boolean isError() {
-		return getLevel() >= LogLevel.ERROR;
-	}
-
-	@Override
-	public boolean isInfo() {
-		return getLevel() >= LogLevel.INFO;
-	}
-
-	@Override
-	public boolean isTrace() {
-		return getLevel() >= LogLevel.TRACE;
-	}
-
-	@Override
-	public boolean isWarn() {
-		return getLevel() >= LogLevel.WARN;
-	}
+	// -- Logger methods --
 
 	@Override
 	public int getLevel() {
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 5e226c64b..928904438 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -31,6 +31,12 @@
 
 package org.scijava.log;
 
+import static org.scijava.log.LogLevel.DEBUG;
+import static org.scijava.log.LogLevel.ERROR;
+import static org.scijava.log.LogLevel.INFO;
+import static org.scijava.log.LogLevel.TRACE;
+import static org.scijava.log.LogLevel.WARN;
+
 /**
  * Interface for objects which can produce log messages.
  * <p>
@@ -44,45 +50,137 @@
  */
 public interface Logger {
 
-	void debug(Object msg);
-
-	void debug(Throwable t);
-
-	void debug(Object msg, Throwable t);
-
-	void error(Object msg);
-
-	void error(Throwable t);
-
-	void error(Object msg, Throwable t);
-
-	void info(Object msg);
-
-	void info(Throwable t);
-
-	void info(Object msg, Throwable t);
-
-	void trace(Object msg);
-
-	void trace(Throwable t);
-
-	void trace(Object msg, Throwable t);
-
-	void warn(Object msg);
-
-	void warn(Throwable t);
-
-	void warn(Object msg, Throwable t);
-
-	boolean isDebug();
-
-	boolean isError();
-
-	boolean isInfo();
-
-	boolean isTrace();
-
-	boolean isWarn();
-
+	default void debug(final Object msg) {
+		log(DEBUG, msg);
+	}
+
+	default void debug(final Throwable t) {
+		log(DEBUG, t);
+	}
+
+	default void debug(final Object msg, final Throwable t) {
+		log(DEBUG, msg, t);
+	}
+
+	default void error(final Object msg) {
+		log(ERROR, msg);
+	}
+
+	default void error(final Throwable t) {
+		log(ERROR, t);
+	}
+
+	default void error(final Object msg, final Throwable t) {
+		log(ERROR, msg, t);
+	}
+
+	default void info(final Object msg) {
+		log(INFO, msg);
+	}
+
+	default void info(final Throwable t) {
+		log(INFO, t);
+	}
+
+	default void info(final Object msg, final Throwable t) {
+		log(INFO, msg, t);
+	}
+
+	default void trace(final Object msg) {
+		log(TRACE, msg);
+	}
+
+	default void trace(final Throwable t) {
+		log(TRACE, t);
+	}
+
+	default void trace(final Object msg, final Throwable t) {
+		log(TRACE, msg, t);
+	}
+
+	default void warn(final Object msg) {
+		log(WARN, msg);
+	}
+
+	default void warn(final Throwable t) {
+		log(WARN, t);
+	}
+
+	default void warn(final Object msg, final Throwable t) {
+		log(WARN, msg, t);
+	}
+
+	default boolean isDebug() {
+		return isLevel(DEBUG);
+	}
+
+	default boolean isError() {
+		return isLevel(ERROR);
+	}
+
+	default boolean isInfo() {
+		return isLevel(INFO);
+	}
+
+	default boolean isTrace() {
+		return isLevel(TRACE);
+	}
+
+	default boolean isWarn() {
+		return isLevel(WARN);
+	}
+
+	default boolean isLevel(final int level) {
+		return getLevel() >= level;
+	}
+
+	/**
+	 * Logs a message.
+	 * 
+	 * @param level The level at which the message will be logged. If the current
+	 *          level (given by {@link #getLevel()} is below this one, no logging
+	 *          is performed.
+	 * @param msg The message to log.
+	 */
+	default void log(final int level, final Object msg) {
+		log(level, msg, null);
+	}
+
+	/**
+	 * Logs an exception.
+	 * 
+	 * @param level The level at which the exception will be logged. If the
+	 *          current level (given by {@link #getLevel()} is below this one, no
+	 *          logging is performed.
+	 * @param t The exception to log.
+	 */
+	default void log(final int level, final Throwable t) {
+		log(level, null, t);
+	}
+
+	/**
+	 * Logs a message with an exception.
+	 * 
+	 * @param level The level at which the information will be logged. If the
+	 *          current level (given by {@link #getLevel()} is below this one, no
+	 *          logging is performed.
+	 * @param msg The message to log.
+	 * @param t The exception to log.
+	 */
+	default void log(final int level, final Object msg, final Throwable t) {
+		if (isLevel(level)) alwaysLog(level, msg, t);
+	}
+
+	/**
+	 * Logs a message with an exception. This message will always be logged even
+	 * if its level is above the current level (given by {@link #getLevel()}).
+	 *
+	 * @param level The level at which the information will be logged.
+	 * @param msg The message to log.
+	 * @param t The exception to log.
+	 */
+	void alwaysLog(int level, Object msg, Throwable t);
+
+	/** Returns the log level of this logger. see {@link LogLevel} */
 	int getLevel();
 }
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 253acc38f..9fb65e169 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -51,32 +51,12 @@
 public class StderrLogService extends AbstractLogService {
 
 	@Override
-	protected void log(final int level, final Object msg) {
+	public void alwaysLog(final int level, final Object msg, final Throwable t) {
 		final String prefix = LogLevel.prefix(level);
 		final String message = (prefix == null ? "" : prefix + " ") + msg;
 		// NB: Emit severe messages to stderr, and less severe ones to stdout.
 		if (level <= LogLevel.WARN) System.err.println(message);
 		else System.out.println(message);
+		if (t != null) t.printStackTrace();
 	}
-
-	/**
-	 * Prints a message to stderr.
-	 * 
-	 * @param message the message
-	 */
-	@Override
-	protected void log(final String message) {
-		System.err.println(message);
-	}
-
-	/**
-	 * Prints an exception to stderr.
-	 * 
-	 * @param t the exception
-	 */
-	@Override
-	protected void log(final Throwable t) {
-		t.printStackTrace();
-	}
-
 }
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index e3d11d085..f4e23510b 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -206,12 +206,8 @@ public Throwable exception() {
 		}
 
 		@Override
-		protected void log(String msg) {
-			this.message = msg;
-		}
-
-		@Override
-		protected void log(Throwable t) {
+		public void alwaysLog(int level, Object msg, Throwable t) {
+			this.message = LogLevel.prefix(level) + msg;
 			this.exception = t;
 		}
 	}

From dc56adec9fe0d190cd3d075d1ec75b381903ab07 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 28 Feb 2017 16:59:38 +0100
Subject: [PATCH 0592/1208] LogService: tweak getCallingClass method

Extract code for calling class detection to new class CallingClassUtils.
Classes that should be ignored by the calling class detection should be
annotated with IgnoreAsCallingClass.
---
 .../org/scijava/log/AbstractLogService.java   | 13 +---
 .../org/scijava/log/CallingClassUtils.java    | 67 ++++++++++++++++++
 .../org/scijava/log/IgnoreAsCallingClass.java | 44 ++++++++++++
 src/main/java/org/scijava/log/Logger.java     |  1 +
 .../scijava/log/CallingClassUtilsTest.java    | 68 +++++++++++++++++++
 5 files changed, 182 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/org/scijava/log/CallingClassUtils.java
 create mode 100644 src/main/java/org/scijava/log/IgnoreAsCallingClass.java
 create mode 100644 src/test/java/org/scijava/log/CallingClassUtilsTest.java

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index abd7cffb3..f279cd32a 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -44,6 +44,7 @@
  * @author Johannes Schindelin
  * @author Curtis Rueden
  */
+@IgnoreAsCallingClass
 public abstract class AbstractLogService extends AbstractService implements
 	LogService
 {
@@ -88,7 +89,7 @@ public AbstractLogService(final Properties properties) {
 	public int getLevel() {
 		if (!classAndPackageLevels.isEmpty()) {
 			// check for a custom log level for calling class or its parent packages
-			String classOrPackageName = callingClass();
+			String classOrPackageName = CallingClassUtils.getCallingClass().getName();
 			while (classOrPackageName != null) {
 				final Integer level = classAndPackageLevels.get(classOrPackageName);
 				if (level != null) return level;
@@ -119,16 +120,6 @@ protected String getPrefix(final int level) {
 
 	// -- Helper methods --
 
-	private String callingClass() {
-		final String thisClass = AbstractLogService.class.getName();
-		for (final StackTraceElement element : new Exception().getStackTrace()) {
-			final String className = element.getClassName();
-			// NB: Skip stack trace elements from other methods of this class.
-			if (!thisClass.equals(className)) return className;
-		}
-		return null;
-	}
-
 	private String parentPackage(final String classOrPackageName) {
 		final int dot = classOrPackageName.lastIndexOf(".");
 		if (dot < 0) return null;
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
new file mode 100644
index 000000000..c885a7ac8
--- /dev/null
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+/**
+ * Utility class for getting the calling class of a method.
+ *
+ * @author Matthias Arzt
+ */
+
+@IgnoreAsCallingClass
+public final class CallingClassUtils {
+
+	private CallingClassUtils() {
+		// prevent instantiation of utility class
+	}
+
+	/**
+	 * Inspects the stack trace to return the class that calls this method, but
+	 * ignores every class annotated with @IgnoreAsCallingClass.
+	 *
+	 * @throws IllegalStateException if every method on the stack, is in a class
+	 *           annotated with @IgnoreAsCallingClass.
+	 */
+	public static Class<?> getCallingClass() {
+		try {
+			StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+			for (int i = 1; i < stackTrace.length - 1; i++) {
+				Class<?> clazz = Class.forName(stackTrace[i].getClassName());
+				if (!clazz.isAnnotationPresent(IgnoreAsCallingClass.class))
+					return clazz;
+			}
+		}
+		catch (ClassNotFoundException ignore) {}
+		throw new IllegalStateException();
+	}
+
+}
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
new file mode 100644
index 000000000..de7c2f974
--- /dev/null
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -0,0 +1,44 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Classes annotated with {@link IgnoreAsCallingClass} are ignored by
+ * {@link CallingClassUtils#getCallingClass()}.
+ *
+ * @author Matthias Arzt
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IgnoreAsCallingClass {}
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 928904438..1ce4fffd8 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -48,6 +48,7 @@
  * @see LogLevel
  * @see LogService
  */
+@IgnoreAsCallingClass
 public interface Logger {
 
 	default void debug(final Object msg) {
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
new file mode 100644
index 000000000..b9be5999b
--- /dev/null
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Tests {@link CallingClassUtils}.
+ * 
+ * @author Matthias Arzt
+ */
+public class CallingClassUtilsTest {
+	@Test
+	public void testGetCallingClass() {
+		Class<?> callingClass = CallingClassUtils.getCallingClass();
+		assertEquals(this.getClass(), callingClass);
+	}
+
+	@Test
+	public void testIgnoreAsCallingClass() {
+		assertEquals(ClassA.class, ClassA.returnGetCallingClass());
+		assertEquals(this.getClass(), ClassB.returnGetCallingClass());
+	}
+
+	public static class ClassA {
+		static Class<?> returnGetCallingClass() {
+			return CallingClassUtils.getCallingClass();
+		}
+	}
+
+	@IgnoreAsCallingClass
+	private static class ClassB {
+		static Class<?> returnGetCallingClass() {
+			return CallingClassUtils.getCallingClass();
+		}
+	}
+}

From 51caae5877bda1edb595a518c6231a95a4e87dda Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Sun, 10 Sep 2017 15:28:53 +0200
Subject: [PATCH 0593/1208] AbstractLogService: refactor into smaller methods

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/log/AbstractLogService.java   | 64 +++++++++----------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index f279cd32a..7ebaf6b4c 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -51,8 +51,7 @@ public abstract class AbstractLogService extends AbstractService implements
 
 	private int currentLevel = levelFromEnvironment();
 
-	private final Map<String, Integer> classAndPackageLevels =
-		new HashMap<>();
+	private final Map<String, Integer> classAndPackageLevels;
 
 	// -- constructor --
 
@@ -61,43 +60,21 @@ public AbstractLogService() {
 	}
 
 	public AbstractLogService(final Properties properties) {
-		// check SciJava log level system properties for initial logging levels
-
-		// global log level property
-		final String logProp = properties.getProperty(LOG_LEVEL_PROPERTY);
-		final int level = LogLevel.value(logProp);
-		if (level >= 0) setLevel(level);
-
-		if (getLevel() == 0)
-			setLevel(levelFromEnvironment());
-
-		// populate custom class- and package-specific log level properties
-		final String logLevelPrefix = LOG_LEVEL_PROPERTY + ":";
-		for (final Object propKey : properties.keySet()) {
-			if (!(propKey instanceof String)) continue;
-			final String propName = (String) propKey;
-			if (!propName.startsWith(logLevelPrefix)) continue;
-			final String classOrPackageName =
-				propName.substring(logLevelPrefix.length());
-			setLevel(classOrPackageName, LogLevel.value(properties.getProperty(propName)));
-		}
+		// provide this constructor to enable unit tests
+		final int level = LogLevel.value(properties.getProperty(
+			LogService.LOG_LEVEL_PROPERTY));
+		if (level >= 0) currentLevel = level;
+		classAndPackageLevels = setupMapFromProperties(properties,
+			LogService.LOG_LEVEL_PROPERTY + ":");
 	}
 
 	// -- Logger methods --
 
 	@Override
 	public int getLevel() {
-		if (!classAndPackageLevels.isEmpty()) {
-			// check for a custom log level for calling class or its parent packages
-			String classOrPackageName = CallingClassUtils.getCallingClass().getName();
-			while (classOrPackageName != null) {
-				final Integer level = classAndPackageLevels.get(classOrPackageName);
-				if (level != null) return level;
-				classOrPackageName = parentPackage(classOrPackageName);
-			}
-		}
-		// no custom log level; return the global log level
-		return currentLevel;
+		if (classAndPackageLevels.isEmpty()) return currentLevel;
+		return getLevelForClass(CallingClassUtils.getCallingClass().getName(),
+			currentLevel);
 	}
 
 	@Override
@@ -120,6 +97,16 @@ protected String getPrefix(final int level) {
 
 	// -- Helper methods --
 
+	private int getLevelForClass(String classOrPackageName, int defaultLevel) {
+		// check for a custom log level for calling class or its parent packages
+		while (classOrPackageName != null) {
+			final Integer level = classAndPackageLevels.get(classOrPackageName);
+			if (level != null) return level;
+			classOrPackageName = parentPackage(classOrPackageName);
+		}
+		return defaultLevel;
+	}
+
 	private String parentPackage(final String classOrPackageName) {
 		final int dot = classOrPackageName.lastIndexOf(".");
 		if (dot < 0) return null;
@@ -131,4 +118,15 @@ private int levelFromEnvironment() {
 		return System.getenv("DEBUG") == null ? LogLevel.INFO : LogLevel.DEBUG;
 	}
 
+	private Map<String, Integer> setupMapFromProperties(Properties properties,
+		String prefix)
+	{
+		final HashMap<String, Integer> map = new HashMap<>();
+		for (final String propName : properties.stringPropertyNames())
+			if (propName.startsWith(prefix)) {
+				final String key = propName.substring(prefix.length());
+				map.put(key, LogLevel.value(properties.getProperty(propName)));
+			}
+		return map;
+	}
 }

From 3d04900e5f9e5e5aa36d3eca304459cdd5f1c9d7 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Thu, 18 May 2017 10:33:17 +0200
Subject: [PATCH 0594/1208] MultiOutputStream: use CopyOnWriteArrayList to
 simplify code

---
 .../scijava/console/MultiOutputStream.java    | 40 +++++--------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index ab1197ce5..d1f380f20 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -35,6 +35,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * A {@code MultiOutputStream} is a collection of constituent
@@ -49,9 +51,7 @@
  */
 public class MultiOutputStream extends OutputStream {
 
-	private final ArrayList<OutputStream> streams;
-
-	private OutputStream[] cachedStreams;
+	private final List<OutputStream> streams;
 
 	/**
 	 * Forwards output to a list of output streams.
@@ -59,37 +59,26 @@ public class MultiOutputStream extends OutputStream {
 	 * @param os Output streams which will receive this stream's output.
 	 */
 	public MultiOutputStream(final OutputStream... os) {
-		streams = new ArrayList<>(os.length);
-		for (int i = 0; i < os.length; i++) {
-			streams.add(os[i]);
-		}
-		cacheStreams();
+		streams = new CopyOnWriteArrayList<>(os);
 	}
 
 	// -- MultiOutputStream methods --
 
 	/** Adds an output stream to those receiving this stream's output. */
 	public void addOutputStream(final OutputStream os) {
-		synchronized (streams) {
-			streams.add(os);
-			cacheStreams();
-		}
+		streams.add(os);
 	}
 
 	/** Removes an output stream from those receiving this stream's output. */
 	public void removeOutputStream(final OutputStream os) {
-		synchronized (streams) {
-			streams.remove(os);
-			cacheStreams();
-		}
+		streams.remove(os);
 	}
 
 	// -- OutputStream methods --
 
 	@Override
 	public void write(final int b) throws IOException {
-		final OutputStream[] toWrite = cachedStreams;
-		for (final OutputStream stream : toWrite)
+		for (final OutputStream stream : streams)
 			stream.write(b);
 	}
 
@@ -97,8 +86,7 @@ public void write(final int b) throws IOException {
 	public void write(final byte[] buf, final int off, final int len)
 		throws IOException
 	{
-		final OutputStream[] toWrite = cachedStreams;
-		for (final OutputStream stream : toWrite)
+		for (final OutputStream stream : streams)
 			stream.write(buf, off, len);
 	}
 
@@ -106,8 +94,7 @@ public void write(final byte[] buf, final int off, final int len)
 
 	@Override
 	public void close() throws IOException {
-		final OutputStream[] toClose = cachedStreams;
-		for (final OutputStream stream : toClose)
+		for (final OutputStream stream : streams)
 			stream.close();
 	}
 
@@ -115,15 +102,8 @@ public void close() throws IOException {
 
 	@Override
 	public void flush() throws IOException {
-		final OutputStream[] toFlush = cachedStreams;
-		for (final OutputStream stream : toFlush)
+		for (final OutputStream stream : streams)
 			stream.flush();
 	}
 
-	// -- Helper methods --
-
-	private void cacheStreams() {
-		cachedStreams = streams.toArray(new OutputStream[streams.size()]);
-	}
-
 }

From dcce18149a24a7384dc0f4401907eb8a084ff658 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Thu, 18 May 2017 10:33:47 +0200
Subject: [PATCH 0595/1208] DefaultConsoleService: use CopyOnWriteArrayList to
 simplify code

---
 .../console/DefaultConsoleService.java        | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 3ff2c2f89..8783e1eb9 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.scijava.Context;
 import org.scijava.console.OutputEvent.Source;
@@ -69,9 +70,7 @@ public class DefaultConsoleService extends
 	private OutputStreamReporter out, err;
 
 	/** List of listeners for {@code stdout} and {@code stderr} output. */
-	private ArrayList<OutputListener> listeners;
-
-	private OutputListener[] cachedListeners;
+	private List<OutputListener> listeners;
 
 	// -- ConsoleService methods --
 
@@ -116,26 +115,19 @@ public void processArgs(final String... args) {
 	@Override
 	public void addOutputListener(final OutputListener l) {
 		if (listeners == null) initListeners();
-		synchronized (listeners) {
-			listeners.add(l);
-			cacheListeners();
-		}
+		listeners.add(l);
 	}
 
 	@Override
 	public void removeOutputListener(final OutputListener l) {
 		if (listeners == null) initListeners();
-		synchronized (listeners) {
-			listeners.remove(l);
-			cacheListeners();
-		}
+		listeners.remove(l);
 	}
 
 	@Override
 	public void notifyListeners(final OutputEvent event) {
 		if (listeners == null) initListeners();
-		final OutputListener[] toNotify = cachedListeners;
-		for (final OutputListener l : toNotify)
+		for (final OutputListener l : listeners)
 			l.outputOccurred(event);
 	}
 
@@ -163,16 +155,11 @@ private synchronized void initListeners() {
 		err = new OutputStreamReporter(Source.STDERR);
 		syserr.getParent().addOutputStream(err);
 
-		listeners = new ArrayList<>();
-		cachedListeners = listeners.toArray(new OutputListener[0]);
+		listeners = new CopyOnWriteArrayList<>();
 	}
 
 	// -- Helper methods --
 
-	private void cacheListeners() {
-		cachedListeners = listeners.toArray(new OutputListener[listeners.size()]);
-	}
-
 	private MultiPrintStream multiPrintStream(final PrintStream ps) {
 		if (ps instanceof MultiPrintStream) return (MultiPrintStream) ps;
 		return new MultiPrintStream(ps);

From 501e2c8f7b182000412642a33f17fa0d1aa09c15 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 24 Jun 2017 19:08:48 +0200
Subject: [PATCH 0596/1208] DefaultUncaughtExceptionHandler: remove
 no-longer-necessary logic

It was only needed before Java 7, and SciJava now requires Java 8.
---
 .../java/org/scijava/log/DefaultUncaughtExceptionHandler.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index 8130547f2..526b27331 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -69,10 +69,6 @@ public static void install(final LogService log) {
 		final UncaughtExceptionHandler handler =
 			new DefaultUncaughtExceptionHandler(log);
 		Thread.setDefaultUncaughtExceptionHandler(handler);
-
-		// Needed for modal dialog handling before Java7:
-		System.setProperty("sun.awt.exception.handler",
-			DefaultUncaughtExceptionHandler.class.getName());
 	}
 
 }

From dd2dac1dacf958b40de4a9e285e469ba1dcacaf1 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 16 May 2017 00:09:18 +0200
Subject: [PATCH 0597/1208] Encapsulate log message info in LogMessage class

---
 src/main/java/org/scijava/log/LogMessage.java | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 src/main/java/org/scijava/log/LogMessage.java

diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
new file mode 100644
index 000000000..99c24c0b2
--- /dev/null
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -0,0 +1,115 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedList;
+
+/**
+ * LogMessage represents a log message.
+ *
+ * @author Matthias Arzt
+ */
+public class LogMessage {
+
+	private final int level;
+	private final String message;
+	private final Throwable throwable;
+	private final Date time;
+
+	private Collection<Object> attachments;
+
+	public LogMessage(int level, Object message,
+		Throwable throwable)
+	{
+		this.attachments = null;
+		this.level = level;
+		this.message = message == null ? null : message.toString();
+		this.throwable = throwable;
+		this.time = new Date();
+	}
+
+	public LogMessage(int level, Object msg) {
+		this(level, msg, null);
+	}
+
+	/**
+	 * Log level of the message.
+	 * 
+	 * @see LogLevel
+	 */
+	public int level() {
+		return level;
+	}
+
+	/** The content of this log message. */
+	public String text() {
+		return message;
+	}
+
+	/** Exception associated with the log message. */
+	public Throwable throwable() {
+		return throwable;
+	}
+
+	/** Time of the creation of the log message. */
+	public Date time() {
+		return time;
+	}
+
+	/**
+	 * Collection of objects that have been attached to this message with
+	 * {@link #attach(Object)}.
+	 */
+	public Collection<Object> attachments() {
+		return Collections.unmodifiableCollection(attachments);
+	}
+
+	/**
+	 * Attach object to this log message. This can be used to attach additional
+	 * information to the log message.
+	 */
+	public void attach(Object value) {
+		if (attachments == null) attachments = new LinkedList<>();
+		attachments.add(value);
+	}
+
+	// -- Object methods --
+
+	@Override
+	public String toString() {
+		return "LogMessage {" + level + ", " + message + ", " + throwable + "}";
+	}
+
+}

From 05c69571c32077d1e4d03958881eac96d1bb7493 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 16 May 2017 00:22:23 +0200
Subject: [PATCH 0598/1208] Format log messages using LogMessage.toString

And test that the method works as expected.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 src/main/java/org/scijava/log/LogMessage.java | 17 ++++-
 .../org/scijava/log/StderrLogService.java     | 10 ++-
 .../java/org/scijava/log/LogMessageTest.java  | 71 +++++++++++++++++++
 3 files changed, 91 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/org/scijava/log/LogMessageTest.java

diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 99c24c0b2..d4dd886ee 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -31,6 +31,8 @@
 
 package org.scijava.log;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -109,7 +111,20 @@ public void attach(Object value) {
 
 	@Override
 	public String toString() {
-		return "LogMessage {" + level + ", " + message + ", " + throwable + "}";
+		return format(this);
 	}
 
+	// -- Utility methods --
+
+	public static String format(final LogMessage message) {
+		final StringWriter sw = new StringWriter();
+		final PrintWriter printer = new PrintWriter(sw);
+		printer.print("[" + message.time() + "] ");
+		printer.print("[" + LogLevel.prefix(message.level()) + "] ");
+		printer.println(message.text());
+		if (message.throwable() != null) {
+			message.throwable().printStackTrace(printer);
+		}
+		return sw.toString();
+	}
 }
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 9fb65e169..4d987a9f2 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -32,6 +32,8 @@
 
 package org.scijava.log;
 
+import java.io.PrintStream;
+
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
@@ -52,11 +54,7 @@ public class StderrLogService extends AbstractLogService {
 
 	@Override
 	public void alwaysLog(final int level, final Object msg, final Throwable t) {
-		final String prefix = LogLevel.prefix(level);
-		final String message = (prefix == null ? "" : prefix + " ") + msg;
-		// NB: Emit severe messages to stderr, and less severe ones to stdout.
-		if (level <= LogLevel.WARN) System.err.println(message);
-		else System.out.println(message);
-		if (t != null) t.printStackTrace();
+		final PrintStream out = (level <= LogLevel.WARN) ? System.err : System.out;
+		out.print(new LogMessage(level, msg, t));
 	}
 }
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
new file mode 100644
index 000000000..0c9e4bf06
--- /dev/null
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests {@link LogMessage}.
+ * 
+ * @author Matthias Arzt
+ */
+public class LogMessageTest {
+
+	/** Tests {@link LogMessage#toString()}. */
+	@Test
+	public void testToString() {
+		String nameOfThisMethod = "testToString";
+		// setup
+		LogMessage message = new LogMessage(LogLevel.DEBUG, 42, new NullPointerException());
+		// process
+		String s = message.toString();
+		//test
+		Assert.assertTrue("Log message contains level", s.contains(LogLevel.prefix(message.level())));
+		Assert.assertTrue("Log message contains msg", s.contains(message.text()));
+		Assert.assertTrue("Log message contains throwable", s.contains(message.throwable().toString()));
+		Assert.assertTrue("Log message contains stack trace", s.contains(nameOfThisMethod));
+	}
+
+	@Test
+	public void testToStringOptionalParameters() {
+		// setup
+		LogMessage message = new LogMessage(LogLevel.WARN, null, null);
+
+		// process
+		// Can it still format the message if optional parameters are null?
+		String s = message.toString();
+
+		// test
+		Assert.assertTrue("Log message contains level", s.contains(LogLevel.prefix(message.level())));
+	}
+}

From 9b908a77da6c5d516bc678a5995ee2f13a952df2 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 16 May 2017 01:00:11 +0200
Subject: [PATCH 0599/1208] Allow subscribing to log events via LogListeners

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/log/AbstractLogService.java   | 26 ++++++++
 .../java/org/scijava/log/LogListener.java     | 48 ++++++++++++++
 src/main/java/org/scijava/log/Logger.java     | 11 ++++
 .../org/scijava/log/StderrLogService.java     |  8 ++-
 .../java/org/scijava/log/LogServiceTest.java  | 13 ++++
 .../java/org/scijava/log/TestLogListener.java | 63 +++++++++++++++++++
 6 files changed, 166 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/scijava/log/LogListener.java
 create mode 100644 src/test/java/org/scijava/log/TestLogListener.java

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 7ebaf6b4c..33d5d9df6 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -33,8 +33,10 @@
 package org.scijava.log;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.scijava.service.AbstractService;
 
@@ -53,6 +55,8 @@ public abstract class AbstractLogService extends AbstractService implements
 
 	private final Map<String, Integer> classAndPackageLevels;
 
+	private final List<LogListener> listeners = new CopyOnWriteArrayList<>();
+
 	// -- constructor --
 
 	public AbstractLogService() {
@@ -68,6 +72,13 @@ public AbstractLogService(final Properties properties) {
 			LogService.LOG_LEVEL_PROPERTY + ":");
 	}
 
+	// -- AbstractLogService methods --
+
+	protected void notifyListeners(LogMessage message) {
+		for (LogListener listener : listeners)
+			listener.messageLogged(message);
+	}
+
 	// -- Logger methods --
 
 	@Override
@@ -87,6 +98,21 @@ public void setLevel(final String classOrPackageName, final int level) {
 		classAndPackageLevels.put(classOrPackageName, level);
 	}
 
+	@Override
+	public void alwaysLog(final int level, final Object msg, final Throwable t) {
+		notifyListeners(new LogMessage(level, msg, t));
+	}
+
+	@Override
+	public void addListener(final LogListener listener) {
+		listeners.add(listener);
+	}
+
+	@Override
+	public void removeListener(final LogListener listener) {
+		listeners.remove(listener);
+	}
+
 	// -- Deprecated --
 
 	/** @deprecated Use {@link LogLevel#prefix(int)} instead. */
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
new file mode 100644
index 000000000..3221245c8
--- /dev/null
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -0,0 +1,48 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+/**
+ * Callback function used by {@link Logger}.
+ *
+ * @author Matthias Arzt
+ * @see LogMessage
+ */
+public interface LogListener {
+
+	/**
+	 * This method is normally called from many threads in parallel. It must be
+	 * implemented highly thread safe and must not use any kind of locks.
+	 */
+	void messageLogged(LogMessage message);
+
+}
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 1ce4fffd8..21601f8a8 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -184,4 +184,15 @@ default void log(final int level, final Object msg, final Throwable t) {
 
 	/** Returns the log level of this logger. see {@link LogLevel} */
 	int getLevel();
+
+	/**
+	 * {@link LogListener}s added with this method are notified of every message,
+	 * NB: Messages are only logged, if their level is lower than the logger's
+	 * level.
+	 *
+	 * @param listener
+	 */
+	void addListener(LogListener listener);
+
+	void removeListener(LogListener listener);
 }
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 4d987a9f2..5518e1f12 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -53,8 +53,10 @@
 public class StderrLogService extends AbstractLogService {
 
 	@Override
-	public void alwaysLog(final int level, final Object msg, final Throwable t) {
-		final PrintStream out = (level <= LogLevel.WARN) ? System.err : System.out;
-		out.print(new LogMessage(level, msg, t));
+	public void notifyListeners(final LogMessage message) {
+		super.notifyListeners(message);
+		final PrintStream out = (message.level() <= LogLevel.WARN) ? System.err
+			: System.out;
+		out.print(message);
 	}
 }
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index f4e23510b..95218dab9 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -165,6 +165,19 @@ public void testPackageLogLevel() {
 		assertEquals(LogLevel.TRACE, level);
 	}
 
+	@Test
+	public void testListener() {
+		// setup
+		TestableLogService logService = new TestableLogService();
+		TestLogListener listener = new TestLogListener();
+		String msg1 = "Hello World!";
+		// process
+		logService.addListener(listener);
+		logService.error(msg1);
+		// test
+		listener.hasLogged(m -> msg1.equals(m.text()));
+	}
+
 	// -- Helper classes --
 
 	private static class MyTestClass {
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
new file mode 100644
index 000000000..fbc31946c
--- /dev/null
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -0,0 +1,63 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+
+/**
+ * TestLogListener is a {@ling LogListener} usable for testing. It stores all
+ * the LogMessages it receives and allows to test if any LogMessage fulfills a
+ * given predicate.
+ *
+ * @author Matthias Arzt
+ */
+
+public class TestLogListener implements LogListener {
+
+	List<LogMessage> messages = new ArrayList<>();
+
+	@Override
+	public void messageLogged(LogMessage message) {
+		messages.add(message);
+	}
+
+	public boolean hasLogged(Predicate<LogMessage> predicate) {
+		return messages.stream().anyMatch(predicate);
+	}
+
+	public void clear() {
+		messages.clear();
+	}
+
+}

From c95856f14e4523a6f9fbc5a425cc65189d4114dc Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Fri, 21 Jul 2017 10:38:31 +0200
Subject: [PATCH 0600/1208] Use ConvertService to get String representation of
 input value

This is required to correctly persist values for File[] inputs etc.
---
 src/main/java/org/scijava/module/DefaultModuleService.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 2bcf13d24..bdad241f5 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -297,9 +297,7 @@ public <T> void save(final ModuleItem<T> item, final T value) {
 			return;
 		}
 
-		// FIXME: Convert to string, instead of just calling toString.
-		// Otherwise many things (e.g. File[]) are persisted improperly.
-		final String sValue = value == null ? "" : value.toString();
+		final String sValue = value == null ? "" : convertService.convert(value, String.class);
 
 		// do not persist if object cannot be converted back from a string
 		if (!convertService.supports(sValue, item.getType())) return;

From edc814d9c14fe0615e9c9c9e8284b5ad39fa15ed Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 16 May 2017 11:07:58 +0200
Subject: [PATCH 0601/1208] AbstractLogService: extract class DefaultLogger

This provides an implementation of Logger that can be used
independently from AbstractLogService. It will be useful
for the implementation of sub loggers.
---
 .../org/scijava/log/AbstractLogService.java   | 37 ++++++---
 .../java/org/scijava/log/DefaultLogger.java   | 82 +++++++++++++++++++
 .../org/scijava/log/StderrLogService.java     |  1 -
 .../org/scijava/log/DefaultLoggerTest.java    | 65 +++++++++++++++
 .../java/org/scijava/log/LogServiceTest.java  |  6 +-
 5 files changed, 177 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/org/scijava/log/DefaultLogger.java
 create mode 100644 src/test/java/org/scijava/log/DefaultLoggerTest.java

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 33d5d9df6..5568b4112 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -33,10 +33,8 @@
 package org.scijava.log;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.scijava.service.AbstractService;
 
@@ -45,6 +43,7 @@
  *
  * @author Johannes Schindelin
  * @author Curtis Rueden
+ * @author Matthias Arzt
  */
 @IgnoreAsCallingClass
 public abstract class AbstractLogService extends AbstractService implements
@@ -55,7 +54,7 @@ public abstract class AbstractLogService extends AbstractService implements
 
 	private final Map<String, Integer> classAndPackageLevels;
 
-	private final List<LogListener> listeners = new CopyOnWriteArrayList<>();
+	private final Logger rootLogger;
 
 	// -- constructor --
 
@@ -64,6 +63,7 @@ public AbstractLogService() {
 	}
 
 	public AbstractLogService(final Properties properties) {
+		rootLogger = new RootLogger();
 		// provide this constructor to enable unit tests
 		final int level = LogLevel.value(properties.getProperty(
 			LogService.LOG_LEVEL_PROPERTY));
@@ -74,10 +74,7 @@ public AbstractLogService(final Properties properties) {
 
 	// -- AbstractLogService methods --
 
-	protected void notifyListeners(LogMessage message) {
-		for (LogListener listener : listeners)
-			listener.messageLogged(message);
-	}
+	abstract void notifyListeners(LogMessage message);
 
 	// -- Logger methods --
 
@@ -100,17 +97,17 @@ public void setLevel(final String classOrPackageName, final int level) {
 
 	@Override
 	public void alwaysLog(final int level, final Object msg, final Throwable t) {
-		notifyListeners(new LogMessage(level, msg, t));
+		rootLogger.alwaysLog(level, msg, t);
 	}
 
 	@Override
 	public void addListener(final LogListener listener) {
-		listeners.add(listener);
+		rootLogger.addListener(listener);
 	}
 
 	@Override
 	public void removeListener(final LogListener listener) {
-		listeners.remove(listener);
+		rootLogger.removeListener(listener);
 	}
 
 	// -- Deprecated --
@@ -155,4 +152,24 @@ private Map<String, Integer> setupMapFromProperties(Properties properties,
 			}
 		return map;
 	}
+
+	// -- Helper classes --
+
+	@IgnoreAsCallingClass
+	private class RootLogger extends DefaultLogger {
+
+		public RootLogger() {
+			super(LogLevel.NONE);
+		}
+
+		@Override
+		public int getLevel() {
+			return AbstractLogService.this.getLevel();
+		}
+
+		@Override
+		protected void messageLogged(LogMessage message) {
+			AbstractLogService.this.notifyListeners(message);
+		}
+	}
 }
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
new file mode 100644
index 000000000..acb8f3ff2
--- /dev/null
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Default implementation of {@link Logger}.
+ *
+ * @author Matthias Arzt
+ */
+@IgnoreAsCallingClass
+public class DefaultLogger implements Logger {
+
+	private final int level;
+
+	private final List<LogListener> listeners = new CopyOnWriteArrayList<>();
+
+	public DefaultLogger(final int level)
+	{
+		this.level = level;
+	}
+
+	// -- DefaultLogger methods --
+
+	protected void messageLogged(final LogMessage message) {
+		for (LogListener listener : listeners)
+			listener.messageLogged(message);
+	}
+
+	// -- Logger methods --
+
+	@Override
+	public int getLevel() {
+		return level;
+	}
+
+	@Override
+	public void alwaysLog(final int level, final Object msg, final Throwable t) {
+		messageLogged(new LogMessage(level, msg, t));
+	}
+
+	@Override
+	public void addListener(final LogListener listener) {
+		listeners.add(listener);
+	}
+
+	@Override
+	public void removeListener(final LogListener listener) {
+		listeners.remove(listener);
+	}
+}
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 5518e1f12..f3b3b1cfd 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -54,7 +54,6 @@ public class StderrLogService extends AbstractLogService {
 
 	@Override
 	public void notifyListeners(final LogMessage message) {
-		super.notifyListeners(message);
 		final PrintStream out = (message.level() <= LogLevel.WARN) ? System.err
 			: System.out;
 		out.print(message);
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
new file mode 100644
index 000000000..911faf90c
--- /dev/null
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests {@link DefaultLogger}
+ *
+ * @author Matthias Arzt
+ */
+public class DefaultLoggerTest {
+
+	private Logger logger;
+	private TestLogListener listener;
+
+	@Before
+	public void setup() {
+		logger = new DefaultLogger(LogLevel.INFO);
+		listener = new TestLogListener();
+		logger.addListener(listener);
+	}
+
+	@Test
+	public void test() {
+		listener.clear();
+
+		logger.error("Hello World!");
+
+		assertTrue(listener.hasLogged(m -> m.text().equals("Hello World!")));
+		assertTrue(listener.hasLogged(m -> m.level() == LogLevel.ERROR));
+	}
+}
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 95218dab9..8dfe9b77d 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -219,9 +219,9 @@ public Throwable exception() {
 		}
 
 		@Override
-		public void alwaysLog(int level, Object msg, Throwable t) {
-			this.message = LogLevel.prefix(level) + msg;
-			this.exception = t;
+		void notifyListeners(LogMessage message) {
+			this.message = message.toString();
+			this.exception = message.throwable();
 		}
 	}
 }

From a07472c948e216db3d30b9c97bfaa5d224d9fb1d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 24 Jun 2017 19:17:25 +0200
Subject: [PATCH 0602/1208] Add a general-purpose Listenable interface

It is a general-purpose interface for something that
notifies listeners when a particular kind of event occurs.
---
 src/main/java/org/scijava/Listenable.java | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 src/main/java/org/scijava/Listenable.java

diff --git a/src/main/java/org/scijava/Listenable.java b/src/main/java/org/scijava/Listenable.java
new file mode 100644
index 000000000..ae7aa3412
--- /dev/null
+++ b/src/main/java/org/scijava/Listenable.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava;
+
+/**
+ * Interface for event listeners.
+ *
+ * @author Curtis Rueden
+ * @param <L> type of listener
+ * @param <E> type of event
+ */
+public interface Listenable<L, E> {
+
+	/** Adds an item to the list of registered listeners. */
+	void addListener(L listener);
+
+	/** Removes an item from the list of registered listeners. */
+	void removeListener(L listener);
+
+	/** Informs the registered list of listeners that an event has occurred. */
+	void notifyListeners(E event);
+}

From ac05b2f109adfaa3c289b553db369ef2c43ac741 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 5 Sep 2017 14:18:01 +0200
Subject: [PATCH 0603/1208] Logger: extend Listenable interface

---
 .../java/org/scijava/log/AbstractLogService.java  | 11 +++++++----
 src/main/java/org/scijava/log/DefaultLogger.java  | 12 ++++++++++--
 src/main/java/org/scijava/log/LogListener.java    |  1 +
 src/main/java/org/scijava/log/Logger.java         | 15 +++------------
 src/test/java/org/scijava/log/LogServiceTest.java |  2 +-
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 5568b4112..fee8edc3a 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -72,10 +72,6 @@ public AbstractLogService(final Properties properties) {
 			LogService.LOG_LEVEL_PROPERTY + ":");
 	}
 
-	// -- AbstractLogService methods --
-
-	abstract void notifyListeners(LogMessage message);
-
 	// -- Logger methods --
 
 	@Override
@@ -100,6 +96,8 @@ public void alwaysLog(final int level, final Object msg, final Throwable t) {
 		rootLogger.alwaysLog(level, msg, t);
 	}
 
+	// -- Listenable methods --
+
 	@Override
 	public void addListener(final LogListener listener) {
 		rootLogger.addListener(listener);
@@ -110,6 +108,11 @@ public void removeListener(final LogListener listener) {
 		rootLogger.removeListener(listener);
 	}
 
+	@Override
+	public void notifyListeners(final LogMessage event) {
+		rootLogger.notifyListeners(event);
+	}
+
 	// -- Deprecated --
 
 	/** @deprecated Use {@link LogLevel#prefix(int)} instead. */
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index acb8f3ff2..71685d8b8 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -38,6 +38,7 @@
  * Default implementation of {@link Logger}.
  *
  * @author Matthias Arzt
+ * @author Curtis Rueden
  */
 @IgnoreAsCallingClass
 public class DefaultLogger implements Logger {
@@ -54,8 +55,7 @@ public DefaultLogger(final int level)
 	// -- DefaultLogger methods --
 
 	protected void messageLogged(final LogMessage message) {
-		for (LogListener listener : listeners)
-			listener.messageLogged(message);
+		notifyListeners(message);
 	}
 
 	// -- Logger methods --
@@ -70,6 +70,8 @@ public void alwaysLog(final int level, final Object msg, final Throwable t) {
 		messageLogged(new LogMessage(level, msg, t));
 	}
 
+	// -- Listenable methods --
+
 	@Override
 	public void addListener(final LogListener listener) {
 		listeners.add(listener);
@@ -79,4 +81,10 @@ public void addListener(final LogListener listener) {
 	public void removeListener(final LogListener listener) {
 		listeners.remove(listener);
 	}
+
+	@Override
+	public void notifyListeners(final LogMessage message) {
+		for (LogListener listener : listeners)
+			listener.messageLogged(message);
+	}
 }
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index 3221245c8..88a1a63d4 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -35,6 +35,7 @@
  * Callback function used by {@link Logger}.
  *
  * @author Matthias Arzt
+ * @see Logger
  * @see LogMessage
  */
 public interface LogListener {
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 21601f8a8..d5dbb913d 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -37,6 +37,8 @@
 import static org.scijava.log.LogLevel.TRACE;
 import static org.scijava.log.LogLevel.WARN;
 
+import org.scijava.Listenable;
+
 /**
  * Interface for objects which can produce log messages.
  * <p>
@@ -49,7 +51,7 @@
  * @see LogService
  */
 @IgnoreAsCallingClass
-public interface Logger {
+public interface Logger extends Listenable<LogListener, LogMessage> {
 
 	default void debug(final Object msg) {
 		log(DEBUG, msg);
@@ -184,15 +186,4 @@ default void log(final int level, final Object msg, final Throwable t) {
 
 	/** Returns the log level of this logger. see {@link LogLevel} */
 	int getLevel();
-
-	/**
-	 * {@link LogListener}s added with this method are notified of every message,
-	 * NB: Messages are only logged, if their level is lower than the logger's
-	 * level.
-	 *
-	 * @param listener
-	 */
-	void addListener(LogListener listener);
-
-	void removeListener(LogListener listener);
 }
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 8dfe9b77d..c18257fd4 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -219,7 +219,7 @@ public Throwable exception() {
 		}
 
 		@Override
-		void notifyListeners(LogMessage message) {
+		public void notifyListeners(LogMessage message) {
 			this.message = message.toString();
 			this.exception = message.throwable();
 		}

From f7f66b1b1013eb15d2322f0b83224b94e8da7581 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Fri, 1 Sep 2017 18:04:11 +0200
Subject: [PATCH 0604/1208] Add Logger.subLogger methods

These methods allow to create a Logger instance
that is a child of another Logger instance.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/log/AbstractLogService.java   | 35 +++++++++++--------
 .../java/org/scijava/log/DefaultLogger.java   | 33 +++++++++++++----
 src/main/java/org/scijava/log/Logger.java     | 20 ++++++++++-
 .../org/scijava/log/DefaultLoggerTest.java    | 29 ++++++++++++++-
 .../java/org/scijava/log/LogServiceTest.java  |  3 ++
 5 files changed, 97 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index fee8edc3a..2acb06d88 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -72,14 +72,7 @@ public AbstractLogService(final Properties properties) {
 			LogService.LOG_LEVEL_PROPERTY + ":");
 	}
 
-	// -- Logger methods --
-
-	@Override
-	public int getLevel() {
-		if (classAndPackageLevels.isEmpty()) return currentLevel;
-		return getLevelForClass(CallingClassUtils.getCallingClass().getName(),
-			currentLevel);
-	}
+	// -- AbstractLogService methods --
 
 	@Override
 	public void setLevel(final int level) {
@@ -91,11 +84,30 @@ public void setLevel(final String classOrPackageName, final int level) {
 		classAndPackageLevels.put(classOrPackageName, level);
 	}
 
+	// -- Logger methods --
+
 	@Override
 	public void alwaysLog(final int level, final Object msg, final Throwable t) {
 		rootLogger.alwaysLog(level, msg, t);
 	}
 
+	@Override
+	public String getName() {
+		return rootLogger.getName();
+	}
+
+	@Override
+	public int getLevel() {
+		if (classAndPackageLevels.isEmpty()) return currentLevel;
+		return getLevelForClass(CallingClassUtils.getCallingClass().getName(),
+			currentLevel);
+	}
+
+	@Override
+	public Logger subLogger(String nameExtension, int level) {
+		return rootLogger.subLogger(nameExtension, level);
+	}
+
 	// -- Listenable methods --
 
 	@Override
@@ -162,17 +174,12 @@ private Map<String, Integer> setupMapFromProperties(Properties properties,
 	private class RootLogger extends DefaultLogger {
 
 		public RootLogger() {
-			super(LogLevel.NONE);
+			super(AbstractLogService.this::notifyListeners, "", LogLevel.NONE);
 		}
 
 		@Override
 		public int getLevel() {
 			return AbstractLogService.this.getLevel();
 		}
-
-		@Override
-		protected void messageLogged(LogMessage message) {
-			AbstractLogService.this.notifyListeners(message);
-		}
 	}
 }
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 71685d8b8..b4e7935de 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -41,25 +41,31 @@
  * @author Curtis Rueden
  */
 @IgnoreAsCallingClass
-public class DefaultLogger implements Logger {
+public class DefaultLogger implements Logger, LogListener {
+
+	private final LogListener destination;
+
+	private final String name;
 
 	private final int level;
 
 	private final List<LogListener> listeners = new CopyOnWriteArrayList<>();
 
-	public DefaultLogger(final int level)
+	public DefaultLogger(final LogListener destination, final String name,
+								   final int level)
 	{
+		this.destination = destination;
+		this.name = name;
 		this.level = level;
 	}
 
-	// -- DefaultLogger methods --
+	// -- Logger methods --
 
-	protected void messageLogged(final LogMessage message) {
-		notifyListeners(message);
+	@Override
+	public String getName() {
+		return name;
 	}
 
-	// -- Logger methods --
-
 	@Override
 	public int getLevel() {
 		return level;
@@ -70,6 +76,10 @@ public void alwaysLog(final int level, final Object msg, final Throwable t) {
 		messageLogged(new LogMessage(level, msg, t));
 	}
 
+	public Logger subLogger(final String name, final int level) {
+		return new DefaultLogger(this, name, level);
+	}
+
 	// -- Listenable methods --
 
 	@Override
@@ -87,4 +97,13 @@ public void notifyListeners(final LogMessage message) {
 		for (LogListener listener : listeners)
 			listener.messageLogged(message);
 	}
+
+	// -- LogListener methods --
+
+	@Override
+	public void messageLogged(final LogMessage message) {
+		for (LogListener listener : listeners)
+			listener.messageLogged(message);
+		destination.messageLogged(message);
+	}
 }
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index d5dbb913d..8a4f3b5fb 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -163,7 +163,7 @@ default void log(final int level, final Throwable t) {
 
 	/**
 	 * Logs a message with an exception.
-	 * 
+	 *
 	 * @param level The level at which the information will be logged. If the
 	 *          current level (given by {@link #getLevel()} is below this one, no
 	 *          logging is performed.
@@ -184,6 +184,24 @@ default void log(final int level, final Object msg, final Throwable t) {
 	 */
 	void alwaysLog(int level, Object msg, Throwable t);
 
+	/** Returns the name of this logger. */
+	String getName();
+
 	/** Returns the log level of this logger. see {@link LogLevel} */
 	int getLevel();
+
+	/**
+	 * Creates a sub logger, that forwards the message it gets to this logger. The
+	 * sub logger will have the same log level as this logger.
+	 */
+	default Logger subLogger(String name) {
+		return subLogger(name, getLevel());
+	}
+
+	/**
+	 * Creates a sub logger, that forwards the message it gets to this logger.
+	 *
+	 * @param level The log level of the sub logger.
+	 */
+	Logger subLogger(String name, int level);
 }
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index 911faf90c..15cc68e79 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -31,6 +31,7 @@
 
 package org.scijava.log;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
@@ -48,7 +49,7 @@ public class DefaultLoggerTest {
 
 	@Before
 	public void setup() {
-		logger = new DefaultLogger(LogLevel.INFO);
+		logger = new DefaultLogger(message -> {}, "", LogLevel.INFO);
 		listener = new TestLogListener();
 		logger.addListener(listener);
 	}
@@ -62,4 +63,30 @@ public void test() {
 		assertTrue(listener.hasLogged(m -> m.text().equals("Hello World!")));
 		assertTrue(listener.hasLogged(m -> m.level() == LogLevel.ERROR));
 	}
+
+	@Test
+	public void testSubLogger() {
+		listener.clear();
+		Logger sub = logger.subLogger("sub");
+
+		sub.error("Hello World!");
+
+		assertTrue(listener.hasLogged(m -> m.text().equals("Hello World!")));
+	}
+
+	@Test
+	public void testLogForwarding() {
+		listener.clear();
+		Logger sub = logger.subLogger("xyz");
+		TestLogListener subListener = new TestLogListener();
+		sub.addListener(subListener);
+
+		sub.error("Hello World!");
+		logger.error("Goodbye!");
+
+		assertTrue(subListener.hasLogged(m -> m.text().equals("Hello World!")));
+		assertFalse(subListener.hasLogged(m -> m.text().equals("Goodbye!")));
+		assertTrue(listener.hasLogged(m -> m.text().equals("Hello World!")));
+		assertTrue(listener.hasLogged(m -> m.text().equals("Goodbye!")));
+	}
 }
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index c18257fd4..ac060df65 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -171,11 +171,14 @@ public void testListener() {
 		TestableLogService logService = new TestableLogService();
 		TestLogListener listener = new TestLogListener();
 		String msg1 = "Hello World!";
+		String msg2 = "foo bar";
 		// process
 		logService.addListener(listener);
 		logService.error(msg1);
+		logService.subLogger("xyz").debug(msg2);
 		// test
 		listener.hasLogged(m -> msg1.equals(m.text()));
+		listener.hasLogged(m -> msg2.equals(m.text()));
 	}
 
 	// -- Helper classes --

From c42f4338979d34b99f00c4f02a227d7748a12274 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 5 Sep 2017 14:18:01 +0200
Subject: [PATCH 0605/1208] Logger: extend Listenable interface

---
 src/main/java/org/scijava/log/DefaultLogger.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index b4e7935de..34bdb6f6b 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -102,8 +102,7 @@ public void notifyListeners(final LogMessage message) {
 
 	@Override
 	public void messageLogged(final LogMessage message) {
-		for (LogListener listener : listeners)
-			listener.messageLogged(message);
+		notifyListeners(message);
 		destination.messageLogged(message);
 	}
 }

From 161b98a4bc481b17f4fd7677c6df4763f6948a1d Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 16 May 2017 17:44:13 +0200
Subject: [PATCH 0606/1208] Add LogSource to encapsulate source of a log event

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/log/AbstractLogService.java   |  11 +-
 .../java/org/scijava/log/DefaultLogger.java   |  16 +--
 src/main/java/org/scijava/log/LogMessage.java |  14 ++-
 src/main/java/org/scijava/log/LogSource.java  | 116 ++++++++++++++++++
 src/main/java/org/scijava/log/Logger.java     |   8 +-
 .../org/scijava/log/DefaultLoggerTest.java    |  20 ++-
 .../java/org/scijava/log/LogMessageTest.java  |   4 +-
 .../java/org/scijava/log/LogSourceTest.java   |  93 ++++++++++++++
 8 files changed, 261 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/org/scijava/log/LogSource.java
 create mode 100644 src/test/java/org/scijava/log/LogSourceTest.java

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 2acb06d88..b75f6acbd 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -92,8 +92,8 @@ public void alwaysLog(final int level, final Object msg, final Throwable t) {
 	}
 
 	@Override
-	public String getName() {
-		return rootLogger.getName();
+	public LogSource getSource() {
+		return rootLogger.getSource();
 	}
 
 	@Override
@@ -104,8 +104,8 @@ public int getLevel() {
 	}
 
 	@Override
-	public Logger subLogger(String nameExtension, int level) {
-		return rootLogger.subLogger(nameExtension, level);
+	public Logger subLogger(String name, int level) {
+		return rootLogger.subLogger(name, level);
 	}
 
 	// -- Listenable methods --
@@ -174,7 +174,8 @@ private Map<String, Integer> setupMapFromProperties(Properties properties,
 	private class RootLogger extends DefaultLogger {
 
 		public RootLogger() {
-			super(AbstractLogService.this::notifyListeners, "", LogLevel.NONE);
+			super(AbstractLogService.this::notifyListeners, LogSource.newRoot(),
+				LogLevel.NONE);
 		}
 
 		@Override
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 34bdb6f6b..07ccd6230 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -45,25 +45,25 @@ public class DefaultLogger implements Logger, LogListener {
 
 	private final LogListener destination;
 
-	private final String name;
+	private final LogSource source;
 
 	private final int level;
 
 	private final List<LogListener> listeners = new CopyOnWriteArrayList<>();
 
-	public DefaultLogger(final LogListener destination, final String name,
-								   final int level)
+	public DefaultLogger(final LogListener destination,
+		final LogSource source, final int level)
 	{
 		this.destination = destination;
-		this.name = name;
+		this.source = source;
 		this.level = level;
 	}
 
 	// -- Logger methods --
 
 	@Override
-	public String getName() {
-		return name;
+	public LogSource getSource() {
+		return source;
 	}
 
 	@Override
@@ -73,11 +73,11 @@ public int getLevel() {
 
 	@Override
 	public void alwaysLog(final int level, final Object msg, final Throwable t) {
-		messageLogged(new LogMessage(level, msg, t));
+		messageLogged(new LogMessage(source, level, msg, t));
 	}
 
 	public Logger subLogger(final String name, final int level) {
-		return new DefaultLogger(this, name, level);
+		return new DefaultLogger(this, source.subSource(name), level);
 	}
 
 	// -- Listenable methods --
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index d4dd886ee..56fd74c30 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -45,6 +45,7 @@
  */
 public class LogMessage {
 
+	private final LogSource source;
 	private final int level;
 	private final String message;
 	private final Throwable throwable;
@@ -52,9 +53,10 @@ public class LogMessage {
 
 	private Collection<Object> attachments;
 
-	public LogMessage(int level, Object message,
+	public LogMessage(LogSource source, int level, Object message,
 		Throwable throwable)
 	{
+		this.source = source;
 		this.attachments = null;
 		this.level = level;
 		this.message = message == null ? null : message.toString();
@@ -62,8 +64,13 @@ public LogMessage(int level, Object message,
 		this.time = new Date();
 	}
 
-	public LogMessage(int level, Object msg) {
-		this(level, msg, null);
+	public LogMessage(LogSource source, int level, Object msg) {
+		this(source, level, msg, null);
+	}
+
+	/** Represents the source of the message. */
+	public LogSource source() {
+		return source;
 	}
 
 	/**
@@ -121,6 +128,7 @@ public static String format(final LogMessage message) {
 		final PrintWriter printer = new PrintWriter(sw);
 		printer.print("[" + message.time() + "] ");
 		printer.print("[" + LogLevel.prefix(message.level()) + "] ");
+		printer.print("[" + message.source() + "] ");
 		printer.println(message.text());
 		if (message.throwable() != null) {
 			message.throwable().printStackTrace(printer);
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
new file mode 100644
index 000000000..c5edee06c
--- /dev/null
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -0,0 +1,116 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+/**
+ * Identifies where a {@link LogMessage} came from.
+ *
+ * @author Matthias Arzt
+ */
+public class LogSource {
+
+	private final LogSource parent;
+
+	private final List<String> path;
+
+	private final ConcurrentMap<String, LogSource> children =
+		new ConcurrentSkipListMap<>();
+
+	private String formatted = null;
+
+	private LogSource(LogSource parent, String name) {
+		this.parent = parent;
+		List<String> parentPath = parent.path();
+		List<String> list = new ArrayList<>(parentPath.size() + 1);
+		list.addAll(parentPath);
+		list.add(name);
+		this.path = Collections.unmodifiableList(list);
+	}
+
+	private LogSource() {
+		this.parent = null;
+		this.path = Collections.emptyList();
+	}
+
+	/** Returns the root log source. This LogSource represents the empty list. */
+	public static LogSource newRoot() {
+		return new LogSource();
+	}
+
+	/** Returns the list of strings which is represented by this LogSource. */
+	public List<String> path() {
+		return path;
+	}
+
+	/** Returns the last entry in the list of strings. */
+	public String name() {
+		if (path.isEmpty()) return "";
+		return path.get(path.size() - 1);
+	}
+
+	/**
+	 * Returns the LogSource which represents the path of this LogSource extended
+	 * by name.
+	 */
+	public LogSource subSource(String name) {
+		LogSource child = children.get(name);
+		if (child != null) return child;
+		child = new LogSource(this, name);
+		children.putIfAbsent(name, child);
+		return children.get(name);
+	}
+
+	@Override
+	public String toString() {
+		if (formatted != null) return formatted;
+		StringJoiner joiner = new StringJoiner(":");
+		path.forEach(s -> joiner.add(s));
+		formatted = joiner.toString();
+		return formatted;
+	}
+
+	public boolean isRoot() {
+		return parent == null;
+	}
+
+	/** Gets the parent of this source, or null if the source is a root. */
+	public LogSource parent() {
+		return parent;
+	}
+}
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 8a4f3b5fb..5eaffb7e8 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -185,7 +185,12 @@ default void log(final int level, final Object msg, final Throwable t) {
 	void alwaysLog(int level, Object msg, Throwable t);
 
 	/** Returns the name of this logger. */
-	String getName();
+	default String getName() {
+		return getSource().name();
+	}
+
+	/** Returns the {@link LogSource} associated with this logger. */
+	LogSource getSource();
 
 	/** Returns the log level of this logger. see {@link LogLevel} */
 	int getLevel();
@@ -201,6 +206,7 @@ default Logger subLogger(String name) {
 	/**
 	 * Creates a sub logger, that forwards the message it gets to this logger.
 	 *
+	 * @param name The name of the sub logger.
 	 * @param level The log level of the sub logger.
 	 */
 	Logger subLogger(String name, int level);
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index 15cc68e79..818a47c90 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -31,9 +31,12 @@
 
 package org.scijava.log;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Arrays;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -49,7 +52,7 @@ public class DefaultLoggerTest {
 
 	@Before
 	public void setup() {
-		logger = new DefaultLogger(message -> {}, "", LogLevel.INFO);
+		logger = new DefaultLogger(message -> {}, LogSource.newRoot(), LogLevel.INFO);
 		listener = new TestLogListener();
 		logger.addListener(listener);
 	}
@@ -71,7 +74,20 @@ public void testSubLogger() {
 
 		sub.error("Hello World!");
 
-		assertTrue(listener.hasLogged(m -> m.text().equals("Hello World!")));
+		assertTrue(listener.hasLogged(m -> m.source().path().contains("sub")));
+	}
+
+	@Test
+	public void testHierarchicLogger() {
+		listener.clear();
+		Logger subA = logger.subLogger("subA");
+		Logger subB = subA.subLogger("subB");
+
+		subB.error("Hello World!");
+
+		assertTrue(listener.hasLogged(m -> m.source().equals(subB.getSource())));
+		assertEquals(Arrays.asList("subA"), subA.getSource().path());
+		assertEquals(Arrays.asList("subA", "subB"), subB.getSource().path());
 	}
 
 	@Test
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 0c9e4bf06..33cca9a4e 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -46,7 +46,7 @@ public class LogMessageTest {
 	public void testToString() {
 		String nameOfThisMethod = "testToString";
 		// setup
-		LogMessage message = new LogMessage(LogLevel.DEBUG, 42, new NullPointerException());
+		LogMessage message = new LogMessage(LogSource.newRoot(), LogLevel.DEBUG, 42, new NullPointerException());
 		// process
 		String s = message.toString();
 		//test
@@ -59,7 +59,7 @@ public void testToString() {
 	@Test
 	public void testToStringOptionalParameters() {
 		// setup
-		LogMessage message = new LogMessage(LogLevel.WARN, null, null);
+		LogMessage message = new LogMessage(LogSource.newRoot(), LogLevel.WARN, null, null);
 
 		// process
 		// Can it still format the message if optional parameters are null?
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
new file mode 100644
index 000000000..d726ca9f0
--- /dev/null
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -0,0 +1,93 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.log;
+
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests {@link LogSource}
+ */
+public class LogSourceTest {
+
+	@Test
+	public void testRoot() {
+		LogSource root = LogSource.newRoot();
+		assertEquals(Collections.emptyList(), root.path());
+		assertTrue(root.isRoot());
+	}
+
+	@Test
+	public void testIsRoot() {
+		LogSource source = LogSource.newRoot().subSource("sub");
+		assertFalse(source.isRoot());
+	}
+
+	@Test
+	public void testChildIsUnique() {
+		String name = "foo";
+		LogSource root = LogSource.newRoot();
+		LogSource a = root.subSource(name);
+		LogSource b = root.subSource(name);
+		assertSame(a, b);
+	}
+
+	@Test
+	public void testToString() {
+		LogSource source = LogSource.newRoot().subSource("Hello").subSource("World");
+		String result = source.toString();
+		assertEquals("Hello:World", result);
+	}
+
+	@Test
+	public void testRootToString() {
+		LogSource source = LogSource.newRoot();
+		String result = source.toString();
+		assertEquals("", result);
+	}
+
+	@Test
+	public void testName() {
+		LogSource source = LogSource.newRoot().subSource("Hello").subSource("World");
+		assertEquals("World", source.name());
+	}
+
+	@Test
+	public void testParent() {
+		LogSource root = LogSource.newRoot();
+		LogSource source = root.subSource("sub");
+		assertSame(root, source.parent());
+	}
+}
\ No newline at end of file

From f26d021fb636785d784cac07244a737944ff1749 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Wed, 17 May 2017 14:48:40 +0200
Subject: [PATCH 0607/1208] Allow setting log levels for specified LogSources

---
 .../org/scijava/log/AbstractLogService.java   |  5 ++
 .../java/org/scijava/log/DefaultLogger.java   |  4 +-
 src/main/java/org/scijava/log/LogService.java | 29 ++++++++--
 src/main/java/org/scijava/log/LogSource.java  | 55 ++++++++++++++-----
 .../java/org/scijava/log/LogServiceTest.java  |  9 +++
 .../java/org/scijava/log/LogSourceTest.java   | 29 +++++++++-
 6 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index b75f6acbd..df1f884d2 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -84,6 +84,11 @@ public void setLevel(final String classOrPackageName, final int level) {
 		classAndPackageLevels.put(classOrPackageName, level);
 	}
 
+	@Override
+	public void setLevelForLogger(final String source, final int level) {
+		rootLogger.getSource().subSource(source).setLogLevel(level);
+	}
+
 	// -- Logger methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 07ccd6230..5c25984aa 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -77,7 +77,9 @@ public void alwaysLog(final int level, final Object msg, final Throwable t) {
 	}
 
 	public Logger subLogger(final String name, final int level) {
-		return new DefaultLogger(this, source.subSource(name), level);
+		LogSource source = getSource().subSource(name);
+		int actualLevel = source.hasLogLevel() ? source.logLevel() : level;
+		return new DefaultLogger(this, source, actualLevel);
 	}
 
 	// -- Listenable methods --
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 6c9075908..649f1d5f6 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -50,6 +50,30 @@ public interface LogService extends SciJavaService, Logger {
 	/** System property to set for overriding the default logging level. */
 	String LOG_LEVEL_PROPERTY = "scijava.log.level";
 
+	String LOG_LEVEL_BY_SOURCE_PROPERTY = "scijava.log.level.source";
+
+	/** Changes the log level of the root logger */
+	void setLevel(int level);
+
+	/**
+	 * For messages that are logged directly to the LogService. The log level can
+	 * be set depending on the class that makes the log.
+	 * 
+	 * @param classOrPackageName If this is the name of a class. Messages logged
+	 *          directly by this class are logged, if the message's level is less
+	 *          or equal to the given level. If this is a package, the same holds
+	 *          for all classes in this package.
+	 * @param level Given level.
+	 */
+	void setLevel(String classOrPackageName, int level);
+
+	/**
+	 * Setting the log level for loggers depending on their {@link LogSource}.
+	 * This will only effect loggers that are created after is method has been
+	 * called.
+	 */
+	void setLevelForLogger(String source, int level);
+
 	// -- Deprecated --
 
 	/** @deprecated Use {@link LogLevel#NONE}. */
@@ -70,9 +94,4 @@ public interface LogService extends SciJavaService, Logger {
 	/** @deprecated Use {@link LogLevel#TRACE}. */
 	@Deprecated
 	int TRACE = LogLevel.TRACE;
-
-	void setLevel(int level);
-
-	void setLevel(String classOrPackageName, int level);
-
 }
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index c5edee06c..ad7bbacf3 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -45,6 +45,8 @@
  */
 public class LogSource {
 
+	public static final String SEPARATOR = ":";
+
 	private final LogSource parent;
 
 	private final List<String> path;
@@ -54,6 +56,8 @@ public class LogSource {
 
 	private String formatted = null;
 
+	private Integer logLevel;
+
 	private LogSource(LogSource parent, String name) {
 		this.parent = parent;
 		List<String> parentPath = parent.path();
@@ -73,6 +77,19 @@ public static LogSource newRoot() {
 		return new LogSource();
 	}
 
+	/**
+	 * Returns a log source with the given path.
+	 *
+	 * @param subPath Relative path to the source, divided by
+	 *          {@link LogSource#SEPARATOR}.
+	 */
+	public LogSource subSource(final String subPath) {
+		LogSource result = this;
+		for (final String name : subPath.split(SEPARATOR))
+			result = result.child(name);
+		return result;
+	}
+
 	/** Returns the list of strings which is represented by this LogSource. */
 	public List<String> path() {
 		return path;
@@ -84,22 +101,10 @@ public String name() {
 		return path.get(path.size() - 1);
 	}
 
-	/**
-	 * Returns the LogSource which represents the path of this LogSource extended
-	 * by name.
-	 */
-	public LogSource subSource(String name) {
-		LogSource child = children.get(name);
-		if (child != null) return child;
-		child = new LogSource(this, name);
-		children.putIfAbsent(name, child);
-		return children.get(name);
-	}
-
 	@Override
 	public String toString() {
 		if (formatted != null) return formatted;
-		StringJoiner joiner = new StringJoiner(":");
+		StringJoiner joiner = new StringJoiner(SEPARATOR);
 		path.forEach(s -> joiner.add(s));
 		formatted = joiner.toString();
 		return formatted;
@@ -113,4 +118,28 @@ public boolean isRoot() {
 	public LogSource parent() {
 		return parent;
 	}
+
+	public void setLogLevel(int logLevel) {
+		this.logLevel = logLevel;
+	}
+
+	public boolean hasLogLevel() {
+		return logLevel != null;
+	}
+
+	public int logLevel() {
+		if (!hasLogLevel()) throw new IllegalStateException();
+		return logLevel;
+	}
+
+	// -- Helper methods --
+
+	private LogSource child(final String name) {
+		if (name.isEmpty()) return this;
+		LogSource child = children.get(name);
+		if (child != null) return child;
+		child = new LogSource(this, name);
+		children.putIfAbsent(name, child);
+		return children.get(name);
+	}
 }
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index ac060df65..cb6ec99ac 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -156,6 +156,15 @@ public void testClassLogLevelViaProperties() {
 		assertEquals(LogLevel.ERROR, level);
 	}
 
+	@Test
+	public void testSubLoggerLogLevel() {
+		final TestableLogService log = new TestableLogService();
+		log.setLevel(LogLevel.ERROR);
+		log.setLevelForLogger("foo:bar", LogLevel.TRACE);
+		Logger sub = log.subLogger("foo").subLogger("bar");
+		assertEquals(LogLevel.TRACE, sub.getLevel());
+	}
+
 	@Test
 	public void testPackageLogLevel() {
 		final LogService log = new TestableLogService();
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index d726ca9f0..b83c7d9ab 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -31,11 +31,14 @@
 
 package org.scijava.log;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Collections;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * Tests {@link LogSource}
@@ -64,6 +67,14 @@ public void testChildIsUnique() {
 		assertSame(a, b);
 	}
 
+	@Test
+	public void testLogSourceParse() {
+		LogSource foo = LogSource.newRoot().subSource("foo");
+		LogSource result = foo.subSource("Hello:World");
+		LogSource expected = foo.subSource("Hello").subSource("World");
+		assertEquals(expected, result);
+	}
+
 	@Test
 	public void testToString() {
 		LogSource source = LogSource.newRoot().subSource("Hello").subSource("World");
@@ -90,4 +101,18 @@ public void testParent() {
 		LogSource source = root.subSource("sub");
 		assertSame(root, source.parent());
 	}
+
+	@Test
+	public void testUnsetLogLevel() {
+		LogSource source = LogSource.newRoot();
+		assertFalse(source.hasLogLevel());
+	}
+
+	@Test
+	public void testSetLogLevel() {
+		LogSource source = LogSource.newRoot();
+		source.setLogLevel(LogLevel.INFO);
+		assertTrue(source.hasLogLevel());
+		assertEquals(LogLevel.INFO, source.logLevel());
+	}
 }
\ No newline at end of file

From 65c10f7423977ae338563f09498beeeb76017df1 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Fri, 8 Sep 2017 11:57:56 +0200
Subject: [PATCH 0608/1208] Set source-dependent log levels via properties

And test it.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 src/main/java/org/scijava/log/AbstractLogService.java |  7 +++++++
 src/test/java/org/scijava/log/LogServiceTest.java     | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index df1f884d2..339151b74 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -70,6 +70,7 @@ public AbstractLogService(final Properties properties) {
 		if (level >= 0) currentLevel = level;
 		classAndPackageLevels = setupMapFromProperties(properties,
 			LogService.LOG_LEVEL_PROPERTY + ":");
+		initLogSourceLevels(properties);
 	}
 
 	// -- AbstractLogService methods --
@@ -140,6 +141,12 @@ protected String getPrefix(final int level) {
 
 	// -- Helper methods --
 
+	private void initLogSourceLevels(Properties properties) {
+		Map<String, Integer> nameLevels = setupMapFromProperties(properties,
+			LOG_LEVEL_BY_SOURCE_PROPERTY + ":");
+		nameLevels.forEach(this::setLevelForLogger);
+	}
+
 	private int getLevelForClass(String classOrPackageName, int defaultLevel) {
 		// check for a custom log level for calling class or its parent packages
 		while (classOrPackageName != null) {
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index cb6ec99ac..93dffd1a5 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -165,6 +165,16 @@ public void testSubLoggerLogLevel() {
 		assertEquals(LogLevel.TRACE, sub.getLevel());
 	}
 
+	@Test
+	public void testSubLoggerLogLevelViaProperties() {
+		Properties properties = new Properties();
+		properties.setProperty(LogService.LOG_LEVEL_BY_SOURCE_PROPERTY + ":Hello:World", LogLevel.prefix(LogLevel.ERROR));
+		properties.setProperty(LogService.LOG_LEVEL_BY_SOURCE_PROPERTY + ":foo:bar", LogLevel.prefix(LogLevel.TRACE));
+		final LogService log = new TestableLogService(properties);
+		Logger sub = log.subLogger("foo").subLogger("bar");
+		assertEquals(LogLevel.TRACE, sub.getLevel());
+	}
+
 	@Test
 	public void testPackageLogLevel() {
 		final LogService log = new TestableLogService();

From 1593cc82c8d034daeaa8fbdb721b740821b5c1c4 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Wed, 17 May 2017 16:14:40 +0200
Subject: [PATCH 0609/1208] StderrLogService: allow overriding output streams

Now, the setPrintStreams method lets the caller define
which output stream is used for each log level.

This commit also adds a regression test verifying that
the log is written to output streams as expected.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../org/scijava/log/StderrLogService.java     | 13 +++++++---
 .../org/scijava/log/StderrLogServiceTest.java | 25 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index f3b3b1cfd..fce0f8a3c 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -33,6 +33,7 @@
 package org.scijava.log;
 
 import java.io.PrintStream;
+import java.util.function.Function;
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
@@ -52,10 +53,16 @@
 @Plugin(type = Service.class, priority = Priority.LOW)
 public class StderrLogService extends AbstractLogService {
 
+	private Function<Integer, PrintStream> levelToStream =
+		level -> (level <= LogLevel.WARN) ? System.err : System.out;
+
+	public void setPrintStreams(Function<Integer, PrintStream> levelToStream) {
+		this.levelToStream = levelToStream;
+	}
+
 	@Override
-	public void notifyListeners(final LogMessage message) {
-		final PrintStream out = (message.level() <= LogLevel.WARN) ? System.err
-			: System.out;
+	public void notifyListeners(LogMessage message) {
+		final PrintStream out = levelToStream.apply(message.level());
 		out.print(message);
 	}
 }
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index 381c41ecb..bf740226e 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -35,14 +35,19 @@
 import static org.junit.Assert.assertTrue;
 import static org.scijava.log.LogLevel.WARN;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
 import org.junit.Test;
 
 /**
  * Tests {@link StderrLogService}.
  * 
  * @author Johannes Schindelin
+ * @author Matthias Arzt
  */
 public class StderrLogServiceTest {
+
 	@Test
 	public void testDefaultLevel() {
 		final LogService log = new StderrLogService();
@@ -50,4 +55,24 @@ public void testDefaultLevel() {
 		assertTrue("default level (" + level + //
 			") is at least INFO(" + WARN + ")", level >= WARN);
 	}
+
+	@Test
+	public void testOutputToStream() {
+		// setup
+		final StderrLogService logService = new StderrLogService();
+		final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+		final PrintStream p = new PrintStream(outputStream);
+		logService.setPrintStreams(ignore -> p);
+
+		final String text1 = "Hello World!";
+		final String text2 = "foo bar";
+
+		// process
+		logService.warn(text1);
+		logService.subLogger("sub").error(text2);
+
+		// test
+		assertTrue(outputStream.toString().contains(text1));
+		assertTrue(outputStream.toString().contains(text2));
+	}
 }

From 555174dab3c745c14f17fd44d53acc113f5e8537 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Fri, 1 Sep 2017 15:59:35 +0200
Subject: [PATCH 0610/1208] LogService: improve javadoc

---
 src/main/java/org/scijava/log/LogService.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 649f1d5f6..ef79590bc 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -38,12 +38,13 @@
  * Interface for the logging service.
  * <p>
  * The service supports five common logging levels: {@link #ERROR},
- * {@link #WARN}, {@link #INFO}, {@link #TRACE} and {@link #DEBUG}. It provides
- * methods for logging messages, exception stack traces and combinations of the
- * two.
+ * {@link #WARN}, {@link #INFO}, {@link #TRACE} and {@link #DEBUG}. It is
+ * extensible to additional levels as needed. It provides methods for logging
+ * messages, exception stack traces and combinations of the two.
  * </p>
  * 
  * @author Curtis Rueden
+ * @author Matthias Arzt
  */
 public interface LogService extends SciJavaService, Logger {
 
@@ -52,7 +53,7 @@ public interface LogService extends SciJavaService, Logger {
 
 	String LOG_LEVEL_BY_SOURCE_PROPERTY = "scijava.log.level.source";
 
-	/** Changes the log level of the root logger */
+	/** Changes the log level of the root logger. */
 	void setLevel(int level);
 
 	/**
@@ -69,7 +70,7 @@ public interface LogService extends SciJavaService, Logger {
 
 	/**
 	 * Setting the log level for loggers depending on their {@link LogSource}.
-	 * This will only effect loggers that are created after is method has been
+	 * This will only affect loggers that are created after this method has been
 	 * called.
 	 */
 	void setLevelForLogger(String source, int level);

From aedc3cac58787f95b8cd198b4d4e6a5bb01a9c7c Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Wed, 17 May 2017 16:26:14 +0200
Subject: [PATCH 0611/1208] Add LoggerPreprocessor to inject Logger instances

This PreprocessorPlugin affects modules with a single Parameter
of type Logger. It will get a logger from LogService, named
like the module's class, and assign it to the Parameter.
---
 .../module/process/LoggerPreprocessor.java    | 74 +++++++++++++++++
 .../process/LoggerPreprocessorTest.java       | 81 +++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 src/main/java/org/scijava/module/process/LoggerPreprocessor.java
 create mode 100644 src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java

diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
new file mode 100644
index 000000000..752dd91b1
--- /dev/null
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.process;
+
+import org.scijava.log.LogService;
+import org.scijava.log.Logger;
+import org.scijava.module.Module;
+import org.scijava.module.ModuleItem;
+import org.scijava.module.ModuleService;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+
+/**
+ * This {@link PreprocessorPlugin} affects {@link Module}s with a single
+ * {@link Parameter} of type {@link Logger}. It will assign a Logger to that
+ * Parameter, that is named like the modules class.
+ *
+ * @author Matthias Arzt
+ */
+@Plugin(type = PreprocessorPlugin.class)
+public class LoggerPreprocessor extends AbstractPreprocessorPlugin {
+
+	@Parameter(required = false)
+	private LogService logService;
+
+	@Parameter(required = false)
+	private ModuleService moduleService;
+
+	// -- ModuleProcessor methods --
+
+	@Override
+	public void process(final Module module) {
+		if (logService == null || moduleService == null) return;
+
+		final ModuleItem<?> loggerInput = moduleService.getSingleInput(module,
+			Logger.class);
+		if (loggerInput == null || !loggerInput.isAutoFill()) return;
+
+		final String name = loggerInput.getName();
+		module.setInput(name, logService.subLogger(module.getDelegateObject()
+			.getClass().getSimpleName()));
+		module.resolveInput(name);
+	}
+
+}
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
new file mode 100644
index 000000000..babdd7990
--- /dev/null
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -0,0 +1,81 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.process;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.ExecutionException;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.command.Command;
+import org.scijava.command.CommandModule;
+import org.scijava.command.CommandService;
+import org.scijava.log.LogService;
+import org.scijava.log.Logger;
+import org.scijava.log.TestLogListener;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+
+/**
+ * Tests {@link LoggerPreprocessor}.
+ *
+ * @author Matthias Arzt
+ */
+public class LoggerPreprocessorTest {
+
+	@Test
+	public void testInjection() throws InterruptedException, ExecutionException {
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+		final LogService logService = context.service(LogService.class);
+		final TestLogListener listener = new TestLogListener();
+		logService.addListener(listener);
+
+		final CommandModule module = //
+				commandService.run(CommandWithLogger.class, true).get();
+		assertTrue(listener.hasLogged(m -> m.source().path().contains(CommandWithLogger.class.getSimpleName())));
+	}
+
+	@Plugin(type = Command.class)
+	public static class CommandWithLogger implements Command {
+
+		@Parameter
+		public Logger log;
+
+		@Override
+		public void run() {
+			log.info("log from the command.");
+		}
+	}
+
+}

From b9c428b429fe6fdf3e7c9e0aa4f67e4a6c6b81fe Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Wed, 24 May 2017 12:04:01 +0200
Subject: [PATCH 0612/1208] LoggerPreprocessor: name Logger by label attribute

If label is specified in the @Parameter annotation,
the logger is given a name matching the provided label.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../module/process/LoggerPreprocessor.java    |  8 ++++--
 .../process/LoggerPreprocessorTest.java       | 28 ++++++++++++++-----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 752dd91b1..7020ac33b 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -65,9 +65,13 @@ public void process(final Module module) {
 			Logger.class);
 		if (loggerInput == null || !loggerInput.isAutoFill()) return;
 
+		String loggerName = loggerInput.getLabel();
+		if(loggerName.isEmpty())
+			loggerName = module.getDelegateObject().getClass().getSimpleName();
+		Logger logger = logService.subLogger(loggerName);
+
 		final String name = loggerInput.getName();
-		module.setInput(name, logService.subLogger(module.getDelegateObject()
-			.getClass().getSimpleName()));
+		module.setInput(name, logger);
 		module.resolveInput(name);
 	}
 
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index babdd7990..92218c63f 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -38,13 +38,13 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.command.Command;
-import org.scijava.command.CommandModule;
 import org.scijava.command.CommandService;
 import org.scijava.log.LogService;
 import org.scijava.log.Logger;
 import org.scijava.log.TestLogListener;
 import org.scijava.plugin.Parameter;
-import org.scijava.plugin.Plugin;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Tests {@link LoggerPreprocessor}.
@@ -57,16 +57,13 @@ public class LoggerPreprocessorTest {
 	public void testInjection() throws InterruptedException, ExecutionException {
 		final Context context = new Context(CommandService.class);
 		final CommandService commandService = context.service(CommandService.class);
-		final LogService logService = context.service(LogService.class);
 		final TestLogListener listener = new TestLogListener();
-		logService.addListener(listener);
+		context.service(LogService.class).addListener(listener);
 
-		final CommandModule module = //
-				commandService.run(CommandWithLogger.class, true).get();
+		commandService.run(CommandWithLogger.class, true).get();
 		assertTrue(listener.hasLogged(m -> m.source().path().contains(CommandWithLogger.class.getSimpleName())));
 	}
 
-	@Plugin(type = Command.class)
 	public static class CommandWithLogger implements Command {
 
 		@Parameter
@@ -78,4 +75,21 @@ public void run() {
 		}
 	}
 
+	@Test
+	public void testLoggerNameByAnnotation() throws ExecutionException, InterruptedException {
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+		commandService.run(CommandWithNamedLogger.class, true).get();
+	}
+
+	public static class CommandWithNamedLogger implements Command {
+
+		@Parameter(label = "MyLoggerName")
+		public Logger log;
+
+		@Override
+		public void run() {
+			assertEquals("MyLoggerName", log.getName());
+		}
+	}
 }

From f2aa79e0bbe8eaed5e1a59591956c13d775d99d0 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Tue, 5 Sep 2017 14:18:01 +0200
Subject: [PATCH 0613/1208] LoggerPreprocessorTest: test log redirection

---
 .../process/LoggerPreprocessorTest.java       | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index 92218c63f..b7e79b097 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -31,6 +31,7 @@
 
 package org.scijava.module.process;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.ExecutionException;
@@ -39,13 +40,14 @@
 import org.scijava.Context;
 import org.scijava.command.Command;
 import org.scijava.command.CommandService;
+import org.scijava.log.DefaultLogger;
+import org.scijava.log.LogLevel;
 import org.scijava.log.LogService;
+import org.scijava.log.LogSource;
 import org.scijava.log.Logger;
 import org.scijava.log.TestLogListener;
 import org.scijava.plugin.Parameter;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * Tests {@link LoggerPreprocessor}.
  *
@@ -64,6 +66,25 @@ public void testInjection() throws InterruptedException, ExecutionException {
 		assertTrue(listener.hasLogged(m -> m.source().path().contains(CommandWithLogger.class.getSimpleName())));
 	}
 
+	/** Tests redirection of a command's log output. */
+	@Test
+	public void testCustomLogger() throws ExecutionException,
+		InterruptedException
+	{
+		// setup
+		final Context context = new Context(CommandService.class);
+		final CommandService commandService = context.service(CommandService.class);
+		final TestLogListener listener = new TestLogListener();
+		final LogSource source = LogSource.newRoot();
+		final DefaultLogger customLogger = new DefaultLogger(listener, source,
+			LogLevel.TRACE);
+		// process
+		commandService.run(CommandWithLogger.class, true, "log", customLogger)
+			.get();
+		// test
+		assertTrue(listener.hasLogged(m -> m.source().equals(source)));
+	}
+
 	public static class CommandWithLogger implements Command {
 
 		@Parameter

From 7db7b91d02aad17ea11a16e88a6213dbe2c14fe0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 20 Sep 2017 15:17:42 +0200
Subject: [PATCH 0614/1208] POM: bump minor version

The org.scijava.log package has new API.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 91b5b993f..4bfbf7f4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.65.1-SNAPSHOT</version>
+	<version>2.66.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From de84489085a3451e4dc94e95c3c83c501f3378e3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 20 Sep 2017 15:18:06 +0200
Subject: [PATCH 0615/1208] LogMessage: improve javadoc

---
 src/main/java/org/scijava/log/LogMessage.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 56fd74c30..bd84e787f 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -38,8 +38,18 @@
 import java.util.Date;
 import java.util.LinkedList;
 
+import org.scijava.event.EventService;
+
 /**
- * LogMessage represents a log message.
+ * A log message broadcast by a {@link Logger}.
+ * <p>
+ * NB: The message is published <em>on the calling thread</em> by
+ * {@link Logger#notifyListeners}, <em>not</em> on a dedicated event dispatch
+ * thread by the {@link EventService}. This is done to avoid the overhead of the
+ * event service's synchronized pub/sub implementation, as well as to avoid
+ * potential infinite loops caused by debugging log messages surrounding event
+ * publication.
+ * </p>
  *
  * @author Matthias Arzt
  */

From c394fd146db7a3662c4e73c6a4d7fa3222863cab Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 20 Sep 2017 15:18:58 +0200
Subject: [PATCH 0616/1208] Logged: add a note to generalize in the future

When a type is Logged, it has a Logger, not necessarily a LogService.
But for now, for backwards compatibility, we cannot change it yet.
---
 src/main/java/org/scijava/log/Logged.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index ee9db5e02..fab36ba9f 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -40,5 +40,6 @@
 public interface Logged {
 
 	/** Gets the {@link LogService} to use when logging activities. */
+	// TODO: SJC3: Generalize to Logger instead of LogService.
 	LogService log();
 }

From 10f74fd7ce45610361c32893e95b350b21fe6325 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 20 Sep 2017 15:49:00 +0200
Subject: [PATCH 0617/1208] ConsoleService: add a note to generalize in future

We could extend the new Listenable interface. But it would
break backwards compatibility, so for the moment, we don't.
---
 src/main/java/org/scijava/console/ConsoleService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 52c6ec14a..f5bd055a8 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -49,6 +49,7 @@
  */
 public interface ConsoleService extends
 	HandlerService<LinkedList<String>, ConsoleArgument>, SciJavaService
+	// TODO: SJC3: Extend Listenable<OutputListener, OutputEvent>
 {
 
 	/** Handles arguments from an external source such as the command line. */

From 6df8c5a8a7b2d0a01042079d6c69c7b963455cc6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 21 Sep 2017 10:11:59 +0200
Subject: [PATCH 0618/1208] Remove Listenable interface

After discussion with @maarzt, we agreed that we do not need this
interface. Most things use the event bus. The only exceptions are
LogService and ConsoleService, because we want to maximize performance
of event notification. The Listenable interface has the property that it
cannot be implemented more than once, which in this case could
theoretically be an issue if you want to support notification of
multiple event types. While this would not be a problem initially,
there is also no great need to keep this interface so general.
---
 src/main/java/org/scijava/Listenable.java     | 51 -------------------
 .../org/scijava/log/AbstractLogService.java   | 10 ++--
 .../java/org/scijava/log/DefaultLogger.java   |  7 ++-
 src/main/java/org/scijava/log/Logger.java     | 13 +++--
 .../org/scijava/log/DefaultLoggerTest.java    |  4 +-
 .../java/org/scijava/log/LogServiceTest.java  |  2 +-
 .../process/LoggerPreprocessorTest.java       |  2 +-
 7 files changed, 21 insertions(+), 68 deletions(-)
 delete mode 100644 src/main/java/org/scijava/Listenable.java

diff --git a/src/main/java/org/scijava/Listenable.java b/src/main/java/org/scijava/Listenable.java
deleted file mode 100644
index ae7aa3412..000000000
--- a/src/main/java/org/scijava/Listenable.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * #%L
- * SciJava Common shared library for SciJava software.
- * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
- * %%
- * 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * #L%
- */
-
-package org.scijava;
-
-/**
- * Interface for event listeners.
- *
- * @author Curtis Rueden
- * @param <L> type of listener
- * @param <E> type of event
- */
-public interface Listenable<L, E> {
-
-	/** Adds an item to the list of registered listeners. */
-	void addListener(L listener);
-
-	/** Removes an item from the list of registered listeners. */
-	void removeListener(L listener);
-
-	/** Informs the registered list of listeners that an event has occurred. */
-	void notifyListeners(E event);
-}
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 339151b74..4ec9c9f58 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -114,16 +114,14 @@ public Logger subLogger(String name, int level) {
 		return rootLogger.subLogger(name, level);
 	}
 
-	// -- Listenable methods --
-
 	@Override
-	public void addListener(final LogListener listener) {
-		rootLogger.addListener(listener);
+	public void addLogListener(final LogListener listener) {
+		rootLogger.addLogListener(listener);
 	}
 
 	@Override
-	public void removeListener(final LogListener listener) {
-		rootLogger.removeListener(listener);
+	public void removeLogListener(final LogListener listener) {
+		rootLogger.removeLogListener(listener);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 5c25984aa..7e5fb7a00 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -76,21 +76,20 @@ public void alwaysLog(final int level, final Object msg, final Throwable t) {
 		messageLogged(new LogMessage(source, level, msg, t));
 	}
 
+	@Override
 	public Logger subLogger(final String name, final int level) {
 		LogSource source = getSource().subSource(name);
 		int actualLevel = source.hasLogLevel() ? source.logLevel() : level;
 		return new DefaultLogger(this, source, actualLevel);
 	}
 
-	// -- Listenable methods --
-
 	@Override
-	public void addListener(final LogListener listener) {
+	public void addLogListener(final LogListener listener) {
 		listeners.add(listener);
 	}
 
 	@Override
-	public void removeListener(final LogListener listener) {
+	public void removeLogListener(final LogListener listener) {
 		listeners.remove(listener);
 	}
 
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 5eaffb7e8..bc0f3203e 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -37,8 +37,6 @@
 import static org.scijava.log.LogLevel.TRACE;
 import static org.scijava.log.LogLevel.WARN;
 
-import org.scijava.Listenable;
-
 /**
  * Interface for objects which can produce log messages.
  * <p>
@@ -51,7 +49,7 @@
  * @see LogService
  */
 @IgnoreAsCallingClass
-public interface Logger extends Listenable<LogListener, LogMessage> {
+public interface Logger {
 
 	default void debug(final Object msg) {
 		log(DEBUG, msg);
@@ -210,4 +208,13 @@ default Logger subLogger(String name) {
 	 * @param level The log level of the sub logger.
 	 */
 	Logger subLogger(String name, int level);
+
+	/** Adds an item to the list of registered listeners. */
+	void addLogListener(LogListener listener);
+
+	/** Removes an item from the list of registered listeners. */
+	void removeLogListener(LogListener listener);
+
+	/** Broadcasts the given log message to the registered listeners. */
+	void notifyListeners(final LogMessage message);
 }
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index 818a47c90..5abf54683 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -54,7 +54,7 @@ public class DefaultLoggerTest {
 	public void setup() {
 		logger = new DefaultLogger(message -> {}, LogSource.newRoot(), LogLevel.INFO);
 		listener = new TestLogListener();
-		logger.addListener(listener);
+		logger.addLogListener(listener);
 	}
 
 	@Test
@@ -95,7 +95,7 @@ public void testLogForwarding() {
 		listener.clear();
 		Logger sub = logger.subLogger("xyz");
 		TestLogListener subListener = new TestLogListener();
-		sub.addListener(subListener);
+		sub.addLogListener(subListener);
 
 		sub.error("Hello World!");
 		logger.error("Goodbye!");
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 93dffd1a5..9d242f75f 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -192,7 +192,7 @@ public void testListener() {
 		String msg1 = "Hello World!";
 		String msg2 = "foo bar";
 		// process
-		logService.addListener(listener);
+		logService.addLogListener(listener);
 		logService.error(msg1);
 		logService.subLogger("xyz").debug(msg2);
 		// test
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index b7e79b097..b3cbc60ca 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -60,7 +60,7 @@ public void testInjection() throws InterruptedException, ExecutionException {
 		final Context context = new Context(CommandService.class);
 		final CommandService commandService = context.service(CommandService.class);
 		final TestLogListener listener = new TestLogListener();
-		context.service(LogService.class).addListener(listener);
+		context.service(LogService.class).addLogListener(listener);
 
 		commandService.run(CommandWithLogger.class, true).get();
 		assertTrue(listener.hasLogged(m -> m.source().path().contains(CommandWithLogger.class.getSimpleName())));

From 82ce585ca0a676d12ee1f612664766cb1ac1cd4d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 21 Sep 2017 17:22:11 +0200
Subject: [PATCH 0619/1208] VersionUtils: add a method to compare versions

This compares two version strings by splitting them by dot, then
comparing each split token numerically and/or lexicographically as
appropriate. SemVer version strings will compare as expected, although
the algorithm used is not limited to SemVer-compliant strings.

This commit is dedicated to Stefan Helfrich.
---
 .../java/org/scijava/util/VersionUtils.java   | 53 ++++++++++
 .../org/scijava/util/VersionUtilsTest.java    | 97 +++++++++++++++++++
 2 files changed, 150 insertions(+)
 create mode 100644 src/test/java/org/scijava/util/VersionUtilsTest.java

diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index 5266c2300..8e0e74b5c 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -114,4 +114,57 @@ public static String getBuildNumber(final Class<?> c) {
 		return m == null ? null : m.getImplementationBuild();
 	}
 
+	/**
+	 * Compares two version strings.
+	 * @param v1 The first version string.
+	 * @param v2 The second version string.
+	 * @return a negative integer, zero, or a positive integer as the
+	 *         first argument is less than, equal to, or greater than the
+	 *         second.
+	 */
+	public static int compare(final String v1, final String v2) {
+		final String[] t1 = splitDots(v1), t2 = splitDots(v2);
+		final int count = Math.min(t1.length, t2.length);
+		for (int t=0; t<count; t++) {
+			final int c = compareToken(t1[t], t2[t]);
+			if (c != 0) return c;
+		}
+		if (t1.length == t2.length) return 0;
+		// NB: Token count differs. More tokens means newer -- e.g. 1.5 < 1.5.1.
+		return t1.length < t2.length ? -1 : 1;
+	}
+
+	// -- Helper methods --
+
+	/** Splits the given version string by dots. */
+	private static String[] splitDots(final String s) {
+		// NB: -1 split limit causes split not to remove empty values.
+		// See: https://stackoverflow.com/a/14602089/1207769
+		return s.isEmpty() ? new String[0] : s.split("\\.", -1);
+	}
+
+	/** Compares one token of a multi-token version string. */
+	private static int compareToken(final String t1, final String t2) {
+		final int i1 = digitIndex(t1), i2 = digitIndex(t2);
+		if (i1 > 0 && i2 > 0) {
+			// Versions start with digits; compare them numerically.
+			final long d1 = Long.parseLong(t1.substring(0, i1));
+			final long d2 = Long.parseLong(t2.substring(0, i2));
+			if (d1 < d2) return -1;
+			if (d1 > d2) return 1;
+		}
+		// Compare remaining characters lexicographically.
+		return t1.substring(i1).compareTo(t2.substring(i2));
+	}
+
+	/** Gets the subsequent index to all the given string's leading digits. */
+	private static int digitIndex(final String s) {
+		int index = 0;
+		for (int i=0; i<s.length(); i++) {
+			final char ch = s.charAt(index);
+			if (ch < '0' || ch > '9') break;
+			index++;
+		}
+		return index;
+	}
 }
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
new file mode 100644
index 000000000..e452ca1f1
--- /dev/null
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -0,0 +1,97 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Tests {@link VersionUtils}.
+ * 
+ * @author Curtis Rueden
+ */
+public class VersionUtilsTest {
+
+	/** Tests {@link VersionUtils#compare(String, String)}. */
+	@Test
+	public void testCompare() {
+		// SemVer PATCH version.
+		assertTrue(VersionUtils.compare("1.5.1", "1.5.2") < 0);
+		assertTrue(VersionUtils.compare("1.5.2", "1.5.1") > 0);
+
+		// SemVer MINOR version.
+		assertTrue(VersionUtils.compare("1.5.2", "1.6.2") < 0);
+		assertTrue(VersionUtils.compare("1.6.2", "1.5.2") > 0);
+
+		// SemVer MAJOR version.
+		assertTrue(VersionUtils.compare("1.7.3", "2.7.3") < 0);
+		assertTrue(VersionUtils.compare("2.7.3", "1.7.3") > 0);
+
+		// Suffix indicates version is older than final release.
+		assertTrue(VersionUtils.compare("1.5.2", "1.5.2-beta-1") < 0);
+
+		// Check when number of version tokens does not match.
+		assertTrue(VersionUtils.compare("1.5", "1.5.1") < 0);
+		assertTrue(VersionUtils.compare("1.5.1", "1.5") > 0);
+
+		// Check equality.
+		assertEquals(VersionUtils.compare("1.5", "1.5"), 0);
+
+		// Check ImageJ 1.x style versions.
+		assertTrue(VersionUtils.compare("1.50a", "1.50b") < 0);
+
+		// Check four version tokens.
+		assertTrue(VersionUtils.compare("1.5.1.3", "1.5.1.4") < 0);
+		assertTrue(VersionUtils.compare("1.5.1.6", "1.5.1.5") > 0);
+		assertEquals(VersionUtils.compare("10.4.9.8", "10.4.9.8"), 0);
+
+		// Check non-numeric tokens.
+		assertTrue(VersionUtils.compare("a.b.c", "a.b.d") < 0);
+		
+		// Check for numerical (not lexicographic) comparison.
+		assertTrue(VersionUtils.compare("2.0", "23.0") < 0);
+		assertTrue(VersionUtils.compare("23.0", "2.0") > 0);
+		assertTrue(VersionUtils.compare("3.0", "23.0") < 0);
+		assertTrue(VersionUtils.compare("23.0", "3.0") > 0);
+
+		// Check weird stuff.
+		assertTrue(VersionUtils.compare("1", "a") < 0);
+		assertTrue(VersionUtils.compare("", "1") < 0);
+		assertTrue(VersionUtils.compare("1", "1.") < 0);
+		assertTrue(VersionUtils.compare("", ".") < 0);
+		assertTrue(VersionUtils.compare("", "..") < 0);
+		assertTrue(VersionUtils.compare(".", "..") < 0);
+	}
+}

From fb085149c7f42d2553c42f4e16a242a6293a34c8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 12:43:49 +0200
Subject: [PATCH 0620/1208] StringUtils: add splitUnquoted method

This lets you split on a separator string but ignore instances
of it inside of quotations ("). Does not support escaped quotes.
---
 src/main/java/org/scijava/util/StringUtils.java  | 11 +++++++++++
 .../java/org/scijava/util/StringUtilsTest.java   | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 9a09e5939..c2155e277 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -63,6 +63,7 @@
 
 import java.io.File;
 import java.text.DecimalFormatSymbols;
+import java.util.regex.Pattern;
 
 /**
  * Useful methods for working with {@link String}s.
@@ -80,6 +81,16 @@ private StringUtils() {
 		// NB: prevent instantiation of utility class.
 	}
 
+	/**
+	 * Splits a string only at separators outside of quotation marks ({@code "}).
+	 * Does not handle escaped quotes.
+	 */
+	public static String[] splitUnquoted(final String s, final String separator) {
+		// See https://stackoverflow.com/a/1757107/1919049
+		return s.split(Pattern.quote(separator) +
+			"(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)", -1);
+	}
+
 	/** Normalizes the decimal separator for the user's locale. */
 	public static String sanitizeDouble(String value) {
 		value = value.replaceAll("[^0-9,\\.]", "");
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 88089986b..9559fd83c 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -32,6 +32,7 @@
 
 package org.scijava.util;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -47,6 +48,21 @@
  */
 public class StringUtilsTest {
 
+	/** Tests {@link StringUtils#splitUnquoted}. */
+	@Test
+	public void testSplitUnquoted() {
+		// See https://stackoverflow.com/a/1757107/1919049
+		final String line = "foo,bar,c;qual=\"baz,blurb\",d;junk=\"quux,syzygy\"";
+		final String[] expected = {
+			"foo",
+			"bar",
+			"c;qual=\"baz,blurb\"",
+			"d;junk=\"quux,syzygy\""
+		};
+		final String[] actual = StringUtils.splitUnquoted(line, ",");
+		assertArrayEquals(expected, actual);
+	}
+
 	@Test
 	public void isNullOrEmptyFalseIfString() throws Exception {
 		assertFalse(StringUtils.isNullOrEmpty("Fresh out of Red Leicester"));

From 10520345a290a0483071342f2e0ec5e11623409e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 12:48:41 +0200
Subject: [PATCH 0621/1208] POM: update parent to pom-scijava 17.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 91b5b993f..8369ce5ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>13.1.0</version>
+		<version>17.0.0</version>
 		<relativePath />
 	</parent>
 

From e2601e2a774ae8b69cf3535a473a1f1948907a7c Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Fri, 21 Jul 2017 10:39:22 +0200
Subject: [PATCH 0622/1208] Add File list converters and tests

---
 .../scijava/convert/FileListConverters.java   | 162 ++++++++++++++++++
 .../convert/FileListConverterTest.java        | 103 +++++++++++
 2 files changed, 265 insertions(+)
 create mode 100644 src/main/java/org/scijava/convert/FileListConverters.java
 create mode 100644 src/test/java/org/scijava/convert/FileListConverterTest.java

diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
new file mode 100644
index 000000000..386279774
--- /dev/null
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -0,0 +1,162 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.scijava.Priority;
+import org.scijava.plugin.Plugin;
+import org.scijava.util.StringUtils;
+
+/**
+ * A collection of {@link Converter} plugins for going between {@link String},
+ * {@link File} and {@code File[]}.
+ *
+ * @author Jan Eglinger
+ * @author Curtis Rueden
+ */
+public class FileListConverters {
+	// -- String to File (list) converters --
+
+	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	public static class StringToFileConverter extends
+		AbstractConverter<String, File>
+	{
+
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T convert(final Object src, final Class<T> dest) {
+			return (T) new File((String) src);
+		}
+
+		@Override
+		public Class<File> getOutputType() {
+			return File.class;
+		}
+
+		@Override
+		public Class<String> getInputType() {
+			return String.class;
+		}
+
+	}
+
+	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	public static class StringToFileArrayConverter extends
+		AbstractConverter<String, File[]>
+	{
+
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T convert(final Object src, final Class<T> dest) {
+			final String[] tokens = StringUtils.splitUnquoted((String) src, ",");
+			final List<File> fileList = new ArrayList<>();
+			for (final String filePath : tokens) {
+				fileList.add(new File(filePath.replaceAll("^\"|\"$", "")));
+			}
+			return (T) fileList.toArray(new File[fileList.size()]);
+		}
+
+		@Override
+		public Class<File[]> getOutputType() {
+			return File[].class;
+		}
+
+		@Override
+		public Class<String> getInputType() {
+			return String.class;
+		}
+
+	}
+
+	// TODO add StringToFileListConverter
+
+	// -- File (list) to String converters --
+
+	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	public static class FileToStringConverter extends
+		AbstractConverter<File, String>
+	{
+
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T convert(final Object src, final Class<T> dest) {
+			return (T) ((File) src).getAbsolutePath();
+		}
+
+		@Override
+		public Class<String> getOutputType() {
+			return String.class;
+		}
+
+		@Override
+		public Class<File> getInputType() {
+			return File.class;
+		}
+
+	}
+
+	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	public static class FileArrayToStringConverter extends
+		AbstractConverter<File[], String>
+	{
+
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T convert(final Object src, final Class<T> dest) {
+			final List<String> result = Arrays.asList((File[]) src).stream().map(
+				f -> {
+					final String path = f.getAbsolutePath();
+					return path.contains(",") ? "\"" + path + "\"" : path;
+				}).collect(Collectors.toList());
+			return (T) String.join(",", result);
+		}
+
+		@Override
+		public Class<String> getOutputType() {
+			return String.class;
+		}
+
+		@Override
+		public Class<File[]> getInputType() {
+			return File[].class;
+		}
+
+	}
+
+	// TODO add FileListToStringConverter
+}
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
new file mode 100644
index 000000000..ed3610e11
--- /dev/null
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -0,0 +1,103 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+
+import org.junit.Test;
+import org.scijava.convert.FileListConverters.FileArrayToStringConverter;
+import org.scijava.convert.FileListConverters.FileToStringConverter;
+import org.scijava.convert.FileListConverters.StringToFileArrayConverter;
+import org.scijava.convert.FileListConverters.StringToFileConverter;
+
+public class FileListConverterTest {
+
+	@Test
+	public void testStringToFileConverter() {
+		final StringToFileConverter conv = new StringToFileConverter();
+		final String path = "C:\\temp\\f,i;l-ename.txt";
+		assertTrue("Cannot convert from String to File",
+				conv.canConvert(String.class, File.class));
+		assertFalse("Can erroneously convert from String to File[]",
+				conv.canConvert(String.class, File[].class));
+		assertEquals(new File(path),
+				conv.convert(path, File.class));
+	}
+
+	@Test
+	public void testStringToFileArrayConverter() {
+		final StringToFileArrayConverter conv = new StringToFileArrayConverter();
+		final String path = "\"C:\\temp\\f,i;l-ename.txt\",C:\\temp";
+		assertTrue("Cannot convert from String to File[]",
+				conv.canConvert(String.class, File[].class));
+		assertFalse("Can erroneously convert from String to File",
+				conv.canConvert(String.class, File.class));
+		assertEquals("Wrong array length", 2,
+				conv.convert(path, File[].class).length);
+		assertEquals("Wrong file name", new File("C:\\temp\\f,i;l-ename.txt"),
+				conv.convert(path, File[].class)[0]);
+		assertEquals("Wrong file name", new File("C:\\temp"),
+				conv.convert(path, File[].class)[1]);
+	}
+
+	@Test
+	public void testFileToStringConverter() {
+		final FileToStringConverter conv = new FileToStringConverter();
+		final File file = new File("C:\\temp\\f,i;l-ename.txt");
+		assertTrue("Cannot convert from File to String",
+				conv.canConvert(File.class, String.class));
+		assertFalse("Can erroneously convert from File[] to String",
+				conv.canConvert(File[].class, String.class));
+		assertEquals(file.getAbsolutePath(),
+				conv.convert(file, String.class));
+	}
+
+	@Test
+	public void testFileArrayToStringConverter() {
+		final FileArrayToStringConverter conv = new FileArrayToStringConverter();
+		final File[] fileArray = new File[2];
+		fileArray[0] = new File("C:\\temp\\f,i;l-ename.txt");
+		fileArray[1] = new File("C:\\temp");
+		final String expected = "\"" + fileArray[0].getAbsolutePath() + "\"," + fileArray[1].getAbsolutePath();
+		assertTrue("Cannot convert from File[] to String",
+				conv.canConvert(File[].class, String.class));
+		assertFalse("Can erroneously convert from File to String",
+				conv.canConvert(File.class, String.class));
+		assertEquals("Wrong output string", expected,
+				conv.convert(fileArray, String.class));
+	}
+}

From 1731a7812aa4f7c0fd78a590c0f5ea2e1118c771 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Wed, 26 Jul 2017 17:07:39 +0200
Subject: [PATCH 0623/1208] Improve multiple file input API

* Change the chooseFiles() method signature to support pre-selected
  files, a starting folder, and style attributes.
* Add style constants to FileListWidget.

Normally, we would deprecate the old method signatures for backwards
compatibility, but since no scijava-common release has occurred since
this API was introduced, we are free to change it.

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 .../java/org/scijava/ui/DefaultUIService.java |  8 +++----
 .../org/scijava/ui/FileListPreprocessor.java  |  4 +++-
 src/main/java/org/scijava/ui/UIService.java   |  4 ++--
 .../java/org/scijava/ui/UserInterface.java    | 10 ++++++---
 .../org/scijava/widget/FileListWidget.java    | 21 ++++++++++++++++++-
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 76aae7e50..e88f94e55 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -321,15 +321,15 @@ public File chooseFile(final File file, final String style) {
 	}
 
 	@Override
-	public File[] chooseFiles(File[] files, FileFilter filter) {
+	public File[] chooseFiles(File parent, File[] files, FileFilter filter, String style) {
 		final UserInterface ui = getDefaultUI();
-		return ui == null ? null : ui.chooseFiles(files, filter);
+		return ui == null ? null : ui.chooseFiles(parent, files, filter, style);
 	}
 	
 	@Override
-	public List<File> chooseFiles(List<File> fileList, FileFilter filter) {
+	public List<File> chooseFiles(File parent, List<File> fileList, FileFilter filter, String style) {
 		final UserInterface ui = getDefaultUI();
-		return ui == null ? null : ui.chooseFiles(fileList, filter);
+		return ui == null ? null : ui.chooseFiles(parent, fileList, filter, style);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index 6cc5ae83f..6a8971898 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -56,7 +56,9 @@ public void process(final Module module) {
 		final File[] files = fileInput.getValue(module);
 
 		// show file chooser dialog box
-		final File[] result = uiService.chooseFiles(files, null);
+		// TODO decide how to create filter from style attributes
+		// TODO retrieve parent folder??
+		final File[] result = uiService.chooseFiles(null, files, null, fileInput.getWidgetStyle());
 		if (result == null) {
 			cancel("");
 			return;
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 7191679dd..9b711bd05 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -304,7 +304,7 @@ DialogPrompt.Result showDialog(String message, String title,
 	 * @param files The initial value displayed in the file chooser prompt.
 	 * @param filter A filter allowing to restrict the choice of files
 	 */
-	File[] chooseFiles(File[] files, FileFilter filter);
+	File[] chooseFiles(File parent, File[] files, FileFilter filter, String style);
 
 	/**
 	 * Prompts the user to select one or multiple files.
@@ -315,7 +315,7 @@ DialogPrompt.Result showDialog(String message, String title,
 	 * @param fileList The initial value displayed in the file chooser prompt.
 	 * @param filter A filter allowing to restrict the choice of files
 	 */
-	List<File> chooseFiles(List<File> fileList, FileFilter filter);
+	List<File> chooseFiles(File parent, List<File> fileList, FileFilter filter, String style);
 
 	/**
 	 * Displays a popup context menu for the given display at the specified
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 544991cd5..385df24d8 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -191,26 +191,30 @@ default File chooseFile(String title, File file, String style) {
 	/**
 	 * Prompts the user to choose a list of files.
 	 *
+	 * @param parent Parent folder for file selection
 	 * @param files The initial value displayed in the file chooser prompt.
 	 * @param filter A filter allowing to restrict file choice.
+	 * @param style File selection style (files, directories, or both) and optional filters
 	 * @return The selected {@link File}s chosen by the user, or null if the
 	 *         user cancels the prompt.
 	 */
-	default File[] chooseFiles(File[] files, FileFilter filter) {
+	default File[] chooseFiles(File parent, File[] files, FileFilter filter, String style) {
 		throw new UnsupportedOperationException();
 	}
 
 	/**
 	 * Prompts the user to choose a list of files.
 	 *
+	 * @param parent Parent folder for file selection
 	 * @param fileList The initial value displayed in the file chooser prompt.
 	 * @param filter A filter allowing to restrict file choice.
+	 * @param style File selection style (files, directories, or both) and optional filters
 	 * @return The selected {@link File}s chosen by the user, or null if the
 	 *         user cancels the prompt.
 	 */
-	default List<File> chooseFiles(List<File> fileList, FileFilter filter) {
+	default List<File> chooseFiles(File parent, List<File> fileList, FileFilter filter, String style) {
 		final File[] initialFiles = fileList.toArray(new File[fileList.size()]);
-		final File[] chosenFiles = chooseFiles(initialFiles, filter);
+		final File[] chosenFiles = chooseFiles(parent, initialFiles, filter, style);
 		return chosenFiles == null ? null : Arrays.asList(chosenFiles);
 	}
 
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index d76c3a1fe..b7f2203a5 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -34,5 +34,24 @@
 import java.io.File;
 
 public interface FileListWidget<U> extends InputWidget<File[], U> {
-	// NB: No changes to interface.
+	/**
+	 * Widget style to allow file selection only
+	 * 
+	 * @see org.scijava.plugin.Parameter#style()
+	 */
+	String FILES_ONLY = "files";
+
+	/**
+	 * Widget style to allow directory selection only
+	 * 
+	 * @see org.scijava.plugin.Parameter#style()
+	 */
+	String DIRECTORIES_ONLY = "directories";
+
+	/**
+	 * Widget style to allow selection of both files and directories
+	 * 
+	 * @see org.scijava.plugin.Parameter#style()
+	 */
+	String FILES_AND_DIRECTORIES = "both";
 }

From b5f24eb03a3debcb2909087e7764bcefb9d8e07d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 06:27:24 -0500
Subject: [PATCH 0624/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3fdfc037e..4d228e590 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.66.0-SNAPSHOT</version>
+	<version>2.66.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 67f3c035d9e1c24b9f62071798929078b66c438c Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Fri, 22 Sep 2017 22:08:19 +0200
Subject: [PATCH 0625/1208] LogMessage: fix NullPointerException when querying
 empty attachments

---
 src/main/java/org/scijava/log/LogMessage.java     |  1 +
 src/test/java/org/scijava/log/LogMessageTest.java | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index bd84e787f..63ad2caeb 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -112,6 +112,7 @@ public Date time() {
 	 * {@link #attach(Object)}.
 	 */
 	public Collection<Object> attachments() {
+		if (attachments == null) return Collections.emptyList();
 		return Collections.unmodifiableCollection(attachments);
 	}
 
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 33cca9a4e..0f19c0b65 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -34,6 +34,12 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Collections;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests {@link LogMessage}.
  * 
@@ -68,4 +74,13 @@ public void testToStringOptionalParameters() {
 		// test
 		Assert.assertTrue("Log message contains level", s.contains(LogLevel.prefix(message.level())));
 	}
+
+	@Test
+	public void testAttachments() {
+		LogMessage message = new LogMessage(LogSource.newRoot(), LogLevel.ERROR, "Message")	;
+		assertTrue(message.attachments().isEmpty());
+		Object object = new Object();
+		message.attach(object);
+		assertEquals(Collections.singletonList(object), new ArrayList<>(message.attachments()));
+	}
 }

From 5e676d4ba05c596034deb510dfc0e44c5d848e0b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Sep 2017 20:45:21 +0200
Subject: [PATCH 0626/1208] Make LazyObjects a Supplier

Because why not. ;-)
---
 src/main/java/org/scijava/object/LazyObjects.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 39037e700..e1d0d660e 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -33,6 +33,7 @@
 package org.scijava.object;
 
 import java.util.Collection;
+import java.util.function.Supplier;
 
 /**
  * Interface for objects created lazily. This interface provides a mechanism to
@@ -41,9 +42,10 @@
  * 
  * @author Curtis Rueden
  */
-public interface LazyObjects<T> {
+public interface LazyObjects<T> extends Supplier<Collection<T>> {
 
 	/** Gets the collection of objects. */
+	@Override
 	Collection<T> get();
 
 }

From e646ce9598d394339e46bd7e21f33aaba0e0e27b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Sep 2017 06:54:31 +0200
Subject: [PATCH 0627/1208] ServicePreprocessor: fix typo in javadoc

---
 .../java/org/scijava/module/process/ServicePreprocessor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 51f496da6..2d7fd96ac 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -51,7 +51,7 @@
  * <p>
  * Many modules (e.g., most {@link Command}s) use @{@link Parameter}-annotated
  * service fields, resulting in those parameters being populated when the
- * SciJava application context is injected (via {@link Context#inject(Object)}.
+ * SciJava application context is injected (via {@link Context#inject(Object)}).
  * However, some modules may have service parameters which are programmatically
  * generated (i.e., returned directly as inputs from {@link ModuleInfo#inputs()}
  * and as such not populated by context injection. E.g., this situation is the

From 6db660406af59871f1f7b0033b479e0504c2847b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Sep 2017 07:03:42 +0200
Subject: [PATCH 0628/1208] Eliminate no-longer-needed priority line breaks

The names of the constants got shorter.
---
 src/main/java/org/scijava/app/SciJavaApp.java                  | 3 +--
 .../java/org/scijava/display/ActiveDisplayPreprocessor.java    | 3 +--
 src/main/java/org/scijava/display/DisplayPostprocessor.java    | 3 +--
 .../java/org/scijava/module/process/GatewayPreprocessor.java   | 3 +--
 .../java/org/scijava/module/process/ServicePreprocessor.java   | 3 +--
 .../java/org/scijava/module/process/ValidityPreprocessor.java  | 3 +--
 src/main/java/org/scijava/platform/DefaultPlatform.java        | 3 +--
 src/test/java/org/scijava/command/CommandModuleTest.java       | 3 +--
 src/test/java/org/scijava/plugin/PluginInfoTest.java           | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 12c049697..6cb97fb8b 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -41,8 +41,7 @@
  * @author Curtis Rueden
  * @see AppService
  */
-@Plugin(type = App.class, name = SciJavaApp.NAME,
-	priority = Priority.LOW)
+@Plugin(type = App.class, name = SciJavaApp.NAME, priority = Priority.LOW)
 public class SciJavaApp extends AbstractApp {
 
 	public static final String NAME = "SciJava";
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 73b92ebd5..58d41b983 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -53,8 +53,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class,
-	priority = Priority.VERY_HIGH)
+@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH)
 public class ActiveDisplayPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 24009e12e..0bfdfd77b 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -54,8 +54,7 @@
  * @author Lee Kamentsky
  * @author Barry DeZonia
  */
-@Plugin(type = PostprocessorPlugin.class,
-	priority = Priority.VERY_LOW)
+@Plugin(type = PostprocessorPlugin.class, priority = Priority.VERY_LOW)
 public class DisplayPostprocessor extends AbstractPostprocessorPlugin {
 
 	@Parameter(required = false)
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 08fdedb2b..59c3169cb 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -53,8 +53,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class, //
-	priority = 2 * Priority.VERY_HIGH)
+@Plugin(type = PreprocessorPlugin.class, priority = 2 * Priority.VERY_HIGH)
 public class GatewayPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 2d7fd96ac..8993cdd46 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -62,8 +62,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class, //
-	priority = 2 * Priority.VERY_HIGH)
+@Plugin(type = PreprocessorPlugin.class, priority = 2 * Priority.VERY_HIGH)
 public class ServicePreprocessor extends AbstractPreprocessorPlugin {
 
 	// -- ModuleProcessor methods --
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index d8294a99e..012d14fe7 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -44,8 +44,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = PreprocessorPlugin.class,
-	priority = 3 * Priority.VERY_HIGH)
+@Plugin(type = PreprocessorPlugin.class, priority = 3 * Priority.VERY_HIGH)
 public class ValidityPreprocessor extends AbstractPreprocessorPlugin {
 
 	// -- ModuleProcessor methods --
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 2c2618082..06124c883 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -44,8 +44,7 @@
  * @author Curtis Rueden
  * @author Johannes Schindelin
  */
-@Plugin(type = Platform.class, name = "Default",
-	priority = Priority.VERY_LOW)
+@Plugin(type = Platform.class, name = "Default", priority = Priority.VERY_LOW)
 public class DefaultPlatform extends AbstractPlatform {
 
 	// -- PlatformHandler methods --
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index a0ad8565c..834962d1c 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -250,8 +250,7 @@ public void run() {
 	 * not as early as {@link Service} and {@link Context} parameters get
 	 * populated.
 	 */
-	@Plugin(type = PreprocessorPlugin.class,
-		priority = Priority.VERY_HIGH)
+	@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH)
 	public static class StuffPreprocessor extends AbstractPreprocessorPlugin {
 
 		@Override
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 554cef02e..20c0b5ebb 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -79,8 +79,7 @@ public static class Flavorless implements SciJavaPlugin {
 		// NB: No implementation needed.
 	}
 
-	@Plugin(type = IceCream.class, name = "vanilla",
-		priority = Priority.LOW)
+	@Plugin(type = IceCream.class, name = "vanilla", priority = Priority.LOW)
 	public static class Vanilla implements SciJavaPlugin {
 		// NB: No implementation needed.
 	}

From 3268140598c1de22d5def163271d1794b19de8d3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Sep 2017 07:04:29 +0200
Subject: [PATCH 0629/1208] SaveInputsPreprocessor: fix priority declaration

Technically, it worked fine as written because the declared priority
matched the PRIORITY constant. But it is more correct for the class to
use its own priority constant explicitly. In case that constant value
ever changes (although changing it would break backwards compatibility
due to the Java compiler inlining constants), we want to avoid any
chance of skew between the constant and the actually declared priority.
---
 .../java/org/scijava/module/process/SaveInputsPreprocessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 9675a431b..30f23a49f 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -51,7 +51,7 @@
  * @author Curtis Rueden
  */
 @Plugin(type = PreprocessorPlugin.class,
-	priority = Priority.VERY_LOW - 1)
+	priority = SaveInputsPreprocessor.PRIORITY)
 public class SaveInputsPreprocessor extends AbstractPreprocessorPlugin {
 
 	public static final double PRIORITY = Priority.VERY_LOW - 1;

From aedaa016cc1d2b7acd359207b89726b61b316149 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 09:22:37 -0500
Subject: [PATCH 0630/1208] Travis: update .travis.yml

---
 .travis.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1570c3987..8595a6b81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,11 @@
 language: java
 jdk: oraclejdk8
 branches:
-  only: master
+  only:
+  - master
+  - "/.*-[0-9]+\\..*/"
 install: true
 script: ".travis/build.sh"
-after_success: ".travis/notify.sh Travis-Success"
-after_failure: ".travis/notify.sh Travis-Failure"
-env:
-  global:
-  - secure: l5k7gyNsC7cS1QcqPcSzxQeueZmakAvYRDBevIGA61yDjL/cK4Pyy/7yNz4CHo+mgHaHul9uLIQuZvQdeAs4FqHi37brY1//emVI4BiUow+XDvge7DttDJ+JjBlGsZrxX0YKtnn/V83WO23RtGGQUZ8PBwpNWYB52stDpizhqqg=
-  - secure: Hs3V7J4BmasiXNWOBzFuxYcPeImFYo8Ze3UWqg85gRa1YxKNbnJLGPjQoIcUxXQU34Fa0qvvWcPUyEjne+nAbWtAVrq/xRSVj5Fnen+UmH3fjV1aR6Rsr56gkdqlaeIfcxaaeGTeguHQB1LSNCIvcF5s8f6J+37l65UUxGsL3+4=
+cache:
+  directories:
+  - "~/.m2/repository"

From 18ec55fa81620cbf98080792af1722e6fc2ff603 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 09:22:37 -0500
Subject: [PATCH 0631/1208] Travis: update .travis/build.sh

---
 .travis/build.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 .travis/build.sh

diff --git a/.travis/build.sh b/.travis/build.sh
old mode 100755
new mode 100644
index 8cddb5f18..e939b6ca3
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -1,10 +1,3 @@
 #!/bin/sh
-dir="$(dirname "$0")"
-if [ "$TRAVIS_SECURE_ENV_VARS" = true \
-  -a "$TRAVIS_PULL_REQUEST" = false \
-  -a "$TRAVIS_BRANCH" = master ]
-then
-  mvn -Pdeploy-to-imagej deploy --settings "$dir/settings.xml"
-else
-  mvn install
-fi
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh
+sh travis-build.sh

From 04862afb445959d4f6dd8e95ca4e55cf39e5fdb6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 09:22:37 -0500
Subject: [PATCH 0632/1208] Travis: remove obsolete files

---
 .travis/notify.sh    |  2 --
 .travis/settings.xml | 14 --------------
 2 files changed, 16 deletions(-)
 delete mode 100755 .travis/notify.sh
 delete mode 100644 .travis/settings.xml

diff --git a/.travis/notify.sh b/.travis/notify.sh
deleted file mode 100755
index b3b239e46..000000000
--- a/.travis/notify.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-curl -fs "https://jenkins.imagej.net/job/$1/buildWithParameters?token=$TOKEN_NAME&repo=$TRAVIS_REPO_SLUG&commit=$TRAVIS_COMMIT&pr=$TRAVIS_PULL_REQUEST"
diff --git a/.travis/settings.xml b/.travis/settings.xml
deleted file mode 100644
index 71a56300a..000000000
--- a/.travis/settings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<settings>
-  <servers>
-    <server>
-      <id>imagej.releases</id>
-      <username>travis</username>
-      <password>${env.MAVEN_PASS}</password>
-    </server>
-    <server>
-      <id>imagej.snapshots</id>
-      <username>travis</username>
-      <password>${env.MAVEN_PASS}</password>
-    </server>
-  </servers>
-</settings>

From 4be1423ac03060a495d80b8bcba2ae078d8d20f4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 09:22:37 -0500
Subject: [PATCH 0633/1208] POM: update pom-scijava parent to 17.1.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4d228e590..0a589e2c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>17.0.0</version>
+		<version>17.1.1</version>
 		<relativePath />
 	</parent>
 

From eb39e7dec84bbaf858947c41c16baa8b26904b0b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 09:22:42 -0500
Subject: [PATCH 0634/1208] Travis: add encrypted environment variables

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8595a6b81..b3fcda211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,3 +9,9 @@ script: ".travis/build.sh"
 cache:
   directories:
   - "~/.m2/repository"
+env:
+  global:
+  - secure: Xkwu2u/v0+kBqW2Mt80FpMS+2NRMnfRaZ6ptiEW44sViKkaENnJegmYVjdSm9RAwAJx9DEp6KYTLH4Hh56JbWp6s8qGcxm2vCbAWBE6ZesOj3oTvv/T4lucxarocZ8hK9NqfY9iCePjl8R10UDePThZgWBFidUQjvPbH+LcXo9g=
+  - secure: Jgj204N4hKv+7sUrXGtXMvUoXYuHAerhUvwbHsm0BJFpzUSyHP5QWJH2tHvCUL9Yb4VhNEjc46RLFVmiIXynJwAdAWJodT/VEnOTb5Cf7+0UHK4qCyjyjVHiWq1cf+R8Lr9fuKRqxUAdz9Hw6g0Yt23TX8kCa+wQW9lwchn0IG8=
+  - secure: RuGzuPrxyvBRJwsCpSJ10p9PdP2Hzc9lxb29L//Y/Fkc3bJwNMlNa0ST83oGNHJapYc4dWuFk22Ooy/2YioNgsVvR4n5MAslqXQXSY0VDle1Nbf1pudAlPU+quaiYxcAyyysjUUtqc5wADVgpkrDA7GJzAuCOWb4aSwiiIn6u4A=
+  - secure: bnsjVlj9MBJto8ahZdMwGpVPjZeyF7r5tZh+t+NhDuZsP0WMlURzGZ9/lJOO4quklgiWCyeVDB5uvDvsdG9BReBe5Q8Q6WZyxhxYtP2iLV0zRWSWsGKk0stGcrmJKk8wbicIJdXD8suiP+2Li5GfxTge/hkhL4CL0OOr6b1JqrM=

From 5922e7d18840d980307cd9a927faaa9c4733ea31 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 09:22:44 -0500
Subject: [PATCH 0635/1208] Travis: add encrypted GPG signing keypair

---
 .travis.yml                |   3 +++
 .travis/signingkey.asc.enc | Bin 0 -> 9632 bytes
 2 files changed, 3 insertions(+)
 create mode 100644 .travis/signingkey.asc.enc

diff --git a/.travis.yml b/.travis.yml
index b3fcda211..92295d68b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,3 +15,6 @@ env:
   - secure: Jgj204N4hKv+7sUrXGtXMvUoXYuHAerhUvwbHsm0BJFpzUSyHP5QWJH2tHvCUL9Yb4VhNEjc46RLFVmiIXynJwAdAWJodT/VEnOTb5Cf7+0UHK4qCyjyjVHiWq1cf+R8Lr9fuKRqxUAdz9Hw6g0Yt23TX8kCa+wQW9lwchn0IG8=
   - secure: RuGzuPrxyvBRJwsCpSJ10p9PdP2Hzc9lxb29L//Y/Fkc3bJwNMlNa0ST83oGNHJapYc4dWuFk22Ooy/2YioNgsVvR4n5MAslqXQXSY0VDle1Nbf1pudAlPU+quaiYxcAyyysjUUtqc5wADVgpkrDA7GJzAuCOWb4aSwiiIn6u4A=
   - secure: bnsjVlj9MBJto8ahZdMwGpVPjZeyF7r5tZh+t+NhDuZsP0WMlURzGZ9/lJOO4quklgiWCyeVDB5uvDvsdG9BReBe5Q8Q6WZyxhxYtP2iLV0zRWSWsGKk0stGcrmJKk8wbicIJdXD8suiP+2Li5GfxTge/hkhL4CL0OOr6b1JqrM=
+before_install:
+- openssl aes-256-cbc -K $encrypted_d2fbfc37eea9_key -iv $encrypted_d2fbfc37eea9_iv
+  -in .travis/signingkey.asc.enc -out .travis/signingkey.asc -d
diff --git a/.travis/signingkey.asc.enc b/.travis/signingkey.asc.enc
new file mode 100644
index 0000000000000000000000000000000000000000..4e4802b462a4c4ae860a84af0c7ec1d1390408e4
GIT binary patch
literal 9632
zcmV;RC12W{wS_|d+vp;Au{m6gL+BFhM?-BCikSk7{kH6M6KnW+ponRb-+96rEk7hE
z$R3OOz6*I!!Y2GYes}r67t%!(VNWQ7qP*|qENU*=!#tm1+5INUY9FkY9^~29Bx@=7
zruzk)i_++1DCkU_00z&cF$$(I+M(`CXe}*3VEJC?yhdPZP=qd&K^mQ75k^OudIacK
zVLw-#qc0TF<Ai#b7OeC>_%wx?JNaM-l4|Ur>;e7pOzr3bRQQx*w@X4BF8pE%i$1Gy
zcNFnE2yx@W9soPHEql?WsrGi3^#M==o;{v}wTPXKtyvB{@L<?Tz1&*+FYWNy!114_
zU}SS)F13K}ja|$HJ3Dgn!3NoO##11|5p%$XUTM#vW%9gPd$5fbAnnTdFF6X$0@gm9
zVipEMS9&7(T<ZVCht%GSc0e1Sne+o71<8E;)7f^tp?HFFX??ReG4Rlj7GkSCOXhI3
zEHTM3@L6OTO}9T>jfpouVE{#GloOG5sxN<y9A$$>u!P5tX?_CvMQx)Am@hpsU43k}
zYPZQBz7I<e)tH0`hiv+a^0{?M)_vz=Q*d+2CJBq;NL1_$+8iyb-6h8;&5M0mRWTpb
z4<7xCVD6|KnX-jH)|xfzVJqDu$}UXx04j$NXneaWLfLf`Vbfa_Qg~v1SW44-WUr%^
zEP$cafpZiiKh}HgIR;sS$&7tN<%YEhfs`6a$Ms4lUow=R+|&qPA@y@FSF`nBi+OUn
zLV5p5Wk2ecOYYp^Nw|^&dBqk^n6=}^o*MqQvO;39fPoo;Otji1-+kW45V9z<@6H?>
z3of{<P}rJH6hqx@W&G*NW#{=Hy9*|EK@gpa4F6%ul%y?~xlF-cnn&ua7SU2KA7NOj
zE1<ua*un;6@u`4_=a*D^S_$w+*wFBzgxC@^v+Pwnr!U{C3qx<4&nuot)iw&zo7IF(
zj#;i44ES><?G<iDjyw92pHP|aF1V++J<oBD6(tg!+!GG(4^7@%FNP=l0z!Q=z}dY%
z&pqpRUUygi3-h3^MUsx47!P;@!#*ti9|NLpZu^-MDt4zk&id1P+Pr{ClGOpHyvdoU
z5bASPEL*96)Pb)Ns~}>=oGWvJ*F%3?Rc>md&i~AdY>@qa<P^Nn53nfOxa&x{blRZ&
zB9MR!*t%h-%!FUErof_rcagsBmXXt6^GSz4#MfGBm!(N{w8$@7qg<DRm!v#0w(|#{
z?Qr<{wQ-`$BEuKpHQF=#w%Zd@bG*!heI6S~1b$(anzMpiI}JGDY%(6Akh}aj{d+}(
zR~CFE0uO1@l6KhIoUCfKh6dAY1UoNG^f8EjgOEC-HNUC{JoC$|dS*|6VWd5!!1;*V
z)?2N6anV@s-Kp&F0S{4WLcQFP2=yGbPYKl2-AC`XKuNHbAl9YV!j2@Ea7YpBbnX;A
zqqGvxY8*<t2X*C#;<ug$*V7$jTp5h?PGjgH2*yDtkM$edwAIf1(@J=SqzwtsfK}<+
z22M>W`z4zuwebm48MAz~>(8Y<EpT(le@#edpz8!7V_xD;>_EJ~5I_1kQvTpe%G>to
z@7KSDF9U(-50|{zI~Aq}g+5~eiv{BDV8%{W-C9$rj>J5_X%9hFIgRfH1$hZ4zYJfC
zzuv^k^^Wc4>@`UBE?dAQGN*bDp}3vJ$RzWz_&2U`^ge)f;)nHILYa5K=kkWFE|98k
z22?Jbp?-9nle9&u32u?tT?3wc+n=q3nA=$e#{8++^x??Zo~j(%tv%Jpr-!<g=~V{1
zk5+UpbTy}`oQGn{uzX4TYC)P{<6!7rM{^Us$>4$@&$LvPcp-<PqnKMHuBI12a2Y3Q
z`jPu-BnZd6JhL`$1T~p2FcZSWHnt1Ja46QwiS-jmgT>=jH&SSC#@Eb4WUHeNB`$}g
zrDnPg<<r{d$SE)SwBF{Ej`AOGoO)SKv7TFC<sF_=9SL(QBXGq`=&i*H=K|Cf#c=gQ
zLj8GR2ohYU^`K~ElZwPt%BcN!Igcb+Yf_iRAaLTJu<2YG=b^k^BOo1CvUkKrx;nzh
z#I3Pt{I+xG*?l<MA~!17Zu7FvR)K0q@Zx8!Cn>Wj<@5dBLEfrTI6OuZ!Y7v%vb5v^
zpZk(){UM7dD(Q1ujM&(&`0__IaS-ZTlO=U@^_Ol)qCcsaaR;j-H9bB8Ni22TFxMOn
zXW&`yZq~3q?0$P$`!>p#K4YgB7}nm?9udcdi}j?tu@sN(+V?GAWQ{?mvVCKeazu&B
zl07qGBs(l34Z4;(2oNvgk;cyA`wBhmquhj@Uu?PJu+QbNfK10mE@%#Za>Le?_;HJ$
zx5yRm*=@!3R*yGPlp@&_+cZCKBgkmuZcVvqY3_J=d5im&=lcwOlV(tDPt@xCTdXCX
zjjyQ|fvu*MOxGkVoZ?!NOwv`U0|@s4i%zZXOr`))oOmV|m;n#MH47++H$c|_tr+-F
zL=gIGa~6Oj`FW)Rht{NAqRRFFKSHkVZR@D-*DSnCDi7F#k*RsY_Vgnmr+KpFMxMo9
z_03xUvlI;^qOc5mdiCOmxp;O7NI>e*+0v#V5wP*HBBIR}5wrgR@Iq;!4yboTIL$a9
z2eEQO`USO+;U~s*GjZ=KA(=xb^~bPBK8}i*%6b|N`{u@t2D&fp(_G{m+n}*QgZ?JM
zFYEHm_=UW&4eV{6VwbvMbDGqpAmIrDYM2Fuw*A8yGOjEfzX}3+*_T$%4W3DZ)w~ts
z+x)`kAl~m0h*WH=(@EFX3h$KV`~6w1v$4j6uv6nAxvql=2O8u>@KU_({g1H}ryjCg
zN>>Lu0EXRWw^KV=&ZJ~T7$1rxW9sQyqW25(B)MZ*nWDKaPOTm-RYSBsvCY}`Ow6+R
z7mc+pgf?teGfp+5Fo|?IDzgDNY3PAS?QZ(yM_JP4H&F!oK<1k}e&xfZ+nPI8y13wF
z?}3POC42V1-35>`BvdK=o?KONxM0d&3qn@>zvmm!<9cO?z8&TXtFC636AIj2q%42X
zUYE_peTV-NY)b+lZ+c{qKBRpyEs2C;8Q-x<0_E@|VBq!Q=k-*ySEKFAHv6n7(Iw&+
z$Uloh)Xq{ie?}~y$X|5@NblY^%Q`-l{j7xVmr8~;EoJ$cIrRks))RbkkSs*d$wy;g
z_F8IN1g5?7)r$aK;~Bx{Kkgry$ZBj-VOKpB<QP<Zmj`?C9sp@=5mfz*!;C_+0ASxu
ziE?&ox2)!sokaRXoRHp>)P3CWL9PgUG(6Q$P5(mitfsf|$QDxY#|6VdMOR*@((!$v
z?hXXB9+IdBc$V$l^;Fv?;VbjuO$bphrvjfR%8{j7G&at!8K_9t$-tKo>M6>LA*uca
ze^?f^^ppmk{D>6Gl6u7awg_yyDqJR~2zmXTfoh}i5^6`v+J;{O(U|TH`1SD*c`CTH
zOsvrz!WD}6^9krB%6X_9@jEsX@&xh4?En5-`5oIIrycJ)<w>speiNEAbah2Obpvgn
zJZ`kzgdju>kz~D~7LpRJL<H4_277RQSJ$)|l%NWIS;e@qmfg>GF3_oAI`a24%7@)s
zRJdJ~t>F%+F%D^9h+4@1Fp0T!#N0#Nf&56<Y*YlVwv_R__!PZ1FUMCP3joDuh5xFy
z%U{tu1h>p~7OR0!==X9IM*oP=*d`vcTl)m1Ifv-AwoIv5C=CZ`?b=$wq-_`-LxJd2
zeKL|H8k7SY4?D*+ac1no+`;#J!a?}jz)Xt@twqfrz(oOuP3zlskhrvJ3Ll*Mb5w2N
z*C1kOZ}A7j^%0R{<(iwHpQmZ<Q(?Hoqorl5_Om~__hLH(YJ1bp6k<GWUQK|#)Y^YB
z!etR3t(f?G;*G_GWxcQ(Uvd^(ZyfIC5;u(ehw5hsbw*jVv=TiCaQF{BxDVi37Ts7O
zaJ%M_wQYJ*gs8dPCFuCP{Rs+R4g2Ev1&thD;&v<Z&cTj$3&s7f&7lDL(b5Xp@`$h4
zBFDLQK(Em5`O||Rm;szx#UZ7bnVE6M{bwqe$pRF5m=jborP8OgX}e4W?*^I_fLyR>
zu8g~zc7z>%8EG-liO`ei-yLaF>JF~@N4IYYdQGnLdO&#GW}U-vEES;eJKLRBbkxRn
z`Zgrsx4DhxIjqWfY4auC<+OTz^U;lV0MRxynYRZ>1){x>T30l+F099~0alYsy;7Vz
z^1sN9JNl9G6wl0S%9&m&m>QbM?3SG#Gr3bWwzICXW`485&Q6B^H}&|zd^@zYJ8hM&
z6(JX`*zNLCwXArzoDF=UwWc$?&4ru8H<O_{c~;sE0t3VF%|&S*s_bLuZtoaL4iDzP
zpe>-&oaWVBLtHgQb|w->l!pK(?^<GV9-%4)L<vEtk0g$jh$fp52;>e)Kq`X{Fj}!;
z(IKV+V(ejC!=7m6u)vtad3W&4#+>u4e%?M?kwzm(&>4v*Pi+pTIDDC{+8491Ndu&^
zoWt-~V2P^7oQ0E9d~N+cB;1Q_Z6-Z(0_RY>By$>y!vKn_2wPcsoDCXQ?<JTJ8XUl!
z0D1gjZN+nx#K~UriNOj4C{iXMgXj580f-wKk)B(%2w8Ts<YkOS1BG=0N>vA}hq8_f
zLxX(hB4lcj28IjbTcT~^YS|~>Qs-8;oJeWq+Lq7^Y~m)F2_j*~{10r^>_3ppBXs0R
zWe)`bE9H=kyFi^ebn}Ggf2aoYJk1jPF(&*f?Ej3FAXZF5lwffAoY}%k%)Cvz_FjI>
z*a+vy?8$_E0-$eIP=v5=_*ScT_VbxV_3yB*u8a7<nYKk#kOVy(Q5tR)&THhRM0lSU
zEPXQxCNeoHi+u~cYj2oz5!299esR37$rN(brOr`%9!Q1;nt)-PQ|zGQFW}JxzpO53
z)t+KT<L~YM|0e64gcyx!n1fc<{75uiKH+W}v-GA(T{<i^`s=NV1?K}sCj+atlj=>~
zQy%1L&X+L|@P=)BL2zlS<nac1z-v(DEY3|%5NPhh^iS!>d5oV3Ee-T({9J1F;BNgS
zaX-f|Y8Tv{#&6>C<yjZ}ZscsOmB#(PQ+JliQ&v)yFBh-^{rO4<pdy_ux!(y8v-X_6
za6sKL2OnDv6bR^jO99QTbpDu&V!Wz@bBn7I5$1N)t*5l)G{sIEmm0Fv6N*-mwAl^`
z9CjqlSXfH?&1r)vq2e3)J^-VhN(r5p>v-Suh+l!3W@HDZ0mRyo!hyWE@y#>^WN<lg
zi#ji(YXHr$6$|oC`|GpEcUot~jHMF)`LTR(!9}@2nC&+L6D{ST$46|&%(sCIAsK`r
zAH0_8^4;}rIX?e_?gH<cKw{almeGA9gri*6+WwC-vp=A>J|m6?&C2}lk|8rNX!QOD
zmMCmdB+7yu&QEXbp8yC*ON=AJQ}Ja&1G3sA*4Xe_^yVm@hgD}E_R{GfDK)*toPBCW
z=NW1A?K>0}nj-?{aIa_v#1nm@0RTSW%VFV>mTVyBUgo5LQwcl~d|hGp=ybmrBB#W4
zXl<V60L$_-eZC#GRh~C3PZY6Kb7Rn<fnP?s_ZQo`rLc63r>`l~9+>cehYXv#<h^OS
zL6HpM%ocFu_%*8;Sxyb=f-2w<OzPH(uhSa+Sr<61jN|vsVL>b$yU4r0GL>rj;y~&}
zTMF>sIci_%-WqF<Qs?$j!_6|8>bifx4M8Snb|$J-mg29QcY@psRaDCbeCDp0fR;>`
zB|KNDvu?_lV@?7KL)n9Cqw`BAl&<u4((s$XBJ6%D<K||cdl1JxRyuH_J&_g!F{v!V
zI5SikOmv=m84DD#Z{5X$RTDA;V_X<fbbNW>BPU?tK$46K*Q1XP)2oIY+Z#~FDSFtZ
zsgEFsGaC+dq_1{*nojjaR6#H|Me_=H{u@{Ng-k_@c!C)<Hv_H26T`EC;GobI0i^#1
zFlNh<ASok}2j@X=aWhOFi+}e~=JiC4yBvpPELAm?o_+gp1TB1jkCxb#Yy7Vt&$1Q;
z5-ZfpUOGNQE`pP816xH>p65n?uS>YO2FwPqz%ns!871!T#7CTbodeIz94E{hmIY}|
z#$j9s_*PgW0`KR{^@H;C7;sZ>rp1VcZf7HD24I%iZp4H1It@D~#HFOb{1Pi%mF#e^
z(Sf}zrWYuRF#8wYGStYC4#3xs46o?8S6<uz#!5wiUe&mx7?ZmqVU~u;5dxlO<Rbn0
zYO%Zw!o1VXr=&#hHT{g*w2)ZUUk--}p+(bZqsn=iRxw<I*NV|oz{pDRcHJ{p^+y!}
zfbbc1ZvUAL7q45zE0FjYZ@zjVd&s@3X4>svWLuAL=|1-@3;l*3k=-}*6CJ6u{ROR0
z-84w0t!aku+e`djC{zW~G430O_5zTnQdQxxQ3Ta=#%j5*U<SE#$~$Ayx-MMp;{j-g
zORj;nnqf!Hz?5^)hsKIO#~dL6=L!V8{jP}SYDj+3g#{vmi)eAb4P4;v(SR<d(p6^&
zahgED-HoGH`B)5qR~B&TtzFHQYiqTacVm)=z#l=G>7rz3Nx0U?YEFfmWacMEkJkb$
ztBuxlLd_nb1MEMsXlnqhpX=!An*m}E<slY>|0iGU_~Uf&Q&y#QD=-<mlxifyED3CY
zI1zVth6kxUhK>z%W%F1<!N^%H4z=RPWpPpuk3NiDjy3frbPjodN5*mW<{D_HRqwh&
z(DAb%21bc=N;<LtQ6Xn`**vEcBziAH=`>g3RO6N6EJh(lbBw@f(Lmn6xcq8Cxm=(`
zhaq7MY{O-l-EWW6RLdWCz#)OXAR*r+UCc)7<Is^3NAhXvENUCae;uSFDdt5~!Gr!`
z`x6|$D`$hD35HUE8P~=F)ap9j(4#EP$Gl09wKITY`A7+F^|(UxfKclHEVSa!Qg=*H
z9Qqa-6!*W%?9PJVjwJb?9DNg)a)(?9&M(TFmn{YK7}oqJyXpoIF<Dca3+4q;yuVfy
zFFT>caGE#3rSZVUTsMm;&K_?;;j4b%P3>#B0yF-z+88po2q}#DVbYi&(Oe7@7ri73
z^N@4^zyeo2+l)ae0{+2`hB%%t_mh8ed@HwQ+)emtj$e|VOy!^Xsk)l~=1o@`JMR&p
zCG@<uw7^@3(eSc;9kjk2Ra~1N)~~YQql$HhH1oS6E1fZrHS2zu936y>ws})m9`_Z`
z=I;=6hT}o){c@P!Jqn}bbpfg22-k~4-aX~FqUC&?x3rO!Nq{-@8gYR6;4JVtoD#!z
zZq>K!Jw48r)9inh@^B845PCz{u^>6TaCb@{uk)uUQEo(!3v<okrJw0S9!3sZVi{0}
z#laY@nr2FnbT1W)K$6jn=g@HV{5sUcD3CZK<_+Tf4)ggaM6)F|NAr;rfiY*<O4T&@
z+wWcFSqqQuj}}`4Z*sVrC5lGHFFf(MwYUKbMZ$}zXF%;#IF2q`OZl{`ubg%L1}7)D
z3(f8Ir!T(?9u4n1vmSyl#LqE7al5GokENhYgUyp;S@wfo94-r$mzwbeICg97bg%1?
zzk8WrulxHiwEVa9Dl5&6>&xixvG`ym3*786a$0Ssd6P_qc7UIuJU4((uBmxs%$b8?
ztgcO-rU6<Iv!aiuMAMe^$5ZPl9^(K)qia>wax?gQ>>Di`&F%<2R(U~UFMWzQJ?vGr
zU1JV4$?+!rN&L!o(8^a#g23ph{{*L{GXDm)YXk<U#f*dcIj-5i(jRB!os8glnYj(!
z`hhL)-jMy?F;~9J4N9nK6$R-yl;jg)Au~J}-FEBRCG5&Z3`^*lL1|w0-34fcV;g<;
z15DlD$g*o{5ld&rVoln*AX$fLezJ9gt-)hX)mE;t;n}cpj7{0csDI;FzrU?9q9<B@
zl_d5QYQ{p4=Pil2urpI<n#M$6M{eI?><+cV&b<a=?}yheaM&@K%XvGs+D~rfLYv{N
z8DRKXvykh7;1bOAQbtZA@O4tjdcFf!Jy?p^J)!ipkzBDpB)rB9(PYQK@%IU$_K7+U
z-b1lY$pGkEufj^MY+WUVOeSM~@(AqAUGTHr!{jstptRSwt+2dd)*WVHf{Tl)%yDzd
z<}CJEGwoIa4aVi=6nP3^jhvm^Dy1DzE>WaW`bo^=0BuebR`kAy%=x~`gom#&=B|m5
z`qf};;ELo6uo2@t+OjWPaacH03#@_pYpEj5(r!!EdJsREMHn(n{^&g+RKX`(=571>
z3*4nW801sGZhe9NvvZC`V?n;)h9)%w;GyiSePJcy1`$6Vu&bXvmE_Kn1(i1)qp#-{
zu#k{#+y`|P#IqZvU-B&VhGyyZ;{7q+-mS_le~BJJ_Ne6_rvsg&NaC~{wF3WM*q`yx
z<*-^_Fx-ECk*RjM3#(AY>=zmJMgH4?kqS_#Mb<VePatld!lZy<GNGPMOJaisX1Vxo
z4eEyZh2%q`7=gnK=^+b235#}L^T^$?y~T|(0|lL5Za=ZXRO~%A&Uuoi>BEz<Jh3v*
zymtREV4H|;O`zz%B!d|0kZ@NOT4i!8HkMQ%?;UTrF$sLgRCA`^0{B}lwq!ss_{|VZ
zzEF=d|HQ>?!>yb+Z8@_9ZKxdhK)j>|kX>GlMfM*y1OLN?FBp+4mJYlK=*ztHxhjQr
z;DX1f7lc$+Wyh)!nm!$IXr(|)qG!Jle>`M!o<y#-vl=qY=34tHpZ_$o!vK4Td>zc;
zQ-y)mStI5n3|CTmtNko19P6)08&hFC`p^o8terFgBOU{^hgcFzeiwGaj68-o&V`l&
zotpr{o$l7eYUH7NbrD#Z1TV-w1c+z$TCMH;k~crSAnS6s?7uZ1Lh!uWXh*(nPfawN
zjQJ^qIu>uyQ&dPXMk1jtK-ts?BDwkNb9EJgs7CLrH?+qZo=~**Q^EJI#H0x|xL|PP
zV3{e$m$ZS9I2#{<-Uj~9TC;Enx>dcQzeH7xf{yh}Pma8s9i!mcGU<lz-lRwJzSRM^
z>I-DAIR#+6U7C7clHMR9J`je&g7<Grbwo%<2xKSCa`F(ac$z=I)9*Ny=KKh~qGAb8
z6ttYC1~@l^T_}6~<gedc2lPGV`C)F>mK!#d37ou&BaT7F1ON6((^Ue_eGd!EHDE`L
z;He`g`l$XaRX@qJgdy1u-P<@>B5fm>o9s&TjG>z4gStKc4rIwMt_c$_7wD5GZB^Sk
zq8#r`#&K#8DV{#X7+#$b?HVd=flTf)?juR)BF%bOpS=irmjdUz&`S;1nP88a(T^no
zXcM^gv~QQx;xr9H8Nt_YJsJ%qK5W9V>1YFBU!qk}q4s2TJvmOfLiu`P!YfNz!5383
zkcccx&ZpU9+cz~zl^0gC!QRd&)oco|5biL7c9qPio!;WDOKGT?ybLt#x8@@60iS%S
zX(Ed9mK4Ya1Oro@<CO>Pm;E9(`_a5bnD<O4v9ouvxO?tCup1pHPgWE2n>-kg+A1;h
zg>i#q#5Is<i<y|snavoHKF0!DfcF?f>sCmMn_a3Lr-8uOV#5-$;w>IdAF`6-4M%JT
zaS=!JPz9!pgkQbzC@nG%9ePJCiJ}&IElQlRFOIG(?OT<}WR2N!Y;MxZ-{1z84Ww@f
zePUD-s0>|5_-OH>2Z#BeP$;%DoR%Aw+cS=(u>}bNA_>|ONaijG%Mx53x3)|ekv)r*
zmZKFqF_W>pHzhQRHP+7SCcgRui8&&QNVxqh7Dxq9Q@l`L?EX~M(@b$?!4Vu#*9nMS
zY|Zd>U$H$ln&7PIjV7R3>^Xevv(X;?;nHedM;IkI(^YpcHClEq=X%bWf@PLN#9K|9
zl4jIdx%Wu=t_8o6HN@%OOtG~J_2gcKVZSxxW@Tvn$1a^+V4(`;?Qw0?spN+y6@}bH
z&PkrrtUw~I3S^swp$x(}Mv>h{&afJ4as?BUk)U1Xg}6S{TqWrVCnfK3>TvaJS%S#y
zgFie|vnE2gvjHTQ^{;|m084L%DCxbZ`eI0}2|k8q5WxKaXqE(}SSn}<O)AO6254N9
z5oTXWoLL%Ph2aW}CqT$!5`u!2*<n=cw!%v~ecCJ0q8-7`QMm~yo_37;M+N7A6mx-}
zmF&)QcE@+9g^z&7x3=9Il)gaSyeRj07HIf%yrgSi_HxJdv`}M{ZVA~&(Ly5LT3TXH
zIt)>D{C(fZ|NAB>lIJB-j5Ob%>}K!Y|KwA;6pTn}+ft-UR;ld5@yx~3#3dxYw>L?0
zQD*MX+E2Wr{sDKT_;*55T*guBLDK$2!Njt)SKGwdW{#1(;k2V9MTzSs_?%-O#XXgs
zCxE9KjTm2uH=hg}8jkz>@(dW00Fp+ZC;h{3>U%LILlYSg?}J;v2HGxY!w#qH;biqO
zd7XdIynnt2A<Z_HZ87!>Farb|zK^*@68<gOl}}jv@xr+CUMx)tKr>30W%Kf^6sUgf
z!0Ni7pl4lD)`h8X*v>pt))cAQ1PGbTg)G?x!u2fMGhDPwSMS{DLo|K~)or?@oWTl-
zlpNC7Ec~gg4*D(vL4zX1g!mDtFMYeL$rf|CdJ3{(EwP>HqLG51$|uFo_2=e~{}G~%
zAWH52-~L1N%Kqtw)403`GdF?tbVgJp^;g!mz~3mVdhR|~g|M@UI0<;OuUv+JakX0(
zkIvI$(68W47-z!vW<dGXP~X@fTb&Al^YpfhV$f=>=zi%thgm%zruV%js(<L02`bAv
zTfNN?MRkA9nTIi>HjN;0#>UIMTS?1)uo9tmTjqB9awPD9aOFPGhU~MK(xw{f<-zc8
zlY=6bIvB#~yO>8)zU&hCyCL_FPo;!shdT4}SF`vkoAHSAo~D3%x(w7u=1NR^$H#Tm
z);Ra@*;)NHP$?@TsPT2{#3}spgPaSgd{jyuk%z2KCVOGk&lY7l@QP+eC>$h8GNQE$
zPuSd)S<Ik;1$z6D%05JMk;Fd+avgeBdZuuU$nvc!F>8L3+)69I*cCj<x-zU*6fPve
zsr{S>z1xEif|7~2#n|QLE|XEYk_7>wtreogAh)xtq|vfz3XC*)$xUCBXL8^gMrK;c
z(>=?-oGZ|#T<^h%A&s6frd=wTcgf)n%Ry&9+p%x;#s))BtHx?ShOFcM=H5~M`xBJa
zSLdlv3_Dx#94G3B*U6o`W8mkBK%468&<X=*c#QZ<mm0T+fM+i4U<bx?nv+(aLHU6o
zYk4}%>W1kkJ-ZQCiwKOaMujrACfdQFPb3#>&3N-Bgu0iKtK#2rTIiyd?3m^s;KS;K
z!WNo?(Y)bU)PEG3b=6~XMz&ZrjXlI@xm~pv@Q=J8Xc6=n8ZK9}WFaSwuwI6`(ZEy^
ze0J(zLCD#zT7H}8$hqkh&hmHj*A>~QwX8JtdNstyQQ<W00r${M)var7QrF+Uq1DYs
zDt}jUt`A86!2QwCsdS3vd{es*^HY9KuP>)qKV|3B(aA}_!JpTTGnc~|#YW`Ras=SJ
zTBHguYR*BTx|pW)CA;N{B5JUY54gi{nO-qe>C~EQtPhJY@NR;-%JRR1;<mDQ*Ps7C
zvqkZmKtwmZ99V|yyMxi1g_A{fX4a-oF!q*L5@kuIGq1XzBm<;u&xcY#P9Nc%UA%B*
zAW1IxH)*7Bf$qoZi&}RX#~j5wzNcz|HUZxn$ycLU2v@?uj`VG7k6;YN8O-EvDBivN
zu%;UL>C7r^Na96@K?cvIG!_7r36q|a6sx@uA;>*CZ8qD+f4X&{847U|Dz+MpOOCvf
z{9Lhs@o<Cf+TiW&@keSO2y2yZny526gb->KSD&q41(eE%SjU}cXBzB<Rq${{yJVh@
z%G>Vk)b7DE$4O=eS;xL&nGH&H|M;(d0a;$U$%(A=Jsu-`nlb$yC+m@umt2oG(IjBc
z-?&m8S9>4oVG6Gwi3QuECVUXq`Spv}c%^tI4~`lFFd4B2`(l$}MdW(=mZB@iSFWCu
zAxC38|MxINHQS;Ldig%5+qo3x)zJHDV-f~~YQ8tq;jIypIFZ|oB)^?W{$hkT!B-FN
zcU}T~#dtKm#ea-o>xPn4%9F;|&xr~Lq;e;NH~ue-62FEDUoOjem^$R;%G7p%XykZ!
zXwD<s6Bb6wa>3At0GqEObPf3U3?2NXkrobdqiehi4^<vM%*bL-ohIA7lgekUl@8G0
zmP*~ywZ=A*cK#<@BTN2B|E9vw5xV@oO%MYjzJ8YypeP-bKExRN#?%pSL^}_nYL{6V
zzRbaN(k<cLr*YvE_Kcp@C?)j?OebObTrCC!BiE{D>141|N?D6KU5Tki$O-7{tyG7L
zwfTc5rhj`-uBHhXI$Z~~+wQV^ZE`{~N9&iM1Y85|-Fcr4(1@{)&1Y#M;J;;lG=e^)
z|A1_@f=6cdIVw|X<@7UP=F!UjXTId@z)!Z3(NfwrM+lou=Dat~c_-;ec9UTOn372t
zfk7K*aFeAwj%V1XRUiUyp$Ef4AOrE^7##eZNp+l`8^H3CB5264FqRU9Gi`$`e(8Wb
zMMWc5;0(4y1JTu&(%0+Fv+rhm7jt8dZBkgzS5C^b&4>z$dP^8LjG$<P*kg^J7K8)h
z-d6V>pjwlDe^3iY+VPjR^C-pDmQo~(LfAQCPJ+vsVcgXIy63bs?Km6^xkf?s?ZF2O
z<k!S_My#=cy!e}$l$srKfw(FpX&>{%jBi?--Txg;9o_QRT*Cs`MdULC2*U7JB+t*u
z*{aG&n1im4_}NuyK3dgCKd2KJ=NVOE9~*Qr(3<I@0i!AL?C;OHQ*r&;MzRt!UV7ch
WJ^V>}4^6{gFAVMRb-5P!&ePv(%K_j3

literal 0
HcmV?d00001


From 793ea61ca21e64367fb5485ca79fd15ba306104a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 13:10:53 -0500
Subject: [PATCH 0636/1208] Travis: add executable bit to build script

---
 .travis/build.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .travis/build.sh

diff --git a/.travis/build.sh b/.travis/build.sh
old mode 100644
new mode 100755

From 960b6d5f575cf66311d2dae91555cd154b526e43 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 22 Oct 2017 13:19:02 -0500
Subject: [PATCH 0637/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0a589e2c3..6830531ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.66.1-SNAPSHOT</version>
+	<version>2.66.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 0e557a7249fea72057f559b0ed5ea13900981f79 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 29 Oct 2017 21:52:57 -0500
Subject: [PATCH 0638/1208] Travis: only decrypt if vars are available

It's too bad that "travis encrypt-file --add" does not guard this.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 92295d68b..a5b33271f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,5 +16,6 @@ env:
   - secure: RuGzuPrxyvBRJwsCpSJ10p9PdP2Hzc9lxb29L//Y/Fkc3bJwNMlNa0ST83oGNHJapYc4dWuFk22Ooy/2YioNgsVvR4n5MAslqXQXSY0VDle1Nbf1pudAlPU+quaiYxcAyyysjUUtqc5wADVgpkrDA7GJzAuCOWb4aSwiiIn6u4A=
   - secure: bnsjVlj9MBJto8ahZdMwGpVPjZeyF7r5tZh+t+NhDuZsP0WMlURzGZ9/lJOO4quklgiWCyeVDB5uvDvsdG9BReBe5Q8Q6WZyxhxYtP2iLV0zRWSWsGKk0stGcrmJKk8wbicIJdXD8suiP+2Li5GfxTge/hkhL4CL0OOr6b1JqrM=
 before_install:
-- openssl aes-256-cbc -K $encrypted_d2fbfc37eea9_key -iv $encrypted_d2fbfc37eea9_iv
+- test "$TRAVIS_SECURE_ENV_VARS" = true && \
+  openssl aes-256-cbc -K $encrypted_d2fbfc37eea9_key -iv $encrypted_d2fbfc37eea9_iv
   -in .travis/signingkey.asc.enc -out .travis/signingkey.asc -d

From 309029a1e9bb98a67395d7a982a305e285b23c54 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 29 Oct 2017 21:59:59 -0500
Subject: [PATCH 0639/1208] Travis: remove apparently unneeded backslash

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a5b33271f..2f772e309 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,6 @@ env:
   - secure: RuGzuPrxyvBRJwsCpSJ10p9PdP2Hzc9lxb29L//Y/Fkc3bJwNMlNa0ST83oGNHJapYc4dWuFk22Ooy/2YioNgsVvR4n5MAslqXQXSY0VDle1Nbf1pudAlPU+quaiYxcAyyysjUUtqc5wADVgpkrDA7GJzAuCOWb4aSwiiIn6u4A=
   - secure: bnsjVlj9MBJto8ahZdMwGpVPjZeyF7r5tZh+t+NhDuZsP0WMlURzGZ9/lJOO4quklgiWCyeVDB5uvDvsdG9BReBe5Q8Q6WZyxhxYtP2iLV0zRWSWsGKk0stGcrmJKk8wbicIJdXD8suiP+2Li5GfxTge/hkhL4CL0OOr6b1JqrM=
 before_install:
-- test "$TRAVIS_SECURE_ENV_VARS" = true && \
+- test "$TRAVIS_SECURE_ENV_VARS" = true &&
   openssl aes-256-cbc -K $encrypted_d2fbfc37eea9_key -iv $encrypted_d2fbfc37eea9_iv
   -in .travis/signingkey.asc.enc -out .travis/signingkey.asc -d

From a00f50de7e84b3d04b9529df839ac92043d2652c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 30 Oct 2017 16:17:28 -0500
Subject: [PATCH 0640/1208] Travis: decrypt GPG keypair via travis-build.sh

Rather than having the .travis.yml declare that it should be
done before_install, we have more control if it is done as part
of the build itself. For one thing, we can use if statements
without being at the mercy of Travis's YAML support.
---
 .travis.yml      | 4 ----
 .travis/build.sh | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f772e309..b3fcda211 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,3 @@ env:
   - secure: Jgj204N4hKv+7sUrXGtXMvUoXYuHAerhUvwbHsm0BJFpzUSyHP5QWJH2tHvCUL9Yb4VhNEjc46RLFVmiIXynJwAdAWJodT/VEnOTb5Cf7+0UHK4qCyjyjVHiWq1cf+R8Lr9fuKRqxUAdz9Hw6g0Yt23TX8kCa+wQW9lwchn0IG8=
   - secure: RuGzuPrxyvBRJwsCpSJ10p9PdP2Hzc9lxb29L//Y/Fkc3bJwNMlNa0ST83oGNHJapYc4dWuFk22Ooy/2YioNgsVvR4n5MAslqXQXSY0VDle1Nbf1pudAlPU+quaiYxcAyyysjUUtqc5wADVgpkrDA7GJzAuCOWb4aSwiiIn6u4A=
   - secure: bnsjVlj9MBJto8ahZdMwGpVPjZeyF7r5tZh+t+NhDuZsP0WMlURzGZ9/lJOO4quklgiWCyeVDB5uvDvsdG9BReBe5Q8Q6WZyxhxYtP2iLV0zRWSWsGKk0stGcrmJKk8wbicIJdXD8suiP+2Li5GfxTge/hkhL4CL0OOr6b1JqrM=
-before_install:
-- test "$TRAVIS_SECURE_ENV_VARS" = true &&
-  openssl aes-256-cbc -K $encrypted_d2fbfc37eea9_key -iv $encrypted_d2fbfc37eea9_iv
-  -in .travis/signingkey.asc.enc -out .travis/signingkey.asc -d
diff --git a/.travis/build.sh b/.travis/build.sh
index e939b6ca3..094a570ee 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh
-sh travis-build.sh
+sh travis-build.sh $encrypted_d2fbfc37eea9_key $encrypted_d2fbfc37eea9_iv

From 4f9717f6ea7613dd96cfb61e3988afd2e8bb21b3 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Sun, 29 Oct 2017 21:16:00 +0100
Subject: [PATCH 0641/1208] Avoid displaying welcome message when running
 headless

See the discussion at http://forum.imagej.net/t/running-fiji-in-headless-mode-inside-docker-container/7626
---
 .../java/org/scijava/welcome/DefaultWelcomeService.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 725b7d9f5..72731ae3b 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -47,6 +47,7 @@
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
 import org.scijava.text.TextService;
+import org.scijava.ui.UIService;
 import org.scijava.ui.event.UIShownEvent;
 import org.scijava.util.DigestUtils;
 import org.scijava.welcome.event.WelcomeEvent;
@@ -83,6 +84,9 @@ public class DefaultWelcomeService extends AbstractService implements
 	@Parameter
 	private EventService eventService;
 
+	@Parameter
+	private UIService uiService;
+
 	@Parameter
 	private PrefService prefService;
 
@@ -127,7 +131,7 @@ public void setFirstRun(final boolean firstRun) {
 	/** Displays the welcome text when a UI is shown for the first time. */
 	@EventHandler
 	protected void onEvent(@SuppressWarnings("unused") final UIShownEvent evt) {
-		if (!isFirstRun()) return;
+		if (uiService.isHeadless() || !isFirstRun()) return;
 		eventService.publish(new WelcomeEvent());
 		setFirstRun(false);
 		displayWelcome(false);

From af154d46cda13e2772e7acf4231885f797573bf0 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Sun, 5 Nov 2017 14:42:49 +0100
Subject: [PATCH 0642/1208] Remove workaround for previous javac bug

---
 src/main/java/org/scijava/plugin/Parameter.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index d2f84472b..3d0f14077 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -97,11 +97,7 @@
 	 * the user nor included as an input or output parameter.</li>
 	 * </ul>
 	 */
-	// NB: We use the fully qualified name to work around a javac bug:
-	// http://bugs.sun.com/view_bug.do?bug_id=6512707
-	// See:
-	// http://groups.google.com/group/project-lombok/browse_thread/thread/c5568eb659cab203
-	ItemVisibility visibility() default org.scijava.ItemVisibility.NORMAL;
+	ItemVisibility visibility() default ItemVisibility.NORMAL;
 
 	/**
 	 * Defines whether the parameter value should be filled programmatically, if

From b85a890df5fb9dfa404bcfdad739da0a607afd60 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 7 Nov 2017 15:40:24 -0600
Subject: [PATCH 0643/1208] AppUtils: recognize target/test-classes, too

Otherwise, base directory detection for test classes is wrong
in some cases -- e.g., when running a test class from Eclipse.
---
 src/main/java/org/scijava/util/AppUtils.java     | 11 +++++++----
 src/test/java/org/scijava/util/AppUtilsTest.java |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 332ad819d..6b7bd66c4 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -234,10 +234,13 @@ public static File getBaseDirectory(final File classLocation,
 		if (baseSubdirectory != null) basePrefix += baseSubdirectory + "/";
 
 		final String targetClassesSuffix = basePrefix + "target/classes";
-		if (path.endsWith(targetClassesSuffix)) {
-			// NB: The class is a file beneath the Maven build directory
-			// ("target/classes").
-			path = path.substring(0, path.length() - targetClassesSuffix.length());
+		final String targetTestClassesSuffix = basePrefix + "target/test-classes";
+		final String[] suffixes = {targetClassesSuffix, targetTestClassesSuffix};
+		for (final String suffix : suffixes) {
+			if (!path.endsWith(suffix)) continue;
+
+			// NB: The class is a file beneath a Maven build directory.
+			path = path.substring(0, path.length() - suffix.length());
 
 			File dir = new File(path);
 			if (baseSubdirectory == null) {
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index ea28c4f9a..2b2da010a 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -53,6 +53,8 @@ public void testBaseDirectory() {
 		final String tmp = PlatformUtils.isWindows() ? "c:/tmp" : "/tmp";
 		assertEquals(new File(tmp), AppUtils.getBaseDirectory(new File(
 			tmp + "/app/target/classes"), "app"));
+		assertEquals(new File(tmp), AppUtils.getBaseDirectory(new File(
+			tmp + "/app/target/test-classes"), "app"));
 		assertEquals(new File(tmp), AppUtils.getBaseDirectory(new File(
 			tmp + "/app/target/ij-app-1.57.jar"), "app"));
 	}

From 17ca44154c5ba4b4126a41656f1a79779229dbec Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 7 Nov 2017 15:37:25 +0100
Subject: [PATCH 0644/1208] DataHandles: Add methods to copy DataHandles

Allows for easy copying from one handle to another.
---
 .../org/scijava/io/handle/DataHandles.java    | 147 +++++++++++++++++-
 1 file changed, 144 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index f3c598ce8..d0494d76e 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -9,13 +9,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
@@ -38,10 +38,14 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.scijava.io.location.Location;
+import org.scijava.task.Task;
+
 /**
  * Utility methods for working with {@link DataHandle}s.
- * 
+ *
  * @author Curtis Rueden
+ * @author Gabriel Einsdorf
  */
 public final class DataHandles {
 
@@ -108,4 +112,141 @@ private static synchronized void initUTFMethod() {
 				"No usable DataOutputStream.writeUTF(String, DataOutput)", exc);
 		}
 	}
+
+	/**
+	 * Copies all bytes from the input to the output handle. Reading and writing
+	 * start at the current positions of the handles.
+	 *
+	 * @param in the input handle
+	 * @param out the output handle
+	 * @return the number of bytes copied
+	 * @throws IOException if an I/O error occurs.
+	 */
+	public static long copy(final DataHandle<Location> in,
+		final DataHandle<Location> out) throws IOException
+	{
+		return copy(in, out, 0l, null);
+	}
+
+	/**
+	 * Copies all bytes from the input to the output handle, reporting the
+	 * progress to the provided task. Reading and writing start at the current
+	 * positions of the handles.
+	 *
+	 * @param in the input handle
+	 * @param out the output handle
+	 * @param task task to report progress to
+	 * @return the number of bytes copied
+	 * @throws IOException if an I/O error occurs.
+	 */
+	public static long copy(final DataHandle<Location> in,
+		final DataHandle<Location> out, final Task task) throws IOException
+	{
+		return copy(in, out, 0l, task);
+	}
+
+	/**
+	 * Copies up to <code>length</code> bytes from the input to the output handle.
+	 * Reading and writing start at the current positions of the handles. Stops
+	 * early if there are no more bytes available from the input handle.
+	 *
+	 * @param in the input handle
+	 * @param out the output handle
+	 * @param length maximum number of bytes to copy; will copy all bytes if set
+	 *          to <code>0</code>
+	 * @return the number of bytes copied
+	 * @throws IOException if an I/O error occurs.
+	 */
+	public static long copy(final DataHandle<Location> in,
+		final DataHandle<Location> out, final int length) throws IOException
+	{
+		return copy(in, out, length, null);
+	}
+
+	/**
+	 * Copies up to <code>length</code> bytes from the input to the output handle,
+	 * reporting the progress to the provided task. Reading and writing start at
+	 * the current positions of the handles. Stops early if there are no more
+	 * bytes available from the input handle.
+	 *
+	 * @param in input handle
+	 * @param out the output handle
+	 * @param length maximum number of bytes to copy; will copy all bytes if set
+	 *          to <code>0</code>
+	 * @param task a task object to use for reporting the status of the copy
+	 *          operation. Can be <code>null</code> if no reporting is needed.
+	 * @return the number of bytes copied
+	 * @throws IOException if an I/O error occurs.
+	 */
+	public static long copy(final DataHandle<Location> in,
+		final DataHandle<Location> out, final long length, final Task task)
+		throws IOException
+	{
+		return copy(in, out, length, task, 64 * 1024);
+	}
+
+	/**
+	 * Copies up to <code>length</code> bytes from the input to the output handle,
+	 * reporting the progress to the provided task. Reading and writing start at
+	 * the current positions of the handles. Stops early if there are no more
+	 * bytes available from the input handle. Uses a buffer of the provided size,
+	 * instead of using the default size.
+	 *
+	 * @param in input handle
+	 * @param out the output handle
+	 * @param length maximum number of bytes to copy, will copy all bytes if set
+	 *          to <code>0</code>
+	 * @param task a task object to use for reporting the status of the copy
+	 *          operation. Can be <code>null</code> if no reporting is needed.
+	 * @return the number of bytes copied
+	 * @throws IOException if an I/O error occurs.
+	 */
+	public static long copy(final DataHandle<Location> in,
+		final DataHandle<Location> out, final long length, final Task task,
+		final int bufferSize) throws IOException
+	{
+
+		// get length of input
+		final long inputlength;
+		{
+			long i = 0;
+			try {
+				i = in.length();
+			}
+			catch (final IOException exc) {
+				// Assume unknown length.
+				i = 0;
+			}
+			inputlength = i;
+		}
+
+		if (task != null) {
+			if (length > 0) task.setProgressMaximum(length);
+			else if (inputlength > 0) task.setProgressMaximum(inputlength);
+		}
+
+		final byte[] buffer = new byte[bufferSize];
+		long totalRead = 0;
+
+		while (true) {
+			if (task != null && task.isCanceled()) break;
+			final int r;
+			// ensure we do not read more than required into the buffer
+			if (length > 0 && totalRead + bufferSize > length) {
+				int remaining = (int) (length - totalRead);
+				r = in.read(buffer, 0, remaining);
+			}
+			else {
+				r = in.read(buffer);
+			}
+			if (r <= 0) break; // EOF
+			if (task != null && task.isCanceled()) break;
+			out.write(buffer, 0, r);
+			totalRead += r;
+			if (task != null) {
+				task.setProgressValue(task.getProgressValue() + r);
+			}
+		}
+		return totalRead;
+	}
 }

From 3d18d7bafca05e4698ef935f5db61faa89ef9c9a Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 7 Nov 2017 19:13:02 +0100
Subject: [PATCH 0645/1208] DataHandles: Add tests for the copy methods

---
 .../scijava/io/handle/DataHandlesTest.java    | 152 ++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 src/test/java/org/scijava/io/handle/DataHandlesTest.java

diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
new file mode 100644
index 000000000..4d2a9a8c6
--- /dev/null
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -0,0 +1,152 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.event.EventService;
+import org.scijava.io.location.BytesLocation;
+import org.scijava.io.location.Location;
+import org.scijava.task.DefaultTask;
+import org.scijava.task.Task;
+import org.scijava.thread.ThreadService;
+import org.scijava.util.MersenneTwisterFast;
+
+/**
+ * Tests for utility methods in the {@link DataHandles} class.
+ *
+ * @author Gabriel Einsdorf
+ */
+public class DataHandlesTest {
+
+	private static final int TEST_SIZE = 2_938_740;
+	private DataHandleService handles;
+	private Location inFile;
+	private BytesLocation outFile;
+	private byte[] data;
+	private ThreadService threadService;
+	private EventService eventService;
+
+	@Before
+	public void classSetup() {
+		final Context ctx = new Context(DataHandleService.class,
+			ThreadService.class, EventService.class);
+		handles = ctx.service(DataHandleService.class);
+		threadService = ctx.service(ThreadService.class);
+		eventService = ctx.service(EventService.class);
+
+		data = randomBytes(0xbabebabe);
+		inFile = new BytesLocation(data);
+		outFile = new BytesLocation(TEST_SIZE);
+	}
+
+	@After
+	public void cleanup() {
+		handles.context().dispose();
+	}
+
+	@Test
+	public void testDefaultCopy() throws IOException {
+		try (DataHandle<Location> src = handles.create(inFile);
+				final DataHandle<Location> dest = handles.create(outFile))
+		{
+			DataHandles.copy(src, dest);
+			assertHandleEquals(data, dest);
+		}
+	}
+
+	@Test
+	public void testCopyTask() throws IOException {
+		try (DataHandle<Location> src = handles.create(inFile);
+				final DataHandle<Location> dest = handles.create(outFile))
+		{
+			final Task t = new DefaultTask(threadService, eventService);
+			DataHandles.copy(src, dest, t);
+			assertEquals(t.getProgressValue(), src.length());
+			assertHandleEquals(data, dest);
+		}
+	}
+
+	@Test
+	public void testCopyLength() throws IOException {
+		final int sliceSize = 50_000;
+		try (DataHandle<Location> src = handles.create(inFile);
+				final DataHandle<Location> dest = handles.create(outFile))
+		{
+			DataHandles.copy(src, dest, sliceSize);
+			final byte[] expected = new byte[sliceSize];
+			System.arraycopy(data, 0, expected, 0, sliceSize);
+			assertHandleEquals(expected, dest);
+		}
+	}
+
+	@Test
+	public void testCopyLengthTask() throws IOException {
+		final int sliceSize = 50_000;
+		try (DataHandle<Location> src = handles.create(inFile);
+				final DataHandle<Location> dest = handles.create(outFile))
+		{
+			final Task t = new DefaultTask(threadService, eventService);
+			DataHandles.copy(src, dest, sliceSize, t);
+			assertEquals(t.getProgressValue(), sliceSize);
+
+			final byte[] expected = new byte[sliceSize];
+			System.arraycopy(data, 0, expected, 0, sliceSize);
+			assertHandleEquals(expected, dest);
+		}
+	}
+
+	private void assertHandleEquals(final byte[] expected,
+		final DataHandle<Location> handle) throws IOException
+	{
+		handle.seek(0);
+		for (int i = 0; i < expected.length; i++) {
+			assertEquals(expected[i], handle.readByte());
+		}
+	}
+
+	private byte[] randomBytes(final long seed) {
+		final MersenneTwisterFast r = new MersenneTwisterFast(seed);
+		final byte[] ldata = new byte[TEST_SIZE];
+		for (int i = 0; i < ldata.length; i++) {
+			ldata[i] = r.nextByte();
+		}
+		return ldata;
+	}
+}

From fbbc76c7c382b942f74d2868af64fb32cb369a30 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 7 Nov 2017 19:13:43 +0100
Subject: [PATCH 0646/1208] DefaultDownloadService: switch to the copy method
 provided by DataHandles

---
 .../download/DefaultDownloadService.java      | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index 85b697eab..b665645c1 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -37,6 +37,7 @@
 
 import org.scijava.io.handle.DataHandle;
 import org.scijava.io.handle.DataHandleService;
+import org.scijava.io.handle.DataHandles;
 import org.scijava.io.location.Location;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -70,7 +71,7 @@ public Download download(final Location source, final Location destination) {
 						destination))
 			{
 				task.setStatusMessage("Downloading " + source.getURI());
-				copy(task, in, out);
+				DataHandles.copy(in, out, task);
 			}
 			catch (final IOException exc) {
 				// TODO: Improve error handling:
@@ -102,13 +103,13 @@ public Download download(final Location source, final Location destination,
 				if (isCachedHandleValid(source, cache, sourceHandle, cachedHandle)) {
 					// The data is cached; download from the cached source instead.
 					task.setStatusMessage("Retrieving " + source.getURI());
-					copy(task, cachedHandle, destHandle);
+					DataHandles.copy(cachedHandle, destHandle, task);
 				}
 				else {
 					// Data is not yet cached; write to the destination _and_ the cache.
 					task.setStatusMessage("Downloading + caching " + source.getURI());
-					copy(task, sourceHandle, //
-						new MultiWriteHandle(cachedHandle, destHandle));
+					DataHandles.copy(sourceHandle, //
+						new MultiWriteHandle(cachedHandle, destHandle), task);
 				}
 			}
 			catch (final IOException exc) {
@@ -122,31 +123,6 @@ public Download download(final Location source, final Location destination,
 
 	// -- Helper methods --
 
-	private void copy(final Task task, final DataHandle<Location> in,
-		final DataHandle<Location> out) throws IOException
-	{
-		long length;
-		try {
-			length = in.length();
-		}
-		catch (final IOException exc) {
-			// Assume unknown length.
-			length = 0;
-		}
-		if (length > 0) task.setProgressMaximum(length);
-
-		final int chunkSize = 64 * 1024; // TODO: Make size configurable.
-		final byte[] buf = new byte[chunkSize];
-		while (true) {
-			if (task.isCanceled()) return;
-			final int r = in.read(buf);
-			if (r <= 0) break; // EOF
-			if (task.isCanceled()) return;
-			out.write(buf, 0, r);
-			if (length > 0) task.setProgressValue(task.getProgressValue() + r);
-		}
-	}
-
 	private boolean isCachedHandleValid(final Location source,
 		final LocationCache cache, final DataHandle<Location> sourceHandle,
 		final DataHandle<Location> cachedHandle) throws IOException

From 16c5f3fb9a7943c13cc656f157e55137cc6ddd26 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 14 Nov 2017 09:14:23 -0600
Subject: [PATCH 0647/1208] FileHandleTest: test FileHandle#exists() method

---
 .../org/scijava/io/handle/FileHandleTest.java | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 234efa90e..4d50625b7 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -32,12 +32,16 @@
 
 package org.scijava.io.handle;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.scijava.io.handle.DataHandle;
-import org.scijava.io.handle.FileHandle;
+import org.junit.Test;
+import org.scijava.Context;
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
 
@@ -62,4 +66,27 @@ public Location createLocation() throws IOException {
 		return new FileLocation(tmpFile);
 	}
 
+	@Test
+	public void testExists() throws IOException {
+		final Context ctx = new Context();
+		final DataHandleService dhs = ctx.service(DataHandleService.class);
+
+		final File nonExistentFile = //
+			File.createTempFile("FileHandleTest", "nonexistent-file");
+		assertTrue(nonExistentFile.delete());
+		assertFalse(nonExistentFile.exists());
+
+		final FileLocation loc = new FileLocation(nonExistentFile);
+		final DataHandle<?> handle = dhs.create(loc);
+		assertTrue(handle instanceof FileHandle);
+		assertFalse(handle.exists());
+		assertEquals(-1, handle.length());
+
+		handle.writeBoolean(true);
+		assertTrue(handle.exists());
+		assertEquals(1, handle.length());
+
+		// Clean up.
+		assertTrue(nonExistentFile.delete());
+	}
 }

From 3834df78509bb975b7bc35df561dff5515582e54 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 17 Nov 2017 14:02:59 +0100
Subject: [PATCH 0648/1208] FileHandle: don't unnecessarily init a
 RandomAccessFile on close

If we close a handle on a file that does not exist, we do not need to
initialize the RandomAccessFile, just to close it again. This fixes the problem of
empty files appearing when closing a FileHandle to a file that does not exist.
---
 src/main/java/org/scijava/io/handle/FileHandle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index d4a214121..8006337cd 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -290,7 +290,7 @@ public void writeUTF(final String str) throws IOException {
 
 	@Override
 	public void close() throws IOException {
-		raf().close();
+		if (raf != null) raf().close();
 	}
 
 	// -- Typed methods --

From 5204925c1936724b0e7ef668dc62f6f8d5a480a2 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 20 Nov 2017 10:35:48 +0100
Subject: [PATCH 0649/1208] FileHandleTest: Ensure we do not create ghost files
 anymore

---
 .../org/scijava/io/handle/FileHandleTest.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 4d50625b7..0a51b4a14 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -89,4 +89,23 @@ public void testExists() throws IOException {
 		// Clean up.
 		assertTrue(nonExistentFile.delete());
 	}
+
+	@Test
+	public void testNotCreatedByClose() throws IOException {
+		final Context ctx = new Context();
+		final DataHandleService dhs = ctx.service(DataHandleService.class);
+
+		final File nonExistentFile = //
+			File.createTempFile("FileHandleTest", "nonexistent-file");
+		assertTrue(nonExistentFile.delete());
+		assertFalse(nonExistentFile.exists());
+
+		final FileLocation loc = new FileLocation(nonExistentFile);
+		final DataHandle<?> handle = dhs.create(loc);
+		assertTrue(handle instanceof FileHandle);
+		assertFalse(handle.exists());
+
+		handle.close();
+		assertFalse(nonExistentFile.exists());
+	}
 }

From 5f4b56ab24ded19218239bf72e533fc52ce184fc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 21 Nov 2017 09:08:16 -0600
Subject: [PATCH 0650/1208] FileHandle: improve behavior of close() method

This change does two things:

* It synchronizes close(), so that the RAF cannot be in the process of
  initializing while the close() operation is happening.
* It guards all operations against an already-closed state, such that
  an IOException will be thrown if the handle has already been closed.
---
 src/main/java/org/scijava/io/handle/FileHandle.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 8006337cd..db54d562f 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -55,6 +55,9 @@ public class FileHandle extends AbstractDataHandle<FileLocation> {
 	/** The mode of the {@link RandomAccessFile}. */
 	private String mode = "rw";
 
+	/** True iff the {@link #close()} has already been called. */
+	private boolean closed;
+
 	// -- FileHandle methods --
 
 	/** Gets the random access file object backing this FileHandle. */
@@ -289,8 +292,9 @@ public void writeUTF(final String str) throws IOException {
 	// -- Closeable methods --
 
 	@Override
-	public void close() throws IOException {
+	public synchronized void close() throws IOException {
 		if (raf != null) raf().close();
+		closed = true;
 	}
 
 	// -- Typed methods --
@@ -308,6 +312,7 @@ private RandomAccessFile raf() throws IOException {
 	}
 
 	private synchronized void initRAF() throws IOException {
+		if (closed) throw new IOException("Handle already closed");
 		if (raf != null) return;
 		raf = new RandomAccessFile(get().getFile(), getMode());
 	}

From 811112c00cfbcd8400e9aa983ae4a0cf49c75c99 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 28 Nov 2017 09:25:07 -0600
Subject: [PATCH 0651/1208] Fix bug in ByteBankByteArray(int) ctor

The size was being initialized as non-zero.

Thanks to Gabriel Einsdorf for noticing.
---
 src/main/java/org/scijava/io/ByteArrayByteBank.java     | 8 +++++++-
 src/test/java/org/scijava/io/ByteArrayByteBankTest.java | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index adfe93ff8..b0b759955 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -58,7 +58,7 @@ public ByteArrayByteBank() {
 	 * @param initialCapacity the initial capacity of this {@link ByteBank}
 	 */
 	public ByteArrayByteBank(final int initialCapacity) {
-		this(new ByteArray(initialCapacity));
+		this(emptyByteArrayOfCapacity(initialCapacity));
 	}
 
 	/**
@@ -148,4 +148,10 @@ public long size() {
 	private void updateSize(final long newSize) {
 		size = newSize > size ? newSize : size;
 	}
+
+	private static ByteArray emptyByteArrayOfCapacity(final int capacity) {
+		final ByteArray byteArray = new ByteArray(new byte[capacity]);
+		byteArray.setSize(0);
+		return byteArray;
+	}
 }
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index 12c9572b1..acf5ec911 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -32,6 +32,8 @@
 
 package org.scijava.io;
 
+import org.junit.Test;
+
 /**
  * Tests {@link ByteArrayByteBank}
  *
@@ -44,4 +46,10 @@ public class ByteArrayByteBankTest extends ByteBankTest {
 	public ByteBank createByteBank() {
 		return new ByteArrayByteBank();
 	}
+
+	@Test(expected = ArrayIndexOutOfBoundsException.class)
+	public void testCreateByteBankWithCapacity() {
+		ByteArrayByteBank bank = new ByteArrayByteBank(50);
+		bank.getByte(0);
+	}
 }

From 5c1f21e285eb5db6a55d5670e1f610797c7b64bd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 30 Nov 2017 14:34:46 -0600
Subject: [PATCH 0652/1208] FileUtils: add shorter createTemporaryDirectory

This is nice, since suffix is allowed to be null.
---
 src/main/java/org/scijava/util/FileUtils.java | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index f2f150bd4..bd42f055b 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -397,6 +397,30 @@ public static String limitPath(final String path, final int limit) {
 		return new String(shortPathArray);
 	}
 
+	/**
+	 * Creates a temporary directory.
+	 * <p>
+	 * Since there is no atomic operation to do that, we create a temporary file,
+	 * delete it and create a directory in its place. To avoid race conditions, we
+	 * use the optimistic approach: if the directory cannot be created, we try to
+	 * obtain a new temporary file rather than erroring out.
+	 * </p>
+	 * <p>
+	 * It is the caller's responsibility to make sure that the directory is
+	 * deleted; see {@link #deleteRecursively(File)}.
+	 * </p>
+	 * 
+	 * @param prefix The prefix string to be used in generating the file's name;
+	 *          see {@link File#createTempFile(String, String, File)}
+	 * @return An abstract pathname denoting a newly-created empty directory
+	 * @throws IOException
+	 */
+	public static File createTemporaryDirectory(final String prefix)
+		throws IOException
+	{
+		return createTemporaryDirectory(prefix, null, null);
+	}
+
 	/**
 	 * Creates a temporary directory.
 	 * <p>

From acbefd7f5f460cd39524d9cbe0c0324f080aadd0 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Sat, 23 Sep 2017 22:58:11 +0200
Subject: [PATCH 0653/1208] LogMessage: reduce toString(), which is used by
 StderrLogService

StderrLogService uses LogMessage.toString() to print log messages.
Reduce the amount of information contained in LogMessage.toString(),
to make the console output easier to read.
---
 src/main/java/org/scijava/log/LogMessage.java | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 63ad2caeb..6eee6e8cf 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -129,20 +129,12 @@ public void attach(Object value) {
 
 	@Override
 	public String toString() {
-		return format(this);
-	}
-
-	// -- Utility methods --
-
-	public static String format(final LogMessage message) {
 		final StringWriter sw = new StringWriter();
 		final PrintWriter printer = new PrintWriter(sw);
-		printer.print("[" + message.time() + "] ");
-		printer.print("[" + LogLevel.prefix(message.level()) + "] ");
-		printer.print("[" + message.source() + "] ");
-		printer.println(message.text());
-		if (message.throwable() != null) {
-			message.throwable().printStackTrace(printer);
+		printer.print("[" + LogLevel.prefix(level()) + "] ");
+		printer.println(text());
+		if (throwable() != null) {
+			throwable().printStackTrace(printer);
 		}
 		return sw.toString();
 	}

From a60d4c82bf7e34cec1d174a4e3b6587be67723b2 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Mon, 4 Dec 2017 17:57:32 +0100
Subject: [PATCH 0654/1208] AbstractLogService: fix notification of
 LogListerners

The method notifyListeners should only notify the log listeners.
It must NOT be used for overloading or to output log messages.
---
 .../java/org/scijava/log/AbstractLogService.java    |  4 +++-
 src/main/java/org/scijava/log/StderrLogService.java |  2 +-
 src/test/java/org/scijava/log/LogServiceTest.java   | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 4ec9c9f58..09038ea6b 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -90,6 +90,8 @@ public void setLevelForLogger(final String source, final int level) {
 		rootLogger.getSource().subSource(source).setLogLevel(level);
 	}
 
+	abstract protected void messageLogged(LogMessage message);
+
 	// -- Logger methods --
 
 	@Override
@@ -184,7 +186,7 @@ private Map<String, Integer> setupMapFromProperties(Properties properties,
 	private class RootLogger extends DefaultLogger {
 
 		public RootLogger() {
-			super(AbstractLogService.this::notifyListeners, LogSource.newRoot(),
+			super(AbstractLogService.this::messageLogged, LogSource.newRoot(),
 				LogLevel.NONE);
 		}
 
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index fce0f8a3c..e59a85a06 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -61,7 +61,7 @@ public void setPrintStreams(Function<Integer, PrintStream> levelToStream) {
 	}
 
 	@Override
-	public void notifyListeners(LogMessage message) {
+	protected void messageLogged(LogMessage message) {
 		final PrintStream out = levelToStream.apply(message.level());
 		out.print(message);
 	}
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 9d242f75f..a3c510d3a 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -200,6 +202,15 @@ public void testListener() {
 		listener.hasLogged(m -> msg2.equals(m.text()));
 	}
 
+	@Test
+	public void testLogListenerIsNotifiedOnce() {
+		List<LogMessage> list = new ArrayList<>();
+		LogService logService = new TestableLogService();
+		logService.addLogListener(list::add);
+		logService.error("dummy");
+		assertEquals(1, list.size());
+	}
+
 	// -- Helper classes --
 
 	private static class MyTestClass {
@@ -241,7 +252,7 @@ public Throwable exception() {
 		}
 
 		@Override
-		public void notifyListeners(LogMessage message) {
+		protected void messageLogged(LogMessage message) {
 			this.message = message.toString();
 			this.exception = message.throwable();
 		}

From 702baa956c28d55f300eea546a57ff0856b71a52 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 5 Dec 2017 08:30:29 -0600
Subject: [PATCH 0655/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6830531ab..9e0fceee5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.66.2-SNAPSHOT</version>
+	<version>2.67.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 6b448216652752ecc288717e53d28ff4a4dd6c62 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 14:28:55 +0200
Subject: [PATCH 0656/1208] ParameterScriptProcessor: default type as Object

Now you can leave off the type, saying only e.g.:

  #@output thing

And it will implicitly mean:

  #@output Object thing

This is useful if you are too lazy to specify your output types,
or you don't know in advance what it will be, or the type would
be some obnoxiously long fully qualified class name like
java.util.function.Function.
---
 .../process/ParameterScriptProcessor.java     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index f38b5e45b..ae58e7df2 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -62,8 +62,9 @@
  * supported:
  * </p>
  * <ul>
- * <li>{@code #@<type> <varName>}</li>
- * <li>{@code #@<type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}</li>
+ * <li>{@code #@ <type> <varName>}</li>
+ * <li>{@code #@ <type>(<attr1>=<value1>, ..., <attrN>=<valueN>) <varName>}</li>
+ * <li>{@code #@<IOType> <varName>}</li>
  * <li>{@code #@<IOType> <type> <varName>}</li>
  * <li>{@code #@<IOType>(<attr1>=<value1>, ..., <attrN>=<valueN>) <type>
  * <varName>}</li>
@@ -77,7 +78,8 @@
  * <li>{@code <IOType>} - one of {@code INPUT}, {@code OUTPUT}, or {@code BOTH}.
  * </li>
  * <li>{@code <varName>} - the name of the input or output variable.</li>
- * <li>{@code <type>} - the Java {@link Class} of the variable.</li>
+ * <li>{@code <type>} - the Java {@link Class} of the variable, or
+ * {@link Object} if none specified.</li>
  * <li>{@code <attr*>} - an attribute key.</li>
  * <li>{@code <value*>} - an attribute value.</li>
  * </ul>
@@ -90,9 +92,9 @@
  * <ul>
  * <li>{@code #@Dataset dataset}</li>
  * <li>{@code #@double(type=OUTPUT) result}</li>
- * <li>{@code #@BOTH ImageDisplay display}</li>
- * <li>{@code #@INPUT(persist=false, visibility=INVISIBLE) boolean verbose}
- * </li>
+ * <li>{@code #@both ImageDisplay display}</li>
+ * <li>{@code #@input(persist=false, visibility=INVISIBLE) boolean verbose}</li>
+ * <li>{@code #@output thing}</li>
  * </ul>
  * <p>
  * Parameters will be parsed and filled just like @{@link Parameter}-annotated
@@ -187,11 +189,18 @@ private boolean parseParam(final String param,
 		final String typeName, varName;
 		final String maybeIOType = tokens[0].toUpperCase();
 		if (isIOType(maybeIOType)) {
-			// assume syntax: <IOType> <type> <varName>
-			if (tokens.length < 3) return false;
+			if (tokens.length == 2) {
+				// <IOType> <varName>
+				typeName = "Object";
+				varName = tokens[1];
+			}
+			else if (tokens.length == 3) {
+				// <IOType> <type> <varName>
+				typeName = tokens[1];
+				varName = tokens[2];
+			}
+			else return false;
 			attrs.put("type", maybeIOType);
-			typeName = tokens[1];
-			varName = tokens[2];
 		}
 		else {
 			// assume syntax: <type> <varName>

From 8184f77194e84a66b7a7e2599d078ae2c832106d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 17:09:22 +0200
Subject: [PATCH 0657/1208] ParameterScriptProcessor: reset state upon begin

When we start processing a new ScriptInfo with the same instance,
let's reset the state so that everything works properly.
---
 .../org/scijava/script/process/ParameterScriptProcessor.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index ae58e7df2..c1a3170e8 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -119,7 +119,7 @@ public class ParameterScriptProcessor implements ScriptProcessor {
 	private LogService log;
 
 	private ScriptInfo info;
-	private boolean header = true;
+	private boolean header;
 
 	// -- ScriptProcessor methods --
 
@@ -127,6 +127,7 @@ public class ParameterScriptProcessor implements ScriptProcessor {
 	public void begin(final ScriptInfo scriptInfo) {
 		info = scriptInfo;
 		info.setReturnValueAppended(true);
+		header = true;
 	}
 
 	@Override

From 793ab9159db8f4ef8513586dee00a23a0bf53771 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 17:10:31 +0200
Subject: [PATCH 0658/1208] ScriptProcessor: do not implement SingletonPlugin

These plugins are not singletons; they have state. The
ScriptProcessorService creates new instances as needed,
and feeds ScriptInfos to them.

The ScriptProcessorService service did not implement SingletonService,
but DefaultScriptProcessorService extended AbstractSingletonService,
so clearly I got my wires crossed when I wrote this.
---
 .../script/process/DefaultScriptProcessorService.java        | 5 ++---
 .../java/org/scijava/script/process/ScriptProcessor.java     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index 0e9f2d998..1978295b4 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -32,7 +32,7 @@
 
 package org.scijava.script.process;
 
-import org.scijava.plugin.AbstractSingletonService;
+import org.scijava.plugin.AbstractPTService;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.Service;
 
@@ -43,8 +43,7 @@
  */
 @Plugin(type = Service.class)
 public class DefaultScriptProcessorService extends
-	AbstractSingletonService<ScriptProcessor> implements
-	ScriptProcessorService
+	AbstractPTService<ScriptProcessor> implements ScriptProcessorService
 {
 	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index ba1143eb7..11bb9645a 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -32,7 +32,7 @@
 
 package org.scijava.script.process;
 
-import org.scijava.plugin.SingletonPlugin;
+import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.script.ScriptInfo;
 
 /**
@@ -46,7 +46,7 @@
  * 
  * @author Curtis Rueden
  */
-public interface ScriptProcessor extends SingletonPlugin {
+public interface ScriptProcessor extends SciJavaPlugin {
 
 	void begin(ScriptInfo info);
 	String process(String line);

From 986cf74c34db9d9815d70795c7af07939001a53a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 17:11:39 +0200
Subject: [PATCH 0659/1208] ScriptProcessorService: be less Java-8-happy

The PluginService already has a perfectly nice, succinct createInstances
method. No need to map over its createInstance method via streams.
---
 .../org/scijava/script/process/ScriptProcessorService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 2f7598bf1..29a0085c5 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -58,8 +58,8 @@ public interface ScriptProcessorService extends
 	 * line in sequence.
 	 */
 	default String process(final ScriptInfo info) throws IOException {
-		final List<ScriptProcessor> processors = getPlugins().stream().map(
-			p -> pluginService().createInstance(p)).collect(Collectors.toList());
+		final List<ScriptProcessor> processors = //
+			pluginService().createInstances(getPlugins());
 
 		BufferedReader reader = info.getReader();
 		if (reader == null) {

From 7b780835a3941b8371d2855274e4a478d1d40f85 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 17:20:32 +0200
Subject: [PATCH 0660/1208] Add a base for directive-oriented ScriptProcessors

Now they can all extend the DirectiveScriptProcessor
abstract base class, saving a lot of boilerplate code.
---
 .../process/DirectiveScriptProcessor.java     | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java

diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
new file mode 100644
index 000000000..a7cdbba47
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.scijava.convert.ConvertService;
+import org.scijava.parse.ParseService;
+import org.scijava.plugin.Parameter;
+import org.scijava.script.ScriptInfo;
+
+/**
+ * Abstract base class for {@link ScriptProcessor} plugins that parse lines
+ * of the form {@code #@directive(...) ...}.
+ * 
+ * @author Curtis Rueden
+ */
+public abstract class DirectiveScriptProcessor implements ScriptProcessor {
+
+	private final Pattern p = //
+		Pattern.compile("^#@(\\w*)\\s*(\\((.*)\\))?\\s*(.*)$");
+
+	@Parameter
+	private ConvertService convertService;
+
+	@Parameter
+	private ParseService parser;
+
+	private ScriptInfo info;
+
+	private Predicate<String> directivesToMatch;
+
+	public DirectiveScriptProcessor(final Predicate<String> directivesToMatch) {
+		this.directivesToMatch = directivesToMatch;
+	}
+
+	// -- ScriptProcessor methods --
+
+	@Override
+	public void begin(final ScriptInfo scriptInfo) {
+		info = scriptInfo;
+	}
+
+	@Override
+	public String process(final String line) {
+		// as quickly as possible, verify that this line is a directive
+		if (!line.startsWith("#@")) return line;
+
+		// parse the directive, and ensure it is well-formed
+		final Matcher m = p.matcher(line);
+		if (!m.matches()) return line;
+
+		// ensure directive is relevant
+		final String directive = m.group(1);
+		if (!directivesToMatch.test(directive)) return line;
+
+		// parse attributes (inner match without parentheses)
+		final String attrString = m.group(3);
+		final Map<String, Object> attrs = attrString == null ? //
+			Collections.emptyMap() : parser.parse(attrString, false).asMap();
+
+		// retain the rest of the string
+		final String theRest = m.group(4);
+
+		return process(directive, attrs, theRest);
+	}
+
+	// -- Internal methods --
+
+	/** Processes the given directive. */
+	protected abstract String process(final String directive,
+		final Map<String, Object> attrs, final String theRest);
+
+	/** Gets the active {@link ScriptInfo} instance. */
+	protected ScriptInfo info() {
+		return info;
+	}
+
+	/** Checks whether some key matches the desired value, ignoring case. */
+	protected boolean is(final String key, final String desired) {
+		return desired.equalsIgnoreCase(key);
+	}
+
+	/** Coerces some object into another object of the given type. */
+	protected <T> T as(final Object v, final Class<T> type) {
+		final T converted = convertService.convert(v, type);
+		if (converted != null) return converted;
+		// NB: Attempt to convert via string.
+		// This is useful in cases where a weird type of object came back
+		// (e.g., org.scijava.parse.eval.Unresolved), but which happens to have a
+		// nice string representation which ultimately is expressible as the type.
+		return convertService.convert(v.toString(), type);
+	}
+
+	/** Coerces some object into a list of objects of the given type. */
+	protected <T> List<T> asList(final Object v, final Class<T> type) {
+		final ArrayList<T> result = new ArrayList<>();
+		final List<?> list = as(v, List.class);
+		for (final Object item : list) {
+			result.add(as(item, type));
+		}
+		return result;
+	}
+}

From 764f39ed10221a952084e998cf2b16ab30d10a74 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 21:40:24 +0200
Subject: [PATCH 0661/1208] MenuPath: tweak javadoc

---
 src/main/java/org/scijava/MenuPath.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 1f102a42c..26b732e17 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -62,7 +62,7 @@ public MenuPath(final Collection<? extends MenuEntry> menuEntries) {
 
 	/**
 	 * Creates a menu path with entries parsed from the given string. Assumes
-	 * "&gt;" as the separator (e.g., "File&gt;New&gt;Image").
+	 * {@code >} as the separator (e.g., {@code File>New>Image}).
 	 * 
 	 * @see #PATH_SEPARATOR
 	 */

From fd9912f292dc78ee4cf7eb77b120e11d792e04bd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 21:40:38 +0200
Subject: [PATCH 0662/1208] ScriptInfo: report headless if headless attr set

The ModuleInfo interface does not have a dedicated headless setting
(accessor/mutator). So let's use the "headless" attribute by convention.
---
 src/main/java/org/scijava/script/ScriptInfo.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index bc165fa5b..e0bfe2117 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -332,6 +332,11 @@ public ScriptModule createModule() throws ModuleException {
 		return new ScriptModule(this);
 	}
 
+	@Override
+	public boolean canRunHeadless() {
+		return is("headless");
+	}
+
 	// -- Contextual methods --
 
 	@Override

From 81728ebf9b0a250da1d46282fddcf203718ef5c5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 21:43:25 +0200
Subject: [PATCH 0663/1208] ScriptInfoTest: move public methods first

See:
https://imagej.net/Coding_style#Ordering_of_code_blocks
---
 .../org/scijava/script/ScriptInfoTest.java    | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 3c5c64ebc..b5d81a7be 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -264,6 +264,24 @@ public void testParameters() {
 		}
 	}
 
+	/**
+	 * Ensures the ScriptInfos Reader can be reused for multiple executions of the
+	 * script.
+	 */
+	@Test
+	public void testReaderSanity() throws Exception {
+		final String script = "" + //
+			"% @LogService log\n" + //
+			"% @OUTPUT Integer output";
+
+		final ScriptInfo info =
+			new ScriptInfo(context, "hello.bsizes", new StringReader(script));
+		final BufferedReader reader1 = info.getReader();
+		final BufferedReader reader2 = info.getReader();
+
+		assertEquals("Readers are not independent.", reader1.read(), reader2.read());
+	}
+
 	private void assertItem(final String name, final Class<?> type,
 		final String label, final ItemIO ioType, final boolean required,
 		final boolean persist, final String persistKey, final String style,
@@ -288,25 +306,6 @@ private void assertItem(final String name, final Class<?> type,
 		assertEquals(choices, item.getChoices());
 	}
 
-	/**
-	 * Ensures the ScriptInfos Reader can be reused for multiple executions of the
-	 * script.
-	 */
-	@Test
-	public void testReaderSanity() throws Exception {
-		final String script = "" + //
-			"% @LogService log\n" + //
-			"% @OUTPUT Integer output";
-
-		final ScriptInfo info =
-			new ScriptInfo(context, "hello.bsizes", new StringReader(script));
-		final BufferedReader reader1 = info.getReader();
-		final BufferedReader reader2 = info.getReader();
-
-		assertEquals("Readers are not independent.", reader1.read(), reader2.read());
-
-	}
-
 	@Plugin(type = ScriptLanguage.class)
 	public static class BindingSizes extends AbstractScriptLanguage {
 

From 8f8e2c3ec60e5744f1b84d56e791d7baf3323967 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 22:40:59 +0200
Subject: [PATCH 0664/1208] ScriptProcessorService: remove unused imports

---
 .../java/org/scijava/script/process/ScriptProcessorService.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 29a0085c5..66a482476 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -36,7 +36,6 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.scijava.plugin.PTService;
 import org.scijava.script.ScriptInfo;

From 8ad318b2be6cb87b3fcf2de2c9d11512c30c7609 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 22:41:54 +0200
Subject: [PATCH 0665/1208] Add a processor for #@script directives

See #294.
---
 .../ScriptDirectiveScriptProcessor.java       | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java

diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
new file mode 100644
index 000000000..eefbb4a76
--- /dev/null
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -0,0 +1,162 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script.process;
+
+import java.util.Map;
+
+import org.scijava.MenuPath;
+import org.scijava.Priority;
+import org.scijava.log.LogService;
+import org.scijava.module.ModuleInfo;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+
+/**
+ * A {@link ScriptProcessor} which parses the {@code #@script} directive.
+ * <p>
+ * The syntax is:
+ * </p>
+ * 
+ * <pre>
+ * #@script(key1=value1, key2=value2, ...)
+ * </pre>
+ * <p>
+ * Supported keys include:
+ * </p>
+ * <ul>
+ * <li>{@code name} - The name of the script.</li>
+ * <li>{@code label} - The human-readable label to use (e.g., in the menu
+ * structure).</li>
+ * <li>{@code description} - A longer description of the script (e.g., for use
+ * as a tool tip).</li>
+ * <li>{@code menuPath} - Abbreviated menu path defining where the script is
+ * shown in the menu structure. Use greater than sign ({@code >}) as a
+ * separator.</li>
+ * <li>{@code menuRoot} - String identifier naming the menu to which this script
+ * belongs.</li>
+ * <li>{@code iconPath} - Path to the plugin's icon (e.g., shown in the menu
+ * structure).</li>
+ * <li>{@code priority} - Priority of the script. Larger values are higher
+ * priority. Value can be written as a {@code double} constant, or as one of the
+ * following convenient shorthands: {@code first}, {@code extremely-high},
+ * {@code very-high}, {@code high}, {@code normal}, {@code low},
+ * {@code very-low}, {@code extremely-low}, {@code last}.</li>
+ * <li>{@code headless} - Provides a "hint" as to whether the script would
+ * behave correctly in a headless context. Do <em>not</em> specify
+ * {@code headless = true} unless the script refrains from using any UI-specific
+ * features (e.g., AWT or Swing calls).</li>
+ * </ul>
+ * <p>
+ * Any other key-value pairs encountered are stored as properties via the
+ * {@link ModuleInfo#set(String, String)} method.
+ * </p>
+ * <p>
+ * See also the @{@link Plugin} annotation, which mostly lines up with this list
+ * of attributes.
+ * </p>
+ * <p>
+ * Here are a few examples:
+ * </p>
+ * <ul>
+ * <li>{@code #@script(name = "extra-functions")}</li>
+ * <li>{@code #@script(headless = true)}</li>
+ * <li>{@code #@script(menuPath = "Image > Import > Text...")}</li>
+ * </ul>
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = ScriptProcessor.class)
+public class ScriptDirectiveScriptProcessor extends DirectiveScriptProcessor {
+
+	public ScriptDirectiveScriptProcessor() {
+		super(directive -> "script".equals(directive));
+	}
+
+	@Parameter
+	private LogService log;
+
+	// -- Internal DirectiveScriptProcessor methods --
+
+	@Override
+	protected String process(final String directive,
+		final Map<String, Object> attrs, final String theRest)
+	{
+		for (final String k : attrs.keySet()) {
+			assignAttribute(k == null ? "name" : k, attrs.get(k));
+		}
+		return "";
+	}
+
+	// -- Helper methods --
+
+	private <T> void assignAttribute(final String k, final Object v) {
+		if (is(k, "name")) info().setName(as(v, String.class));
+		else if (is(k, "label")) info().setLabel(as(v, String.class));
+		else if (is(k, "description")) info().setDescription(as(v, String.class));
+		else if (is(k, "menuPath")) {
+			info().setMenuPath(new MenuPath(as(v, String.class)));
+		}
+		else if (is(k, "menuRoot")) info().setMenuRoot(as(v, String.class));
+		else if (is(k, "iconPath")) info().setIconPath(as(v, String.class));
+		else if (is(k, "priority")) {
+			final Double priority = priority(v);
+			if (priority != null) info().setPriority(priority);
+		}
+		else if (is(k, "headless") && as(v, boolean.class)) {
+			// NB: There is no ModuleInfo#setHeadless(boolean).
+			// So we add a "headless" property; see ScriptInfo#canRunHeadless().
+			info().set("headless", "true");
+		}
+		else info().set(k, v.toString());
+	}
+
+	private Double priority(final Object p) {
+		final Double pDouble = as(p, Double.class);
+		if (pDouble != null) return pDouble;
+
+		final String pString = as(p, String.class);
+		if (pString == null) return null;
+
+		final String lString = pString.toLowerCase();
+		if (lString.matches("first")) return Priority.FIRST;
+		if (lString.matches("extremely[ _-]?high")) return Priority.EXTREMELY_HIGH;
+		if (lString.matches("very[ _-]?high")) return Priority.VERY_HIGH;
+		if (lString.matches("high")) return Priority.HIGH;
+		if (lString.matches("normal")) return Priority.NORMAL;
+		if (lString.matches("low")) return Priority.LOW;
+		if (lString.matches("very[ _-]?low")) return Priority.VERY_LOW;
+		if (lString.matches("extremely[ _-]?low")) return Priority.EXTREMELY_LOW;
+		if (lString.matches("last")) return Priority.LAST;
+		return null;
+	}
+}

From 51e631ff87853014ec13d0c0b92926aa806ae6eb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Sep 2017 22:42:53 +0200
Subject: [PATCH 0666/1208] Test that #@script directive works

---
 .../org/scijava/script/ScriptInfoTest.java    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index b5d81a7be..42bdf37e9 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -60,6 +60,8 @@
 import org.scijava.Context;
 import org.scijava.ItemIO;
 import org.scijava.ItemVisibility;
+import org.scijava.MenuPath;
+import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Plugin;
@@ -264,6 +266,40 @@ public void testParameters() {
 		}
 	}
 
+	/** Tests {@code #@script} directives. */
+	@Test
+	public void testScriptDirective() {
+		final String script = "" + //
+			"#@script(name = \"my_script\"" + //
+			", label = \"My Script\"" + //
+			", description = \"What a great script.\"" + //
+			", menuPath = \"Plugins > Do All The Things\"" + //
+			", menuRoot = \"special\"" + //
+			", iconPath = \"/path/to/myIcon.png\"" + //
+			", priority = \"extremely-high\"" + //
+			", headless = true" + //
+			", foo = \"bar\"" + //
+			")\n" +
+			"WOOT\n";
+
+		ScriptInfo info = null;
+		info =
+			new ScriptInfo(context, "scriptHeader.bsizes", new StringReader(script));
+		info.inputs(); // HACK: Force lazy initialization.
+
+		assertEquals("my_script", info.getName());
+		assertEquals("My Script", info.getLabel());
+		assertEquals("What a great script.", info.getDescription());
+		final MenuPath menuPath = info.getMenuPath();
+		assertEquals(2, menuPath.size());
+		assertEquals("Plugins", menuPath.get(0).getName());
+		assertEquals("Do All The Things", menuPath.get(1).getName());
+		assertEquals("/path/to/myIcon.png", info.getIconPath());
+		assertEquals(Priority.EXTREMELY_HIGH, info.getPriority(), 0.0);
+		assertTrue(info.canRunHeadless());
+		assertEquals("bar", info.get("foo"));
+	}
+
 	/**
 	 * Ensures the ScriptInfos Reader can be reused for multiple executions of the
 	 * script.

From cf6efdef50f29a85260317e82150369a743bcc92 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 23 Sep 2017 08:23:51 +0200
Subject: [PATCH 0667/1208] ScriptInfoTest: add authors to javadoc

---
 src/test/java/org/scijava/script/ScriptInfoTest.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 42bdf37e9..889e38844 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -69,7 +69,12 @@
 import org.scijava.util.DigestUtils;
 import org.scijava.util.FileUtils;
 
-/** Tests {@link ScriptInfo}. */
+/**
+ * Tests {@link ScriptInfo}.
+ * 
+ * @author Curtis Rueden
+ * @author Mark Hiner
+ */
 public class ScriptInfoTest {
 
 	private static Context context;

From b0607328e8e4229588fcb1851caf57c5b4a9ecd4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 8 Nov 2017 16:57:00 -0600
Subject: [PATCH 0668/1208] ScriptInfoTest: do not use a static Context

Other tests create a new Context per test.
This is cleaner than reusing the same Context.
---
 .../java/org/scijava/script/ScriptInfoTest.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 889e38844..b219bd1b9 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -54,8 +54,8 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.ItemIO;
@@ -77,19 +77,19 @@
  */
 public class ScriptInfoTest {
 
-	private static Context context;
-	private static ScriptService scriptService;
+	private Context context;
+	private ScriptService scriptService;
 
 	// -- Test setup --
 
-	@BeforeClass
-	public static void setUp() {
+	@Before
+	public void setUp() {
 		context = new Context();
 		scriptService = context.service(ScriptService.class);
 	}
 
-	@AfterClass
-	public static void tearDown() {
+	@After
+	public void tearDown() {
 		context.dispose();
 	}
 

From 13231ff9d388e8db052532aefb929f0474ce402f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 8 Nov 2017 16:59:28 -0600
Subject: [PATCH 0669/1208] ScriptInfo: improve behavior of script identifiers

Script IDs are now of the form "script:${name}" for named scripts,
"script:${path}" for unnamed scripts with a file path given, and
"script:<${hex}>" where "${hex}" is a hexidecimal hash code of the
script contents when it has neither name nor path.

In this way, script IDs should hopefully always be unique, except
in the case where they are intended to collide -- e.g., to
dynamically replace one version of a script with another.
---
 .../java/org/scijava/script/ScriptInfo.java   |  7 +++-
 .../org/scijava/script/ScriptInfoTest.java    | 38 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index e0bfe2117..1bd3995a7 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -359,7 +359,12 @@ public void setContext(final Context context) {
 
 	@Override
 	public String getIdentifier() {
-		return "script:" + (path == null ? "<inline>" : path);
+		final String name = getName();
+		final String prefix = "script:";
+		if (name != null) return prefix + name;
+		if (path != null) return prefix + path;
+		if (script != null) return prefix + "<" + DigestUtils.bestHex(script) + ">";
+		return prefix + "<unknown>";
 	}
 
 	// -- Locatable methods --
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index b219bd1b9..521327ccf 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -95,6 +95,35 @@ public void tearDown() {
 
 	// -- Tests --
 
+	/** Tests script identifiers. */
+	@Test
+	public void testGetIdentifier() {
+		final String name = "strategerize";
+
+		final String namedPath = "victory.bsizes";
+		final String named = "" + //
+			"#@script(name = '" + name + "')\n" + //
+			"zxywvutsrqponmlkjihgfdcba\n";
+
+		final String unnamedPath = "alphabet.bsizes";
+		final String unnamed = "" + //
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZ\n" + //
+			"0123456789\n";
+
+		// Test named, with explicit path.
+		assertEquals("script:" + name, id(namedPath, named));
+
+		// Test named, and no path given.
+		assertEquals("script:" + name, id(null, named));
+
+		// Test unnamed, with explicit path.
+		assertEquals("script:" + unnamedPath, id(unnamedPath, unnamed));
+
+		// Test unnamed, and no path given.
+		final String hex = DigestUtils.bestHex(unnamed);
+		assertEquals("script:<" + hex + ">", id(null, unnamed));
+	}
+
 	/** Tests whether new-style parameter syntax are parsed correctly. */
 	@Test
 	public void testNewStyle() throws Exception {
@@ -323,6 +352,15 @@ public void testReaderSanity() throws Exception {
 		assertEquals("Readers are not independent.", reader1.read(), reader2.read());
 	}
 
+	// -- Helper methods --
+
+	private String id(final String path, final String script) {
+		final ScriptInfo info = //
+			new ScriptInfo(context, path, new StringReader(script));
+		info.inputs(); // NB: Force parameter parsing.
+		return info.getIdentifier();
+	}
+
 	private void assertItem(final String name, final Class<?> type,
 		final String label, final ItemIO ioType, final boolean required,
 		final boolean persist, final String persistKey, final String style,

From a6fd9cf656ab2596f056acb56bf49804fb9afddd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 6 Dec 2017 17:15:21 +0100
Subject: [PATCH 0670/1208] Fix IllegalStateException when class is not found

We need to pass the cause to the constructor, since
ClassNotFoundException does not allow initCause to be called.
---
 src/main/java/org/scijava/command/CommandInfo.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 9dcdc710b..2efbe2c38 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -300,9 +300,7 @@ public Class<?> loadDelegateClass() throws ClassNotFoundException {
 			return loadClass();
 		}
 		catch (final InstantiableException exc) {
-			final ClassNotFoundException cnfe = new ClassNotFoundException();
-			cnfe.initCause(exc);
-			throw cnfe;
+			throw new ClassNotFoundException(null, exc);
 		}
 	}
 

From c05a172156b851ee181da6e5e0c9f5481715889c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 7 Dec 2017 13:28:28 +0100
Subject: [PATCH 0671/1208] DefaultModuleService: refactor for DRYness

Interally, the prefClass is null when class is not specified.
So this should be OK.
---
 .../scijava/module/DefaultModuleService.java  | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index bdad241f5..29a82b954 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -302,13 +302,7 @@ public <T> void save(final ModuleItem<T> item, final T value) {
 		// do not persist if object cannot be converted back from a string
 		if (!convertService.supports(sValue, item.getType())) return;
 
-		final String persistKey = item.getPersistKey();
-		if (persistKey == null || persistKey.isEmpty()) {
-			final Class<?> prefClass = delegateClass(item);
-			final String prefKey = item.getName();
-			prefService.put(prefClass, prefKey, sValue);
-		}
-		else prefService.put(persistKey, sValue);
+		prefService.put(prefClass(item), prefKey(item), sValue);
 	}
 
 	@Override
@@ -316,14 +310,7 @@ public <T> T load(final ModuleItem<T> item) {
 		// if there is nothing to load from persistence return nothing
 		if (!item.isPersisted()) return null;
 
-		final String sValue;
-		final String persistKey = item.getPersistKey();
-		if (persistKey == null || persistKey.isEmpty()) {
-			final Class<?> prefClass = delegateClass(item);
-			final String prefKey = item.getName();
-			sValue = prefService.get(prefClass, prefKey);
-		}
-		else sValue = prefService.get(persistKey);
+		final String sValue = prefService.get(prefClass(item), prefKey(item));
 
 		// if persisted value has never been set before return null
 		if (sValue == null) return null;
@@ -524,4 +511,15 @@ private <T> Class<?> delegateClass(final ModuleItem<T> item) {
 		}
 	}
 
+	private Class<?> prefClass(final ModuleItem<?> item) {
+		final String persistKey = item.getPersistKey();
+		return persistKey == null || persistKey.isEmpty() ? //
+			delegateClass(item) : null;
+	}
+
+	private String prefKey(final ModuleItem<?> item) {
+		final String persistKey = item.getPersistKey();
+		return persistKey == null || persistKey.isEmpty() ? //
+			persistKey : item.getName();
+	}
 }

From 1e046ce21c9cb2135bc31db7c7b2ba4841df0290 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 7 Dec 2017 13:29:08 +0100
Subject: [PATCH 0672/1208] Clear persisted value when default value is used

Otherwise, the last-used non-default value remains persisted for next
time. This results in surprising behavior where setting a field back to
the default works, but then does not persist the next time you run.

This commit is dedicated to Klim Kolyvanov.
---
 src/main/java/org/scijava/module/DefaultModuleService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 29a82b954..9bf7f740b 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -294,6 +294,7 @@ public <T> void save(final ModuleItem<T> item, final T value) {
 			// NB: Do not persist the value if it is the default.
 			// This is nice if the default value might change later,
 			// such as when iteratively developing a script.
+			prefService.remove(prefClass(item), prefKey(item));
 			return;
 		}
 

From e5a5e324d5d53b4a3e43c5214a948aeea861997c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 7 Dec 2017 16:28:54 +0100
Subject: [PATCH 0673/1208] DefaultModuleService: fix bug in conditional order

This makes 1e046ce21c9cb2135bc31db7c7b2ba4841df0290 work as intended...
almost. There is still a problem with the PrefService's remove method,
which will be fixed in the subsequent series of commits.
---
 src/main/java/org/scijava/module/DefaultModuleService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 9bf7f740b..893e846ff 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -521,6 +521,6 @@ private Class<?> prefClass(final ModuleItem<?> item) {
 	private String prefKey(final ModuleItem<?> item) {
 		final String persistKey = item.getPersistKey();
 		return persistKey == null || persistKey.isEmpty() ? //
-			persistKey : item.getName();
+			item.getName() : persistKey;
 	}
 }

From 13e4ec325d951cb89b1cba89bcab8889ca25e65f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 14 Dec 2017 10:48:32 +0100
Subject: [PATCH 0674/1208] DefaultMutableModuleItem: preserve the validater

Otherwise, the module item will "forget" the validater of its parent.
This causes DynamicCommand, for example, to ignore validater methods.

This commit is dedicated to Richard Domander.
---
 src/main/java/org/scijava/module/DefaultMutableModuleItem.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index afa563749..7a2d3ec23 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -92,6 +92,7 @@ public DefaultMutableModuleItem(final ModuleInfo info, final String name,
 		persisted = super.isPersisted();
 		persistKey = super.getPersistKey();
 		initializer = super.getInitializer();
+		validater = super.getValidater();
 		callback = super.getCallback();
 		widgetStyle = super.getWidgetStyle();
 		minimumValue = super.getMinimumValue();
@@ -118,6 +119,7 @@ public DefaultMutableModuleItem(final ModuleInfo info,
 		persisted = item.isPersisted();
 		persistKey = item.getPersistKey();
 		initializer = item.getInitializer();
+		validater = item.getValidater();
 		callback = item.getCallback();
 		widgetStyle = item.getWidgetStyle();
 		minimumValue = item.getMinimumValue();

From 3927f28db503c968d2d0b0ddb736386cc90ada5c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 12:46:48 +0100
Subject: [PATCH 0675/1208] CommandService: don't run Command/Module hybrids

Unfortunately, running such a command (e.g., DynamicCommand) results in
the command instance -- and not a CommandModule -- being returned by
ModuleService#run. Rather than fix the API and break backwards
compatibility, we apply a band-aid for now: this commit checks for that
situation and proactively throws an IllegalArgumentException, rather
than throwing a cryptic ClassCastException after the fact.

This commit is also dedicated to Richard Domander.
---
 .../command/DefaultCommandService.java        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index d35905b6b..e48d143bc 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -41,6 +41,7 @@
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.log.LogService;
+import org.scijava.module.Module;
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.AbstractPTService;
 import org.scijava.plugin.Parameter;
@@ -182,6 +183,7 @@ public <C extends Command> Future<CommandModule> run(
 	public Future<CommandModule> run(final CommandInfo info,
 		final boolean process, final Object... inputs)
 	{
+		validateModuleType(info);
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		final Future<CommandModule> future =
 			(Future) moduleService.run(info, process, inputs);
@@ -192,6 +194,7 @@ public Future<CommandModule> run(final CommandInfo info,
 	public Future<CommandModule> run(final CommandInfo info,
 		final boolean process, final Map<String, Object> inputMap)
 	{
+		validateModuleType(info);
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		final Future<CommandModule> future =
 			(Future) moduleService.run(info, process, inputMap);
@@ -348,4 +351,26 @@ private <PT extends SciJavaPlugin> List<PluginInfo<?>> downcast(
 		return typedPlugins;
 	}
 
+	/**
+	 * A HACK to prevent calling run when the resultant module will not be a
+	 * {@link CommandModule}. This is an API design flaw in CommandService
+	 * currently, but for now work around it rather than breaking backwards API
+	 * compatibility.
+	 */
+	private void validateModuleType(final CommandInfo info) {
+		try {
+			final Class<?> commandClass = info.loadDelegateClass();
+			if (Module.class.isAssignableFrom(commandClass)) {
+				throw new IllegalArgumentException("Cannot use " +
+					"commandService.run(commandClass, ...) " +
+					"with classes that extend Module directly. Please call " +
+					"moduleService.run(commandService.getCommand(commandClass), ...) " +
+					"instead.");
+			}
+		}
+		catch (final ClassNotFoundException exc) {
+			throw new IllegalStateException("Command class unavailable: " + //
+				info.getDelegateClassName(), exc);
+		}
+	}
 }

From 5f303268430b1f932765b8c73da2faab2e4bde08 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 12 Dec 2017 23:31:45 +0100
Subject: [PATCH 0676/1208] PrefService: deprecate global preferences

Best to always give a class.
---
 .../org/scijava/prefs/DefaultPrefService.java | 28 +++++++++++++++++++
 .../java/org/scijava/prefs/PrefService.java   | 28 +++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 225a909ef..8b1bc8398 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -60,66 +60,79 @@ public class DefaultPrefService extends AbstractPrefService {
 
 	// -- Global preferences --
 
+	@Deprecated
 	@Override
 	public String get(final String name) {
 		return get((Class<?>) null, name);
 	}
 
+	@Deprecated
 	@Override
 	public String get(final String name, final String defaultValue) {
 		return get(null, name, defaultValue);
 	}
 
+	@Deprecated
 	@Override
 	public boolean getBoolean(final String name, final boolean defaultValue) {
 		return getBoolean(null, name, defaultValue);
 	}
 
+	@Deprecated
 	@Override
 	public double getDouble(final String name, final double defaultValue) {
 		return getDouble(null, name, defaultValue);
 	}
 
+	@Deprecated
 	@Override
 	public float getFloat(final String name, final float defaultValue) {
 		return getFloat(null, name, defaultValue);
 	}
 
+	@Deprecated
 	@Override
 	public int getInt(final String name, final int defaultValue) {
 		return getInt(null, name, defaultValue);
 	}
 
+	@Deprecated
 	@Override
 	public long getLong(final String name, final long defaultValue) {
 		return getLong(null, name, defaultValue);
 	}
 
+	@Deprecated
 	@Override
 	public void put(final String name, final String value) {
 		put(null, name, value);
 	}
 
+	@Deprecated
 	@Override
 	public void put(final String name, final boolean value) {
 		put(null, name, value);
 	}
 
+	@Deprecated
 	@Override
 	public void put(final String name, final double value) {
 		put(null, name, value);
 	}
 
+	@Deprecated
 	@Override
 	public void put(final String name, final float value) {
 		put(null, name, value);
 	}
 
+	@Deprecated
 	@Override
 	public void put(final String name, final int value) {
 		put(null, name, value);
 	}
 
+	@Deprecated
 	@Override
 	public void put(final String name, final long value) {
 		put(null, name, value);
@@ -220,6 +233,7 @@ public void clearAll() {
 			prefs(name).removeNode();
 	}
 
+	@Deprecated
 	@Override
 	public void clear(final String key) {
 		clear((Class<?>) null, key);
@@ -230,6 +244,7 @@ public void clear(final Class<?> prefClass, final String key) {
 		prefs(prefClass).clear(key);
 	}
 
+	@Deprecated
 	@Override
 	public void clear(final String absolutePath, final String key) {
 		prefs(absolutePath).clear(key);
@@ -240,11 +255,13 @@ public void remove(final Class<?> prefClass, final String key) {
 		prefs(prefClass).remove(key);
 	}
 
+	@Deprecated
 	@Override
 	public void remove(final String absolutePath, final String key) {
 		prefs(absolutePath).remove(key);
 	}
 
+	@Deprecated
 	@Override
 	public void putMap(final Map<String, String> map, final String key) {
 		putMap((Class<?>) null, map, key);
@@ -257,6 +274,7 @@ public void putMap(final Class<?> prefClass, final Map<String, String> map,
 		prefs(prefClass).node(key).putMap(map);
 	}
 
+	@Deprecated
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map,
 		final String key)
@@ -269,11 +287,13 @@ public void putMap(final Class<?> prefClass, final Map<String, String> map) {
 		prefs(prefClass).putMap(map);
 	}
 
+	@Deprecated
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map) {
 		prefs(absolutePath).putMap(map);
 	}
 
+	@Deprecated
 	@Override
 	public Map<String, String> getMap(final String key) {
 		return getMap((Class<?>) null, key);
@@ -285,6 +305,7 @@ public Map<String, String> getMap(final Class<?> prefClass, final String key)
 		return prefs(prefClass).node(key).getMap();
 	}
 
+	@Deprecated
 	@Override
 	public Map<String, String>
 		getMap(final String absolutePath, final String key)
@@ -297,6 +318,7 @@ public Map<String, String> getMap(final Class<?> prefClass) {
 		return prefs(prefClass).getMap();
 	}
 
+	@Deprecated
 	@Override
 	public void putList(final List<String> list, final String key) {
 		putList((Class<?>) null, list, key);
@@ -309,6 +331,7 @@ public void putList(final Class<?> prefClass, final List<String> list,
 		prefs(prefClass).node(key).putList(list);
 	}
 
+	@Deprecated
 	@Override
 	public void putList(final String absolutePath, final List<String> list,
 		final String key)
@@ -321,11 +344,13 @@ public void putList(final Class<?> prefClass, final List<String> list) {
 		prefs(prefClass).putList(list);
 	}
 
+	@Deprecated
 	@Override
 	public void putList(final String absolutePath, final List<String> list) {
 		prefs(absolutePath).putList(list);
 	}
 
+	@Deprecated
 	@Override
 	public List<String> getList(final String key) {
 		return getList((Class<?>) null, key);
@@ -336,6 +361,7 @@ public List<String> getList(final Class<?> prefClass, final String key) {
 		return prefs(prefClass).node(key).getList();
 	}
 
+	@Deprecated
 	@Override
 	public List<String> getList(final String absolutePath, final String key) {
 		return prefs(absolutePath).node(key).getList();
@@ -346,6 +372,7 @@ public List<String> getList(final Class<?> prefClass) {
 		return prefs(prefClass).getList();
 	}
 
+	@Deprecated
 	@Override
 	public Iterable<String> getIterable(final String key) {
 		return getIterable((Class<?>) null, key);
@@ -356,6 +383,7 @@ public Iterable<String> getIterable(final Class<?> prefClass, final String key)
 		return prefs(prefClass).node(key).getIterable();
 	}
 
+	@Deprecated
 	@Override
 	public void putIterable(final Iterable<String> iterable, final String key) {
 		putIterable((Class<?>) null, iterable, key);
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 79de5cd4c..90da244e7 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -45,30 +45,43 @@
  */
 public interface PrefService extends SciJavaService {
 
+	@Deprecated
 	String get(String name);
 
+	@Deprecated
 	String get(String name, String defaultValue);
 
+	@Deprecated
 	boolean getBoolean(String name, boolean defaultValue);
 
+	@Deprecated
 	double getDouble(String name, double defaultValue);
 
+	@Deprecated
 	float getFloat(String name, float defaultValue);
 
+	@Deprecated
 	int getInt(String name, int defaultValue);
 
+	@Deprecated
 	long getLong(String name, long defaultValue);
 
+	@Deprecated
 	void put(String name, String value);
 
+	@Deprecated
 	void put(String name, boolean value);
 
+	@Deprecated
 	void put(String name, double value);
 
+	@Deprecated
 	void put(String name, float value);
 
+	@Deprecated
 	void put(String name, int value);
 
+	@Deprecated
 	void put(String name, long value);
 
 	String get(Class<?> c, String name);
@@ -103,6 +116,7 @@ public interface PrefService extends SciJavaService {
 	void clearAll();
 
 	/** Clears the node. */
+	@Deprecated
 	void clear(String key);
 
 	/**
@@ -113,14 +127,17 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Clears the ndoe indexed under the given path.
 	 */
+	@Deprecated
 	void clear(String absolutePath, String key);
 
 	/** Removes the node. */
 	void remove(Class<?> prefClass, String key);
 
+	@Deprecated
 	void remove(String absolutePath, String key);
 
 	/** Puts a Map into the preferences. */
+	@Deprecated
 	void putMap(Map<String, String> map, String key);
 
 	/**
@@ -131,6 +148,7 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Puts a Map into the preferences, indexed under the given path.
 	 */
+	@Deprecated
 	void putMap(String absolutePath, Map<String, String> map);
 
 	/**
@@ -142,9 +160,11 @@ public interface PrefService extends SciJavaService {
 	 * Puts a Map into the preferences, indexed under the given path and
 	 * relative key path.
 	 */
+	@Deprecated
 	void putMap(String absolutePath, Map<String, String> map, String key);
 
 	/** Gets a Map from the preferences. */
+	@Deprecated
 	Map<String, String> getMap(String key);
 
 	/**
@@ -155,9 +175,11 @@ public interface PrefService extends SciJavaService {
 	/** Gets a Map from the preferences. */
 	Map<String, String> getMap(Class<?> prefClass);
 
+	@Deprecated
 	Map<String, String> getMap(String absolutePath, String key);
 
 	/** Puts a list into the preferences. */
+	@Deprecated
 	void putList(List<String> list, String key);
 
 	/**
@@ -169,20 +191,24 @@ public interface PrefService extends SciJavaService {
 	 * Puts a list into the preferences, indexed under the specified path and
 	 * relative key.
 	 */
+	@Deprecated
 	void putList(String absolutePath, List<String> list, String key);
 
 	/** Puts a list into the preferences. */
 	void putList(Class<?> prefClass, List<String> list);
 
 	/** Puts a list into the preferences, indexed under the specified path. */
+	@Deprecated
 	void putList(String absolutePath, List<String> list);
 
 	/** Gets a List from the preferences. */
+	@Deprecated
 	List<String> getList(String key);
 
 	/**
 	 * Gets a List from the preferences, indexed under the specified path.
 	 */
+	@Deprecated
 	List<String> getList(String absolutePath, String key);
 
 	/**
@@ -199,6 +225,7 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Puts an iterable into the preferences.
 	 */
+	@Deprecated
 	void putIterable(Iterable<String> iterable, String key);
 
 	/**
@@ -209,6 +236,7 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Gets an iterable from the preferences.
 	 */
+	@Deprecated
 	Iterable<String> getIterable(String key);
 
 	/**

From 8021b1149c054cf1fe74403e741142258ed5ead7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 12 Dec 2017 23:39:25 +0100
Subject: [PATCH 0677/1208] PrefService: isolate the deprecated methods

---
 .../org/scijava/prefs/DefaultPrefService.java | 287 +++++++++---------
 .../java/org/scijava/prefs/PrefService.java   | 197 ++++++------
 2 files changed, 225 insertions(+), 259 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 8b1bc8398..3d35eb639 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -58,201 +58,249 @@ public class DefaultPrefService extends AbstractPrefService {
 	@Parameter(required = false)
 	private LogService log;
 
-	// -- Global preferences --
+	@Override
+	public String get(final Class<?> c, final String name) {
+		return get(c, name, null);
+	}
 
-	@Deprecated
 	@Override
-	public String get(final String name) {
-		return get((Class<?>) null, name);
+	public String get(final Class<?> c, final String name,
+		final String defaultValue)
+	{
+		return prefs(c).get(key(c, name), defaultValue);
 	}
 
-	@Deprecated
 	@Override
-	public String get(final String name, final String defaultValue) {
-		return get(null, name, defaultValue);
+	public boolean getBoolean(final Class<?> c, final String name,
+		final boolean defaultValue)
+	{
+		return prefs(c).getBoolean(key(c, name), defaultValue);
 	}
 
-	@Deprecated
 	@Override
-	public boolean getBoolean(final String name, final boolean defaultValue) {
-		return getBoolean(null, name, defaultValue);
+	public double getDouble(final Class<?> c, final String name,
+		final double defaultValue)
+	{
+		return prefs(c).getDouble(key(c, name), defaultValue);
 	}
 
-	@Deprecated
 	@Override
-	public double getDouble(final String name, final double defaultValue) {
-		return getDouble(null, name, defaultValue);
+	public float getFloat(final Class<?> c, final String name,
+		final float defaultValue)
+	{
+		return prefs(c).getFloat(key(c, name), defaultValue);
 	}
 
-	@Deprecated
 	@Override
-	public float getFloat(final String name, final float defaultValue) {
-		return getFloat(null, name, defaultValue);
+	public int
+		getInt(final Class<?> c, final String name, final int defaultValue)
+	{
+		return prefs(c).getInt(key(c, name), defaultValue);
 	}
 
-	@Deprecated
 	@Override
-	public int getInt(final String name, final int defaultValue) {
-		return getInt(null, name, defaultValue);
+	public long getLong(final Class<?> c, final String name,
+		final long defaultValue)
+	{
+		return prefs(c).getLong(key(c, name), defaultValue);
 	}
 
-	@Deprecated
 	@Override
-	public long getLong(final String name, final long defaultValue) {
-		return getLong(null, name, defaultValue);
+	public void put(final Class<?> c, final String name, final String value) {
+		prefs(c).put(key(c, name), value);
 	}
 
-	@Deprecated
 	@Override
-	public void put(final String name, final String value) {
-		put(null, name, value);
+	public void put(final Class<?> c, final String name, final boolean value) {
+		prefs(c).putBoolean(key(c, name), value);
 	}
 
-	@Deprecated
 	@Override
-	public void put(final String name, final boolean value) {
-		put(null, name, value);
+	public void put(final Class<?> c, final String name, final double value) {
+		prefs(c).putDouble(key(c, name), value);
 	}
 
-	@Deprecated
 	@Override
-	public void put(final String name, final double value) {
-		put(null, name, value);
+	public void put(final Class<?> c, final String name, final float value) {
+		prefs(c).putFloat(key(c, name), value);
 	}
 
-	@Deprecated
 	@Override
-	public void put(final String name, final float value) {
-		put(null, name, value);
+	public void put(final Class<?> c, final String name, final int value) {
+		prefs(c).putInt(key(c, name), value);
 	}
 
-	@Deprecated
 	@Override
-	public void put(final String name, final int value) {
-		put(null, name, value);
+	public void put(final Class<?> c, final String name, final long value) {
+		prefs(c).putLong(key(c, name), value);
 	}
 
-	@Deprecated
 	@Override
-	public void put(final String name, final long value) {
-		put(null, name, value);
+	public void clear(final Class<?> c) {
+		prefs(c).clear();
 	}
 
-	// -- Class-specific preferences --
+	@Override
+	public void clearAll() {
+		for (final String name : allPrefs())
+			prefs(name).removeNode();
+	}
 
 	@Override
-	public String get(final Class<?> c, final String name) {
-		return get(c, name, null);
+	public void clear(final Class<?> prefClass, final String key) {
+		prefs(prefClass).clear(key);
 	}
 
 	@Override
-	public String get(final Class<?> c, final String name,
-		final String defaultValue)
-	{
-		return prefs(c).get(key(c, name), defaultValue);
+	public void remove(final Class<?> prefClass, final String key) {
+		prefs(prefClass).remove(key);
 	}
 
 	@Override
-	public boolean getBoolean(final Class<?> c, final String name,
-		final boolean defaultValue)
+	public void putMap(final Class<?> prefClass, final Map<String, String> map,
+		final String key)
 	{
-		return prefs(c).getBoolean(key(c, name), defaultValue);
+		prefs(prefClass).node(key).putMap(map);
 	}
 
 	@Override
-	public double getDouble(final Class<?> c, final String name,
-		final double defaultValue)
-	{
-		return prefs(c).getDouble(key(c, name), defaultValue);
+	public void putMap(final Class<?> prefClass, final Map<String, String> map) {
+		prefs(prefClass).putMap(map);
 	}
 
 	@Override
-	public float getFloat(final Class<?> c, final String name,
-		final float defaultValue)
+	public Map<String, String> getMap(final Class<?> prefClass, final String key)
 	{
-		return prefs(c).getFloat(key(c, name), defaultValue);
+		return prefs(prefClass).node(key).getMap();
 	}
 
 	@Override
-	public int
-		getInt(final Class<?> c, final String name, final int defaultValue)
-	{
-		return prefs(c).getInt(key(c, name), defaultValue);
+	public Map<String, String> getMap(final Class<?> prefClass) {
+		return prefs(prefClass).getMap();
 	}
 
 	@Override
-	public long getLong(final Class<?> c, final String name,
-		final long defaultValue)
+	public void putList(final Class<?> prefClass, final List<String> list,
+		final String key)
 	{
-		return prefs(c).getLong(key(c, name), defaultValue);
+		prefs(prefClass).node(key).putList(list);
 	}
 
 	@Override
-	public void put(final Class<?> c, final String name, final String value) {
-		prefs(c).put(key(c, name), value);
+	public void putList(final Class<?> prefClass, final List<String> list) {
+		prefs(prefClass).putList(list);
 	}
 
 	@Override
-	public void put(final Class<?> c, final String name, final boolean value) {
-		prefs(c).putBoolean(key(c, name), value);
+	public List<String> getList(final Class<?> prefClass, final String key) {
+		return prefs(prefClass).node(key).getList();
 	}
 
 	@Override
-	public void put(final Class<?> c, final String name, final double value) {
-		prefs(c).putDouble(key(c, name), value);
+	public List<String> getList(final Class<?> prefClass) {
+		return prefs(prefClass).getList();
 	}
 
 	@Override
-	public void put(final Class<?> c, final String name, final float value) {
-		prefs(c).putFloat(key(c, name), value);
+	public Iterable<String> getIterable(final Class<?> prefClass, final String key) {
+		return prefs(prefClass).node(key).getIterable();
 	}
 
 	@Override
-	public void put(final Class<?> c, final String name, final int value) {
-		prefs(c).putInt(key(c, name), value);
+	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String key) {
+		prefs(prefClass).node(key).node(key).putIterable(iterable);
 	}
 
+	// -- Deprecated methods --
+
+	@Deprecated
 	@Override
-	public void put(final Class<?> c, final String name, final long value) {
-		prefs(c).putLong(key(c, name), value);
+	public String get(final String name) {
+		return get((Class<?>) null, name);
 	}
 
+	@Deprecated
 	@Override
-	public void clear(final Class<?> c) {
-		prefs(c).clear();
+	public String get(final String name, final String defaultValue) {
+		return get(null, name, defaultValue);
 	}
 
-	// -- Other/unsorted --
+	@Deprecated
+	@Override
+	public boolean getBoolean(final String name, final boolean defaultValue) {
+		return getBoolean(null, name, defaultValue);
+	}
 
-	// TODO - Evaluate which of these methods are really needed, and which are
-	// duplicate of similar functionality above.
+	@Deprecated
+	@Override
+	public double getDouble(final String name, final double defaultValue) {
+		return getDouble(null, name, defaultValue);
+	}
 
+	@Deprecated
 	@Override
-	public void clearAll() {
-		for (final String name : allPrefs())
-			prefs(name).removeNode();
+	public float getFloat(final String name, final float defaultValue) {
+		return getFloat(null, name, defaultValue);
 	}
 
 	@Deprecated
 	@Override
-	public void clear(final String key) {
-		clear((Class<?>) null, key);
+	public int getInt(final String name, final int defaultValue) {
+		return getInt(null, name, defaultValue);
 	}
 
+	@Deprecated
 	@Override
-	public void clear(final Class<?> prefClass, final String key) {
-		prefs(prefClass).clear(key);
+	public long getLong(final String name, final long defaultValue) {
+		return getLong(null, name, defaultValue);
 	}
 
 	@Deprecated
 	@Override
-	public void clear(final String absolutePath, final String key) {
-		prefs(absolutePath).clear(key);
+	public void put(final String name, final String value) {
+		put(null, name, value);
 	}
 
+	@Deprecated
 	@Override
-	public void remove(final Class<?> prefClass, final String key) {
-		prefs(prefClass).remove(key);
+	public void put(final String name, final boolean value) {
+		put(null, name, value);
+	}
+
+	@Deprecated
+	@Override
+	public void put(final String name, final double value) {
+		put(null, name, value);
+	}
+
+	@Deprecated
+	@Override
+	public void put(final String name, final float value) {
+		put(null, name, value);
+	}
+
+	@Deprecated
+	@Override
+	public void put(final String name, final int value) {
+		put(null, name, value);
+	}
+
+	@Deprecated
+	@Override
+	public void put(final String name, final long value) {
+		put(null, name, value);
+	}
+
+	@Deprecated
+	@Override
+	public void clear(final String key) {
+		clear((Class<?>) null, key);
+	}
+
+	@Deprecated
+	@Override
+	public void clear(final String absolutePath, final String key) {
+		prefs(absolutePath).clear(key);
 	}
 
 	@Deprecated
@@ -267,13 +315,6 @@ public void putMap(final Map<String, String> map, final String key) {
 		putMap((Class<?>) null, map, key);
 	}
 
-	@Override
-	public void putMap(final Class<?> prefClass, final Map<String, String> map,
-		final String key)
-	{
-		prefs(prefClass).node(key).putMap(map);
-	}
-
 	@Deprecated
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map,
@@ -282,11 +323,6 @@ public void putMap(final String absolutePath, final Map<String, String> map,
 		prefs(absolutePath).node(key).putMap(map);
 	}
 
-	@Override
-	public void putMap(final Class<?> prefClass, final Map<String, String> map) {
-		prefs(prefClass).putMap(map);
-	}
-
 	@Deprecated
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map) {
@@ -299,12 +335,6 @@ public Map<String, String> getMap(final String key) {
 		return getMap((Class<?>) null, key);
 	}
 
-	@Override
-	public Map<String, String> getMap(final Class<?> prefClass, final String key)
-	{
-		return prefs(prefClass).node(key).getMap();
-	}
-
 	@Deprecated
 	@Override
 	public Map<String, String>
@@ -313,24 +343,12 @@ public Map<String, String> getMap(final Class<?> prefClass, final String key)
 		return prefs(absolutePath).node(key).getMap();
 	}
 
-	@Override
-	public Map<String, String> getMap(final Class<?> prefClass) {
-		return prefs(prefClass).getMap();
-	}
-
 	@Deprecated
 	@Override
 	public void putList(final List<String> list, final String key) {
 		putList((Class<?>) null, list, key);
 	}
 
-	@Override
-	public void putList(final Class<?> prefClass, final List<String> list,
-		final String key)
-	{
-		prefs(prefClass).node(key).putList(list);
-	}
-
 	@Deprecated
 	@Override
 	public void putList(final String absolutePath, final List<String> list,
@@ -339,11 +357,6 @@ public void putList(final String absolutePath, final List<String> list,
 		prefs(absolutePath).node(key).putList(list);
 	}
 
-	@Override
-	public void putList(final Class<?> prefClass, final List<String> list) {
-		prefs(prefClass).putList(list);
-	}
-
 	@Deprecated
 	@Override
 	public void putList(final String absolutePath, final List<String> list) {
@@ -356,44 +369,24 @@ public List<String> getList(final String key) {
 		return getList((Class<?>) null, key);
 	}
 
-	@Override
-	public List<String> getList(final Class<?> prefClass, final String key) {
-		return prefs(prefClass).node(key).getList();
-	}
-
 	@Deprecated
 	@Override
 	public List<String> getList(final String absolutePath, final String key) {
 		return prefs(absolutePath).node(key).getList();
 	}
 
-	@Override
-	public List<String> getList(final Class<?> prefClass) {
-		return prefs(prefClass).getList();
-	}
-
 	@Deprecated
 	@Override
 	public Iterable<String> getIterable(final String key) {
 		return getIterable((Class<?>) null, key);
 	}
 
-	@Override
-	public Iterable<String> getIterable(final Class<?> prefClass, final String key) {
-		return prefs(prefClass).node(key).getIterable();
-	}
-
 	@Deprecated
 	@Override
 	public void putIterable(final Iterable<String> iterable, final String key) {
 		putIterable((Class<?>) null, iterable, key);
 	}
 
-	@Override
-	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String key) {
-		prefs(prefClass).node(key).node(key).putIterable(iterable);
-	}
-
 	// -- Helper methods --
 
 	private static String key(final Class<?> c, final String name) {
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 90da244e7..27a4311a3 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -45,45 +45,6 @@
  */
 public interface PrefService extends SciJavaService {
 
-	@Deprecated
-	String get(String name);
-
-	@Deprecated
-	String get(String name, String defaultValue);
-
-	@Deprecated
-	boolean getBoolean(String name, boolean defaultValue);
-
-	@Deprecated
-	double getDouble(String name, double defaultValue);
-
-	@Deprecated
-	float getFloat(String name, float defaultValue);
-
-	@Deprecated
-	int getInt(String name, int defaultValue);
-
-	@Deprecated
-	long getLong(String name, long defaultValue);
-
-	@Deprecated
-	void put(String name, String value);
-
-	@Deprecated
-	void put(String name, boolean value);
-
-	@Deprecated
-	void put(String name, double value);
-
-	@Deprecated
-	void put(String name, float value);
-
-	@Deprecated
-	void put(String name, int value);
-
-	@Deprecated
-	void put(String name, long value);
-
 	String get(Class<?> c, String name);
 
 	String get(Class<?> c, String name, String defaultValue);
@@ -115,58 +76,24 @@ public interface PrefService extends SciJavaService {
 	/** Clears everything. */
 	void clearAll();
 
-	/** Clears the node. */
-	@Deprecated
-	void clear(String key);
-
 	/**
 	 * Clears the node indexed under the given class.
 	 */
 	void clear(Class<?> prefClass, String key);
 
-	/**
-	 * Clears the ndoe indexed under the given path.
-	 */
-	@Deprecated
-	void clear(String absolutePath, String key);
-
 	/** Removes the node. */
 	void remove(Class<?> prefClass, String key);
 
-	@Deprecated
-	void remove(String absolutePath, String key);
-
-	/** Puts a Map into the preferences. */
-	@Deprecated
-	void putMap(Map<String, String> map, String key);
-
 	/**
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
 	void putMap(Class<?> prefClass, Map<String, String> map, String key);
 
-	/**
-	 * Puts a Map into the preferences, indexed under the given path.
-	 */
-	@Deprecated
-	void putMap(String absolutePath, Map<String, String> map);
-
 	/**
 	 * Puts a Map into the preferences, indexed under the given class.
 	 */
 	void putMap(Class<?> prefClass, Map<String, String> map);
 
-	/**
-	 * Puts a Map into the preferences, indexed under the given path and
-	 * relative key path.
-	 */
-	@Deprecated
-	void putMap(String absolutePath, Map<String, String> map, String key);
-
-	/** Gets a Map from the preferences. */
-	@Deprecated
-	Map<String, String> getMap(String key);
-
 	/**
 	 * Gets a map from the preferences, indexed under the specified class.
 	 */
@@ -175,42 +102,14 @@ public interface PrefService extends SciJavaService {
 	/** Gets a Map from the preferences. */
 	Map<String, String> getMap(Class<?> prefClass);
 
-	@Deprecated
-	Map<String, String> getMap(String absolutePath, String key);
-
-	/** Puts a list into the preferences. */
-	@Deprecated
-	void putList(List<String> list, String key);
-
 	/**
 	 * Puts a list into the preferences, indexed under the specified class.
 	 */
 	void putList(Class<?> prefClass, List<String> list, String key);
 
-	/**
-	 * Puts a list into the preferences, indexed under the specified path and
-	 * relative key.
-	 */
-	@Deprecated
-	void putList(String absolutePath, List<String> list, String key);
-
 	/** Puts a list into the preferences. */
 	void putList(Class<?> prefClass, List<String> list);
 
-	/** Puts a list into the preferences, indexed under the specified path. */
-	@Deprecated
-	void putList(String absolutePath, List<String> list);
-
-	/** Gets a List from the preferences. */
-	@Deprecated
-	List<String> getList(String key);
-
-	/**
-	 * Gets a List from the preferences, indexed under the specified path.
-	 */
-	@Deprecated
-	List<String> getList(String absolutePath, String key);
-
 	/**
 	 * Gets a List from the preferences, indexed under the specified class.
 	 */
@@ -222,12 +121,6 @@ public interface PrefService extends SciJavaService {
 	 */
 	List<String> getList(Class<?> prefClass);
 
-	/**
-	 * Puts an iterable into the preferences.
-	 */
-	@Deprecated
-	void putIterable(Iterable<String> iterable, String key);
-
 	/**
 	 * Puts an iterable into the preferences.
 	 */
@@ -236,11 +129,91 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Gets an iterable from the preferences.
 	 */
+	Iterable<String> getIterable(Class<?> prefClass, String key);
+
+	// -- Deprecated methods --
+
 	@Deprecated
-	Iterable<String> getIterable(String key);
+	String get(String name);
 
-	/**
-	 * Gets an iterable from the preferences.
-	 */
-	Iterable<String> getIterable(Class<?> prefClass, String key);
+	@Deprecated
+	String get(String name, String defaultValue);
+
+	@Deprecated
+	boolean getBoolean(String name, boolean defaultValue);
+
+	@Deprecated
+	double getDouble(String name, double defaultValue);
+
+	@Deprecated
+	float getFloat(String name, float defaultValue);
+
+	@Deprecated
+	int getInt(String name, int defaultValue);
+
+	@Deprecated
+	long getLong(String name, long defaultValue);
+
+	@Deprecated
+	void put(String name, String value);
+
+	@Deprecated
+	void put(String name, boolean value);
+
+	@Deprecated
+	void put(String name, double value);
+
+	@Deprecated
+	void put(String name, float value);
+
+	@Deprecated
+	void put(String name, int value);
+
+	@Deprecated
+	void put(String name, long value);
+
+	@Deprecated
+	void clear(String key);
+
+	@Deprecated
+	void clear(String absolutePath, String key);
+
+	@Deprecated
+	void remove(String absolutePath, String key);
+
+	@Deprecated
+	void putMap(Map<String, String> map, String key);
+
+	@Deprecated
+	void putMap(String absolutePath, Map<String, String> map);
+
+	@Deprecated
+	void putMap(String absolutePath, Map<String, String> map, String key);
+
+	@Deprecated
+	Map<String, String> getMap(String key);
+
+	@Deprecated
+	Map<String, String> getMap(String absolutePath, String key);
+
+	@Deprecated
+	void putList(List<String> list, String key);
+
+	@Deprecated
+	void putList(String absolutePath, List<String> list, String key);
+
+	@Deprecated
+	void putList(String absolutePath, List<String> list);
+
+	@Deprecated
+	List<String> getList(String key);
+
+	@Deprecated
+	List<String> getList(String absolutePath, String key);
+
+	@Deprecated
+	void putIterable(Iterable<String> iterable, String key);
+
+	@Deprecated
+	Iterable<String> getIterable(String key);
 }

From 15907aee9ca2e4bec67630354c91e90701d768bc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 12 Dec 2017 23:44:15 +0100
Subject: [PATCH 0678/1208] PrefService: make String arg always name, not key

Passing a raw key is never what we want. The name needs to be
synthesized with the class name. Otherwise the raw key is stored in the
_package_ node, and not actually associated with the specified class.

This is a quasi-breaking change, in that certain kinds of persisted
preferences from previous will be lost. But the behavior was confusing
and inconsistent and problematic as it was, and needed to be fixed.
---
 .../org/scijava/prefs/DefaultPrefService.java | 32 +++++++++----------
 .../java/org/scijava/prefs/PrefService.java   | 16 +++++-----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 3d35eb639..dbc67ab67 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -147,20 +147,20 @@ public void clearAll() {
 	}
 
 	@Override
-	public void clear(final Class<?> prefClass, final String key) {
-		prefs(prefClass).clear(key);
+	public void clear(final Class<?> prefClass, final String name) {
+		prefs(prefClass).clear(key(prefClass, name));
 	}
 
 	@Override
-	public void remove(final Class<?> prefClass, final String key) {
-		prefs(prefClass).remove(key);
+	public void remove(final Class<?> prefClass, final String name) {
+		prefs(prefClass).remove(key(prefClass, name));
 	}
 
 	@Override
 	public void putMap(final Class<?> prefClass, final Map<String, String> map,
-		final String key)
+		final String name)
 	{
-		prefs(prefClass).node(key).putMap(map);
+		prefs(prefClass).node(key(prefClass, name)).putMap(map);
 	}
 
 	@Override
@@ -169,9 +169,9 @@ public void putMap(final Class<?> prefClass, final Map<String, String> map) {
 	}
 
 	@Override
-	public Map<String, String> getMap(final Class<?> prefClass, final String key)
+	public Map<String, String> getMap(final Class<?> prefClass, final String name)
 	{
-		return prefs(prefClass).node(key).getMap();
+		return prefs(prefClass).node(key(prefClass, name)).getMap();
 	}
 
 	@Override
@@ -181,9 +181,9 @@ public Map<String, String> getMap(final Class<?> prefClass) {
 
 	@Override
 	public void putList(final Class<?> prefClass, final List<String> list,
-		final String key)
+		final String name)
 	{
-		prefs(prefClass).node(key).putList(list);
+		prefs(prefClass).node(key(prefClass, name)).putList(list);
 	}
 
 	@Override
@@ -192,8 +192,8 @@ public void putList(final Class<?> prefClass, final List<String> list) {
 	}
 
 	@Override
-	public List<String> getList(final Class<?> prefClass, final String key) {
-		return prefs(prefClass).node(key).getList();
+	public List<String> getList(final Class<?> prefClass, final String name) {
+		return prefs(prefClass).node(key(prefClass, name)).getList();
 	}
 
 	@Override
@@ -202,13 +202,13 @@ public List<String> getList(final Class<?> prefClass) {
 	}
 
 	@Override
-	public Iterable<String> getIterable(final Class<?> prefClass, final String key) {
-		return prefs(prefClass).node(key).getIterable();
+	public Iterable<String> getIterable(final Class<?> prefClass, final String name) {
+		return prefs(prefClass).node(key(prefClass, name)).getIterable();
 	}
 
 	@Override
-	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String key) {
-		prefs(prefClass).node(key).node(key).putIterable(iterable);
+	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
+		prefs(prefClass).node(key(prefClass, name)).putIterable(iterable);
 	}
 
 	// -- Deprecated methods --
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 27a4311a3..bf8210554 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -79,15 +79,15 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Clears the node indexed under the given class.
 	 */
-	void clear(Class<?> prefClass, String key);
+	void clear(Class<?> prefClass, String name);
 
 	/** Removes the node. */
-	void remove(Class<?> prefClass, String key);
+	void remove(Class<?> prefClass, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
-	void putMap(Class<?> prefClass, Map<String, String> map, String key);
+	void putMap(Class<?> prefClass, Map<String, String> map, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the given class.
@@ -97,7 +97,7 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Gets a map from the preferences, indexed under the specified class.
 	 */
-	Map<String, String> getMap(Class<?> prefClass, String key);
+	Map<String, String> getMap(Class<?> prefClass, String name);
 
 	/** Gets a Map from the preferences. */
 	Map<String, String> getMap(Class<?> prefClass);
@@ -105,7 +105,7 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Puts a list into the preferences, indexed under the specified class.
 	 */
-	void putList(Class<?> prefClass, List<String> list, String key);
+	void putList(Class<?> prefClass, List<String> list, String name);
 
 	/** Puts a list into the preferences. */
 	void putList(Class<?> prefClass, List<String> list);
@@ -113,7 +113,7 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Gets a List from the preferences, indexed under the specified class.
 	 */
-	List<String> getList(Class<?> prefClass, String key);
+	List<String> getList(Class<?> prefClass, String name);
 
 	/**
 	 * Gets a List from the preferences. Returns an empty list if nothing in
@@ -124,12 +124,12 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Puts an iterable into the preferences.
 	 */
-	void putIterable(Class<?> prefClass, Iterable<String> iterable, String key);
+	void putIterable(Class<?> prefClass, Iterable<String> iterable, String name);
 
 	/**
 	 * Gets an iterable from the preferences.
 	 */
-	Iterable<String> getIterable(Class<?> prefClass, String key);
+	Iterable<String> getIterable(Class<?> prefClass, String name);
 
 	// -- Deprecated methods --
 

From 7d4f21dc60e0de2f0faff84026f90c5a9f2c329f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 13:14:09 +0100
Subject: [PATCH 0679/1208] PrefService: do not limit lists to 1000 items

There was no reason for that hard-coded (and silent) limit.
---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index dbc67ab67..8c6b34bb1 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -470,7 +470,7 @@ public void putList(final List<String> list) {
 
 		public List<String> getList() {
 			final List<String> list = new ArrayList<>();
-			for (int index = 0; index < 1000; index++) {
+			for (int index = 0; index < Integer.MAX_VALUE; index++) {
 				final String value = get("" + index);
 				if (value == null) {
 					break;

From fdc342cd7d6442853dccb8a6cdfc5b20b4649fad Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 13:15:11 +0100
Subject: [PATCH 0680/1208] PrefService: tweak style

---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 8c6b34bb1..75f17624a 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -472,9 +472,7 @@ public List<String> getList() {
 			final List<String> list = new ArrayList<>();
 			for (int index = 0; index < Integer.MAX_VALUE; index++) {
 				final String value = get("" + index);
-				if (value == null) {
-					break;
-				}
+				if (value == null) break;
 				list.add(value);
 			}
 			return list;

From fd2dd6da1712e020de22fad818042c516fc9c7e9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 12 Dec 2017 23:51:59 +0100
Subject: [PATCH 0681/1208] PrefService: deprecate bad map/list/iterable sigs

Pattern should always be get(class, name) and set(class, name, value).

The methods not conforming to this pattern are now deprecated.
---
 .../org/scijava/prefs/DefaultPrefService.java | 53 ++++++++++++++-----
 .../java/org/scijava/prefs/PrefService.java   | 31 +++++++----
 2 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 75f17624a..d55fc4ff3 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -105,6 +105,16 @@ public long getLong(final Class<?> c, final String name,
 		return prefs(c).getLong(key(c, name), defaultValue);
 	}
 
+	@Override
+	public Map<String, String> getMap(final Class<?> c, final String name) {
+		return prefs(c).node(key(c, name)).getMap();
+	}
+
+	@Override
+	public List<String> getList(final Class<?> c, final String name) {
+		return prefs(c).node(key(c, name)).getList();
+	}
+
 	@Override
 	public void put(final Class<?> c, final String name, final String value) {
 		prefs(c).put(key(c, name), value);
@@ -135,6 +145,20 @@ public void put(final Class<?> c, final String name, final long value) {
 		prefs(c).putLong(key(c, name), value);
 	}
 
+	@Override
+	public void put(final Class<?> c, final String name,
+		final Map<String, String> value)
+	{
+		prefs(c).node(key(c, name)).putMap(value);
+	}
+
+	@Override
+	public void put(final Class<?> c, final String name,
+		final List<String> value)
+	{
+		prefs(c).node(key(c, name)).putList(value);
+	}
+
 	@Override
 	public void clear(final Class<?> c) {
 		prefs(c).clear();
@@ -156,46 +180,41 @@ public void remove(final Class<?> prefClass, final String name) {
 		prefs(prefClass).remove(key(prefClass, name));
 	}
 
+	@Deprecated
 	@Override
 	public void putMap(final Class<?> prefClass, final Map<String, String> map,
 		final String name)
 	{
-		prefs(prefClass).node(key(prefClass, name)).putMap(map);
+		put(prefClass, name, map);
 	}
 
+	@Deprecated
 	@Override
 	public void putMap(final Class<?> prefClass, final Map<String, String> map) {
 		prefs(prefClass).putMap(map);
 	}
 
-	@Override
-	public Map<String, String> getMap(final Class<?> prefClass, final String name)
-	{
-		return prefs(prefClass).node(key(prefClass, name)).getMap();
-	}
-
+	@Deprecated
 	@Override
 	public Map<String, String> getMap(final Class<?> prefClass) {
 		return prefs(prefClass).getMap();
 	}
 
+	@Deprecated
 	@Override
 	public void putList(final Class<?> prefClass, final List<String> list,
 		final String name)
 	{
-		prefs(prefClass).node(key(prefClass, name)).putList(list);
+		put(prefClass, name, list);
 	}
 
+	@Deprecated
 	@Override
 	public void putList(final Class<?> prefClass, final List<String> list) {
 		prefs(prefClass).putList(list);
 	}
 
-	@Override
-	public List<String> getList(final Class<?> prefClass, final String name) {
-		return prefs(prefClass).node(key(prefClass, name)).getList();
-	}
-
+	@Deprecated
 	@Override
 	public List<String> getList(final Class<?> prefClass) {
 		return prefs(prefClass).getList();
@@ -207,10 +226,16 @@ public Iterable<String> getIterable(final Class<?> prefClass, final String name)
 	}
 
 	@Override
-	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
+	public void putIterable(final Class<?> prefClass, final String name, final Iterable<String> iterable) {
 		prefs(prefClass).node(key(prefClass, name)).putIterable(iterable);
 	}
 
+	@Deprecated
+	@Override
+	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
+		putIterable(prefClass, name, iterable);
+	}
+
 	// -- Deprecated methods --
 
 	@Deprecated
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index bf8210554..140a49710 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -59,6 +59,10 @@ public interface PrefService extends SciJavaService {
 
 	long getLong(Class<?> c, String name, long defaultValue);
 
+	Map<String, String> getMap(Class<?> c, String name);
+
+	List<String> getList(Class<?> c, String name);
+
 	void put(Class<?> c, String name, String value);
 
 	void put(Class<?> c, String name, boolean value);
@@ -71,6 +75,10 @@ public interface PrefService extends SciJavaService {
 
 	void put(Class<?> c, String name, long value);
 
+	void put(Class<?> c, String name, Map<String, String> value);
+
+	void put(Class<?> c, String name, List<String> list);
+
 	void clear(Class<?> c);
 
 	/** Clears everything. */
@@ -87,48 +95,51 @@ public interface PrefService extends SciJavaService {
 	/**
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
+	@Deprecated
 	void putMap(Class<?> prefClass, Map<String, String> map, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the given class.
 	 */
+	@Deprecated
 	void putMap(Class<?> prefClass, Map<String, String> map);
 
-	/**
-	 * Gets a map from the preferences, indexed under the specified class.
-	 */
-	Map<String, String> getMap(Class<?> prefClass, String name);
-
 	/** Gets a Map from the preferences. */
+	@Deprecated
 	Map<String, String> getMap(Class<?> prefClass);
 
 	/**
 	 * Puts a list into the preferences, indexed under the specified class.
 	 */
+	@Deprecated
 	void putList(Class<?> prefClass, List<String> list, String name);
 
 	/** Puts a list into the preferences. */
+	@Deprecated
 	void putList(Class<?> prefClass, List<String> list);
 
-	/**
-	 * Gets a List from the preferences, indexed under the specified class.
-	 */
-	List<String> getList(Class<?> prefClass, String name);
-
 	/**
 	 * Gets a List from the preferences. Returns an empty list if nothing in
 	 * prefs.
 	 */
+	@Deprecated
 	List<String> getList(Class<?> prefClass);
 
 	/**
 	 * Puts an iterable into the preferences.
 	 */
+	void putIterable(Class<?> prefClass, String name, Iterable<String> iterable);
+
+	/**
+	 * Puts an iterable into the preferences.
+	 */
+	@Deprecated
 	void putIterable(Class<?> prefClass, Iterable<String> iterable, String name);
 
 	/**
 	 * Gets an iterable from the preferences.
 	 */
+	@Deprecated
 	Iterable<String> getIterable(Class<?> prefClass, String name);
 
 	// -- Deprecated methods --

From 0030059eb21eb6a87f72fb9219b4a076d8cf4c98 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 12 Dec 2017 23:58:44 +0100
Subject: [PATCH 0682/1208] PrefServiceTest: stop using deprecated methods

---
 .../org/scijava/prefs/PrefServiceTest.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index a9bd6ac4a..d5a7d83d7 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -142,7 +142,7 @@ public void testLong() {
 	}
 
 	/**
-	 * Tests {@link PrefService#putMap(Class, Map, String)} and
+	 * Tests {@link PrefService#put(Class, String, Map)} and
 	 * {@link PrefService#getMap(Class, String)}.
 	 */
 	@Test
@@ -153,25 +153,25 @@ public void testMap() {
 		map.put("2", "C");
 		map.put("3", "D");
 		map.put("5", "f");
-		final String mapKey = "MapKey";
-		prefService.putMap(getClass(), map, mapKey);
-		final Map<String, String> result = prefService.getMap(getClass(), mapKey);
+		final String mapName = "MapKey";
+		prefService.put(getClass(), mapName, map);
+		final Map<String, String> result = prefService.getMap(getClass(), mapName);
 		assertEquals(map, result);
 	}
 
 	/**
-	 * Tests {@link PrefService#putList(Class, List, String)} and
+	 * Tests {@link PrefService#put(Class, String, List)} and
 	 * {@link PrefService#getList(Class, String)}.
 	 */
 	@Test
 	public void testList() {
-		final String recentFilesKey = "RecentFiles";
+		final String recentFilesName = "RecentFiles";
 		final List<String> recentFiles = new ArrayList<>();
 		recentFiles.add("some/path1");
 		recentFiles.add("some/path2");
 		recentFiles.add("some/path3");
-		prefService.putList(getClass(), recentFiles, recentFilesKey);
-		final List<String> result = prefService.getList(getClass(), recentFilesKey);
+		prefService.put(getClass(), recentFilesName, recentFiles);
+		final List<String> result = prefService.getList(getClass(), recentFilesName);
 		assertEquals(recentFiles, result);
 	}
 
@@ -190,8 +190,8 @@ public void testLongKeys() {
 			"zyxwvutsrqponmlkjihgfedcba";
 		final String lyrics =
 			"Now I know my ABC's. Next time won't you sing with me?";
-		prefService.put(longKey, lyrics);
-		final String recovered = prefService.get(longKey);
+		prefService.put(getClass(), longKey, lyrics);
+		final String recovered = prefService.get(getClass(), longKey);
 		assertEquals(lyrics, recovered);
 	}
 

From aa8cd49d38ebd47e89fd69d89ed232f1081b94f0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 13:15:32 +0100
Subject: [PATCH 0683/1208] PrefService: eliminate get/putIterable methods

These have now been combined with the get/putList methods:

* The putList method accepts any iterable.
* Any persisted Iterable is retrievable as a List with getList.

Previously, it might have broken backwards compatibility for
the putList(Class, List, String) signature to be widened to
putList(Class, Iterable, String). But since we deprecated
that method in favor of a new and as-yet-unreleased method
put(Class, String, List), we can widen it to
put(Class, String, Iterable) without guilt.
---
 .../org/scijava/prefs/DefaultPrefService.java | 25 ++++++-------------
 .../java/org/scijava/prefs/PrefService.java   |  7 +-----
 .../org/scijava/prefs/PrefServiceTest.java    |  2 +-
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index d55fc4ff3..c414830fd 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -154,7 +154,7 @@ public void put(final Class<?> c, final String name,
 
 	@Override
 	public void put(final Class<?> c, final String name,
-		final List<String> value)
+		final Iterable<String> value)
 	{
 		prefs(c).node(key(c, name)).putList(value);
 	}
@@ -225,15 +225,10 @@ public Iterable<String> getIterable(final Class<?> prefClass, final String name)
 		return prefs(prefClass).node(key(prefClass, name)).getIterable();
 	}
 
-	@Override
-	public void putIterable(final Class<?> prefClass, final String name, final Iterable<String> iterable) {
-		prefs(prefClass).node(key(prefClass, name)).putIterable(iterable);
-	}
-
 	@Deprecated
 	@Override
 	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
-		putIterable(prefClass, name, iterable);
+		put(prefClass, name, iterable);
 	}
 
 	// -- Deprecated methods --
@@ -486,13 +481,14 @@ public Map<String, String> getMap() {
 			return map;
 		}
 
-		public void putList(final List<String> list) {
-			for (int index = 0; list != null && index < list.size(); index++) {
-				final Object value = list.get(index);
-				put("" + index, value);
+		public void putList(final Iterable<String> list) {
+			int index = 0;
+			for (final String value : list) {
+				put("" + index++, value);
 			}
 		}
 
+
 		public List<String> getList() {
 			final List<String> list = new ArrayList<>();
 			for (int index = 0; index < Integer.MAX_VALUE; index++) {
@@ -503,13 +499,6 @@ public List<String> getList() {
 			return list;
 		}
 
-		public void putIterable(final Iterable<String> iterable) {
-			int index = 0;
-			for (final String value : iterable) {
-				put("" + index++, value);
-			}
-		}
-
 		public Iterable<String> getIterable() {
 			return new Iterable<String>() {
 				@Override
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 140a49710..9ebf7c227 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -77,7 +77,7 @@ public interface PrefService extends SciJavaService {
 
 	void put(Class<?> c, String name, Map<String, String> value);
 
-	void put(Class<?> c, String name, List<String> list);
+	void put(Class<?> c, String name, Iterable<String> list);
 
 	void clear(Class<?> c);
 
@@ -125,11 +125,6 @@ public interface PrefService extends SciJavaService {
 	@Deprecated
 	List<String> getList(Class<?> prefClass);
 
-	/**
-	 * Puts an iterable into the preferences.
-	 */
-	void putIterable(Class<?> prefClass, String name, Iterable<String> iterable);
-
 	/**
 	 * Puts an iterable into the preferences.
 	 */
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index d5a7d83d7..fa25625a9 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -160,7 +160,7 @@ public void testMap() {
 	}
 
 	/**
-	 * Tests {@link PrefService#put(Class, String, List)} and
+	 * Tests {@link PrefService#put(Class, String, Iterable)} and
 	 * {@link PrefService#getList(Class, String)}.
 	 */
 	@Test

From 1668bd424151efdf2cee17d383450bbf892f859a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 13:45:26 +0100
Subject: [PATCH 0684/1208] PrefService: move get(Class, String) to interface

---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 5 -----
 src/main/java/org/scijava/prefs/PrefService.java        | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index c414830fd..173959df0 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -58,11 +58,6 @@ public class DefaultPrefService extends AbstractPrefService {
 	@Parameter(required = false)
 	private LogService log;
 
-	@Override
-	public String get(final Class<?> c, final String name) {
-		return get(c, name, null);
-	}
-
 	@Override
 	public String get(final Class<?> c, final String name,
 		final String defaultValue)
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 9ebf7c227..a17c70f2d 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -45,7 +45,9 @@
  */
 public interface PrefService extends SciJavaService {
 
-	String get(Class<?> c, String name);
+	default String get(final Class<?> c, final String name) {
+		return get(c, name, null);
+	}
 
 	String get(Class<?> c, String name, String defaultValue);
 

From 42c480f59534eab09db52685d8f7bab673deab5e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 14:30:40 +0100
Subject: [PATCH 0685/1208] PrefService: make Class argument name consistent

---
 .../org/scijava/prefs/DefaultPrefService.java | 40 +++++++++----------
 .../java/org/scijava/prefs/PrefService.java   | 20 +++++-----
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 173959df0..ac05de562 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -166,64 +166,64 @@ public void clearAll() {
 	}
 
 	@Override
-	public void clear(final Class<?> prefClass, final String name) {
-		prefs(prefClass).clear(key(prefClass, name));
+	public void clear(final Class<?> c, final String name) {
+		prefs(c).clear(key(c, name));
 	}
 
 	@Override
-	public void remove(final Class<?> prefClass, final String name) {
-		prefs(prefClass).remove(key(prefClass, name));
+	public void remove(final Class<?> c, final String name) {
+		prefs(c).remove(key(c, name));
 	}
 
 	@Deprecated
 	@Override
-	public void putMap(final Class<?> prefClass, final Map<String, String> map,
+	public void putMap(final Class<?> c, final Map<String, String> map,
 		final String name)
 	{
-		put(prefClass, name, map);
+		put(c, name, map);
 	}
 
 	@Deprecated
 	@Override
-	public void putMap(final Class<?> prefClass, final Map<String, String> map) {
-		prefs(prefClass).putMap(map);
+	public void putMap(final Class<?> c, final Map<String, String> map) {
+		prefs(c).putMap(map);
 	}
 
 	@Deprecated
 	@Override
-	public Map<String, String> getMap(final Class<?> prefClass) {
-		return prefs(prefClass).getMap();
+	public Map<String, String> getMap(final Class<?> c) {
+		return prefs(c).getMap();
 	}
 
 	@Deprecated
 	@Override
-	public void putList(final Class<?> prefClass, final List<String> list,
+	public void putList(final Class<?> c, final List<String> list,
 		final String name)
 	{
-		put(prefClass, name, list);
+		put(c, name, list);
 	}
 
 	@Deprecated
 	@Override
-	public void putList(final Class<?> prefClass, final List<String> list) {
-		prefs(prefClass).putList(list);
+	public void putList(final Class<?> c, final List<String> list) {
+		prefs(c).putList(list);
 	}
 
 	@Deprecated
 	@Override
-	public List<String> getList(final Class<?> prefClass) {
-		return prefs(prefClass).getList();
+	public List<String> getList(final Class<?> c) {
+		return prefs(c).getList();
 	}
 
 	@Override
-	public Iterable<String> getIterable(final Class<?> prefClass, final String name) {
-		return prefs(prefClass).node(key(prefClass, name)).getIterable();
+	public Iterable<String> getIterable(final Class<?> c, final String name) {
+		return prefs(c).node(key(c, name)).getIterable();
 	}
 
 	@Deprecated
 	@Override
-	public void putIterable(final Class<?> prefClass, final Iterable<String> iterable, final String name) {
-		put(prefClass, name, iterable);
+	public void putIterable(final Class<?> c, final Iterable<String> iterable, final String name) {
+		put(c, name, iterable);
 	}
 
 	// -- Deprecated methods --
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index a17c70f2d..958513072 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -89,55 +89,55 @@ default String get(final Class<?> c, final String name) {
 	/**
 	 * Clears the node indexed under the given class.
 	 */
-	void clear(Class<?> prefClass, String name);
+	void clear(Class<?> c, String name);
 
 	/** Removes the node. */
-	void remove(Class<?> prefClass, String name);
+	void remove(Class<?> c, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
 	@Deprecated
-	void putMap(Class<?> prefClass, Map<String, String> map, String name);
+	void putMap(Class<?> c, Map<String, String> map, String name);
 
 	/**
 	 * Puts a Map into the preferences, indexed under the given class.
 	 */
 	@Deprecated
-	void putMap(Class<?> prefClass, Map<String, String> map);
+	void putMap(Class<?> c, Map<String, String> map);
 
 	/** Gets a Map from the preferences. */
 	@Deprecated
-	Map<String, String> getMap(Class<?> prefClass);
+	Map<String, String> getMap(Class<?> c);
 
 	/**
 	 * Puts a list into the preferences, indexed under the specified class.
 	 */
 	@Deprecated
-	void putList(Class<?> prefClass, List<String> list, String name);
+	void putList(Class<?> c, List<String> list, String name);
 
 	/** Puts a list into the preferences. */
 	@Deprecated
-	void putList(Class<?> prefClass, List<String> list);
+	void putList(Class<?> c, List<String> list);
 
 	/**
 	 * Gets a List from the preferences. Returns an empty list if nothing in
 	 * prefs.
 	 */
 	@Deprecated
-	List<String> getList(Class<?> prefClass);
+	List<String> getList(Class<?> c);
 
 	/**
 	 * Puts an iterable into the preferences.
 	 */
 	@Deprecated
-	void putIterable(Class<?> prefClass, Iterable<String> iterable, String name);
+	void putIterable(Class<?> c, Iterable<String> iterable, String name);
 
 	/**
 	 * Gets an iterable from the preferences.
 	 */
 	@Deprecated
-	Iterable<String> getIterable(Class<?> prefClass, String name);
+	Iterable<String> getIterable(Class<?> c, String name);
 
 	// -- Deprecated methods --
 

From 734a31cdfdec146c6bc4c3ba25df324feb3d70dc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 15:14:32 +0100
Subject: [PATCH 0686/1208] PrefService: fix deprecation markers

---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 5 +++--
 src/main/java/org/scijava/prefs/PrefService.java        | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index ac05de562..7dfd3b307 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -175,6 +175,8 @@ public void remove(final Class<?> c, final String name) {
 		prefs(c).remove(key(c, name));
 	}
 
+	// -- Deprecated methods --
+
 	@Deprecated
 	@Override
 	public void putMap(final Class<?> c, final Map<String, String> map,
@@ -215,6 +217,7 @@ public List<String> getList(final Class<?> c) {
 		return prefs(c).getList();
 	}
 
+	@Deprecated
 	@Override
 	public Iterable<String> getIterable(final Class<?> c, final String name) {
 		return prefs(c).node(key(c, name)).getIterable();
@@ -226,8 +229,6 @@ public void putIterable(final Class<?> c, final Iterable<String> iterable, final
 		put(c, name, iterable);
 	}
 
-	// -- Deprecated methods --
-
 	@Deprecated
 	@Override
 	public String get(final String name) {
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 958513072..43d918fcb 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -94,6 +94,8 @@ default String get(final Class<?> c, final String name) {
 	/** Removes the node. */
 	void remove(Class<?> c, String name);
 
+	// -- Deprecated methods --
+
 	/**
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
@@ -139,8 +141,6 @@ default String get(final Class<?> c, final String name) {
 	@Deprecated
 	Iterable<String> getIterable(Class<?> c, String name);
 
-	// -- Deprecated methods --
-
 	@Deprecated
 	String get(String name);
 

From 75ad716c8ecfa5345ed7fcac6c3cb9bb36d4c3f5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 14:45:40 +0100
Subject: [PATCH 0687/1208] PrefService: push some methods to interface

Many of the deprecated methods do direct delegation.
---
 .../org/scijava/prefs/DefaultPrefService.java | 106 ------------------
 .../java/org/scijava/prefs/PrefService.java   |  74 +++++++++---
 2 files changed, 57 insertions(+), 123 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 7dfd3b307..646762f29 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -177,14 +177,6 @@ public void remove(final Class<?> c, final String name) {
 
 	// -- Deprecated methods --
 
-	@Deprecated
-	@Override
-	public void putMap(final Class<?> c, final Map<String, String> map,
-		final String name)
-	{
-		put(c, name, map);
-	}
-
 	@Deprecated
 	@Override
 	public void putMap(final Class<?> c, final Map<String, String> map) {
@@ -197,14 +189,6 @@ public Map<String, String> getMap(final Class<?> c) {
 		return prefs(c).getMap();
 	}
 
-	@Deprecated
-	@Override
-	public void putList(final Class<?> c, final List<String> list,
-		final String name)
-	{
-		put(c, name, list);
-	}
-
 	@Deprecated
 	@Override
 	public void putList(final Class<?> c, final List<String> list) {
@@ -223,96 +207,6 @@ public Iterable<String> getIterable(final Class<?> c, final String name) {
 		return prefs(c).node(key(c, name)).getIterable();
 	}
 
-	@Deprecated
-	@Override
-	public void putIterable(final Class<?> c, final Iterable<String> iterable, final String name) {
-		put(c, name, iterable);
-	}
-
-	@Deprecated
-	@Override
-	public String get(final String name) {
-		return get((Class<?>) null, name);
-	}
-
-	@Deprecated
-	@Override
-	public String get(final String name, final String defaultValue) {
-		return get(null, name, defaultValue);
-	}
-
-	@Deprecated
-	@Override
-	public boolean getBoolean(final String name, final boolean defaultValue) {
-		return getBoolean(null, name, defaultValue);
-	}
-
-	@Deprecated
-	@Override
-	public double getDouble(final String name, final double defaultValue) {
-		return getDouble(null, name, defaultValue);
-	}
-
-	@Deprecated
-	@Override
-	public float getFloat(final String name, final float defaultValue) {
-		return getFloat(null, name, defaultValue);
-	}
-
-	@Deprecated
-	@Override
-	public int getInt(final String name, final int defaultValue) {
-		return getInt(null, name, defaultValue);
-	}
-
-	@Deprecated
-	@Override
-	public long getLong(final String name, final long defaultValue) {
-		return getLong(null, name, defaultValue);
-	}
-
-	@Deprecated
-	@Override
-	public void put(final String name, final String value) {
-		put(null, name, value);
-	}
-
-	@Deprecated
-	@Override
-	public void put(final String name, final boolean value) {
-		put(null, name, value);
-	}
-
-	@Deprecated
-	@Override
-	public void put(final String name, final double value) {
-		put(null, name, value);
-	}
-
-	@Deprecated
-	@Override
-	public void put(final String name, final float value) {
-		put(null, name, value);
-	}
-
-	@Deprecated
-	@Override
-	public void put(final String name, final int value) {
-		put(null, name, value);
-	}
-
-	@Deprecated
-	@Override
-	public void put(final String name, final long value) {
-		put(null, name, value);
-	}
-
-	@Deprecated
-	@Override
-	public void clear(final String key) {
-		clear((Class<?>) null, key);
-	}
-
 	@Deprecated
 	@Override
 	public void clear(final String absolutePath, final String key) {
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 43d918fcb..4ce1d8529 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -100,7 +100,11 @@ default String get(final Class<?> c, final String name) {
 	 * Puts a Map into the preferences, indexed under the specified class.
 	 */
 	@Deprecated
-	void putMap(Class<?> c, Map<String, String> map, String name);
+	default void putMap(final Class<?> c, final Map<String, String> map,
+		final String name)
+	{
+		put(c, name, map);
+	}
 
 	/**
 	 * Puts a Map into the preferences, indexed under the given class.
@@ -116,7 +120,11 @@ default String get(final Class<?> c, final String name) {
 	 * Puts a list into the preferences, indexed under the specified class.
 	 */
 	@Deprecated
-	void putList(Class<?> c, List<String> list, String name);
+	default void putList(final Class<?> c, final List<String> list,
+		final String name)
+	{
+		put(c, name, list);
+	}
 
 	/** Puts a list into the preferences. */
 	@Deprecated
@@ -133,7 +141,11 @@ default String get(final Class<?> c, final String name) {
 	 * Puts an iterable into the preferences.
 	 */
 	@Deprecated
-	void putIterable(Class<?> c, Iterable<String> iterable, String name);
+	default void putIterable(final Class<?> c, final Iterable<String> iterable,
+		final String name)
+	{
+		put(c, name, iterable);
+	}
 
 	/**
 	 * Gets an iterable from the preferences.
@@ -142,46 +154,74 @@ default String get(final Class<?> c, final String name) {
 	Iterable<String> getIterable(Class<?> c, String name);
 
 	@Deprecated
-	String get(String name);
+	default String get(final String name) {
+		return get((Class<?>) null, name);
+	}
 
 	@Deprecated
-	String get(String name, String defaultValue);
+	default String get(final String name, final String defaultValue) {
+		return get(null, name, defaultValue);
+	}
 
 	@Deprecated
-	boolean getBoolean(String name, boolean defaultValue);
+	default boolean getBoolean(final String name, final boolean defaultValue) {
+		return getBoolean(null, name, defaultValue);
+	}
 
 	@Deprecated
-	double getDouble(String name, double defaultValue);
+	default double getDouble(final String name, final double defaultValue) {
+		return getDouble(null, name, defaultValue);
+	}
 
 	@Deprecated
-	float getFloat(String name, float defaultValue);
+	default float getFloat(final String name, final float defaultValue) {
+		return getFloat(null, name, defaultValue);
+	}
 
 	@Deprecated
-	int getInt(String name, int defaultValue);
+	default int getInt(final String name, final int defaultValue) {
+		return getInt(null, name, defaultValue);
+	}
 
 	@Deprecated
-	long getLong(String name, long defaultValue);
+	default long getLong(final String name, final long defaultValue) {
+		return getLong(null, name, defaultValue);
+	}
 
 	@Deprecated
-	void put(String name, String value);
+	default void put(final String name, final String value) {
+		put(null, name, value);
+	}
 
 	@Deprecated
-	void put(String name, boolean value);
+	default void put(final String name, final boolean value) {
+		put(null, name, value);
+	}
 
 	@Deprecated
-	void put(String name, double value);
+	default void put(final String name, final double value) {
+		put(null, name, value);
+	}
 
 	@Deprecated
-	void put(String name, float value);
+	default void put(final String name, final float value) {
+		put(null, name, value);
+	}
 
 	@Deprecated
-	void put(String name, int value);
+	default void put(final String name, final int value) {
+		put(null, name, value);
+	}
 
 	@Deprecated
-	void put(String name, long value);
+	default void put(final String name, final long value) {
+		put(null, name, value);
+	}
 
 	@Deprecated
-	void clear(String key);
+	default void clear(final String key) {
+		clear((Class<?>) null, key);
+	}
 
 	@Deprecated
 	void clear(String absolutePath, String key);

From 4fee211f569c08db58216151c379f2b99f4975b6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 15:19:49 +0100
Subject: [PATCH 0688/1208] PrefService: use sub-node for the specified class

It was silly to use org.foo/Bar.myKey for c=org.foo.Bar, name=myKey.
Much easier and safer to use org.foo/Bar/myKey.
---
 .../org/scijava/prefs/DefaultPrefService.java | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 646762f29..c57a0eedd 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -62,96 +62,96 @@ public class DefaultPrefService extends AbstractPrefService {
 	public String get(final Class<?> c, final String name,
 		final String defaultValue)
 	{
-		return prefs(c).get(key(c, name), defaultValue);
+		return prefs(c).get(name, defaultValue);
 	}
 
 	@Override
 	public boolean getBoolean(final Class<?> c, final String name,
 		final boolean defaultValue)
 	{
-		return prefs(c).getBoolean(key(c, name), defaultValue);
+		return prefs(c).getBoolean(name, defaultValue);
 	}
 
 	@Override
 	public double getDouble(final Class<?> c, final String name,
 		final double defaultValue)
 	{
-		return prefs(c).getDouble(key(c, name), defaultValue);
+		return prefs(c).getDouble(name, defaultValue);
 	}
 
 	@Override
 	public float getFloat(final Class<?> c, final String name,
 		final float defaultValue)
 	{
-		return prefs(c).getFloat(key(c, name), defaultValue);
+		return prefs(c).getFloat(name, defaultValue);
 	}
 
 	@Override
 	public int
 		getInt(final Class<?> c, final String name, final int defaultValue)
 	{
-		return prefs(c).getInt(key(c, name), defaultValue);
+		return prefs(c).getInt(name, defaultValue);
 	}
 
 	@Override
 	public long getLong(final Class<?> c, final String name,
 		final long defaultValue)
 	{
-		return prefs(c).getLong(key(c, name), defaultValue);
+		return prefs(c).getLong(name, defaultValue);
 	}
 
 	@Override
 	public Map<String, String> getMap(final Class<?> c, final String name) {
-		return prefs(c).node(key(c, name)).getMap();
+		return prefs(c).node(name).getMap();
 	}
 
 	@Override
 	public List<String> getList(final Class<?> c, final String name) {
-		return prefs(c).node(key(c, name)).getList();
+		return prefs(c).node(name).getList();
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name, final String value) {
-		prefs(c).put(key(c, name), value);
+		prefs(c).put(name, value);
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name, final boolean value) {
-		prefs(c).putBoolean(key(c, name), value);
+		prefs(c).putBoolean(name, value);
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name, final double value) {
-		prefs(c).putDouble(key(c, name), value);
+		prefs(c).putDouble(name, value);
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name, final float value) {
-		prefs(c).putFloat(key(c, name), value);
+		prefs(c).putFloat(name, value);
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name, final int value) {
-		prefs(c).putInt(key(c, name), value);
+		prefs(c).putInt(name, value);
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name, final long value) {
-		prefs(c).putLong(key(c, name), value);
+		prefs(c).putLong(name, value);
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name,
 		final Map<String, String> value)
 	{
-		prefs(c).node(key(c, name)).putMap(value);
+		prefs(c).node(name).putMap(value);
 	}
 
 	@Override
 	public void put(final Class<?> c, final String name,
 		final Iterable<String> value)
 	{
-		prefs(c).node(key(c, name)).putList(value);
+		prefs(c).node(name).putList(value);
 	}
 
 	@Override
@@ -167,12 +167,12 @@ public void clearAll() {
 
 	@Override
 	public void clear(final Class<?> c, final String name) {
-		prefs(c).clear(key(c, name));
+		prefs(c).clear(name);
 	}
 
 	@Override
 	public void remove(final Class<?> c, final String name) {
-		prefs(c).remove(key(c, name));
+		prefs(c).remove(name);
 	}
 
 	// -- Deprecated methods --
@@ -204,7 +204,7 @@ public List<String> getList(final Class<?> c) {
 	@Deprecated
 	@Override
 	public Iterable<String> getIterable(final Class<?> c, final String name) {
-		return prefs(c).node(key(c, name)).getIterable();
+		return prefs(c).node(name).getIterable();
 	}
 
 	@Deprecated
@@ -299,13 +299,10 @@ public void putIterable(final Iterable<String> iterable, final String key) {
 
 	// -- Helper methods --
 
-	private static String key(final Class<?> c, final String name) {
-		return c == null ? name : c.getSimpleName() + "." + name;
-	}
-
 	private SmartPrefs prefs(final Class<?> c) {
+		final Class<?> nodeClass = c == null ? PrefService.class : c;
 		return new SmartPrefs(java.util.prefs.Preferences.userNodeForPackage(
-			c == null ? PrefService.class : c), log);
+			nodeClass).node(nodeClass.getSimpleName()), log);
 	}
 
 	private SmartPrefs prefs(final String absolutePath) {

From 25ce153b0708c1aa42430e14375c88574a59a02d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 15:25:28 +0100
Subject: [PATCH 0689/1208] PrefService: deprecate clear(Class, String)

This is the same thing as remove(Class, String).

Actually, in the Preferences API, clear and removeNode are not the same:
removeNode is recursive, whereas clear just clears keys at the current
node and not below. But the latter non-recursive behavior is not
something we want to expose via the PrefService API.
---
 .../java/org/scijava/prefs/DefaultPrefService.java    | 11 ++++++-----
 src/main/java/org/scijava/prefs/PrefService.java      |  8 +++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index c57a0eedd..d67a3f15a 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -165,11 +165,6 @@ public void clearAll() {
 			prefs(name).removeNode();
 	}
 
-	@Override
-	public void clear(final Class<?> c, final String name) {
-		prefs(c).clear(name);
-	}
-
 	@Override
 	public void remove(final Class<?> c, final String name) {
 		prefs(c).remove(name);
@@ -297,6 +292,12 @@ public void putIterable(final Iterable<String> iterable, final String key) {
 		putIterable((Class<?>) null, iterable, key);
 	}
 
+	@Deprecated
+	@Override
+	public void clear(final Class<?> c, final String name) {
+		prefs(c).clear(name);
+	}
+
 	// -- Helper methods --
 
 	private SmartPrefs prefs(final Class<?> c) {
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 4ce1d8529..b511ce91b 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -86,11 +86,6 @@ default String get(final Class<?> c, final String name) {
 	/** Clears everything. */
 	void clearAll();
 
-	/**
-	 * Clears the node indexed under the given class.
-	 */
-	void clear(Class<?> c, String name);
-
 	/** Removes the node. */
 	void remove(Class<?> c, String name);
 
@@ -264,4 +259,7 @@ default void clear(final String key) {
 
 	@Deprecated
 	Iterable<String> getIterable(String key);
+
+	@Deprecated
+	void clear(Class<?> c, String name);
 }

From 609bd351a9d0aba754f6030a8afd4baec81bddc3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 15:26:56 +0100
Subject: [PATCH 0690/1208] PrefService: fix clear(Class)

Removing the entire node seems safer than using clear,
which may possibly leave junk underneath this node.
---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index d67a3f15a..84c66cee1 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -156,7 +156,7 @@ public void put(final Class<?> c, final String name,
 
 	@Override
 	public void clear(final Class<?> c) {
-		prefs(c).clear();
+		prefs(c).removeNode();
 	}
 
 	@Override

From ca89deffa45904497422432929803d041f4e0dfc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 15:35:43 +0100
Subject: [PATCH 0691/1208] PrefServiceTest: test 2 classes in same package

This is a regression test which failed prior to the last two commits.
---
 .../org/scijava/prefs/PrefServiceTest.java    | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index fa25625a9..d93b1a6a0 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -195,4 +195,70 @@ public void testLongKeys() {
 		assertEquals(lyrics, recovered);
 	}
 
+	@Test
+	public void testClassesInSamePackage() {
+		final String blueDog = "lazy", blueFox = "quick";
+		final String redDog = "friendly", redCat = "snuggly";
+
+		assertNull(prefService.get(BlueNode.class, "cat"));
+		assertNull(prefService.get(BlueNode.class, "dog"));
+		assertNull(prefService.get(BlueNode.class, "fox"));
+		assertNull(prefService.get(RedNode.class, "cat"));
+		assertNull(prefService.get(RedNode.class, "dog"));
+		assertNull(prefService.get(RedNode.class, "fox"));
+
+		prefService.put(BlueNode.class, "dog", "lazy");
+		prefService.put(BlueNode.class, "fox", "quick");
+
+		assertNull(prefService.get(BlueNode.class, "cat"));
+		assertEquals(blueDog, prefService.get(BlueNode.class, "dog"));
+		assertEquals(blueFox, prefService.get(BlueNode.class, "fox"));
+		assertNull(prefService.get(RedNode.class, "cat"));
+		assertNull(prefService.get(RedNode.class, "dog"));
+		assertNull(prefService.get(RedNode.class, "fox"));
+
+		prefService.put(RedNode.class, "dog", redDog);
+		prefService.put(RedNode.class, "cat", redCat);
+
+		assertNull(prefService.get(BlueNode.class, "cat"));
+		assertEquals(blueDog, prefService.get(BlueNode.class, "dog"));
+		assertEquals(blueFox, prefService.get(BlueNode.class, "fox"));
+		assertEquals(redCat, prefService.get(RedNode.class, "cat"));
+		assertEquals(redDog, prefService.get(RedNode.class, "dog"));
+		assertNull(prefService.get(RedNode.class, "fox"));
+
+		prefService.clear(BlueNode.class);
+
+		assertNull(prefService.get(BlueNode.class, "cat"));
+		assertNull(prefService.get(BlueNode.class, "dog"));
+		assertNull(prefService.get(BlueNode.class, "fox"));
+		assertEquals(redCat, prefService.get(RedNode.class, "cat"));
+		assertEquals(redDog, prefService.get(RedNode.class, "dog"));
+		assertNull(prefService.get(RedNode.class, "fox"));
+
+		prefService.clear(RedNode.class);
+
+		assertNull(prefService.get(BlueNode.class, "cat"));
+		assertNull(prefService.get(BlueNode.class, "dog"));
+		assertNull(prefService.get(BlueNode.class, "fox"));
+		assertNull(prefService.get(RedNode.class, "cat"));
+		assertNull(prefService.get(RedNode.class, "dog"));
+		assertNull(prefService.get(RedNode.class, "fox"));
+	}
+
+	// -- Helper classes --
+
+	/**
+	 * A class to use for anchoring preferences. Needed to test that preferences
+	 * are stored with each class specifically, rather than the package as a
+	 * whole. (Because the Java Preferences API uses packages for nodes, a
+	 * potential pitfall here is that clear(Class) might delete too much.)
+	 */
+	private interface BlueNode {}
+
+	/**
+	 * Another class for anchoring preferences, in the same package as
+	 * {@link BlueNode}.
+	 */
+	private interface RedNode {}
 }

From e72ec273fa763d2221c140e74b8bd287b8f04f0f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 15:43:56 +0100
Subject: [PATCH 0692/1208] PrefService: push more methods into iface

---
 .../org/scijava/prefs/DefaultPrefService.java | 36 -------------------
 .../java/org/scijava/prefs/PrefService.java   | 24 +++++++++----
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 84c66cee1..e4b9fde14 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -214,12 +214,6 @@ public void remove(final String absolutePath, final String key) {
 		prefs(absolutePath).remove(key);
 	}
 
-	@Deprecated
-	@Override
-	public void putMap(final Map<String, String> map, final String key) {
-		putMap((Class<?>) null, map, key);
-	}
-
 	@Deprecated
 	@Override
 	public void putMap(final String absolutePath, final Map<String, String> map,
@@ -234,12 +228,6 @@ public void putMap(final String absolutePath, final Map<String, String> map) {
 		prefs(absolutePath).putMap(map);
 	}
 
-	@Deprecated
-	@Override
-	public Map<String, String> getMap(final String key) {
-		return getMap((Class<?>) null, key);
-	}
-
 	@Deprecated
 	@Override
 	public Map<String, String>
@@ -248,12 +236,6 @@ public Map<String, String> getMap(final String key) {
 		return prefs(absolutePath).node(key).getMap();
 	}
 
-	@Deprecated
-	@Override
-	public void putList(final List<String> list, final String key) {
-		putList((Class<?>) null, list, key);
-	}
-
 	@Deprecated
 	@Override
 	public void putList(final String absolutePath, final List<String> list,
@@ -268,30 +250,12 @@ public void putList(final String absolutePath, final List<String> list) {
 		prefs(absolutePath).putList(list);
 	}
 
-	@Deprecated
-	@Override
-	public List<String> getList(final String key) {
-		return getList((Class<?>) null, key);
-	}
-
 	@Deprecated
 	@Override
 	public List<String> getList(final String absolutePath, final String key) {
 		return prefs(absolutePath).node(key).getList();
 	}
 
-	@Deprecated
-	@Override
-	public Iterable<String> getIterable(final String key) {
-		return getIterable((Class<?>) null, key);
-	}
-
-	@Deprecated
-	@Override
-	public void putIterable(final Iterable<String> iterable, final String key) {
-		putIterable((Class<?>) null, iterable, key);
-	}
-
 	@Deprecated
 	@Override
 	public void clear(final Class<?> c, final String name) {
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index b511ce91b..e3a6c059a 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -225,7 +225,9 @@ default void clear(final String key) {
 	void remove(String absolutePath, String key);
 
 	@Deprecated
-	void putMap(Map<String, String> map, String key);
+	default void putMap(final Map<String, String> map, final String key) {
+		putMap((Class<?>) null, map, key);
+	}
 
 	@Deprecated
 	void putMap(String absolutePath, Map<String, String> map);
@@ -234,13 +236,17 @@ default void clear(final String key) {
 	void putMap(String absolutePath, Map<String, String> map, String key);
 
 	@Deprecated
-	Map<String, String> getMap(String key);
+	default Map<String, String> getMap(final String key) {
+		return getMap((Class<?>) null, key);
+	}
 
 	@Deprecated
 	Map<String, String> getMap(String absolutePath, String key);
 
 	@Deprecated
-	void putList(List<String> list, String key);
+	default void putList(final List<String> list, final String key) {
+		putList((Class<?>) null, list, key);
+	}
 
 	@Deprecated
 	void putList(String absolutePath, List<String> list, String key);
@@ -249,16 +255,22 @@ default void clear(final String key) {
 	void putList(String absolutePath, List<String> list);
 
 	@Deprecated
-	List<String> getList(String key);
+	default List<String> getList(final String key) {
+		return getList((Class<?>) null, key);
+	}
 
 	@Deprecated
 	List<String> getList(String absolutePath, String key);
 
 	@Deprecated
-	void putIterable(Iterable<String> iterable, String key);
+	default void putIterable(final Iterable<String> iterable, final String key) {
+		putIterable((Class<?>) null, iterable, key);
+	}
 
 	@Deprecated
-	Iterable<String> getIterable(String key);
+	default Iterable<String> getIterable(final String key) {
+		return getIterable((Class<?>) null, key);
+	}
 
 	@Deprecated
 	void clear(Class<?> c, String name);

From df36a090197d3ee7e89a61dabb1fce4a1d13d3b4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 15:54:39 +0100
Subject: [PATCH 0693/1208] PrefService: twiddle method order

---
 .../java/org/scijava/prefs/DefaultPrefService.java     | 10 +++++-----
 src/main/java/org/scijava/prefs/PrefService.java       |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index e4b9fde14..9efe6f5d3 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -154,6 +154,11 @@ public void put(final Class<?> c, final String name,
 		prefs(c).node(name).putList(value);
 	}
 
+	@Override
+	public void remove(final Class<?> c, final String name) {
+		prefs(c).remove(name);
+	}
+
 	@Override
 	public void clear(final Class<?> c) {
 		prefs(c).removeNode();
@@ -165,11 +170,6 @@ public void clearAll() {
 			prefs(name).removeNode();
 	}
 
-	@Override
-	public void remove(final Class<?> c, final String name) {
-		prefs(c).remove(name);
-	}
-
 	// -- Deprecated methods --
 
 	@Deprecated
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index e3a6c059a..d6fbb5f47 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -81,14 +81,14 @@ default String get(final Class<?> c, final String name) {
 
 	void put(Class<?> c, String name, Iterable<String> list);
 
+	/** Removes the node. */
+	void remove(Class<?> c, String name);
+
 	void clear(Class<?> c);
 
 	/** Clears everything. */
 	void clearAll();
 
-	/** Removes the node. */
-	void remove(Class<?> c, String name);
-
 	// -- Deprecated methods --
 
 	/**

From 8bfefe43a3d15f3a88d992c980954d6b4412ad78 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 16:13:52 +0100
Subject: [PATCH 0694/1208] PrefService: add javadoc to all methods

---
 .../java/org/scijava/prefs/PrefService.java   | 212 ++++++++++++++++--
 1 file changed, 188 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index d6fbb5f47..b039d970b 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -45,55 +45,199 @@
  */
 public interface PrefService extends SciJavaService {
 
+	/**
+	 * Gets a persisted key as a {@link String}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @return The value of the key as a {@link String}, or null if the key is not
+	 *         present.
+	 */
 	default String get(final Class<?> c, final String name) {
 		return get(c, name, null);
 	}
 
+	/**
+	 * Gets a persisted key as a {@link String}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @param defaultValue The value to return if the key is not present.
+	 * @return The value of the key as a {@link String}.
+	 */
 	String get(Class<?> c, String name, String defaultValue);
 
+	/**
+	 * Gets a persisted key as a {@code boolean}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @param defaultValue The value to return if the key is not present.
+	 * @return The value of the key as a {@code boolean}.
+	 */
 	boolean getBoolean(Class<?> c, String name, boolean defaultValue);
 
+	/**
+	 * Gets a persisted key as a {@code double}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @param defaultValue The value to return if the key is not present.
+	 * @return The value of the key as a {@code double}.
+	 */
 	double getDouble(Class<?> c, String name, double defaultValue);
 
+	/**
+	 * Gets a persisted key as a {@code float}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @param defaultValue The value to return if the key is not present.
+	 * @return The value of the key as a {@code float}.
+	 */
 	float getFloat(Class<?> c, String name, float defaultValue);
 
+	/**
+	 * Gets a persisted key as an {@code int}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @param defaultValue The value to return if the key is not present.
+	 * @return The value of the key as an {@code int}.
+	 */
 	int getInt(Class<?> c, String name, int defaultValue);
 
+	/**
+	 * Gets a persisted key as a {@code long}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @param defaultValue The value to return if the key is not present.
+	 * @return The value of the key as an {@code long}.
+	 */
 	long getLong(Class<?> c, String name, long defaultValue);
 
+	/**
+	 * Gets a persisted key as a {@code Map}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @return The value of the key as an {@code Map}, or null if the key is not
+	 *         present.
+	 */
 	Map<String, String> getMap(Class<?> c, String name);
 
+	/**
+	 * Gets a persisted key as a {@code List}.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to retrieve.
+	 * @return The value of the key as an {@code List}, or null if the key is not
+	 *         present.
+	 */
 	List<String> getList(Class<?> c, String name);
 
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #get(Class, String)
+	 * @see #get(Class, String, String)
+	 */
 	void put(Class<?> c, String name, String value);
 
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #getBoolean(Class, String, boolean)
+	 */
 	void put(Class<?> c, String name, boolean value);
 
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #getDouble(Class, String, double)
+	 */
 	void put(Class<?> c, String name, double value);
 
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #getFloat(Class, String, float)
+	 */
 	void put(Class<?> c, String name, float value);
 
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #getInt(Class, String, int)
+	 */
 	void put(Class<?> c, String name, int value);
 
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #getLong(Class, String, long)
+	 */
 	void put(Class<?> c, String name, long value);
 
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #getMap(Class, String)
+	 */
 	void put(Class<?> c, String name, Map<String, String> value);
 
-	void put(Class<?> c, String name, Iterable<String> list);
+	/**
+	 * Saves a key/value pair in persistent storage.
+	 * 
+	 * @param c The class with which the key/value pair is associated.
+	 * @param name The key where the value should be stored.
+	 * @param value The value to store.
+	 * @see #getList(Class, String)
+	 */
+	void put(Class<?> c, String name, Iterable<String> value);
 
-	/** Removes the node. */
+	/**
+	 * Deletes a key from persistent storage.
+	 * 
+	 * @param c The class with which the key is associated.
+	 * @param name The key to remove.
+	 */
 	void remove(Class<?> c, String name);
 
+	/**
+	 * Deletes all of the given {@link Class}'s keys from persistent storage.
+	 * @param c The class whose keys should be removed.
+	 */
 	void clear(Class<?> c);
 
-	/** Clears everything. */
+	/** Deletes all information from the data store. Use with care! */
 	void clearAll();
 
 	// -- Deprecated methods --
 
-	/**
-	 * Puts a Map into the preferences, indexed under the specified class.
-	 */
+	/** @deprecated Use {@link #put(Class, String, Map)}. */
 	@Deprecated
 	default void putMap(final Class<?> c, final Map<String, String> map,
 		final String name)
@@ -101,19 +245,15 @@ default void putMap(final Class<?> c, final Map<String, String> map,
 		put(c, name, map);
 	}
 
-	/**
-	 * Puts a Map into the preferences, indexed under the given class.
-	 */
+	/** @deprecated Use {@link #put(Class, String, Map)}. */
 	@Deprecated
 	void putMap(Class<?> c, Map<String, String> map);
 
-	/** Gets a Map from the preferences. */
+	/** @deprecated Use {@link #getMap(Class, String)}. */
 	@Deprecated
 	Map<String, String> getMap(Class<?> c);
 
-	/**
-	 * Puts a list into the preferences, indexed under the specified class.
-	 */
+	/** @deprecated Use {@link #put(Class, String, Iterable)}. */
 	@Deprecated
 	default void putList(final Class<?> c, final List<String> list,
 		final String name)
@@ -121,20 +261,15 @@ default void putList(final Class<?> c, final List<String> list,
 		put(c, name, list);
 	}
 
-	/** Puts a list into the preferences. */
+	/** @deprecated Use {@link #put(Class, String, Iterable)}. */
 	@Deprecated
 	void putList(Class<?> c, List<String> list);
 
-	/**
-	 * Gets a List from the preferences. Returns an empty list if nothing in
-	 * prefs.
-	 */
+	/** @deprecated Use {@link #getList(Class, String)}. */
 	@Deprecated
 	List<String> getList(Class<?> c);
 
-	/**
-	 * Puts an iterable into the preferences.
-	 */
+	/** @deprecated Use {@link #put(Class, String, Iterable)}. */
 	@Deprecated
 	default void putIterable(final Class<?> c, final Iterable<String> iterable,
 		final String name)
@@ -142,136 +277,165 @@ default void putIterable(final Class<?> c, final Iterable<String> iterable,
 		put(c, name, iterable);
 	}
 
-	/**
-	 * Gets an iterable from the preferences.
-	 */
+	/** @deprecated Use {@link #getList(Class, String)}. */
 	@Deprecated
 	Iterable<String> getIterable(Class<?> c, String name);
 
+	/** @deprecated Use {@link #get(Class, String)}. */
 	@Deprecated
 	default String get(final String name) {
 		return get((Class<?>) null, name);
 	}
 
+	/** @deprecated Use {@link #get(Class, String, String)}. */
 	@Deprecated
 	default String get(final String name, final String defaultValue) {
 		return get(null, name, defaultValue);
 	}
 
+	/** @deprecated Use {@link #getBoolean(Class, String, boolean)}. */
 	@Deprecated
 	default boolean getBoolean(final String name, final boolean defaultValue) {
 		return getBoolean(null, name, defaultValue);
 	}
 
+	/** @deprecated Use {@link #getDouble(Class, String, double)}. */
 	@Deprecated
 	default double getDouble(final String name, final double defaultValue) {
 		return getDouble(null, name, defaultValue);
 	}
 
+	/** @deprecated Use {@link #getFloat(Class, String, float)}. */
 	@Deprecated
 	default float getFloat(final String name, final float defaultValue) {
 		return getFloat(null, name, defaultValue);
 	}
 
+	/** @deprecated Use {@link #getInt(Class, String, int)}. */
 	@Deprecated
 	default int getInt(final String name, final int defaultValue) {
 		return getInt(null, name, defaultValue);
 	}
 
+	/** @deprecated Use {@link #getLong(Class, String, long)}. */
 	@Deprecated
 	default long getLong(final String name, final long defaultValue) {
 		return getLong(null, name, defaultValue);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, String)}. */
 	@Deprecated
 	default void put(final String name, final String value) {
 		put(null, name, value);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, boolean)}. */
 	@Deprecated
 	default void put(final String name, final boolean value) {
 		put(null, name, value);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, double)}. */
 	@Deprecated
 	default void put(final String name, final double value) {
 		put(null, name, value);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, float)}. */
 	@Deprecated
 	default void put(final String name, final float value) {
 		put(null, name, value);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, int)}. */
 	@Deprecated
 	default void put(final String name, final int value) {
 		put(null, name, value);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, long)}. */
 	@Deprecated
 	default void put(final String name, final long value) {
 		put(null, name, value);
 	}
 
+	/**
+	 * @deprecated Use {@link #remove(Class, String)} or {@link #clear(Class)}.
+	 */
 	@Deprecated
 	default void clear(final String key) {
 		clear((Class<?>) null, key);
 	}
 
+	/** @deprecated Use {@link #remove(Class, String)}. */
 	@Deprecated
 	void clear(String absolutePath, String key);
 
+	/** @deprecated Use {@link #remove(Class, String)}. */
 	@Deprecated
 	void remove(String absolutePath, String key);
 
+	/** @deprecated Use {@link #put(Class, String, Map)}. */
 	@Deprecated
 	default void putMap(final Map<String, String> map, final String key) {
 		putMap((Class<?>) null, map, key);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, Map)}. */
 	@Deprecated
 	void putMap(String absolutePath, Map<String, String> map);
 
+	/** @deprecated Use {@link #put(Class, String, Map)}. */
 	@Deprecated
 	void putMap(String absolutePath, Map<String, String> map, String key);
 
+	/** @deprecated Use {@link #getMap(Class, String)}. */
 	@Deprecated
 	default Map<String, String> getMap(final String key) {
 		return getMap((Class<?>) null, key);
 	}
 
+	/** @deprecated Use {@link #getMap(Class, String)}. */
 	@Deprecated
 	Map<String, String> getMap(String absolutePath, String key);
 
+	/** @deprecated Use {@link #put(Class, String, Iterable)}. */
 	@Deprecated
 	default void putList(final List<String> list, final String key) {
 		putList((Class<?>) null, list, key);
 	}
 
+	/** @deprecated Use {@link #put(Class, String, Iterable)}. */
 	@Deprecated
 	void putList(String absolutePath, List<String> list, String key);
 
+	/** @deprecated Use {@link #put(Class, String, Iterable)}. */
 	@Deprecated
 	void putList(String absolutePath, List<String> list);
 
+	/** @deprecated Use {@link #getList(Class, String)}. */
 	@Deprecated
 	default List<String> getList(final String key) {
 		return getList((Class<?>) null, key);
 	}
 
+	/** @deprecated Use {@link #getList(Class, String)}. */
 	@Deprecated
 	List<String> getList(String absolutePath, String key);
 
+	/** @deprecated Use {@link #put(Class, String, Iterable)}. */
 	@Deprecated
 	default void putIterable(final Iterable<String> iterable, final String key) {
 		putIterable((Class<?>) null, iterable, key);
 	}
 
+	/** @deprecated User {@link #getList(Class, String)}. */
 	@Deprecated
 	default Iterable<String> getIterable(final String key) {
 		return getIterable((Class<?>) null, key);
 	}
 
+	/** @deprecated Use {@link #remove(Class, String)}. */
 	@Deprecated
 	void clear(Class<?> c, String name);
 }

From 5fb1ca5e41ee4ab6dc8aa4c1807cbd381fd2c0a1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 16:16:53 +0100
Subject: [PATCH 0695/1208] PrefService: deprecate SmartPrefs#clear(String)

This internal method is now only called by other deprecated methods.
---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 9efe6f5d3..06aed1396 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -305,10 +305,6 @@ public SmartPrefs(final java.util.prefs.Preferences p,
 
 		// -- SmartPrefs methods --
 
-		public void clear(final String key) {
-			if (nodeExists(key)) node(key).clear();
-		}
-
 		public void remove(final String key) {
 			if (nodeExists(key)) node(key).removeNode();
 		}
@@ -545,6 +541,10 @@ private String makeSafe(final String s, final int max) {
 			return "..." + s.substring(len - max + 3, len);
 		}
 
+		@Deprecated
+		public void clear(final String key) {
+			if (nodeExists(key)) node(key).clear();
+		}
 	}
 
 }

From 967ac72017c2200cd15a1400db061da5328a8bdc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 16:29:08 +0100
Subject: [PATCH 0696/1208] PrefService: fix bug in remove method

When removing a key, there are actually two different scenarios:

1. In the case of Map or List, the key is actually the name of a child
   node whose key/value pairs are the elements of the collection.
2. In the case of String or primitive values, the key really is a key
   in the backing preferences node.

In the case of (1), the child node should be removed, whereas in the
case of (2), the key should simply be removed. The code was handling
the former, but not the latter.
---
 src/main/java/org/scijava/prefs/DefaultPrefService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 06aed1396..92ae62f8f 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -307,6 +307,7 @@ public SmartPrefs(final java.util.prefs.Preferences p,
 
 		public void remove(final String key) {
 			if (nodeExists(key)) node(key).removeNode();
+			p.remove(safeKey(key));
 		}
 
 		public void putMap(final Map<String, String> map) {

From fa115fa0ddb17c66abad4e1bbc5c7361ef11c8ad Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 Dec 2017 13:22:38 +0100
Subject: [PATCH 0697/1208] PrefServiceTest: add tests for clear and remove

This verifies that the previous commit improves behavior.
---
 .../org/scijava/prefs/PrefServiceTest.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index d93b1a6a0..b768d960b 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -175,6 +175,25 @@ public void testList() {
 		assertEquals(recentFiles, result);
 	}
 
+	@Test
+	public void testClear() {
+		prefService.put(getClass(), "dog", "lazy");
+		prefService.put(getClass(), "fox", "quick");
+		assertEquals("lazy", prefService.get(getClass(), "dog"));
+		assertEquals("quick", prefService.get(getClass(), "fox"));
+		prefService.clear(getClass());
+		assertNull(prefService.get(getClass(), "dog"));
+		assertNull(prefService.get(getClass(), "fox"));
+	}
+
+	@Test
+	public void testRemove() {
+		prefService.put(getClass(), "hello", "world");
+		assertEquals("world", prefService.get(getClass(), "hello"));
+		prefService.remove(getClass(), "hello");
+		assertNull(prefService.get(getClass(), "hello"));
+	}
+
 	/**
 	 * The Java Preferences API does not support keys longer than 80 characters.
 	 * Let's test that our service does not fall victim to this limitation.

From a973b7244dfce9059fd0cf108d116594aebb9ecf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 18 Dec 2017 13:10:58 -0600
Subject: [PATCH 0698/1208] ScriptLanguage: give getEngineVersion an OK value

The default of 0.0 is no good. We can return the same
version that we do for getLanguageVersion by default.

See scijava/scripting-clojure#6.
---
 src/main/java/org/scijava/script/ScriptLanguage.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index ff6f81d11..779ca7897 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -159,7 +159,6 @@ else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) {
 
 	@Override
 	default String getEngineVersion() {
-		return "0.0";
+		return VersionUtils.getVersion(getClass());
 	}
-
 }

From a67c719e17b5f5a8e17e93bffa0c443e7c8eb5b1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 10:40:01 -0600
Subject: [PATCH 0699/1208] CommandService: fix the DynamicCommand run hack

With 3927f28db503c968d2d0b0ddb736386cc90ada5c, we tried to avoid a
scenario where ClassCastException is thrown when running a command
that implements Module (e.g. DynamicCommand).

Unfortunately, that fix is problematic because the command no longer
actually runs; this breaks e.g. OptionsPlugins launched from the menu.
Instead, let's run it, but return null for the result, and log an
informative debug message. This should be no worse than originally.
---
 .../command/DefaultCommandService.java        | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index e48d143bc..ca8c412d1 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -183,22 +183,16 @@ public <C extends Command> Future<CommandModule> run(
 	public Future<CommandModule> run(final CommandInfo info,
 		final boolean process, final Object... inputs)
 	{
-		validateModuleType(info);
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		final Future<CommandModule> future =
-			(Future) moduleService.run(info, process, inputs);
-		return future;
+		final Future<Module> future = moduleService.run(info, process, inputs);
+		return validateFuture(future, info);
 	}
 
 	@Override
 	public Future<CommandModule> run(final CommandInfo info,
 		final boolean process, final Map<String, Object> inputMap)
 	{
-		validateModuleType(info);
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		final Future<CommandModule> future =
-			(Future) moduleService.run(info, process, inputMap);
-		return future;
+		final Future<Module> future = moduleService.run(info, process, inputMap);
+		return validateFuture(future, info);
 	}
 
 	// -- PTService methods --
@@ -352,25 +346,32 @@ private <PT extends SciJavaPlugin> List<PluginInfo<?>> downcast(
 	}
 
 	/**
-	 * A HACK to prevent calling run when the resultant module will not be a
-	 * {@link CommandModule}. This is an API design flaw in CommandService
-	 * currently, but for now work around it rather than breaking backwards API
-	 * compatibility.
+	 * A HACK to avoid {@link ClassCastException} when calling run when the
+	 * resultant module will not be a {@link CommandModule}. This is an API design
+	 * flaw in CommandService currently, but for now we work around it rather than
+	 * breaking backwards API compatibility.
 	 */
-	private void validateModuleType(final CommandInfo info) {
+	private Future<CommandModule> validateFuture(final Future<Module> future,
+		final CommandInfo info)
+	{
 		try {
 			final Class<?> commandClass = info.loadDelegateClass();
 			if (Module.class.isAssignableFrom(commandClass)) {
-				throw new IllegalArgumentException("Cannot use " +
-					"commandService.run(commandClass, ...) " +
-					"with classes that extend Module directly. Please call " +
-					"moduleService.run(commandService.getCommand(commandClass), ...) " +
-					"instead.");
+				log.debug("The command '" + info.getIdentifier() +
+					"' extends Module directly. Due to a design flaw in the " +
+					"CommandService API, the result cannot be coerced to a " +
+					"Future<CommandModule>, so null will be returned instead. " +
+					"If you need the resulting module, please instead call " +
+					"moduleService.run(commandService.getCommand(commandClass), ...).");
+				return null;
 			}
 		}
 		catch (final ClassNotFoundException exc) {
 			throw new IllegalStateException("Command class unavailable: " + //
 				info.getDelegateClassName(), exc);
 		}
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		final Future<CommandModule> result = (Future) future;
+		return result;
 	}
 }

From e8e9644e2b103db5879fe14d87754be88122a00b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 10:51:26 -0600
Subject: [PATCH 0700/1208] OptionsPlugin: fix bug with cancelation

After canceling an options plugin, it would not run again.

Great idea Curtis to make OptionsPlugins singletons... >_<
---
 .../org/scijava/command/DynamicCommand.java   |  4 +++
 .../org/scijava/options/OptionsPlugin.java    | 26 ++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index ae88e949a..b56a0bac6 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -140,4 +140,8 @@ public String getCancelReason() {
 		return cancelReason;
 	}
 
+	// HACK: For OptionsPlugin.
+	public void uncancel() {
+		cancelReason = null;
+	}
 }
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index c217a5c14..6d9c75825 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -108,19 +108,20 @@ public void reset() {
 		prefService.clear(getClass());
 	}
 
+	// -- Module methods --
+
+	@Override
+	public void cancel() {
+		resetState();
+	}
+
 	// -- Runnable methods --
 
 	@Override
 	public void run() {
 		save();
-
-		// NB: Clear "resolved" status of all inputs.
-		// Otherwise, no inputs are harvested on next run.
-		for (final ModuleItem<?> input : getInfo().inputs()) {
-			unresolveInput(input.getName());
-		}
-
 		eventService.publish(new OptionsEvent(this));
+		resetState();
 	}
 
 	// -- Helper methods --
@@ -135,4 +136,15 @@ private <T> void saveInput(final ModuleItem<T> input) {
 		moduleService.save(input, value);
 	}
 
+	private void resetState() {
+		// NB: Clear "resolved" status of all inputs.
+		// Otherwise, no inputs are harvested on next run.
+		for (final ModuleItem<?> input : getInfo().inputs()) {
+			unresolveInput(input.getName());
+		}
+
+		// NB: Clear "canceled" status.
+		// Otherwise, the command cannot run again.
+		uncancel();
+	}
 }

From f6e1f8e0d7aa291a1edc89dc2edb12fcb4e35fd0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 10:52:47 -0600
Subject: [PATCH 0701/1208] POM: advance the minor version

The PrefService API changed, gaining new methods.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9e0fceee5..07edc7150 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.67.1-SNAPSHOT</version>
+	<version>2.68.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 8ec715cbd691cd492a6aae1969bc3d0d1ef7b68f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 9 Dec 2017 20:50:00 +0100
Subject: [PATCH 0702/1208] ScriptREPL: add option to use REPL quietly

Now you can call initialize(false) and it will skip the greeting. And
you can call lang(ScriptLanguage) to pass the language directly, in
which case it will not emit the notification about the language change.
---
 .../java/org/scijava/script/ScriptREPL.java   | 53 ++++++++++++++-----
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 6c5ac208c..cc773f7d6 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -134,22 +134,38 @@ public void loop(final InputStream in) throws IOException {
 		}
 	}
 
-	/** Outputs a greeting, and sets up the initial language of the REPL. */
+	/**
+	 * Outputs a greeting, and sets up the initial language and variables of the
+	 * REPL.
+	 */
 	public void initialize() {
-		out.println("Welcome to the SciJava REPL!");
-		out.println();
-		help();
+		initialize(true);
+	}
+
+	/**
+	 * Sets up the initial language and variables of the REPL.
+	 * 
+	 * @param verbose Whether to output an initial greeting.
+	 */
+	public void initialize(final boolean verbose) {
+		if (verbose) {
+			out.println("Welcome to the SciJava REPL!");
+			out.println();
+			help();
+		}
 		final List<ScriptLanguage> langs = getInterpretedLanguages();
-		if (langs.isEmpty()) {
-			out.println("--------------------------------------------------------------");
-			out.println("Uh oh! There are no SciJava script languages available!");
-			out.println("Are any on your classpath? E.g.: org.scijava:scripting-groovy?");
-			out.println("--------------------------------------------------------------");
+		if (verbose) {
+			if (langs.isEmpty()) {
+				out.println("--------------------------------------------------------------");
+				out.println("Uh oh! There are no SciJava script languages available!");
+				out.println("Are any on your classpath? E.g.: org.scijava:scripting-groovy?");
+				out.println("--------------------------------------------------------------");
+				out.println();
+				return;
+			}
+			out.println("Have fun!");
 			out.println();
-			return;
 		}
-		out.println("Have fun!");
-		out.println();
 		lang(langs.get(0).getLanguageName());
 		populateBindings(interpreter.getBindings());
 	}
@@ -249,6 +265,17 @@ public void lang(final String langName) {
 			out.println("No such language: " + langName);
 			return;
 		}
+		lang(language);
+		out.println("language -> " + interpreter.getLanguage().getLanguageName());
+	}
+
+	/**
+	 * Creates a new {@link ScriptInterpreter} to interpret statements, preserving
+	 * existing variables from the previous interpreter.
+	 * 
+	 * @param language The script language of the new interpreter.
+	 */
+	public void lang(final ScriptLanguage language) {
 		final ScriptInterpreter newInterpreter =
 			new DefaultScriptInterpreter(language);
 
@@ -259,8 +286,6 @@ public void lang(final String langName) {
 		catch (final Throwable t) {
 			t.printStackTrace(out);
 		}
-		out.println("language -> " +
-			newInterpreter.getLanguage().getLanguageName());
 		interpreter = newInterpreter;
 	}
 

From 3e5289e7bed7972f2ec893fa7680dcf314ee79eb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 11:24:35 -0600
Subject: [PATCH 0703/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 07edc7150..b09db3002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.68.0-SNAPSHOT</version>
+	<version>2.68.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 91e8d7fd07a4f0601d407d02eaae5e912334d29d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 11:56:58 -0600
Subject: [PATCH 0704/1208] ScriptREPL: set language quietly as appropriate

---
 src/main/java/org/scijava/script/ScriptREPL.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index cc773f7d6..71dc6eea0 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -165,8 +165,9 @@ public void initialize(final boolean verbose) {
 			}
 			out.println("Have fun!");
 			out.println();
+			lang(langs.get(0).getLanguageName());
 		}
-		lang(langs.get(0).getLanguageName());
+		else if (!langs.isEmpty()) lang(langs.get(0));
 		populateBindings(interpreter.getBindings());
 	}
 

From 72e613aae68d60de03919aaabac50798278e6c30 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 16:04:52 -0600
Subject: [PATCH 0705/1208] ShadowMenu: log duplicate menus at debug level

It comes up extremely frequently. Especially when imagej-legacy is
part of the mix, and the ImageJ1 commands overlap the SciJava ones.
---
 src/main/java/org/scijava/menu/ShadowMenu.java | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 35613098e..c1d1c2524 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -548,14 +548,8 @@ private ShadowMenu addChild(final ModuleInfo info, final int depth) {
 		else if (existingChild != null) {
 			if (log != null) {
 				final ModuleInfo childInfo = existingChild.getModuleInfo();
-				if (childInfo != null && info.getPriority() == childInfo.getPriority())
-				{
-					log.warn("ShadowMenu: menu item already exists:\n" + //
-						"\texisting: " + details(childInfo) + "\n" + //
-						"\t ignored: " + details(info));
-				}
-				else {
-					log.debug("ShadowMenu: higher-priority menu item already exists:\n" +
+				if (log.isDebug()) {
+					log.debug("ShadowMenu: menu item already exists:\n" + //
 						"\texisting: " + details(childInfo) + "\n" + //
 						"\t ignored: " + details(info));
 				}

From 3b626bf90d5efde3268a7045322d924ac3bdee3c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 16:28:07 -0600
Subject: [PATCH 0706/1208] PluginService: add a method to sort plugins

If you have a list of instances, but not their PluginInfo metadata
anymore, the priority will not be known unless the plugin type extends
HasPluginInfo. But regardless, we can look up the infos again, match
the instances against the looked-up infos, and sort that way.
---
 pom.xml                                       |  2 +-
 .../org/scijava/plugin/PluginService.java     | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b09db3002..61799b40f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.68.1-SNAPSHOT</version>
+	<version>2.69.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index c7154f5a5..36adb07a7 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -34,8 +34,14 @@
 
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import org.scijava.Priority;
 import org.scijava.service.SciJavaService;
 
 /**
@@ -254,4 +260,23 @@ public interface PluginService extends SciJavaService {
 	 */
 	<PT extends SciJavaPlugin> PT createInstance(PluginInfo<PT> info);
 
+	/**
+	 * Sorts the given list of plugin instances by priority.
+	 * 
+	 * @param instances List of plugin instances to sort.
+	 * @param type The type of plugin these instances represent.
+	 */
+	default <PT extends SciJavaPlugin> void sort(final List<PT> instances,
+		final Class<PT> type)
+	{
+		// Create a mapping from plugin classes to priorities.
+		final List<PluginInfo<PT>> plugins = getPluginsOfType(type);
+		final Map<Class<?>, PluginInfo<PT>> infos = plugins.stream().collect(//
+			Collectors.toMap(PluginInfo::getPluginClass, Function.identity()));
+
+		// Compare plugin instances by priority via the mapping.
+		final Comparator<PT> comparator = (o1, o2) -> Priority.compare(//
+			infos.get(o1.getClass()), infos.get(o2.getClass()));
+		Collections.sort(instances, comparator);
+	}
 }

From 328b9367e6f0d95f15c620168f3f17ca55fbe689 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 22 Dec 2017 16:30:57 -0600
Subject: [PATCH 0707/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 61799b40f..7029accf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.69.0-SNAPSHOT</version>
+	<version>2.69.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 33a3194fd93f83d3afa518c38bd22b77ce7f74fa Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Wed, 10 Jan 2018 10:59:45 +0100
Subject: [PATCH 0708/1208] Fix NullPointerException in LoggerPreprocessor

This handles the case of loggerName being null when running scripts that contain a Logger parameter.
---
 .../java/org/scijava/module/process/LoggerPreprocessor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 7020ac33b..2e62faaf1 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -66,7 +66,7 @@ public void process(final Module module) {
 		if (loggerInput == null || !loggerInput.isAutoFill()) return;
 
 		String loggerName = loggerInput.getLabel();
-		if(loggerName.isEmpty())
+		if(loggerName == null || loggerName.isEmpty())
 			loggerName = module.getDelegateObject().getClass().getSimpleName();
 		Logger logger = logService.subLogger(loggerName);
 

From 31e6c1b34179928578d4f55f3d2b07395cf5ea3e Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 27 Nov 2017 15:46:37 +0100
Subject: [PATCH 0709/1208] BytesLocation: improve javadoc

- Adds note about size of handles created using BytesLocation(int).
- Adds explanation of BytesLocation(byte[], int, int)
---
 .../java/org/scijava/io/location/BytesLocation.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 49c1b07cd..43c08e659 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -34,6 +34,7 @@
 
 import org.scijava.io.ByteArrayByteBank;
 import org.scijava.io.ByteBank;
+import org.scijava.io.handle.DataHandle;
 import org.scijava.util.ByteArray;
 
 /**
@@ -57,8 +58,9 @@ public BytesLocation(final ByteBank bytes) {
 	}
 
 	/**
-	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank}
-	 * with the specified initial capacity.
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank} with
+	 * the specified initial capacity, but with a reported size of 0. This method
+	 * can be used to avoid needing to grow the underlying {@link ByteBank}.
 	 */
 	public BytesLocation(final int initialCapacity) {
 		this.bytes = new ByteArrayByteBank(initialCapacity);
@@ -84,7 +86,11 @@ public BytesLocation(final byte[] bytes) {
 
 	/**
 	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank} with
-	 * the specified initial capacity.
+	 * the specified initial capacity and the provided data.
+	 * 
+	 * @param bytes the bytes to copy into the new {@link BytesLocation}
+	 * @param offset the offset in the bytes array to start copying from
+	 * @param length the number of bytes to copy, starting from the offset
 	 */
 	public BytesLocation(final byte[] bytes, final int offset,
 		final int length)

From 8b9f05c42d038973d710f9491e750e0acdf91e7c Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Thu, 28 Dec 2017 23:32:46 +0100
Subject: [PATCH 0710/1208] Add LocationService framework

The LocationService manages LocationResolver plugins that provide
translation from URI to Location. The LocationService itself
contains convenience methods to translate from String to Location.
---
 .../io/location/AbstractLocationResolver.java | 72 ++++++++++++++++
 .../io/location/DefaultLocationService.java   | 72 ++++++++++++++++
 .../scijava/io/location/LocationResolver.java | 56 ++++++++++++
 .../scijava/io/location/LocationService.java  | 86 +++++++++++++++++++
 .../java/org/scijava/ContextCreationTest.java |  1 +
 5 files changed, 287 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/location/AbstractLocationResolver.java
 create mode 100644 src/main/java/org/scijava/io/location/DefaultLocationService.java
 create mode 100644 src/main/java/org/scijava/io/location/LocationResolver.java
 create mode 100644 src/main/java/org/scijava/io/location/LocationService.java

diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
new file mode 100644
index 000000000..3ab3c8e75
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import java.net.URI;
+
+import org.scijava.plugin.AbstractHandlerPlugin;
+
+/**
+ * Abstract super class for {@link LocationResolver} plugins.
+ * 
+ * @author Gabriel Einsdorf
+ */
+public abstract class AbstractLocationResolver extends
+	AbstractHandlerPlugin<URI> implements LocationResolver
+{
+
+	private final String[] schemes;
+
+	/**
+	 * @param schemes the uri schmemes that the implementing sub-type supports
+	 */
+	public AbstractLocationResolver(String... schemes) {
+		assert schemes.length > 0;
+		this.schemes = schemes;
+	}
+
+	@Override
+	public boolean supports(URI uri) {
+		boolean supports = false;
+		for (final String scheme : schemes) {
+			supports = supports || scheme.equals(uri.getScheme());
+		}
+		return supports;
+	}
+
+	@Override
+	public Class<URI> getType() {
+		return URI.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
new file mode 100644
index 000000000..a75d5dbfd
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.scijava.plugin.AbstractHandlerService;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.Service;
+
+/**
+ * Default {@link LocationService} implementation.
+ * 
+ * @author Gabriel Einsdorf
+ */
+@Plugin(type = Service.class)
+public class DefaultLocationService extends
+	AbstractHandlerService<URI, LocationResolver> implements
+	LocationService
+{
+
+	private final Map<String, LocationResolver> resolvers = new HashMap<>();
+
+	@Override
+	public Class<LocationResolver> getPluginType() {
+		return LocationResolver.class;
+	}
+
+	@Override
+	public Class<URI> getType() {
+		return URI.class;
+	}
+
+
+	@Override
+	public LocationResolver getResolver(final URI uri) {
+		return resolvers.computeIfAbsent(uri.getScheme(), u -> getHandler(uri));
+	}
+}
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
new file mode 100644
index 000000000..6e71f617c
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -0,0 +1,56 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.scijava.plugin.HandlerPlugin;
+
+/**
+ * {@link LocationResolver} plugins allow resolving an {@link URI} to a
+ * {@link Location}. Extending {@link AbstractLocationResolver} is recommended
+ * for easy implementation.
+ * 
+ * @author Gabriel Einsdorf
+ */
+public interface LocationResolver extends HandlerPlugin<URI> {
+
+	/**
+	 * Resolves the given {@link URI} to a {@link Location}
+	 * 
+	 * @return the resolved Location
+	 * @throws URISyntaxException
+	 */
+	Location resolve(URI uri) throws URISyntaxException;
+}
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
new file mode 100644
index 000000000..bd62ad7e8
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.scijava.plugin.HandlerService;
+import org.scijava.service.SciJavaService;
+
+/**
+ * A service that allows resolving of URIs to Locations, using
+ * {@link LocationResolver} plugins for translation.
+ * 
+ * @author Gabriel Einsdorf
+ */
+public interface LocationService extends HandlerService<URI, LocationResolver>,
+	SciJavaService
+{
+
+	/**
+	 * Turns the given string into an {@link URI}, then resolves it to a
+	 * {@link Location}
+	 * 
+	 * @param uri the uri to resolve
+	 * @return the resolved {@link Location}
+	 * @throws URISyntaxException if the URI is malformed
+	 */
+	default Location resolve(final String uri) throws URISyntaxException {
+		return resolve(new URI(uri));
+	}
+
+	/**
+	 * Resolves the given {@link URI} to a location.
+	 * 
+	 * @param uri the uri to resolve
+	 * @return the resolved {@link Location} or <code>null</code> if no resolver
+	 *         could be found.
+	 * @throws URISyntaxException if the URI is malformed
+	 */
+	default Location resolve(final URI uri) throws URISyntaxException {
+		final LocationResolver resolver = getResolver(uri);
+		return resolver != null ? resolver.resolve(uri) : null;
+	}
+
+	/**
+	 * Returns a {@link LocationResolver} capable of resolving URL like the one
+	 * provided to this method. Allows faster repeated resolving of similar URIs
+	 * without going through this service.
+	 * 
+	 * @param uri the uri
+	 * @return the {@link LocationResolver} for this uri type, or
+	 *         <code>null</code> if no resolver could be found.
+	 */
+	LocationResolver getResolver(URI uri);
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 79b80affc..bfcce46e5 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -100,6 +100,7 @@ public void testFull() {
 				org.scijava.io.DefaultIOService.class,
 				org.scijava.io.DefaultRecentFileService.class,
 				org.scijava.io.handle.DefaultDataHandleService.class,
+				org.scijava.io.location.DefaultLocationService.class,
 				org.scijava.io.nio.DefaultNIOService.class,
 				org.scijava.main.DefaultMainService.class,
 				org.scijava.menu.DefaultMenuService.class,

From 76e4e1efee88e58b0daa7892c0d0e858b87232ea Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Thu, 28 Dec 2017 23:41:26 +0100
Subject: [PATCH 0711/1208] Add FileLocationResolver + LocationService Tests

---
 .../io/location/FileLocationResolver.java     | 55 ++++++++++++++
 .../io/location/FileLocationResolverTest.java | 72 +++++++++++++++++++
 .../io/location/LocationServiceTest.java      | 66 +++++++++++++++++
 3 files changed, 193 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/location/FileLocationResolver.java
 create mode 100644 src/test/java/org/scijava/io/location/FileLocationResolverTest.java
 create mode 100644 src/test/java/org/scijava/io/location/LocationServiceTest.java

diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
new file mode 100644
index 000000000..b40f0f13e
--- /dev/null
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import java.net.URI;
+
+import org.scijava.plugin.Plugin;
+
+/**
+ * Implementation of {@link LocationResolver} for {@link FileLocation}.
+ * 
+ * @author Gabriel Einsdorf
+ */
+@Plugin(type = LocationResolver.class)
+public class FileLocationResolver extends AbstractLocationResolver {
+
+	public FileLocationResolver() {
+		super("file");
+	}
+
+	@Override
+	public Location resolve(URI uri) {
+		return new FileLocation(uri);
+	}
+}
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
new file mode 100644
index 000000000..9e94b0281
--- /dev/null
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.Test;
+import org.scijava.Context;
+
+/**
+ * Test for {@link FileLocationResolver}.
+ *
+ * @author Gabriel Einsdorf
+ */
+public class FileLocationResolverTest {
+
+	Context ctx = new Context(LocationService.class);
+	LocationService resolver = ctx.getService(LocationService.class);
+
+	@Test
+	public void testStringResolve() throws URISyntaxException {
+		final String uri = new File(new File(".").getAbsolutePath()) //
+			.toURI().toString();
+		final Location loc = resolver.resolve(uri);
+		assertTrue(loc instanceof FileLocation);
+		assertEquals(uri, loc.getURI().toString());
+	}
+
+	@Test
+	public void testURIResolve() throws URISyntaxException {
+		final URI uri = new File(new File(".").getAbsolutePath()).toURI();
+		final Location loc = resolver.resolve(uri);
+		assertTrue(loc instanceof FileLocation);
+		assertEquals(uri, loc.getURI());
+	}
+
+}
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
new file mode 100644
index 000000000..5d6d5d9b7
--- /dev/null
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.location;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.Test;
+import org.scijava.Context;
+
+/**
+ * Tests {@link LocationService}.
+ * 
+ * @author Gabriel Einsdorf
+ */
+public class LocationServiceTest {
+
+	@Test
+	public void testResolve() throws URISyntaxException {
+		final Context ctx = new Context(LocationService.class);
+		final LocationService loc = ctx.getService(LocationService.class);
+
+		final URI uri = new File(new File(".").getAbsolutePath()).toURI();
+		final LocationResolver res = loc.getResolver(uri);
+
+		assertTrue(res instanceof FileLocationResolver);
+		assertEquals(uri, res.resolve(uri).getURI());
+		assertEquals(uri, loc.resolve(uri).getURI());
+		assertEquals(uri, loc.resolve(uri.toString()).getURI());
+	}
+
+}

From e3babc89c95bbd3a4fe15deaffea017536c851de Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 20 Feb 2018 09:13:17 -0600
Subject: [PATCH 0712/1208] LocationService: move get*Type methods to iface

---
 .../io/location/DefaultLocationService.java        | 12 ------------
 .../org/scijava/io/location/LocationService.java   | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index a75d5dbfd..d8c3c037d 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -33,7 +33,6 @@
 package org.scijava.io.location;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,17 +53,6 @@ public class DefaultLocationService extends
 
 	private final Map<String, LocationResolver> resolvers = new HashMap<>();
 
-	@Override
-	public Class<LocationResolver> getPluginType() {
-		return LocationResolver.class;
-	}
-
-	@Override
-	public Class<URI> getType() {
-		return URI.class;
-	}
-
-
 	@Override
 	public LocationResolver getResolver(final URI uri) {
 		return resolvers.computeIfAbsent(uri.getScheme(), u -> getHandler(uri));
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index bd62ad7e8..193e03929 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -83,4 +83,18 @@ default Location resolve(final URI uri) throws URISyntaxException {
 	 *         <code>null</code> if no resolver could be found.
 	 */
 	LocationResolver getResolver(URI uri);
+
+	// -- PTService methods --
+
+	@Override
+	default Class<LocationResolver> getPluginType() {
+		return LocationResolver.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default Class<URI> getType() {
+		return URI.class;
+	}
 }

From 353ca568dae8abc7e3059e895aaed7a0f41347a8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 Jul 2016 23:26:56 -0500
Subject: [PATCH 0713/1208] Add a utility class for working with Java types

This Types class will be the central place for utility methods that work
with Java types via reflection, including reasoning about generics,
retrieving Field and Method metadata, and similar activities.

The existing GenericUtils and ClassUtils functionality will be merged
into the Types class and refined.
---
 pom.xml                                   |   2 +-
 src/main/java/org/scijava/util/Types.java | 114 ++++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/util/Types.java

diff --git a/pom.xml b/pom.xml
index 7029accf9..2c5fc4cb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.69.1-SNAPSHOT</version>
+	<version>2.70.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
new file mode 100644
index 000000000..57764592a
--- /dev/null
+++ b/src/main/java/org/scijava/util/Types.java
@@ -0,0 +1,114 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2016 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.util;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+/**
+ * Utility class for working with generic types, fields and methods.
+ * <p>
+ * Logic and inspiration were drawn from the following excellent libraries:
+ * <ul>
+ * <li>Google Guava's {@code com.google.common.reflect} package.</li>
+ * <li>Apache Commons Lang 3's {@code org.apache.commons.lang3.reflect} package.
+ * </li>
+ * <li><a href="https://github.com/coekarts/gentyref">GenTyRef</a> (Generic Type
+ * Reflector), a library for runtime generic type introspection.</li>
+ * </ul>
+ * </p>
+ *
+ * @author Curtis Rueden
+ */
+public final class Types {
+
+	private Types() {
+		// NB: Prevent instantiation of utility class.
+	}
+
+	// TODO: Migrate all GenericUtils methods here.
+
+	public static String name(final Type t) {
+		// NB: It is annoying that Class.toString() prepends "class " or
+		// "interface "; this method exists to work around that behavior.
+		return t instanceof Class ? ((Class<?>) t).getName() : t.toString();
+	}
+
+	/**
+	 * Gets the (first) raw class of the given type.
+	 * <ul>
+	 * <li>If the type is a {@code Class} itself, the type itself is returned.
+	 * </li>
+	 * <li>If the type is a {@link ParameterizedType}, the raw type of the
+	 * parameterized type is returned.</li>
+	 * <li>If the type is a {@link GenericArrayType}, the returned type is the
+	 * corresponding array class. For example: {@code List<Integer>[] => List[]}.
+	 * </li>
+	 * <li>If the type is a type variable or wildcard type, the raw type of the
+	 * first upper bound is returned. For example:
+	 * {@code <X extends Foo & Bar> => Foo}.</li>
+	 * </ul>
+	 * <p>
+	 * If you want <em>all</em> raw classes of the given type, use {@link #raws}.
+	 * </p>
+	 */
+	public static Class<?> raw(final Type type) {
+		// TODO: Consolidate with GenericUtils.
+		return GenericUtils.getClass(type);
+	}
+
+	/**
+	 * Gets all raw classes corresponding to the given type.
+	 * <p>
+	 * For example, a type parameter {@code A extends Number & Iterable} will
+	 * return both {@link Number} and {@link Iterable} as its raw classes.
+	 * </p>
+	 *
+	 * @see #raw
+	 */
+	public static List<Class<?>> raws(final Type type) {
+		// TODO: Consolidate with GenericUtils.
+		return GenericUtils.getClasses(type);
+	}
+
+	public static Field field(final Class<?> c, final String name) {
+		if (c == null) throw new IllegalArgumentException("No such field: " + name);
+		try {
+			return c.getDeclaredField(name);
+		}
+		catch (final NoSuchFieldException e) {}
+		return field(c.getSuperclass(), name);
+	}
+}

From 5f75cada8305ba5711972ee7f2140918feb31911 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 29 Jul 2016 16:47:07 -0500
Subject: [PATCH 0714/1208] Fork Apache Commons Lang 3.4's TypeUtils class

We cannot use it as is, because it has bugs which we will need to fix.
And (at least for now) it is nice to avoid this dependency anyway.

This commit splices in the TypeUtils code from Apache Commons Lang 3.4
with a minimal set of changes which compile and work with SciJava code
style. Subsequent commits will fix bugs as well as clean up various
issues in the code.
---
 src/main/java/org/scijava/util/Types.java | 2096 +++++++++++++++++++++
 1 file changed, 2096 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 57764592a..bd4018ff5 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -31,11 +31,33 @@
 
 package org.scijava.util;
 
+// Portions of this class were adapted from the
+// org.apache.commons.lang3.reflect.TypeUtils and
+// org.apache.commons.lang3.Validate classes of
+// Apache Commons Lang 3.4, which is distributed
+// under the Apache 2 license.
+// See lines below starting with "BEGIN FORK".
+
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.GenericDeclaration;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import org.scijava.util.ConversionUtils;
+import org.scijava.util.GenericUtils;
 
 /**
  * Utility class for working with generic types, fields and methods.
@@ -111,4 +133,2078 @@ public static Field field(final Class<?> c, final String name) {
 		catch (final NoSuchFieldException e) {}
 		return field(c.getSuperclass(), name);
 	}
+
+	// -- BEGIN FORK OF APACHE COMMONS LANG 3.4 CODE --
+
+	/*
+	 * Licensed to the Apache Software Foundation (ASF) under one or more
+	 * contributor license agreements.  See the NOTICE file distributed with
+	 * this work for additional information regarding copyright ownership.
+	 * The ASF licenses this file to You under the Apache License, Version 2.0
+	 * (the "License"); you may not use this file except in compliance with
+	 * the License.  You may obtain a copy of the License at
+	 *
+	 *      http://www.apache.org/licenses/LICENSE-2.0
+	 *
+	 * Unless required by applicable law or agreed to in writing, software
+	 * distributed under the License is distributed on an "AS IS" BASIS,
+	 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	 * See the License for the specific language governing permissions and
+	 * limitations under the License.
+	 */
+
+	/**
+	 * <p>
+	 * Utility methods focusing on type inspection, particularly with regard to
+	 * generics.
+	 * </p>
+	 *
+	 * @since 3.0
+	 * @version $Id: TypeUtils.java 1606051 2014-06-27 12:22:17Z ggregory $
+	 */
+	@SuppressWarnings("unused")
+	private static class TypeUtils {
+
+		/**
+		 * {@link WildcardType} builder.
+		 *
+		 * @since 3.2
+		 */
+		public static class WildcardTypeBuilder {
+
+			/**
+			 * Constructor
+			 */
+			private WildcardTypeBuilder() {}
+
+			private Type[] upperBounds;
+			private Type[] lowerBounds;
+
+			/**
+			 * Specify upper bounds of the wildcard type to build.
+			 *
+			 * @param bounds to set
+			 * @return {@code this}
+			 */
+			public WildcardTypeBuilder withUpperBounds(final Type... bounds) {
+				this.upperBounds = bounds;
+				return this;
+			}
+
+			/**
+			 * Specify lower bounds of the wildcard type to build.
+			 *
+			 * @param bounds to set
+			 * @return {@code this}
+			 */
+			public WildcardTypeBuilder withLowerBounds(final Type... bounds) {
+				this.lowerBounds = bounds;
+				return this;
+			}
+
+			public WildcardType build() {
+				return new WildcardTypeImpl(upperBounds, lowerBounds);
+			}
+		}
+
+		/**
+		 * GenericArrayType implementation class.
+		 *
+		 * @since 3.2
+		 */
+		private static final class GenericArrayTypeImpl implements
+			GenericArrayType
+		{
+
+			private final Type componentType;
+
+			/**
+			 * Constructor
+			 *
+			 * @param componentType of this array type
+			 */
+			private GenericArrayTypeImpl(final Type componentType) {
+				this.componentType = componentType;
+			}
+
+			@Override
+			public Type getGenericComponentType() {
+				return componentType;
+			}
+
+			@Override
+			public String toString() {
+				return TypeUtils.toString(this);
+			}
+
+			@Override
+			public boolean equals(final Object obj) {
+				return obj == this || obj instanceof GenericArrayType && TypeUtils
+					.equals(this, (GenericArrayType) obj);
+			}
+
+			@Override
+			public int hashCode() {
+				int result = 67 << 4;
+				result |= componentType.hashCode();
+				return result;
+			}
+		}
+
+		/**
+		 * ParameterizedType implementation class.
+		 *
+		 * @since 3.2
+		 */
+		private static final class ParameterizedTypeImpl implements
+			ParameterizedType
+		{
+
+			private final Class<?> raw;
+			private final Type useOwner;
+			private final Type[] typeArguments;
+
+			/**
+			 * Constructor
+			 *
+			 * @param raw type
+			 * @param useOwner owner type to use, if any
+			 * @param typeArguments formal type arguments
+			 */
+			private ParameterizedTypeImpl(final Class<?> raw, final Type useOwner,
+				final Type[] typeArguments)
+			{
+				this.raw = raw;
+				this.useOwner = useOwner;
+				this.typeArguments = typeArguments;
+			}
+
+			@Override
+			public Type getRawType() {
+				return raw;
+			}
+
+			@Override
+			public Type getOwnerType() {
+				return useOwner;
+			}
+
+			@Override
+			public Type[] getActualTypeArguments() {
+				return typeArguments.clone();
+			}
+
+			@Override
+			public String toString() {
+				return TypeUtils.toString(this);
+			}
+
+			@Override
+			public boolean equals(final Object obj) {
+				return obj == this || obj instanceof ParameterizedType && TypeUtils
+					.equals(this, ((ParameterizedType) obj));
+			}
+
+			@Override
+			public int hashCode() {
+				int result = 71 << 4;
+				result |= raw.hashCode();
+				result <<= 4;
+				result |= Objects.hashCode(useOwner);
+				result <<= 8;
+				result |= Arrays.hashCode(typeArguments);
+				return result;
+			}
+		}
+
+		/**
+		 * WildcardType implementation class.
+		 *
+		 * @since 3.2
+		 */
+		private static final class WildcardTypeImpl implements WildcardType {
+
+			private static final Type[] EMPTY_BOUNDS = new Type[0];
+
+			private final Type[] upperBounds;
+			private final Type[] lowerBounds;
+
+			/**
+			 * Constructor
+			 *
+			 * @param upperBound of this type
+			 * @param lowerBound of this type
+			 */
+			private WildcardTypeImpl(final Type upperBound, final Type lowerBound) {
+				this(upperBound == null ? null : new Type[] { upperBound },
+					lowerBound == null ? null : new Type[] { lowerBound });
+			}
+
+			/**
+			 * Constructor
+			 *
+			 * @param upperBounds of this type
+			 * @param lowerBounds of this type
+			 */
+			private WildcardTypeImpl(final Type[] upperBounds,
+				final Type[] lowerBounds)
+			{
+				this.upperBounds = upperBounds == null ? EMPTY_BOUNDS : upperBounds;
+				this.lowerBounds = lowerBounds == null ? EMPTY_BOUNDS : lowerBounds;
+			}
+
+			@Override
+			public Type[] getUpperBounds() {
+				return upperBounds.clone();
+			}
+
+			@Override
+			public Type[] getLowerBounds() {
+				return lowerBounds.clone();
+			}
+
+			@Override
+			public String toString() {
+				return TypeUtils.toString(this);
+			}
+
+			@Override
+			public boolean equals(final Object obj) {
+				return obj == this || obj instanceof WildcardType && TypeUtils.equals(
+					this, (WildcardType) obj);
+			}
+
+			@Override
+			public int hashCode() {
+				int result = 73 << 8;
+				result |= Arrays.hashCode(upperBounds);
+				result <<= 8;
+				result |= Arrays.hashCode(lowerBounds);
+				return result;
+			}
+		}
+
+		/**
+		 * A wildcard instance matching {@code ?}.
+		 *
+		 * @since 3.2
+		 */
+		public static final WildcardType WILDCARD_ALL = //
+			wildcardType().withUpperBounds(Object.class).build();
+
+		/**
+		 * <p>
+		 * Checks if the subject type may be implicitly cast to the target type
+		 * following the Java generics rules. If both types are {@link Class}
+		 * objects, the method returns the result of
+		 * {@link Class#isAssignableFrom(Class)}.
+		 * </p>
+		 *
+		 * @param type the subject type to be assigned to the target type
+		 * @param toType the target type
+		 * @return {@code true} if {@code type} is assignable to {@code toType}.
+		 */
+		public static boolean isAssignable(final Type type, final Type toType) {
+			return isAssignable(type, toType, null);
+		}
+
+		/**
+		 * <p>
+		 * Checks if the subject type may be implicitly cast to the target type
+		 * following the Java generics rules.
+		 * </p>
+		 *
+		 * @param type the subject type to be assigned to the target type
+		 * @param toType the target type
+		 * @param typeVarAssigns optional map of type variable assignments
+		 * @return {@code true} if {@code type} is assignable to {@code toType}.
+		 */
+		private static boolean isAssignable(final Type type, final Type toType,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			if (toType == null || toType instanceof Class<?>) {
+				return isAssignable(type, (Class<?>) toType);
+			}
+
+			if (toType instanceof ParameterizedType) {
+				return isAssignable(type, (ParameterizedType) toType, typeVarAssigns);
+			}
+
+			if (toType instanceof GenericArrayType) {
+				return isAssignable(type, (GenericArrayType) toType, typeVarAssigns);
+			}
+
+			if (toType instanceof WildcardType) {
+				return isAssignable(type, (WildcardType) toType, typeVarAssigns);
+			}
+
+			if (toType instanceof TypeVariable<?>) {
+				return isAssignable(type, (TypeVariable<?>) toType, typeVarAssigns);
+			}
+
+			throw new IllegalStateException("found an unhandled type: " + toType);
+		}
+
+		/**
+		 * <p>
+		 * Checks if the subject type may be implicitly cast to the target class
+		 * following the Java generics rules.
+		 * </p>
+		 *
+		 * @param type the subject type to be assigned to the target type
+		 * @param toClass the target class
+		 * @return {@code true} if {@code type} is assignable to {@code toClass}.
+		 */
+		private static boolean isAssignable(final Type type,
+			final Class<?> toClass)
+		{
+			if (type == null) {
+				// consistency with ClassUtils.isAssignable() behavior
+				return toClass == null || !toClass.isPrimitive();
+			}
+
+			// only a null type can be assigned to null type which
+			// would have cause the previous to return true
+			if (toClass == null) {
+				return false;
+			}
+
+			// all types are assignable to themselves
+			if (toClass.equals(type)) {
+				return true;
+			}
+
+			if (type instanceof Class<?>) {
+				// just comparing two classes
+				return toClass.isAssignableFrom((Class<?>) type);
+			}
+
+			if (type instanceof ParameterizedType) {
+				// only have to compare the raw type to the class
+				return isAssignable(getRawType((ParameterizedType) type), toClass);
+			}
+
+			// *
+			if (type instanceof TypeVariable<?>) {
+				// if any of the bounds are assignable to the class, then the
+				// type is assignable to the class.
+				for (final Type bound : ((TypeVariable<?>) type).getBounds()) {
+					if (isAssignable(bound, toClass)) {
+						return true;
+					}
+				}
+
+				return false;
+			}
+
+			// the only classes to which a generic array type can be assigned
+			// are class Object and array classes
+			if (type instanceof GenericArrayType) {
+				return toClass.equals(Object.class) || toClass.isArray() &&
+					isAssignable(((GenericArrayType) type).getGenericComponentType(),
+						toClass.getComponentType());
+			}
+
+			// wildcard types are not assignable to a class (though one would think
+			// "? super Object" would be assignable to Object)
+			if (type instanceof WildcardType) {
+				return false;
+			}
+
+			throw new IllegalStateException("found an unhandled type: " + type);
+		}
+
+		/**
+		 * <p>
+		 * Checks if the subject type may be implicitly cast to the target
+		 * parameterized type following the Java generics rules.
+		 * </p>
+		 *
+		 * @param type the subject type to be assigned to the target type
+		 * @param toParameterizedType the target parameterized type
+		 * @param typeVarAssigns a map with type variables
+		 * @return {@code true} if {@code type} is assignable to {@code toType}.
+		 */
+		private static boolean isAssignable(final Type type,
+			final ParameterizedType toParameterizedType,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			if (type == null) {
+				return true;
+			}
+
+			// only a null type can be assigned to null type which
+			// would have cause the previous to return true
+			if (toParameterizedType == null) {
+				return false;
+			}
+
+			// all types are assignable to themselves
+			if (toParameterizedType.equals(type)) {
+				return true;
+			}
+
+			// get the target type's raw type
+			final Class<?> toClass = getRawType(toParameterizedType);
+			// get the subject type's type arguments including owner type arguments
+			// and supertype arguments up to and including the target class.
+			final Map<TypeVariable<?>, Type> fromTypeVarAssigns = getTypeArguments(
+				type, toClass, null);
+
+			// null means the two types are not compatible
+			if (fromTypeVarAssigns == null) {
+				return false;
+			}
+
+			// compatible types, but there's no type arguments. this is equivalent
+			// to comparing Map< ?, ? > to Map, and raw types are always assignable
+			// to parameterized types.
+			if (fromTypeVarAssigns.isEmpty()) {
+				return true;
+			}
+
+			// get the target type's type arguments including owner type arguments
+			final Map<TypeVariable<?>, Type> toTypeVarAssigns = getTypeArguments(
+				toParameterizedType, toClass, typeVarAssigns);
+
+			// now to check each type argument
+			for (final TypeVariable<?> var : toTypeVarAssigns.keySet()) {
+				final Type toTypeArg = unrollVariableAssignments(var, toTypeVarAssigns);
+				final Type fromTypeArg = unrollVariableAssignments(var,
+					fromTypeVarAssigns);
+
+				// parameters must either be absent from the subject type, within
+				// the bounds of the wildcard type, or be an exact match to the
+				// parameters of the target type.
+				if (fromTypeArg != null && !toTypeArg.equals(fromTypeArg) &&
+					!(toTypeArg instanceof WildcardType && isAssignable(fromTypeArg,
+						toTypeArg, typeVarAssigns)))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/**
+		 * Look up {@code var} in {@code typeVarAssigns} <em>transitively</em>, i.e.
+		 * keep looking until the value found is <em>not</em> a type variable.
+		 *
+		 * @param var the type variable to look up
+		 * @param typeVarAssigns the map used for the look up
+		 * @return Type or {@code null} if some variable was not in the map
+		 * @since 3.2
+		 */
+		private static Type unrollVariableAssignments(TypeVariable<?> var,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			Type result;
+			do {
+				result = typeVarAssigns.get(var);
+				if (result instanceof TypeVariable<?> && !result.equals(var)) {
+					var = (TypeVariable<?>) result;
+					continue;
+				}
+				break;
+			}
+			while (true);
+			return result;
+		}
+
+		/**
+		 * <p>
+		 * Checks if the subject type may be implicitly cast to the target generic
+		 * array type following the Java generics rules.
+		 * </p>
+		 *
+		 * @param type the subject type to be assigned to the target type
+		 * @param toGenericArrayType the target generic array type
+		 * @param typeVarAssigns a map with type variables
+		 * @return {@code true} if {@code type} is assignable to
+		 *         {@code toGenericArrayType}.
+		 */
+		private static boolean isAssignable(final Type type,
+			final GenericArrayType toGenericArrayType,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			if (type == null) {
+				return true;
+			}
+
+			// only a null type can be assigned to null type which
+			// would have cause the previous to return true
+			if (toGenericArrayType == null) {
+				return false;
+			}
+
+			// all types are assignable to themselves
+			if (toGenericArrayType.equals(type)) {
+				return true;
+			}
+
+			final Type toComponentType = toGenericArrayType.getGenericComponentType();
+
+			if (type instanceof Class<?>) {
+				final Class<?> cls = (Class<?>) type;
+
+				// compare the component types
+				return cls.isArray() && isAssignable(cls.getComponentType(),
+					toComponentType, typeVarAssigns);
+			}
+
+			if (type instanceof GenericArrayType) {
+				// compare the component types
+				return isAssignable(((GenericArrayType) type).getGenericComponentType(),
+					toComponentType, typeVarAssigns);
+			}
+
+			if (type instanceof WildcardType) {
+				// so long as one of the upper bounds is assignable, it's good
+				for (final Type bound : getImplicitUpperBounds((WildcardType) type)) {
+					if (isAssignable(bound, toGenericArrayType)) {
+						return true;
+					}
+				}
+
+				return false;
+			}
+
+			if (type instanceof TypeVariable<?>) {
+				// probably should remove the following logic and just return false.
+				// type variables cannot specify arrays as bounds.
+				for (final Type bound : getImplicitBounds((TypeVariable<?>) type)) {
+					if (isAssignable(bound, toGenericArrayType)) {
+						return true;
+					}
+				}
+
+				return false;
+			}
+
+			if (type instanceof ParameterizedType) {
+				// the raw type of a parameterized type is never an array or
+				// generic array, otherwise the declaration would look like this:
+				// Collection[]< ? extends String > collection;
+				return false;
+			}
+
+			throw new IllegalStateException("found an unhandled type: " + type);
+		}
+
+		/**
+		 * <p>
+		 * Checks if the subject type may be implicitly cast to the target wildcard
+		 * type following the Java generics rules.
+		 * </p>
+		 *
+		 * @param type the subject type to be assigned to the target type
+		 * @param toWildcardType the target wildcard type
+		 * @param typeVarAssigns a map with type variables
+		 * @return {@code true} if {@code type} is assignable to
+		 *         {@code toWildcardType}.
+		 */
+		private static boolean isAssignable(final Type type,
+			final WildcardType toWildcardType,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			if (type == null) {
+				return true;
+			}
+
+			// only a null type can be assigned to null type which
+			// would have cause the previous to return true
+			if (toWildcardType == null) {
+				return false;
+			}
+
+			// all types are assignable to themselves
+			if (toWildcardType.equals(type)) {
+				return true;
+			}
+
+			final Type[] toUpperBounds = getImplicitUpperBounds(toWildcardType);
+			final Type[] toLowerBounds = getImplicitLowerBounds(toWildcardType);
+
+			if (type instanceof WildcardType) {
+				final WildcardType wildcardType = (WildcardType) type;
+				final Type[] upperBounds = getImplicitUpperBounds(wildcardType);
+				final Type[] lowerBounds = getImplicitLowerBounds(wildcardType);
+
+				for (Type toBound : toUpperBounds) {
+					// if there are assignments for unresolved type variables,
+					// now's the time to substitute them.
+					toBound = substituteTypeVariables(toBound, typeVarAssigns);
+
+					// each upper bound of the subject type has to be assignable to
+					// each
+					// upper bound of the target type
+					for (final Type bound : upperBounds) {
+						if (!isAssignable(bound, toBound, typeVarAssigns)) {
+							return false;
+						}
+					}
+				}
+
+				for (Type toBound : toLowerBounds) {
+					// if there are assignments for unresolved type variables,
+					// now's the time to substitute them.
+					toBound = substituteTypeVariables(toBound, typeVarAssigns);
+
+					// each lower bound of the target type has to be assignable to
+					// each
+					// lower bound of the subject type
+					for (final Type bound : lowerBounds) {
+						if (!isAssignable(toBound, bound, typeVarAssigns)) {
+							return false;
+						}
+					}
+				}
+				return true;
+			}
+
+			for (final Type toBound : toUpperBounds) {
+				// if there are assignments for unresolved type variables,
+				// now's the time to substitute them.
+				if (!isAssignable(type, substituteTypeVariables(toBound,
+					typeVarAssigns), typeVarAssigns))
+				{
+					return false;
+				}
+			}
+
+			for (final Type toBound : toLowerBounds) {
+				// if there are assignments for unresolved type variables,
+				// now's the time to substitute them.
+				if (!isAssignable(substituteTypeVariables(toBound, typeVarAssigns),
+					type, typeVarAssigns))
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/**
+		 * <p>
+		 * Checks if the subject type may be implicitly cast to the target type
+		 * variable following the Java generics rules.
+		 * </p>
+		 *
+		 * @param type the subject type to be assigned to the target type
+		 * @param toTypeVariable the target type variable
+		 * @param typeVarAssigns a map with type variables
+		 * @return {@code true} if {@code type} is assignable to
+		 *         {@code toTypeVariable}.
+		 */
+		private static boolean isAssignable(final Type type,
+			final TypeVariable<?> toTypeVariable,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			if (type == null) {
+				return true;
+			}
+
+			// only a null type can be assigned to null type which
+			// would have cause the previous to return true
+			if (toTypeVariable == null) {
+				return false;
+			}
+
+			// all types are assignable to themselves
+			if (toTypeVariable.equals(type)) {
+				return true;
+			}
+
+			if (type instanceof TypeVariable<?>) {
+				// a type variable is assignable to another type variable, if
+				// and only if the former is the latter, extends the latter, or
+				// is otherwise a descendant of the latter.
+				final Type[] bounds = getImplicitBounds((TypeVariable<?>) type);
+
+				for (final Type bound : bounds) {
+					if (isAssignable(bound, toTypeVariable, typeVarAssigns)) {
+						return true;
+					}
+				}
+			}
+
+			if (type instanceof Class<?> || type instanceof ParameterizedType ||
+				type instanceof GenericArrayType || type instanceof WildcardType)
+			{
+				return false;
+			}
+
+			throw new IllegalStateException("found an unhandled type: " + type);
+		}
+
+		/**
+		 * <p>
+		 * Find the mapping for {@code type} in {@code typeVarAssigns}.
+		 * </p>
+		 *
+		 * @param type the type to be replaced
+		 * @param typeVarAssigns the map with type variables
+		 * @return the replaced type
+		 * @throws IllegalArgumentException if the type cannot be substituted
+		 */
+		private static Type substituteTypeVariables(final Type type,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			if (type instanceof TypeVariable<?> && typeVarAssigns != null) {
+				final Type replacementType = typeVarAssigns.get(type);
+
+				if (replacementType == null) {
+					throw new IllegalArgumentException(
+						"missing assignment type for type variable " + type);
+				}
+				return replacementType;
+			}
+			return type;
+		}
+
+		/**
+		 * <p>
+		 * Retrieves all the type arguments for this parameterized type including
+		 * owner hierarchy arguments such as {@code Outer<K,V>.Inner<T>.DeepInner
+		 * <E>} . The arguments are returned in a {@link Map} specifying the
+		 * argument type for each {@link TypeVariable}.
+		 * </p>
+		 *
+		 * @param type specifies the subject parameterized type from which to
+		 *          harvest the parameters.
+		 * @return a {@code Map} of the type arguments to their respective type
+		 *         variables.
+		 */
+		public static Map<TypeVariable<?>, Type> getTypeArguments(
+			final ParameterizedType type)
+		{
+			return getTypeArguments(type, getRawType(type), null);
+		}
+
+		/**
+		 * <p>
+		 * Gets the type arguments of a class/interface based on a subtype. For
+		 * instance, this method will determine that both of the parameters for the
+		 * interface {@link Map} are {@link Object} for the subtype
+		 * {@link java.util.Properties Properties} even though the subtype does not
+		 * directly implement the {@code Map} interface.
+		 * </p>
+		 * <p>
+		 * This method returns {@code null} if {@code type} is not assignable to
+		 * {@code toClass}. It returns an empty map if none of the classes or
+		 * interfaces in its inheritance hierarchy specify any type arguments.
+		 * </p>
+		 * <p>
+		 * A side effect of this method is that it also retrieves the type arguments
+		 * for the classes and interfaces that are part of the hierarchy between
+		 * {@code type} and {@code toClass}. So with the above example, this method
+		 * will also determine that the type arguments for
+		 * {@link java.util.Hashtable Hashtable} are also both {@code Object}. In
+		 * cases where the interface specified by {@code toClass} is (indirectly)
+		 * implemented more than once (e.g. where {@code toClass} specifies the
+		 * interface {@link java.lang.Iterable Iterable} and {@code type} specifies
+		 * a parameterized type that implements both {@link java.util.Set Set} and
+		 * {@link java.util.Collection Collection}), this method will look at the
+		 * inheritance hierarchy of only one of the implementations/subclasses; the
+		 * first interface encountered that isn't a subinterface to one of the
+		 * others in the {@code type} to {@code toClass} hierarchy.
+		 * </p>
+		 *
+		 * @param type the type from which to determine the type parameters of
+		 *          {@code toClass}
+		 * @param toClass the class whose type parameters are to be determined based
+		 *          on the subtype {@code type}
+		 * @return a {@code Map} of the type assignments for the type variables in
+		 *         each type in the inheritance hierarchy from {@code type} to
+		 *         {@code toClass} inclusive.
+		 */
+		public static Map<TypeVariable<?>, Type> getTypeArguments(final Type type,
+			final Class<?> toClass)
+		{
+			return getTypeArguments(type, toClass, null);
+		}
+
+		/**
+		 * <p>
+		 * Return a map of the type arguments of @{code type} in the context of
+		 * {@code toClass}.
+		 * </p>
+		 *
+		 * @param type the type in question
+		 * @param toClass the class
+		 * @param subtypeVarAssigns a map with type variables
+		 * @return the {@code Map} with type arguments
+		 */
+		private static Map<TypeVariable<?>, Type> getTypeArguments(final Type type,
+			final Class<?> toClass,
+			final Map<TypeVariable<?>, Type> subtypeVarAssigns)
+		{
+			if (type instanceof Class<?>) {
+				return getTypeArguments((Class<?>) type, toClass, subtypeVarAssigns);
+			}
+
+			if (type instanceof ParameterizedType) {
+				return getTypeArguments((ParameterizedType) type, toClass,
+					subtypeVarAssigns);
+			}
+
+			if (type instanceof GenericArrayType) {
+				return getTypeArguments(((GenericArrayType) type)
+					.getGenericComponentType(), toClass.isArray() ? toClass
+						.getComponentType() : toClass, subtypeVarAssigns);
+			}
+
+			// since wildcard types are not assignable to classes, should this just
+			// return null?
+			if (type instanceof WildcardType) {
+				for (final Type bound : getImplicitUpperBounds((WildcardType) type)) {
+					// find the first bound that is assignable to the target class
+					if (isAssignable(bound, toClass)) {
+						return getTypeArguments(bound, toClass, subtypeVarAssigns);
+					}
+				}
+
+				return null;
+			}
+
+			if (type instanceof TypeVariable<?>) {
+				for (final Type bound : getImplicitBounds((TypeVariable<?>) type)) {
+					// find the first bound that is assignable to the target class
+					if (isAssignable(bound, toClass)) {
+						return getTypeArguments(bound, toClass, subtypeVarAssigns);
+					}
+				}
+
+				return null;
+			}
+			throw new IllegalStateException("found an unhandled type: " + type);
+		}
+
+		/**
+		 * <p>
+		 * Return a map of the type arguments of a parameterized type in the context
+		 * of {@code toClass}.
+		 * </p>
+		 *
+		 * @param parameterizedType the parameterized type
+		 * @param toClass the class
+		 * @param subtypeVarAssigns a map with type variables
+		 * @return the {@code Map} with type arguments
+		 */
+		private static Map<TypeVariable<?>, Type> getTypeArguments(
+			final ParameterizedType parameterizedType, final Class<?> toClass,
+			final Map<TypeVariable<?>, Type> subtypeVarAssigns)
+		{
+			final Class<?> cls = getRawType(parameterizedType);
+
+			// make sure they're assignable
+			if (!isAssignable(cls, toClass)) {
+				return null;
+			}
+
+			final Type ownerType = parameterizedType.getOwnerType();
+			Map<TypeVariable<?>, Type> typeVarAssigns;
+
+			if (ownerType instanceof ParameterizedType) {
+				// get the owner type arguments first
+				final ParameterizedType parameterizedOwnerType =
+					(ParameterizedType) ownerType;
+				typeVarAssigns = getTypeArguments(parameterizedOwnerType, getRawType(
+					parameterizedOwnerType), subtypeVarAssigns);
+			}
+			else {
+				// no owner, prep the type variable assignments map
+				typeVarAssigns = subtypeVarAssigns == null ? new HashMap<>()
+					: new HashMap<>(subtypeVarAssigns);
+			}
+
+			// get the subject parameterized type's arguments
+			final Type[] typeArgs = parameterizedType.getActualTypeArguments();
+			// and get the corresponding type variables from the raw class
+			final TypeVariable<?>[] typeParams = cls.getTypeParameters();
+
+			// map the arguments to their respective type variables
+			for (int i = 0; i < typeParams.length; i++) {
+				final Type typeArg = typeArgs[i];
+				typeVarAssigns.put(typeParams[i], typeVarAssigns.containsKey(typeArg)
+					? typeVarAssigns.get(typeArg) : typeArg);
+			}
+
+			if (toClass.equals(cls)) {
+				// target class has been reached. Done.
+				return typeVarAssigns;
+			}
+
+			// walk the inheritance hierarchy until the target class is reached
+			return getTypeArguments(getClosestParentType(cls, toClass), toClass,
+				typeVarAssigns);
+		}
+
+		/**
+		 * <p>
+		 * Return a map of the type arguments of a class in the context of @{code
+		 * toClass}.
+		 * </p>
+		 *
+		 * @param cls the class in question
+		 * @param toClass the context class
+		 * @param subtypeVarAssigns a map with type variables
+		 * @return the {@code Map} with type arguments
+		 */
+		private static Map<TypeVariable<?>, Type> getTypeArguments(Class<?> cls,
+			final Class<?> toClass,
+			final Map<TypeVariable<?>, Type> subtypeVarAssigns)
+		{
+			// make sure they're assignable
+			if (!isAssignable(cls, toClass)) {
+				return null;
+			}
+
+			// can't work with primitives
+			if (cls.isPrimitive()) {
+				// both classes are primitives?
+				if (toClass.isPrimitive()) {
+					// dealing with widening here. No type arguments to be
+					// harvested with these two types.
+					return new HashMap<>();
+				}
+
+				// work with wrapper the wrapper class instead of the primitive
+				cls = ConversionUtils.getNonprimitiveType(cls);
+			}
+
+			// create a copy of the incoming map, or an empty one if it's null
+			final HashMap<TypeVariable<?>, Type> typeVarAssigns =
+				subtypeVarAssigns == null ? new HashMap<>() : new HashMap<>(
+					subtypeVarAssigns);
+
+			// has target class been reached?
+			if (toClass.equals(cls)) {
+				return typeVarAssigns;
+			}
+
+			// walk the inheritance hierarchy until the target class is reached
+			return getTypeArguments(getClosestParentType(cls, toClass), toClass,
+				typeVarAssigns);
+		}
+
+		/**
+		 * <p>
+		 * Tries to determine the type arguments of a class/interface based on a
+		 * super parameterized type's type arguments. This method is the inverse of
+		 * {@link #getTypeArguments(Type, Class)} which gets a class/interface's
+		 * type arguments based on a subtype. It is far more limited in determining
+		 * the type arguments for the subject class's type variables in that it can
+		 * only determine those parameters that map from the subject {@link Class}
+		 * object to the supertype.
+		 * </p>
+		 * <p>
+		 * Example: {@link java.util.TreeSet TreeSet} sets its parameter as the
+		 * parameter for {@link java.util.NavigableSet NavigableSet}, which in turn
+		 * sets the parameter of {@link java.util.SortedSet}, which in turn sets the
+		 * parameter of {@link Set}, which in turn sets the parameter of
+		 * {@link java.util.Collection}, which in turn sets the parameter of
+		 * {@link java.lang.Iterable}. Since {@code TreeSet}'s parameter maps
+		 * (indirectly) to {@code Iterable}'s parameter, it will be able to
+		 * determine that based on the super type {@code Iterable<? extends
+		 * Map<Integer, ? extends Collection<?>>>}, the parameter of {@code TreeSet}
+		 * is {@code ? extends Map<Integer, ? extends
+		 * Collection<?>>}.
+		 * </p>
+		 *
+		 * @param cls the class whose type parameters are to be determined, not
+		 *          {@code null}
+		 * @param superType the super type from which {@code cls}'s type arguments
+		 *          are to be determined, not {@code null}
+		 * @return a {@code Map} of the type assignments that could be determined
+		 *         for the type variables in each type in the inheritance hierarchy
+		 *         from {@code type} to {@code toClass} inclusive.
+		 */
+		public static Map<TypeVariable<?>, Type> determineTypeArguments(
+			final Class<?> cls, final ParameterizedType superType)
+		{
+			validateNotNull(cls, "cls is null");
+			validateNotNull(superType, "superType is null");
+
+			final Class<?> superClass = getRawType(superType);
+
+			// compatibility check
+			if (!isAssignable(cls, superClass)) {
+				return null;
+			}
+
+			if (cls.equals(superClass)) {
+				return getTypeArguments(superType, superClass, null);
+			}
+
+			// get the next class in the inheritance hierarchy
+			final Type midType = getClosestParentType(cls, superClass);
+
+			// can only be a class or a parameterized type
+			if (midType instanceof Class<?>) {
+				return determineTypeArguments((Class<?>) midType, superType);
+			}
+
+			final ParameterizedType midParameterizedType =
+				(ParameterizedType) midType;
+			final Class<?> midClass = getRawType(midParameterizedType);
+			// get the type variables of the mid class that map to the type
+			// arguments of the super class
+			final Map<TypeVariable<?>, Type> typeVarAssigns = determineTypeArguments(
+				midClass, superType);
+			// map the arguments of the mid type to the class type variables
+			mapTypeVariablesToArguments(cls, midParameterizedType, typeVarAssigns);
+
+			return typeVarAssigns;
+		}
+
+		/**
+		 * <p>
+		 * Performs a mapping of type variables.
+		 * </p>
+		 *
+		 * @param <T> the generic type of the class in question
+		 * @param cls the class in question
+		 * @param parameterizedType the parameterized type
+		 * @param typeVarAssigns the map to be filled
+		 */
+		private static <T> void mapTypeVariablesToArguments(final Class<T> cls,
+			final ParameterizedType parameterizedType,
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			// capture the type variables from the owner type that have assignments
+			final Type ownerType = parameterizedType.getOwnerType();
+
+			if (ownerType instanceof ParameterizedType) {
+				// recursion to make sure the owner's owner type gets processed
+				mapTypeVariablesToArguments(cls, (ParameterizedType) ownerType,
+					typeVarAssigns);
+			}
+
+			// parameterizedType is a generic interface/class (or it's in the owner
+			// hierarchy of said interface/class) implemented/extended by the class
+			// cls. Find out which type variables of cls are type arguments of
+			// parameterizedType:
+			final Type[] typeArgs = parameterizedType.getActualTypeArguments();
+
+			// of the cls's type variables that are arguments of parameterizedType,
+			// find out which ones can be determined from the super type's arguments
+			final TypeVariable<?>[] typeVars = getRawType(parameterizedType)
+				.getTypeParameters();
+
+			// use List view of type parameters of cls so the contains() method can be
+			// used:
+			final List<TypeVariable<Class<T>>> typeVarList = Arrays.asList(cls
+				.getTypeParameters());
+
+			for (int i = 0; i < typeArgs.length; i++) {
+				final TypeVariable<?> typeVar = typeVars[i];
+				final Type typeArg = typeArgs[i];
+
+				// argument of parameterizedType is a type variable of cls
+				if (typeVarList.contains(typeArg)
+				// type variable of parameterizedType has an assignment in
+				// the super type.
+					&& typeVarAssigns.containsKey(typeVar)) {
+					// map the assignment to the cls's type variable
+					typeVarAssigns.put((TypeVariable<?>) typeArg, typeVarAssigns.get(
+						typeVar));
+				}
+			}
+		}
+
+		/**
+		 * <p>
+		 * Get the closest parent type to the super class specified by
+		 * {@code superClass}.
+		 * </p>
+		 *
+		 * @param cls the class in question
+		 * @param superClass the super class
+		 * @return the closes parent type
+		 */
+		private static Type getClosestParentType(final Class<?> cls,
+			final Class<?> superClass)
+		{
+			// only look at the interfaces if the super class is also an interface
+			if (superClass.isInterface()) {
+				// get the generic interfaces of the subject class
+				final Type[] interfaceTypes = cls.getGenericInterfaces();
+				// will hold the best generic interface match found
+				Type genericInterface = null;
+
+				// find the interface closest to the super class
+				for (final Type midType : interfaceTypes) {
+					Class<?> midClass = null;
+
+					if (midType instanceof ParameterizedType) {
+						midClass = getRawType((ParameterizedType) midType);
+					}
+					else if (midType instanceof Class<?>) {
+						midClass = (Class<?>) midType;
+					}
+					else {
+						throw new IllegalStateException("Unexpected generic" +
+							" interface type found: " + midType);
+					}
+
+					// check if this interface is further up the inheritance chain
+					// than the previously found match
+					if (isAssignable(midClass, superClass) && isAssignable(
+						genericInterface, (Type) midClass))
+					{
+						genericInterface = midType;
+					}
+				}
+
+				// found a match?
+				if (genericInterface != null) {
+					return genericInterface;
+				}
+			}
+
+			// none of the interfaces were descendants of the target class, so the
+			// super class has to be one, instead
+			return cls.getGenericSuperclass();
+		}
+
+		/**
+		 * <p>
+		 * Checks if the given value can be assigned to the target type following
+		 * the Java generics rules.
+		 * </p>
+		 *
+		 * @param value the value to be checked
+		 * @param type the target type
+		 * @return {@code true} if {@code value} is an instance of {@code type}.
+		 */
+		public static boolean isInstance(final Object value, final Type type) {
+			if (type == null) {
+				return false;
+			}
+
+			return value == null ? !(type instanceof Class<?>) || !((Class<?>) type)
+				.isPrimitive() : isAssignable(value.getClass(), type, null);
+		}
+
+		/**
+		 * <p>
+		 * This method strips out the redundant upper bound types in type variable
+		 * types and wildcard types (or it would with wildcard types if multiple
+		 * upper bounds were allowed).
+		 * </p>
+		 * <p>
+		 * Example, with the variable type declaration:
+		 *
+		 * <pre>
+		 * &lt;K extends java.util.Collection&lt;String&gt; &amp;
+		 * java.util.List&lt;String&gt;&gt;
+		 * </pre>
+		 * <p>
+		 * since {@code List} is a subinterface of {@code Collection}, this method
+		 * will return the bounds as if the declaration had been:
+		 * </p>
+		 *
+		 * <pre>
+		 * &lt;K extends java.util.List&lt;String&gt;&gt;
+		 * </pre>
+		 *
+		 * @param bounds an array of types representing the upper bounds of either
+		 *          {@link WildcardType} or {@link TypeVariable}, not {@code null}.
+		 * @return an array containing the values from {@code bounds} minus the
+		 *         redundant types.
+		 */
+		public static Type[] normalizeUpperBounds(final Type[] bounds) {
+			validateNotNull(bounds, "null value specified for bounds array");
+			// don't bother if there's only one (or none) type
+			if (bounds.length < 2) {
+				return bounds;
+			}
+
+			final Set<Type> types = new HashSet<>(bounds.length);
+
+			for (final Type type1 : bounds) {
+				boolean subtypeFound = false;
+
+				for (final Type type2 : bounds) {
+					if (type1 != type2 && isAssignable(type2, type1, null)) {
+						subtypeFound = true;
+						break;
+					}
+				}
+
+				if (!subtypeFound) {
+					types.add(type1);
+				}
+			}
+
+			return types.toArray(new Type[types.size()]);
+		}
+
+		/**
+		 * <p>
+		 * Returns an array containing the sole type of {@link Object} if
+		 * {@link TypeVariable#getBounds()} returns an empty array. Otherwise, it
+		 * returns the result of {@link TypeVariable#getBounds()} passed into
+		 * {@link #normalizeUpperBounds}.
+		 * </p>
+		 *
+		 * @param typeVariable the subject type variable, not {@code null}
+		 * @return a non-empty array containing the bounds of the type variable.
+		 */
+		public static Type[] getImplicitBounds(final TypeVariable<?> typeVariable) {
+			validateNotNull(typeVariable, "typeVariable is null");
+			final Type[] bounds = typeVariable.getBounds();
+
+			return bounds.length == 0 ? new Type[] { Object.class }
+				: normalizeUpperBounds(bounds);
+		}
+
+		/**
+		 * <p>
+		 * Returns an array containing the sole value of {@link Object} if
+		 * {@link WildcardType#getUpperBounds()} returns an empty array. Otherwise,
+		 * it returns the result of {@link WildcardType#getUpperBounds()} passed
+		 * into {@link #normalizeUpperBounds}.
+		 * </p>
+		 *
+		 * @param wildcardType the subject wildcard type, not {@code null}
+		 * @return a non-empty array containing the upper bounds of the wildcard
+		 *         type.
+		 */
+		public static Type[] getImplicitUpperBounds(
+			final WildcardType wildcardType)
+		{
+			validateNotNull(wildcardType, "wildcardType is null");
+			final Type[] bounds = wildcardType.getUpperBounds();
+
+			return bounds.length == 0 ? new Type[] { Object.class }
+				: normalizeUpperBounds(bounds);
+		}
+
+		/**
+		 * <p>
+		 * Returns an array containing a single value of {@code null} if
+		 * {@link WildcardType#getLowerBounds()} returns an empty array. Otherwise,
+		 * it returns the result of {@link WildcardType#getLowerBounds()}.
+		 * </p>
+		 *
+		 * @param wildcardType the subject wildcard type, not {@code null}
+		 * @return a non-empty array containing the lower bounds of the wildcard
+		 *         type.
+		 */
+		public static Type[] getImplicitLowerBounds(
+			final WildcardType wildcardType)
+		{
+			validateNotNull(wildcardType, "wildcardType is null");
+			final Type[] bounds = wildcardType.getLowerBounds();
+
+			return bounds.length == 0 ? new Type[] { null } : bounds;
+		}
+
+		/**
+		 * <p>
+		 * Determines whether or not specified types satisfy the bounds of their
+		 * mapped type variables. When a type parameter extends another (such as
+		 * {@code <T, S extends T>}), uses another as a type parameter (such as
+		 * {@code <T, S extends Comparable>>}), or otherwise depends on another type
+		 * variable to be specified, the dependencies must be included in
+		 * {@code typeVarAssigns}.
+		 * </p>
+		 *
+		 * @param typeVarAssigns specifies the potential types to be assigned to the
+		 *          type variables, not {@code null}.
+		 * @return whether or not the types can be assigned to their respective type
+		 *         variables.
+		 */
+		public static boolean typesSatisfyVariables(
+			final Map<TypeVariable<?>, Type> typeVarAssigns)
+		{
+			validateNotNull(typeVarAssigns, "typeVarAssigns is null");
+			// all types must be assignable to all the bounds of the their mapped
+			// type variable.
+			for (final Map.Entry<TypeVariable<?>, Type> entry : typeVarAssigns
+				.entrySet())
+			{
+				final TypeVariable<?> typeVar = entry.getKey();
+				final Type type = entry.getValue();
+
+				for (final Type bound : getImplicitBounds(typeVar)) {
+					if (!isAssignable(type, substituteTypeVariables(bound,
+						typeVarAssigns), typeVarAssigns))
+					{
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+
+		/**
+		 * <p>
+		 * Transforms the passed in type to a {@link Class} object. Type-checking
+		 * method of convenience.
+		 * </p>
+		 *
+		 * @param parameterizedType the type to be converted
+		 * @return the corresponding {@code Class} object
+		 * @throws IllegalStateException if the conversion fails
+		 */
+		private static Class<?> getRawType(
+			final ParameterizedType parameterizedType)
+		{
+			final Type rawType = parameterizedType.getRawType();
+
+			// check if raw type is a Class object
+			// not currently necessary, but since the return type is Type instead of
+			// Class, there's enough reason to believe that future versions of Java
+			// may return other Type implementations. And type-safety checking is
+			// rarely a bad idea.
+			if (!(rawType instanceof Class<?>)) {
+				throw new IllegalStateException("Wait... What!? Type of rawType: " +
+					rawType);
+			}
+
+			return (Class<?>) rawType;
+		}
+
+		/**
+		 * <p>
+		 * Get the raw type of a Java type, given its context. Primarily for use
+		 * with {@link TypeVariable}s and {@link GenericArrayType}s, or when you do
+		 * not know the runtime type of {@code type}: if you know you have a
+		 * {@link Class} instance, it is already raw; if you know you have a
+		 * {@link ParameterizedType}, its raw type is only a method call away.
+		 * </p>
+		 *
+		 * @param type to resolve
+		 * @param assigningType type to be resolved against
+		 * @return the resolved {@link Class} object or {@code null} if the type
+		 *         could not be resolved
+		 */
+		public static Class<?> getRawType(final Type type,
+			final Type assigningType)
+		{
+			if (type instanceof Class<?>) {
+				// it is raw, no problem
+				return (Class<?>) type;
+			}
+
+			if (type instanceof ParameterizedType) {
+				// simple enough to get the raw type of a ParameterizedType
+				return getRawType((ParameterizedType) type);
+			}
+
+			if (type instanceof TypeVariable<?>) {
+				if (assigningType == null) {
+					return null;
+				}
+
+				// get the entity declaring this type variable
+				final Object genericDeclaration = ((TypeVariable<?>) type)
+					.getGenericDeclaration();
+
+				// can't get the raw type of a method- or constructor-declared type
+				// variable
+				if (!(genericDeclaration instanceof Class<?>)) {
+					return null;
+				}
+
+				// get the type arguments for the declaring class/interface based
+				// on the enclosing type
+				final Map<TypeVariable<?>, Type> typeVarAssigns = getTypeArguments(
+					assigningType, (Class<?>) genericDeclaration);
+
+				// enclosingType has to be a subclass (or subinterface) of the
+				// declaring type
+				if (typeVarAssigns == null) {
+					return null;
+				}
+
+				// get the argument assigned to this type variable
+				final Type typeArgument = typeVarAssigns.get(type);
+
+				if (typeArgument == null) {
+					return null;
+				}
+
+				// get the argument for this type variable
+				return getRawType(typeArgument, assigningType);
+			}
+
+			if (type instanceof GenericArrayType) {
+				// get raw component type
+				final Class<?> rawComponentType = getRawType(((GenericArrayType) type)
+					.getGenericComponentType(), assigningType);
+
+				// create array type from raw component type and return its class
+				return Array.newInstance(rawComponentType, 0).getClass();
+			}
+
+			// (hand-waving) this is not the method you're looking for
+			if (type instanceof WildcardType) {
+				return null;
+			}
+
+			throw new IllegalArgumentException("unknown type: " + type);
+		}
+
+		/**
+		 * Learn whether the specified type denotes an array type.
+		 *
+		 * @param type the type to be checked
+		 * @return {@code true} if {@code type} is an array class or a
+		 *         {@link GenericArrayType}.
+		 */
+		public static boolean isArrayType(final Type type) {
+			return type instanceof GenericArrayType || type instanceof Class<?> &&
+				((Class<?>) type).isArray();
+		}
+
+		/**
+		 * Get the array component type of {@code type}.
+		 *
+		 * @param type the type to be checked
+		 * @return component type or null if type is not an array type
+		 */
+		public static Type getArrayComponentType(final Type type) {
+			if (type instanceof Class<?>) {
+				final Class<?> clazz = (Class<?>) type;
+				return clazz.isArray() ? clazz.getComponentType() : null;
+			}
+			if (type instanceof GenericArrayType) {
+				return ((GenericArrayType) type).getGenericComponentType();
+			}
+			return null;
+		}
+
+		/**
+		 * Get a type representing {@code type} with variable assignments
+		 * "unrolled."
+		 *
+		 * @param typeArguments as from
+		 *          {@link TypeUtils#getTypeArguments(Type, Class)}
+		 * @param type the type to unroll variable assignments for
+		 * @return Type
+		 * @since 3.2
+		 */
+		public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments,
+			final Type type)
+		{
+			if (typeArguments == null) {
+				typeArguments = Collections.<TypeVariable<?>, Type> emptyMap();
+			}
+			if (containsTypeVariables(type)) {
+				if (type instanceof TypeVariable<?>) {
+					return unrollVariables(typeArguments, typeArguments.get(type));
+				}
+				if (type instanceof ParameterizedType) {
+					final ParameterizedType p = (ParameterizedType) type;
+					final Map<TypeVariable<?>, Type> parameterizedTypeArguments;
+					if (p.getOwnerType() == null) {
+						parameterizedTypeArguments = typeArguments;
+					}
+					else {
+						parameterizedTypeArguments = new HashMap<>(typeArguments);
+						parameterizedTypeArguments.putAll(TypeUtils.getTypeArguments(p));
+					}
+					final Type[] args = p.getActualTypeArguments();
+					for (int i = 0; i < args.length; i++) {
+						final Type unrolled = unrollVariables(parameterizedTypeArguments,
+							args[i]);
+						if (unrolled != null) {
+							args[i] = unrolled;
+						}
+					}
+					return parameterizeWithOwner(p.getOwnerType(), (Class<?>) p
+						.getRawType(), args);
+				}
+				if (type instanceof WildcardType) {
+					final WildcardType wild = (WildcardType) type;
+					return wildcardType().withUpperBounds(unrollBounds(typeArguments, wild
+						.getUpperBounds())).withLowerBounds(unrollBounds(typeArguments, wild
+							.getLowerBounds())).build();
+				}
+			}
+			return type;
+		}
+
+		/**
+		 * Local helper method to unroll variables in a type bounds array.
+		 *
+		 * @param typeArguments assignments {@link Map}
+		 * @param bounds in which to expand variables
+		 * @return {@code bounds} with any variables reassigned
+		 * @since 3.2
+		 */
+		private static Type[] unrollBounds(
+			final Map<TypeVariable<?>, Type> typeArguments, final Type[] bounds)
+		{
+			final ArrayList<Type> result = new ArrayList<>();
+			for (final Type bound : bounds) {
+				final Type unrolled = unrollVariables(typeArguments, bound);
+				if (unrolled != null) result.add(unrolled);
+			}
+			return result.toArray(new Type[result.size()]);
+		}
+
+		/**
+		 * Learn, recursively, whether any of the type parameters associated with
+		 * {@code type} are bound to variables.
+		 *
+		 * @param type the type to check for type variables
+		 * @return boolean
+		 * @since 3.2
+		 */
+		public static boolean containsTypeVariables(final Type type) {
+			if (type instanceof TypeVariable<?>) {
+				return true;
+			}
+			if (type instanceof Class<?>) {
+				return ((Class<?>) type).getTypeParameters().length > 0;
+			}
+			if (type instanceof ParameterizedType) {
+				for (final Type arg : ((ParameterizedType) type)
+					.getActualTypeArguments())
+				{
+					if (containsTypeVariables(arg)) {
+						return true;
+					}
+				}
+				return false;
+			}
+			if (type instanceof WildcardType) {
+				final WildcardType wild = (WildcardType) type;
+				return containsTypeVariables(TypeUtils.getImplicitLowerBounds(
+					wild)[0]) || containsTypeVariables(TypeUtils.getImplicitUpperBounds(
+						wild)[0]);
+			}
+			return false;
+		}
+
+		/**
+		 * Create a parameterized type instance.
+		 *
+		 * @param raw the raw class to create a parameterized type instance for
+		 * @param typeArguments the types used for parameterization
+		 * @return {@link ParameterizedType}
+		 * @since 3.2
+		 */
+		public static final ParameterizedType parameterize(final Class<?> raw,
+			final Type... typeArguments)
+		{
+			return parameterizeWithOwner(null, raw, typeArguments);
+		}
+
+		/**
+		 * Create a parameterized type instance.
+		 *
+		 * @param raw the raw class to create a parameterized type instance for
+		 * @param typeArgMappings the mapping used for parameterization
+		 * @return {@link ParameterizedType}
+		 * @since 3.2
+		 */
+		public static final ParameterizedType parameterize(final Class<?> raw,
+			final Map<TypeVariable<?>, Type> typeArgMappings)
+		{
+			validateNotNull(raw, "raw class is null");
+			validateNotNull(typeArgMappings, "typeArgMappings is null");
+			return parameterizeWithOwner(null, raw, extractTypeArgumentsFrom(
+				typeArgMappings, raw.getTypeParameters()));
+		}
+
+		/**
+		 * Create a parameterized type instance.
+		 *
+		 * @param owner the owning type
+		 * @param raw the raw class to create a parameterized type instance for
+		 * @param typeArguments the types used for parameterization
+		 * @return {@link ParameterizedType}
+		 * @since 3.2
+		 */
+		public static final ParameterizedType parameterizeWithOwner(
+			final Type owner, final Class<?> raw, final Type... typeArguments)
+		{
+			validateNotNull(raw, "raw class is null");
+			final Type useOwner;
+			if (raw.getEnclosingClass() == null) {
+				validateIsTrue(owner == null, "no owner allowed for top-level %s", raw);
+				useOwner = null;
+			}
+			else if (owner == null) {
+				useOwner = raw.getEnclosingClass();
+			}
+			else {
+				validateIsTrue(TypeUtils.isAssignable(owner, raw.getEnclosingClass()),
+					"%s is invalid owner type for parameterized %s", owner, raw);
+				useOwner = owner;
+			}
+			validateNoNullElements(typeArguments, "null type argument at index %s");
+			validateIsTrue(raw.getTypeParameters().length == typeArguments.length,
+				"invalid number of type parameters specified: expected %s, got %s", raw
+					.getTypeParameters().length, typeArguments.length);
+
+			return new ParameterizedTypeImpl(raw, useOwner, typeArguments);
+		}
+
+		/**
+		 * Create a parameterized type instance.
+		 *
+		 * @param owner the owning type
+		 * @param raw the raw class to create a parameterized type instance for
+		 * @param typeArgMappings the mapping used for parameterization
+		 * @return {@link ParameterizedType}
+		 * @since 3.2
+		 */
+		public static final ParameterizedType parameterizeWithOwner(
+			final Type owner, final Class<?> raw,
+			final Map<TypeVariable<?>, Type> typeArgMappings)
+		{
+			validateNotNull(raw, "raw class is null");
+			validateNotNull(typeArgMappings, "typeArgMappings is null");
+			return parameterizeWithOwner(owner, raw, extractTypeArgumentsFrom(
+				typeArgMappings, raw.getTypeParameters()));
+		}
+
+		/**
+		 * Helper method to establish the formal parameters for a parameterized
+		 * type.
+		 *
+		 * @param mappings map containing the assignements
+		 * @param variables expected map keys
+		 * @return array of map values corresponding to specified keys
+		 */
+		private static Type[] extractTypeArgumentsFrom(
+			final Map<TypeVariable<?>, Type> mappings,
+			final TypeVariable<?>[] variables)
+		{
+			final Type[] result = new Type[variables.length];
+			int index = 0;
+			for (final TypeVariable<?> var : variables) {
+				validateIsTrue(mappings.containsKey(var),
+					"missing argument mapping for %s", toString(var));
+				result[index++] = mappings.get(var);
+			}
+			return result;
+		}
+
+		/**
+		 * Get a {@link WildcardTypeBuilder}.
+		 *
+		 * @return {@link WildcardTypeBuilder}
+		 * @since 3.2
+		 */
+		public static WildcardTypeBuilder wildcardType() {
+			return new WildcardTypeBuilder();
+		}
+
+		/**
+		 * Create a generic array type instance.
+		 *
+		 * @param componentType the type of the elements of the array. For example
+		 *          the component type of {@code boolean[]} is {@code boolean}
+		 * @return {@link GenericArrayType}
+		 * @since 3.2
+		 */
+		public static GenericArrayType genericArrayType(final Type componentType) {
+			return new GenericArrayTypeImpl(validateNotNull(componentType,
+				"componentType is null"));
+		}
+
+		/**
+		 * Check equality of types.
+		 *
+		 * @param t1 the first type
+		 * @param t2 the second type
+		 * @return boolean
+		 * @since 3.2
+		 */
+		public static boolean equals(final Type t1, final Type t2) {
+			if (Objects.equals(t1, t2)) {
+				return true;
+			}
+			if (t1 instanceof ParameterizedType) {
+				return equals((ParameterizedType) t1, t2);
+			}
+			if (t1 instanceof GenericArrayType) {
+				return equals((GenericArrayType) t1, t2);
+			}
+			if (t1 instanceof WildcardType) {
+				return equals((WildcardType) t1, t2);
+			}
+			return false;
+		}
+
+		/**
+		 * Learn whether {@code t} equals {@code p}.
+		 *
+		 * @param p LHS
+		 * @param t RHS
+		 * @return boolean
+		 * @since 3.2
+		 */
+		private static boolean equals(final ParameterizedType p, final Type t) {
+			if (t instanceof ParameterizedType) {
+				final ParameterizedType other = (ParameterizedType) t;
+				if (equals(p.getRawType(), other.getRawType()) && equals(p
+					.getOwnerType(), other.getOwnerType()))
+				{
+					return equals(p.getActualTypeArguments(), other
+						.getActualTypeArguments());
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Learn whether {@code t} equals {@code a}.
+		 *
+		 * @param a LHS
+		 * @param t RHS
+		 * @return boolean
+		 * @since 3.2
+		 */
+		private static boolean equals(final GenericArrayType a, final Type t) {
+			return t instanceof GenericArrayType && equals(a
+				.getGenericComponentType(), ((GenericArrayType) t)
+					.getGenericComponentType());
+		}
+
+		/**
+		 * Learn whether {@code t} equals {@code w}.
+		 *
+		 * @param w LHS
+		 * @param t RHS
+		 * @return boolean
+		 * @since 3.2
+		 */
+		private static boolean equals(final WildcardType w, final Type t) {
+			if (t instanceof WildcardType) {
+				final WildcardType other = (WildcardType) t;
+				return equals(getImplicitLowerBounds(w), getImplicitLowerBounds(
+					other)) && equals(getImplicitUpperBounds(w), getImplicitUpperBounds(
+						other));
+			}
+			return true;
+		}
+
+		/**
+		 * Learn whether {@code t1} equals {@code t2}.
+		 *
+		 * @param t1 LHS
+		 * @param t2 RHS
+		 * @return boolean
+		 * @since 3.2
+		 */
+		private static boolean equals(final Type[] t1, final Type[] t2) {
+			if (t1.length == t2.length) {
+				for (int i = 0; i < t1.length; i++) {
+					if (!equals(t1[i], t2[i])) {
+						return false;
+					}
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Present a given type as a Java-esque String.
+		 *
+		 * @param type the type to create a String representation for, not
+		 *          {@code null}
+		 * @return String
+		 * @since 3.2
+		 */
+		public static String toString(final Type type) {
+			validateNotNull(type);
+			if (type instanceof Class<?>) {
+				return classToString((Class<?>) type);
+			}
+			if (type instanceof ParameterizedType) {
+				return parameterizedTypeToString((ParameterizedType) type);
+			}
+			if (type instanceof WildcardType) {
+				return wildcardTypeToString((WildcardType) type);
+			}
+			if (type instanceof TypeVariable<?>) {
+				return typeVariableToString((TypeVariable<?>) type);
+			}
+			if (type instanceof GenericArrayType) {
+				return genericArrayTypeToString((GenericArrayType) type);
+			}
+			throw new IllegalArgumentException("Unknown generic type: " + //
+				type.getClass().getName());
+		}
+
+		/**
+		 * Format a {@link TypeVariable} including its {@link GenericDeclaration}.
+		 *
+		 * @param var the type variable to create a String representation for, not
+		 *          {@code null}
+		 * @return String
+		 * @since 3.2
+		 */
+		public static String toLongString(final TypeVariable<?> var) {
+			validateNotNull(var, "var is null");
+			final StringBuilder buf = new StringBuilder();
+			final GenericDeclaration d = ((TypeVariable<?>) var)
+				.getGenericDeclaration();
+			if (d instanceof Class<?>) {
+				Class<?> c = (Class<?>) d;
+				while (true) {
+					if (c.getEnclosingClass() == null) {
+						buf.insert(0, c.getName());
+						break;
+					}
+					buf.insert(0, c.getSimpleName()).insert(0, '.');
+					c = c.getEnclosingClass();
+				}
+			}
+			else if (d instanceof Type) {// not possible as of now
+				buf.append(toString((Type) d));
+			}
+			else {
+				buf.append(d);
+			}
+			return buf.append(':').append(typeVariableToString(var)).toString();
+		}
+
+//		/**
+//		 * Wrap the specified {@link Type} in a {@link Typed} wrapper.
+//		 *
+//		 * @param <T> inferred generic type
+//		 * @param type to wrap
+//		 * @return Typed&lt;T&gt;
+//		 * @since 3.2
+//		 */
+//		public static <T> Typed<T> wrap(final Type type) {
+//			return new Typed<T>() {
+//
+//				@Override
+//				public Type getType() {
+//					return type;
+//				}
+//			};
+//		}
+//
+//		/**
+//		 * Wrap the specified {@link Class} in a {@link Typed} wrapper.
+//		 *
+//		 * @param <T> generic type
+//		 * @param type to wrap
+//		 * @return Typed&lt;T&gt;
+//		 * @since 3.2
+//		 */
+//		public static <T> Typed<T> wrap(final Class<T> type) {
+//			return TypeUtils.<T> wrap((Type) type);
+//		}
+
+		/**
+		 * Format a {@link Class} as a {@link String}.
+		 *
+		 * @param c {@code Class} to format
+		 * @return String
+		 * @since 3.2
+		 */
+		private static String classToString(final Class<?> c) {
+			final StringBuilder buf = new StringBuilder();
+
+			if (c.getEnclosingClass() != null) {
+				buf.append(classToString(c.getEnclosingClass())).append('.').append(c
+					.getSimpleName());
+			}
+			else {
+				buf.append(c.getName());
+			}
+			if (c.getTypeParameters().length > 0) {
+				buf.append('<');
+				appendAllTo(buf, ", ", c.getTypeParameters());
+				buf.append('>');
+			}
+			return buf.toString();
+		}
+
+		/**
+		 * Format a {@link TypeVariable} as a {@link String}.
+		 *
+		 * @param v {@code TypeVariable} to format
+		 * @return String
+		 * @since 3.2
+		 */
+		private static String typeVariableToString(final TypeVariable<?> v) {
+			final StringBuilder buf = new StringBuilder(v.getName());
+			final Type[] bounds = v.getBounds();
+			if (bounds.length > 0 && !(bounds.length == 1 && Object.class.equals(
+				bounds[0])))
+			{
+				buf.append(" extends ");
+				appendAllTo(buf, " & ", v.getBounds());
+			}
+			return buf.toString();
+		}
+
+		/**
+		 * Format a {@link ParameterizedType} as a {@link String}.
+		 *
+		 * @param p {@code ParameterizedType} to format
+		 * @return String
+		 * @since 3.2
+		 */
+		private static String parameterizedTypeToString(final ParameterizedType p) {
+			final StringBuilder buf = new StringBuilder();
+
+			final Type useOwner = p.getOwnerType();
+			final Class<?> raw = (Class<?>) p.getRawType();
+			final Type[] typeArguments = p.getActualTypeArguments();
+			if (useOwner == null) {
+				buf.append(raw.getName());
+			}
+			else {
+				if (useOwner instanceof Class<?>) {
+					buf.append(((Class<?>) useOwner).getName());
+				}
+				else {
+					buf.append(useOwner.toString());
+				}
+				buf.append('.').append(raw.getSimpleName());
+			}
+
+			appendAllTo(buf.append('<'), ", ", typeArguments).append('>');
+			return buf.toString();
+		}
+
+		/**
+		 * Format a {@link WildcardType} as a {@link String}.
+		 *
+		 * @param w {@code WildcardType} to format
+		 * @return String
+		 * @since 3.2
+		 */
+		private static String wildcardTypeToString(final WildcardType w) {
+			final StringBuilder buf = new StringBuilder().append('?');
+			final Type[] lowerBounds = w.getLowerBounds();
+			final Type[] upperBounds = w.getUpperBounds();
+			if (lowerBounds.length > 1 || lowerBounds.length == 1 &&
+				lowerBounds[0] != null)
+			{
+				appendAllTo(buf.append(" super "), " & ", lowerBounds);
+			}
+			else if (upperBounds.length > 1 || upperBounds.length == 1 &&
+				!Object.class.equals(upperBounds[0]))
+			{
+				appendAllTo(buf.append(" extends "), " & ", upperBounds);
+			}
+			return buf.toString();
+		}
+
+		/**
+		 * Format a {@link GenericArrayType} as a {@link String}.
+		 *
+		 * @param g {@code GenericArrayType} to format
+		 * @return String
+		 * @since 3.2
+		 */
+		private static String genericArrayTypeToString(final GenericArrayType g) {
+			return String.format("%s[]", toString(g.getGenericComponentType()));
+		}
+
+		/**
+		 * Append {@code types} to {@code buf} with separator {@code sep}.
+		 *
+		 * @param buf destination
+		 * @param sep separator
+		 * @param types to append
+		 * @return {@code buf}
+		 * @since 3.2
+		 */
+		private static StringBuilder appendAllTo(final StringBuilder buf,
+			final String sep, final Type... types)
+		{
+			validateNotEmpty(validateNoNullElements(types));
+			if (types.length > 0) {
+				buf.append(toString(types[0]));
+				for (int i = 1; i < types.length; i++) {
+					buf.append(sep).append(toString(types[i]));
+				}
+			}
+			return buf;
+		}
+
+		private static final String DEFAULT_IS_NULL_EX_MESSAGE =
+			"The validated object is null";
+
+		/** Forked from {@code org.apache.commons.lang3.Validate#notNull}. */
+		private static <T> T validateNotNull(final T object) {
+			return validateNotNull(object, DEFAULT_IS_NULL_EX_MESSAGE);
+		}
+
+		/** Forked from {@code org.apache.commons.lang3.Validate#notNull}. */
+		private static <T> T validateNotNull(final T object, final String message,
+			final Object... values)
+		{
+			if (object == null) {
+				throw new NullPointerException(String.format(message, values));
+			}
+			return object;
+		}
+
+		/** Forked from {@code org.apache.commons.lang3.Validate#isTrue}. */
+		private static void validateIsTrue(final boolean expression,
+			final String message, final Object... values)
+		{
+			if (expression == false) {
+				throw new IllegalArgumentException(String.format(message, values));
+			}
+		}
+
+		private static final String DEFAULT_NO_NULL_ELEMENTS_ARRAY_EX_MESSAGE =
+			"The validated array contains null element at index: %d";
+
+		/** Forked from {@code org.apache.commons.lang3.Validate#noNullElements}. */
+		private static <T> T[] validateNoNullElements(final T[] array) {
+			return validateNoNullElements(array,
+				DEFAULT_NO_NULL_ELEMENTS_ARRAY_EX_MESSAGE);
+		}
+
+		/** Forked from {@code org.apache.commons.lang3.Validate#noNullElements}. */
+		private static <T> T[] validateNoNullElements(final T[] array,
+			final String message, final Object... values)
+		{
+			validateNotNull(array);
+			for (int i = 0; i < array.length; i++) {
+				if (array[i] == null) {
+					final Object[] values2 = new Object[values.length + 1];
+					System.arraycopy(values, 0, values2, 0, values.length);
+					values2[values.length] = Integer.valueOf(i);
+					throw new IllegalArgumentException(String.format(message, values2));
+				}
+			}
+			return array;
+		}
+
+		private static final String DEFAULT_NOT_EMPTY_ARRAY_EX_MESSAGE =
+			"The validated array is empty";
+
+		/** Forked from {@code org.apache.commons.lang3.Validate#notEmpty}. */
+		private static <T> T[] validateNotEmpty(final T[] array) {
+			return validateNotEmpty(array, DEFAULT_NOT_EMPTY_ARRAY_EX_MESSAGE);
+		}
+
+		/** Forked from {@code org.apache.commons.lang3.Validate#notEmpty}. */
+		private static <T> T[] validateNotEmpty(final T[] array,
+			final String message, final Object... values)
+		{
+			if (array == null) {
+				throw new NullPointerException(String.format(message, values));
+			}
+			if (array.length == 0) {
+				throw new IllegalArgumentException(String.format(message, values));
+			}
+			return array;
+		}
+	}
+
+	// -- END FORK OF APACHE COMMONS LANG 3.4 CODE --
+
 }

From 359f22a644d989b2cfc477fb20cb4e8010b72a9a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jul 2016 15:45:41 -0500
Subject: [PATCH 0715/1208] Types: fix bug in TypeUtils.toString(Type) method

When string-izing a generic type which contains a type variable (or,
theoretically, a wildcard) whose bounds include itself, the method
would previously recurse infinitely, resulting in StackOverflowError.

The solution here is to only enumerate a type's bounds the first time it
is encountered; after that, we simply return the name of the type alone.
---
 src/main/java/org/scijava/util/Types.java | 60 ++++++++++++++++-------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index bd4018ff5..17c8662ba 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -1917,18 +1917,22 @@ private static boolean equals(final Type[] t1, final Type[] t2) {
 		 * @since 3.2
 		 */
 		public static String toString(final Type type) {
+			return toString(type, new HashSet<>());
+		}
+
+		private static String toString(final Type type, final Set<Type> done) {
 			validateNotNull(type);
 			if (type instanceof Class<?>) {
-				return classToString((Class<?>) type);
+				return classToString((Class<?>) type, done);
 			}
 			if (type instanceof ParameterizedType) {
-				return parameterizedTypeToString((ParameterizedType) type);
+				return parameterizedTypeToString((ParameterizedType) type, done);
 			}
 			if (type instanceof WildcardType) {
-				return wildcardTypeToString((WildcardType) type);
+				return wildcardTypeToString((WildcardType) type, done);
 			}
 			if (type instanceof TypeVariable<?>) {
-				return typeVariableToString((TypeVariable<?>) type);
+				return typeVariableToString((TypeVariable<?>) type, done);
 			}
 			if (type instanceof GenericArrayType) {
 				return genericArrayTypeToString((GenericArrayType) type);
@@ -1967,7 +1971,8 @@ else if (d instanceof Type) {// not possible as of now
 			else {
 				buf.append(d);
 			}
-			return buf.append(':').append(typeVariableToString(var)).toString();
+			return buf.append(':').append(typeVariableToString(var, new HashSet<>()))
+				.toString();
 		}
 
 //		/**
@@ -2004,22 +2009,25 @@ else if (d instanceof Type) {// not possible as of now
 		 * Format a {@link Class} as a {@link String}.
 		 *
 		 * @param c {@code Class} to format
+		 * @param done list of already-encountered types
 		 * @return String
 		 * @since 3.2
 		 */
-		private static String classToString(final Class<?> c) {
+		private static String classToString(final Class<?> c,
+			final Set<Type> done)
+		{
 			final StringBuilder buf = new StringBuilder();
 
 			if (c.getEnclosingClass() != null) {
-				buf.append(classToString(c.getEnclosingClass())).append('.').append(c
-					.getSimpleName());
+				buf.append(classToString(c.getEnclosingClass(), done)).append('.')
+					.append(c.getSimpleName());
 			}
 			else {
 				buf.append(c.getName());
 			}
 			if (c.getTypeParameters().length > 0) {
 				buf.append('<');
-				appendAllTo(buf, ", ", c.getTypeParameters());
+				appendAllTo(buf, ", ", done, c.getTypeParameters());
 				buf.append('>');
 			}
 			return buf.toString();
@@ -2029,17 +2037,22 @@ private static String classToString(final Class<?> c) {
 		 * Format a {@link TypeVariable} as a {@link String}.
 		 *
 		 * @param v {@code TypeVariable} to format
+		 * @param done list of already-encountered types
 		 * @return String
 		 * @since 3.2
 		 */
-		private static String typeVariableToString(final TypeVariable<?> v) {
+		private static String typeVariableToString(final TypeVariable<?> v,
+			final Set<Type> done)
+		{
 			final StringBuilder buf = new StringBuilder(v.getName());
+			if (done.contains(v)) return buf.toString();
+			done.add(v);
 			final Type[] bounds = v.getBounds();
 			if (bounds.length > 0 && !(bounds.length == 1 && Object.class.equals(
 				bounds[0])))
 			{
 				buf.append(" extends ");
-				appendAllTo(buf, " & ", v.getBounds());
+				appendAllTo(buf, " & ", done, v.getBounds());
 			}
 			return buf.toString();
 		}
@@ -2048,10 +2061,13 @@ private static String typeVariableToString(final TypeVariable<?> v) {
 		 * Format a {@link ParameterizedType} as a {@link String}.
 		 *
 		 * @param p {@code ParameterizedType} to format
+		 * @param done list of already-encountered types
 		 * @return String
 		 * @since 3.2
 		 */
-		private static String parameterizedTypeToString(final ParameterizedType p) {
+		private static String parameterizedTypeToString(final ParameterizedType p,
+			final Set<Type> done)
+		{
 			final StringBuilder buf = new StringBuilder();
 
 			final Type useOwner = p.getOwnerType();
@@ -2070,7 +2086,7 @@ private static String parameterizedTypeToString(final ParameterizedType p) {
 				buf.append('.').append(raw.getSimpleName());
 			}
 
-			appendAllTo(buf.append('<'), ", ", typeArguments).append('>');
+			appendAllTo(buf.append('<'), ", ", done, typeArguments).append('>');
 			return buf.toString();
 		}
 
@@ -2078,22 +2094,27 @@ private static String parameterizedTypeToString(final ParameterizedType p) {
 		 * Format a {@link WildcardType} as a {@link String}.
 		 *
 		 * @param w {@code WildcardType} to format
+		 * @param done list of already-encountered types
 		 * @return String
 		 * @since 3.2
 		 */
-		private static String wildcardTypeToString(final WildcardType w) {
+		private static String wildcardTypeToString(final WildcardType w,
+			final Set<Type> done)
+		{
 			final StringBuilder buf = new StringBuilder().append('?');
+			if (done.contains(w)) return buf.toString();
+			done.add(w);
 			final Type[] lowerBounds = w.getLowerBounds();
 			final Type[] upperBounds = w.getUpperBounds();
 			if (lowerBounds.length > 1 || lowerBounds.length == 1 &&
 				lowerBounds[0] != null)
 			{
-				appendAllTo(buf.append(" super "), " & ", lowerBounds);
+				appendAllTo(buf.append(" super "), " & ", done, lowerBounds);
 			}
 			else if (upperBounds.length > 1 || upperBounds.length == 1 &&
 				!Object.class.equals(upperBounds[0]))
 			{
-				appendAllTo(buf.append(" extends "), " & ", upperBounds);
+				appendAllTo(buf.append(" extends "), " & ", done, upperBounds);
 			}
 			return buf.toString();
 		}
@@ -2114,18 +2135,19 @@ private static String genericArrayTypeToString(final GenericArrayType g) {
 		 *
 		 * @param buf destination
 		 * @param sep separator
+		 * @param done list of already-encountered types
 		 * @param types to append
 		 * @return {@code buf}
 		 * @since 3.2
 		 */
 		private static StringBuilder appendAllTo(final StringBuilder buf,
-			final String sep, final Type... types)
+			final String sep, final Set<Type> done, final Type... types)
 		{
 			validateNotEmpty(validateNoNullElements(types));
 			if (types.length > 0) {
-				buf.append(toString(types[0]));
+				buf.append(toString(types[0], done));
 				for (int i = 1; i < types.length; i++) {
-					buf.append(sep).append(toString(types[i]));
+					buf.append(sep).append(toString(types[i], done));
 				}
 			}
 			return buf;

From 4b90eca4ee2c362e7ed0bde96fcad0d27fe103f4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jul 2016 20:53:09 -0500
Subject: [PATCH 0716/1208] Types: remove ineffectual wildcards in TypeUtils

---
 src/main/java/org/scijava/util/Types.java | 56 +++++++++++------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 17c8662ba..05be06ead 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -422,7 +422,7 @@ public static boolean isAssignable(final Type type, final Type toType) {
 		private static boolean isAssignable(final Type type, final Type toType,
 			final Map<TypeVariable<?>, Type> typeVarAssigns)
 		{
-			if (toType == null || toType instanceof Class<?>) {
+			if (toType == null || toType instanceof Class) {
 				return isAssignable(type, (Class<?>) toType);
 			}
 
@@ -438,7 +438,7 @@ private static boolean isAssignable(final Type type, final Type toType,
 				return isAssignable(type, (WildcardType) toType, typeVarAssigns);
 			}
 
-			if (toType instanceof TypeVariable<?>) {
+			if (toType instanceof TypeVariable) {
 				return isAssignable(type, (TypeVariable<?>) toType, typeVarAssigns);
 			}
 
@@ -474,7 +474,7 @@ private static boolean isAssignable(final Type type,
 				return true;
 			}
 
-			if (type instanceof Class<?>) {
+			if (type instanceof Class) {
 				// just comparing two classes
 				return toClass.isAssignableFrom((Class<?>) type);
 			}
@@ -485,7 +485,7 @@ private static boolean isAssignable(final Type type,
 			}
 
 			// *
-			if (type instanceof TypeVariable<?>) {
+			if (type instanceof TypeVariable) {
 				// if any of the bounds are assignable to the class, then the
 				// type is assignable to the class.
 				for (final Type bound : ((TypeVariable<?>) type).getBounds()) {
@@ -601,7 +601,7 @@ private static Type unrollVariableAssignments(TypeVariable<?> var,
 			Type result;
 			do {
 				result = typeVarAssigns.get(var);
-				if (result instanceof TypeVariable<?> && !result.equals(var)) {
+				if (result instanceof TypeVariable && !result.equals(var)) {
 					var = (TypeVariable<?>) result;
 					continue;
 				}
@@ -644,7 +644,7 @@ private static boolean isAssignable(final Type type,
 
 			final Type toComponentType = toGenericArrayType.getGenericComponentType();
 
-			if (type instanceof Class<?>) {
+			if (type instanceof Class) {
 				final Class<?> cls = (Class<?>) type;
 
 				// compare the component types
@@ -669,7 +669,7 @@ private static boolean isAssignable(final Type type,
 				return false;
 			}
 
-			if (type instanceof TypeVariable<?>) {
+			if (type instanceof TypeVariable) {
 				// probably should remove the following logic and just return false.
 				// type variables cannot specify arrays as bounds.
 				for (final Type bound : getImplicitBounds((TypeVariable<?>) type)) {
@@ -815,7 +815,7 @@ private static boolean isAssignable(final Type type,
 				return true;
 			}
 
-			if (type instanceof TypeVariable<?>) {
+			if (type instanceof TypeVariable) {
 				// a type variable is assignable to another type variable, if
 				// and only if the former is the latter, extends the latter, or
 				// is otherwise a descendant of the latter.
@@ -828,7 +828,7 @@ private static boolean isAssignable(final Type type,
 				}
 			}
 
-			if (type instanceof Class<?> || type instanceof ParameterizedType ||
+			if (type instanceof Class || type instanceof ParameterizedType ||
 				type instanceof GenericArrayType || type instanceof WildcardType)
 			{
 				return false;
@@ -850,7 +850,7 @@ private static boolean isAssignable(final Type type,
 		private static Type substituteTypeVariables(final Type type,
 			final Map<TypeVariable<?>, Type> typeVarAssigns)
 		{
-			if (type instanceof TypeVariable<?> && typeVarAssigns != null) {
+			if (type instanceof TypeVariable && typeVarAssigns != null) {
 				final Type replacementType = typeVarAssigns.get(type);
 
 				if (replacementType == null) {
@@ -939,7 +939,7 @@ private static Map<TypeVariable<?>, Type> getTypeArguments(final Type type,
 			final Class<?> toClass,
 			final Map<TypeVariable<?>, Type> subtypeVarAssigns)
 		{
-			if (type instanceof Class<?>) {
+			if (type instanceof Class) {
 				return getTypeArguments((Class<?>) type, toClass, subtypeVarAssigns);
 			}
 
@@ -967,7 +967,7 @@ private static Map<TypeVariable<?>, Type> getTypeArguments(final Type type,
 				return null;
 			}
 
-			if (type instanceof TypeVariable<?>) {
+			if (type instanceof TypeVariable) {
 				for (final Type bound : getImplicitBounds((TypeVariable<?>) type)) {
 					// find the first bound that is assignable to the target class
 					if (isAssignable(bound, toClass)) {
@@ -1141,7 +1141,7 @@ public static Map<TypeVariable<?>, Type> determineTypeArguments(
 			final Type midType = getClosestParentType(cls, superClass);
 
 			// can only be a class or a parameterized type
-			if (midType instanceof Class<?>) {
+			if (midType instanceof Class) {
 				return determineTypeArguments((Class<?>) midType, superType);
 			}
 
@@ -1240,7 +1240,7 @@ private static Type getClosestParentType(final Class<?> cls,
 					if (midType instanceof ParameterizedType) {
 						midClass = getRawType((ParameterizedType) midType);
 					}
-					else if (midType instanceof Class<?>) {
+					else if (midType instanceof Class) {
 						midClass = (Class<?>) midType;
 					}
 					else {
@@ -1283,7 +1283,7 @@ public static boolean isInstance(final Object value, final Type type) {
 				return false;
 			}
 
-			return value == null ? !(type instanceof Class<?>) || !((Class<?>) type)
+			return value == null ? !(type instanceof Class) || !((Class<?>) type)
 				.isPrimitive() : isAssignable(value.getClass(), type, null);
 		}
 
@@ -1460,7 +1460,7 @@ private static Class<?> getRawType(
 			// Class, there's enough reason to believe that future versions of Java
 			// may return other Type implementations. And type-safety checking is
 			// rarely a bad idea.
-			if (!(rawType instanceof Class<?>)) {
+			if (!(rawType instanceof Class)) {
 				throw new IllegalStateException("Wait... What!? Type of rawType: " +
 					rawType);
 			}
@@ -1485,7 +1485,7 @@ private static Class<?> getRawType(
 		public static Class<?> getRawType(final Type type,
 			final Type assigningType)
 		{
-			if (type instanceof Class<?>) {
+			if (type instanceof Class) {
 				// it is raw, no problem
 				return (Class<?>) type;
 			}
@@ -1495,7 +1495,7 @@ public static Class<?> getRawType(final Type type,
 				return getRawType((ParameterizedType) type);
 			}
 
-			if (type instanceof TypeVariable<?>) {
+			if (type instanceof TypeVariable) {
 				if (assigningType == null) {
 					return null;
 				}
@@ -1506,7 +1506,7 @@ public static Class<?> getRawType(final Type type,
 
 				// can't get the raw type of a method- or constructor-declared type
 				// variable
-				if (!(genericDeclaration instanceof Class<?>)) {
+				if (!(genericDeclaration instanceof Class)) {
 					return null;
 				}
 
@@ -1557,7 +1557,7 @@ public static Class<?> getRawType(final Type type,
 		 *         {@link GenericArrayType}.
 		 */
 		public static boolean isArrayType(final Type type) {
-			return type instanceof GenericArrayType || type instanceof Class<?> &&
+			return type instanceof GenericArrayType || type instanceof Class &&
 				((Class<?>) type).isArray();
 		}
 
@@ -1568,7 +1568,7 @@ public static boolean isArrayType(final Type type) {
 		 * @return component type or null if type is not an array type
 		 */
 		public static Type getArrayComponentType(final Type type) {
-			if (type instanceof Class<?>) {
+			if (type instanceof Class) {
 				final Class<?> clazz = (Class<?>) type;
 				return clazz.isArray() ? clazz.getComponentType() : null;
 			}
@@ -1595,7 +1595,7 @@ public static Type unrollVariables(Map<TypeVariable<?>, Type> typeArguments,
 				typeArguments = Collections.<TypeVariable<?>, Type> emptyMap();
 			}
 			if (containsTypeVariables(type)) {
-				if (type instanceof TypeVariable<?>) {
+				if (type instanceof TypeVariable) {
 					return unrollVariables(typeArguments, typeArguments.get(type));
 				}
 				if (type instanceof ParameterizedType) {
@@ -1657,10 +1657,10 @@ private static Type[] unrollBounds(
 		 * @since 3.2
 		 */
 		public static boolean containsTypeVariables(final Type type) {
-			if (type instanceof TypeVariable<?>) {
+			if (type instanceof TypeVariable) {
 				return true;
 			}
-			if (type instanceof Class<?>) {
+			if (type instanceof Class) {
 				return ((Class<?>) type).getTypeParameters().length > 0;
 			}
 			if (type instanceof ParameterizedType) {
@@ -1922,7 +1922,7 @@ public static String toString(final Type type) {
 
 		private static String toString(final Type type, final Set<Type> done) {
 			validateNotNull(type);
-			if (type instanceof Class<?>) {
+			if (type instanceof Class) {
 				return classToString((Class<?>) type, done);
 			}
 			if (type instanceof ParameterizedType) {
@@ -1931,7 +1931,7 @@ private static String toString(final Type type, final Set<Type> done) {
 			if (type instanceof WildcardType) {
 				return wildcardTypeToString((WildcardType) type, done);
 			}
-			if (type instanceof TypeVariable<?>) {
+			if (type instanceof TypeVariable) {
 				return typeVariableToString((TypeVariable<?>) type, done);
 			}
 			if (type instanceof GenericArrayType) {
@@ -1954,7 +1954,7 @@ public static String toLongString(final TypeVariable<?> var) {
 			final StringBuilder buf = new StringBuilder();
 			final GenericDeclaration d = ((TypeVariable<?>) var)
 				.getGenericDeclaration();
-			if (d instanceof Class<?>) {
+			if (d instanceof Class) {
 				Class<?> c = (Class<?>) d;
 				while (true) {
 					if (c.getEnclosingClass() == null) {
@@ -2077,7 +2077,7 @@ private static String parameterizedTypeToString(final ParameterizedType p,
 				buf.append(raw.getName());
 			}
 			else {
-				if (useOwner instanceof Class<?>) {
+				if (useOwner instanceof Class) {
 					buf.append(((Class<?>) useOwner).getName());
 				}
 				else {

From 17f2f60da0743ef8479a8c725d61774025c0e458 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 29 Jul 2016 16:53:06 -0500
Subject: [PATCH 0717/1208] Types: expose some needed TypeUtils methods

The ultimate goal will probably be to expose them all -- perhaps even
factor them all directly into the Types class and remove the private
inner TypeUtils class -- but for now, we expose only a few we need.
---
 src/main/java/org/scijava/util/Types.java | 162 ++++++++++++++++++++++
 1 file changed, 162 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 05be06ead..f18977592 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -134,6 +134,168 @@ public static Field field(final Class<?> c, final String name) {
 		return field(c.getSuperclass(), name);
 	}
 
+	/**
+	 * Discerns whether it would be legal to assign a reference of type
+	 * {@code source} to a reference of type {@code target}.
+	 *
+	 * @see Class#isAssignableFrom(Class)
+	 */
+	public static boolean isAssignable(final Type source, final Type target) {
+		return TypeUtils.isAssignable(source, target);
+	}
+
+	/**
+	 * Creates a new {@link ParameterizedType} of the given class together with
+	 * the specified type arguments.
+	 *
+	 * @param rawType The class of the {@link ParameterizedType}.
+	 * @param typeArgs The type arguments to use in parameterizing it.
+	 * @return The newly created {@link ParameterizedType}.
+	 */
+	public static ParameterizedType newParameterizedType(final Class<?> rawType,
+		final Type... typeArgs)
+	{
+		return newParameterizedType(rawType, rawType.getDeclaringClass(), typeArgs);
+	}
+
+	/**
+	 * Creates a new {@link ParameterizedType} of the given class together with
+	 * the specified type arguments.
+	 *
+	 * @param rawType The class of the {@link ParameterizedType}.
+	 * @param ownerType The owner type of the parameterized class.
+	 * @param typeArgs The type arguments to use in parameterizing it.
+	 * @return The newly created {@link ParameterizedType}.
+	 */
+	public static ParameterizedType newParameterizedType(final Class<?> rawType,
+		final Type ownerType, final Type... typeArgs)
+	{
+		return new TypeUtils.ParameterizedTypeImpl(rawType, ownerType, typeArgs);
+	}
+
+	/**
+	 * Creates a new {@link WildcardType} with no upper or lower bounds (i.e.,
+	 * {@code ?}).
+	 *
+	 * @return The newly created {@link WildcardType}.
+	 */
+	public static WildcardType newWildcardType() {
+		return newWildcardType(null, null);
+	}
+
+	/**
+	 * Creates a new {@link WildcardType} with the given upper and/or lower bound.
+	 *
+	 * @param upperBound Upper bound of the wildcard, or null for none.
+	 * @param lowerBound Lower bound of the wildcard, or null for none.
+	 * @return The newly created {@link WildcardType}.
+	 */
+	public static WildcardType newWildcardType(final Type upperBound,
+		final Type lowerBound)
+	{
+		return new TypeUtils.WildcardTypeImpl(upperBound, lowerBound);
+	}
+
+	/**
+	 * Learn, recursively, whether any of the type parameters associated with
+	 * {@code type} are bound to variables.
+	 *
+	 * @param type the type to check for type variables
+	 * @return boolean
+	 */
+	public static boolean containsTypeVars(final Type type) {
+		return TypeUtils.containsTypeVariables(type);
+	}
+
+	/**
+	 * Gets the type arguments of a class/interface based on a subtype. For
+	 * instance, this method will determine that both of the parameters for the
+	 * interface {@link Map} are {@link Object} for the subtype
+	 * {@link java.util.Properties Properties} even though the subtype does not
+	 * directly implement the {@code Map} interface.
+	 * <p>
+	 * This method returns {@code null} if {@code type} is not assignable to
+	 * {@code toClass}. It returns an empty map if none of the classes or
+	 * interfaces in its inheritance hierarchy specify any type arguments.
+	 * </p>
+	 * <p>
+	 * A side effect of this method is that it also retrieves the type arguments
+	 * for the classes and interfaces that are part of the hierarchy between
+	 * {@code type} and {@code toClass}. So with the above example, this method
+	 * will also determine that the type arguments for {@link java.util.Hashtable
+	 * Hashtable} are also both {@code Object}. In cases where the interface
+	 * specified by {@code toClass} is (indirectly) implemented more than once
+	 * (e.g. where {@code toClass} specifies the interface
+	 * {@link java.lang.Iterable Iterable} and {@code type} specifies a
+	 * parameterized type that implements both {@link java.util.Set Set} and
+	 * {@link java.util.Collection Collection}), this method will look at the
+	 * inheritance hierarchy of only one of the implementations/subclasses; the
+	 * first interface encountered that isn't a subinterface to one of the others
+	 * in the {@code type} to {@code toClass} hierarchy.
+	 * </p>
+	 *
+	 * @param type the type from which to determine the type parameters of
+	 *          {@code toClass}
+	 * @param toClass the class whose type parameters are to be determined based
+	 *          on the subtype {@code type}
+	 * @return a {@code Map} of the type assignments for the type variables in
+	 *         each type in the inheritance hierarchy from {@code type} to
+	 *         {@code toClass} inclusive.
+	 */
+	public static Map<TypeVariable<?>, Type> args(final Type type,
+		final Class<?> toClass)
+	{
+		return TypeUtils.getTypeArguments(type, toClass);
+	}
+
+	/**
+	 * Tries to determine the type arguments of a class/interface based on a super
+	 * parameterized type's type arguments. This method is the inverse of
+	 * {@link #args(Type, Class)} which gets a class/interface's type arguments
+	 * based on a subtype. It is far more limited in determining the type
+	 * arguments for the subject class's type variables in that it can only
+	 * determine those parameters that map from the subject {@link Class} object
+	 * to the supertype.
+	 * <p>
+	 * Example: {@link java.util.TreeSet TreeSet} sets its parameter as the
+	 * parameter for {@link java.util.NavigableSet NavigableSet}, which in turn
+	 * sets the parameter of {@link java.util.SortedSet}, which in turn sets the
+	 * parameter of {@link Set}, which in turn sets the parameter of
+	 * {@link java.util.Collection}, which in turn sets the parameter of
+	 * {@link java.lang.Iterable}. Since {@code TreeSet}'s parameter maps
+	 * (indirectly) to {@code Iterable}'s parameter, it will be able to determine
+	 * that based on the super type {@code Iterable<? extends
+	 * Map<Integer, ? extends Collection<?>>>}, the parameter of {@code TreeSet}
+	 * is {@code ? extends Map<Integer, ? extends Collection<?>>}.
+	 * </p>
+	 *
+	 * @param c the class whose type parameters are to be determined, not
+	 *          {@code null}
+	 * @param superType the super type from which {@code c}'s type arguments are
+	 *          to be determined, not {@code null}
+	 * @return a {@code Map} of the type assignments that could be determined for
+	 *         the type variables in each type in the inheritance hierarchy from
+	 *         {@code type} to {@code c} inclusive.
+	 */
+	public static Map<TypeVariable<?>, Type> args(final Class<?> c,
+		final ParameterizedType superType)
+	{
+		return TypeUtils.determineTypeArguments(c, superType);
+	}
+
+		/**
+	 * Create a parameterized type instance.
+	 *
+	 * @param raw the raw class to create a parameterized type instance for
+	 * @param typeArgMappings the mapping used for parameterization
+	 * @return {@link ParameterizedType}
+	 */
+	public static final ParameterizedType parameterize(final Class<?> raw,
+		final Map<TypeVariable<?>, Type> typeArgMappings)
+	{
+		return TypeUtils.parameterize(raw, typeArgMappings);
+	}
+
 	// -- BEGIN FORK OF APACHE COMMONS LANG 3.4 CODE --
 
 	/*

From d87cc91aa7115022ef701e8fd065c1aeb4852990 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 29 Jul 2016 20:54:52 -0500
Subject: [PATCH 0718/1208] Types: add missing javadoc

---
 src/main/java/org/scijava/util/Types.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index f18977592..161c66a2b 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -82,6 +82,12 @@ private Types() {
 
 	// TODO: Migrate all GenericUtils methods here.
 
+	/**
+	 * Gets a string representation of the given type.
+	 * 
+	 * @param t Type whose name is desired.
+	 * @return The name of the given type.
+	 */
 	public static String name(final Type t) {
 		// NB: It is annoying that Class.toString() prepends "class " or
 		// "interface "; this method exists to work around that behavior.
@@ -105,6 +111,8 @@ public static String name(final Type t) {
 	 * <p>
 	 * If you want <em>all</em> raw classes of the given type, use {@link #raws}.
 	 * </p>
+	 * @param type The type from which to discern the (first) raw class.
+	 * @return The type's first raw class.
 	 */
 	public static Class<?> raw(final Type type) {
 		// TODO: Consolidate with GenericUtils.
@@ -118,6 +126,8 @@ public static Class<?> raw(final Type type) {
 	 * return both {@link Number} and {@link Iterable} as its raw classes.
 	 * </p>
 	 *
+	 * @param type The type from which to discern the raw classes.
+	 * @return List of the type's raw classes.
 	 * @see #raw
 	 */
 	public static List<Class<?>> raws(final Type type) {
@@ -138,6 +148,10 @@ public static Field field(final Class<?> c, final String name) {
 	 * Discerns whether it would be legal to assign a reference of type
 	 * {@code source} to a reference of type {@code target}.
 	 *
+	 * @param source The type from which assignment is desired.
+	 * @param target The type to which assignment is desired.
+	 * @return True if the source is assignable to the target.
+	 * @throws NullPointerException if {@code target} is null.
 	 * @see Class#isAssignableFrom(Class)
 	 */
 	public static boolean isAssignable(final Type source, final Type target) {

From 74092f67d417de505d68f854a32d52d81e94fa4f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 29 Jul 2016 20:27:49 -0500
Subject: [PATCH 0719/1208] Migrate GenericUtils methods to Types class

This also updates Types.raw to return the first raw type, rather
than null, in the case where multiple raw type bounds exist. This
returns null in fewer cases, and matches what the javadoc says.

For backwards compatibility, the deprecated method preserves the
legacy behavior of returning null in that case.
---
 .../java/org/scijava/util/GenericUtils.java   | 179 ++++--------------
 src/main/java/org/scijava/util/Types.java     |  84 +++++++-
 .../{GenericUtilsTest.java => TypesTest.java} | 100 +++++-----
 3 files changed, 165 insertions(+), 198 deletions(-)
 rename src/test/java/org/scijava/util/{GenericUtilsTest.java => TypesTest.java} (60%)

diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index df6165ccb..b653a67aa 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -32,198 +32,89 @@
 
 package org.scijava.util;
 
-import com.googlecode.gentyref.GenericTypeReflector;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.List;
 
-/**
- * Useful methods for working with {@link Type} objects, particularly generic
- * types.
- * <p>
- * This class leans heavily on the excellent <a
- * href="https://code.google.com/p/gentyref/">gentyref</a> library, and exists
- * mainly to keep the gentyref dependency encapsulated within SciJava Common.
- * </p>
- * 
- * @author Curtis Rueden
- * @see ClassUtils For utility methods specific to {@link Class} objects.
- * @see ConversionUtils For utility methods that convert between {@link Type}s.
- */
+import org.scijava.util.Types;
+
+/** @deprecated Use {@link Types} instead. */
+@Deprecated
 public final class GenericUtils {
 
 	private GenericUtils() {
 		// prevent instantiation of utility class
 	}
 
-	/**
-	 * Gets the sole raw class corresponding to the given type, or null if none.
-	 */
+	/** @deprecated Use {@link Types#raw} instead. */
+	@Deprecated
 	public static Class<?> getClass(final Type type) {
-		if (type == null) return null;
-		if (type instanceof Class) return (Class<?>) type;
-		final List<Class<?>> c = getClasses(type);
-		if (c == null || c.size() != 1) return null;
-		return c.get(0);
+		final List<Class<?>> bounds = Types.raws(type);
+		return bounds != null && bounds.size() == 1 ? bounds.get(0) : null;
 	}
 
-	/**
-	 * Gets all raw classes corresponding to the given type.
-	 * <p>
-	 * For example, a type parameter {@code A extends Number & Iterable} will
-	 * return both {@link Number} and {@link Iterable} as its raw classes.
-	 * </p>
-	 */
+	/** @deprecated Use {@link Types#raws} instead. */
+	@Deprecated
 	public static List<Class<?>> getClasses(final Type type) {
-		if (type == null) return null;
-		return GenericTypeReflector.getUpperBoundClassAndInterfaces(type);
+		return Types.raws(type);
 	}
 
-	/**
-	 * Gets the component type of the given array type, or null if not an array.
-	 */
+	/** @deprecated Use {@link Types#component} instead. */
+	@Deprecated
 	public static Type getComponentType(final Type type) {
-		return GenericTypeReflector.getArrayComponentType(type);
+		return Types.component(type);
 	}
 
 	/**
-	 * Gets the sole component class of the given array type, or null if none.
+	 * @deprecated Use {@link Types#component} and {@link Types#raw} instead.
 	 */
+	@Deprecated
 	public static Class<?> getComponentClass(final Type type) {
-		return getClass(getComponentType(type));
+		return Types.raw(Types.component(type));
 	}
 
-	/**
-	 * Returns the "safe" generic type of the given field, as viewed from the
-	 * given type. This may be narrower than what {@link Field#getGenericType()}
-	 * returns, if the field is declared in a superclass, or {@code type} has a
-	 * type parameter that is used in the type of the field.
-	 * <p>
-	 * For example, suppose we have the following three classes:
-	 * </p>
-	 * 
-	 * <pre>
-	 * public class Thing&lt;T&gt; {
-	 * 	public T thing;
-	 * }
-	 * 
-	 * public class NumberThing&lt;N extends Number&gt; extends Thing&lt;N&gt; { }
-	 * 
-	 * public class IntegerThing extends NumberThing&lt;Integer&gt; { }
-	 * </pre>
-	 * 
-	 * Then this method operates as follows:
-	 * 
-	 * <pre>
-	 * field = ClassUtils.getField(Thing.class, "thing");
-	 * 
-	 * field.getType(); // Object
-	 * field.getGenericType(); // T
-	 * 
-	 * GenericUtils.getFieldType(field, Thing.class); // T
-	 * GenericUtils.getFieldType(field, NumberThing.class); // N extends Number
-	 * GenericUtils.getFieldType(field, IntegerThing.class); // Integer
-	 * </pre>
-	 */
+	/** @deprecated Use {@link Types#type(Field, Class)} instead. */
+	@Deprecated
 	public static Type getFieldType(final Field field, final Class<?> type) {
-		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
-		return GenericTypeReflector.getExactFieldType(field, wildType);
+		return Types.type(field, type);
 	}
 
 	/**
-	 * Returns the "safe" class(es) of the given field, as viewed from the
-	 * specified type. This may be narrower than what {@link Field#getType()}
-	 * returns, if the field is declared in a superclass, or {@code type} has a
-	 * type parameter that is used in the type of the field.
-	 * <p>
-	 * For example, suppose we have the following three classes:
-	 * </p>
-	 * 
-	 * <pre>
-	 * 
-	 * public class Thing&lt;T&gt; {
-	 * 
-	 * 	public T thing;
-	 * }
-	 * 
-	 * public class NumberThing&lt;N extends Number&gt; extends Thing&lt;N&gt; {}
-	 * 
-	 * public class IntegerThing extends NumberThing&lt;Integer&gt; {}
-	 * </pre>
-	 * 
-	 * Then this method operates as follows:
-	 * 
-	 * <pre>
-	 * field = ClassUtils.getField(Thing.class, &quot;thing&quot;);
-	 * 
-	 * field.getType(); // Object
-	 * 
-	 * ClassUtils.getTypes(field, Thing.class).get(0); // Object
-	 * ClassUtils.getTypes(field, NumberThing.class).get(0); // Number
-	 * ClassUtils.getTypes(field, IntegerThing.class).get(0); // Integer
-	 * </pre>
-	 * <p>
-	 * In cases of complex generics which take the intersection of multiple types
-	 * using the {@code &} operator, there may be multiple types returned by this
-	 * method. For example:
-	 * </p>
-	 * 
-	 * <pre>
-	 * public class ComplexThing&lt;T extends Serializable &amp; Cloneable&gt; extends Thing&lt;T&gt; {}
-	 * 
-	 * ClassUtils.getTypes(field, ComplexThing.class); // Serializable, Cloneable
-	 * </pre>
-	 * 
-	 * @see #getFieldType(Field, Class)
-	 * @see #getClasses(Type)
+	 * @deprecated Use {@link Types#type(Field, Class)} and {@link Types#raws}
+	 *             instead.
 	 */
+	@Deprecated
 	public static List<Class<?>> getFieldClasses(final Field field,
 		final Class<?> type)
 	{
-		final Type genericType = getFieldType(field, type);
-		return getClasses(genericType);
+		return Types.raws(Types.type(field, type));
 	}
 
-	/**
-	 * As {@link #getFieldType(Field, Class)}, but with respect to the return
-	 * type of the given {@link Method} rather than a {@link Field}.
-	 */
+	/** @deprecated Use {@link Types#returnType} instead. */
+	@Deprecated
 	public static Type getMethodReturnType(final Method method,
 		final Class<?> type)
 	{
-		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
-		return GenericTypeReflector.getExactReturnType(method, wildType);
+		return Types.returnType(method, type);
 	}
 
 	/**
-	 * As {@link #getFieldClasses(Field, Class)}, but with respect to the return
-	 * type of the given {@link Method} rather than a {@link Field}.
-	 * 
-	 * @see #getMethodReturnType(Method, Class)
-	 * @see #getClasses(Type)
+	 * @deprecated Use {@link Types#returnType} and {@link Types#raws} instead.
 	 */
-	public static List<Class<?>>
-		getMethodReturnClasses(final Method method, final Class<?> type)
+	@Deprecated
+	public static List<Class<?>> getMethodReturnClasses(final Method method,
+		final Class<?> type)
 	{
-		final Type genericType = getMethodReturnType(method, type);
-		return getClasses(genericType);
+		return Types.raws(Types.returnType(method, type));
 	}
 
-	/**
-	 * Gets the given type's {@code n}th type parameter of the specified class.
-	 * <p>
-	 * For example, with class {@code StringList implements List<String>},
-	 * {@code getTypeParameter(StringList.class, Collection.class, 0)} returns
-	 * {@code String}.
-	 * </p>
-	 */
+	/** @deprecated Use {@link Types#param} instead. */
+	@Deprecated
 	public static Type getTypeParameter(final Type type, final Class<?> c,
 		final int paramNo)
 	{
-		return GenericTypeReflector.getTypeParameter(type,
-			c.getTypeParameters()[paramNo]);
+		return Types.param(type, c, paramNo);
 	}
 
 }
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 161c66a2b..45b9263b3 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -38,10 +38,13 @@
 // under the Apache 2 license.
 // See lines below starting with "BEGIN FORK".
 
+import com.googlecode.gentyref.GenericTypeReflector;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.GenericDeclaration;
+import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
@@ -57,7 +60,6 @@
 import java.util.Set;
 
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.GenericUtils;
 
 /**
  * Utility class for working with generic types, fields and methods.
@@ -80,8 +82,6 @@ private Types() {
 		// NB: Prevent instantiation of utility class.
 	}
 
-	// TODO: Migrate all GenericUtils methods here.
-
 	/**
 	 * Gets a string representation of the given type.
 	 * 
@@ -115,8 +115,11 @@ public static String name(final Type t) {
 	 * @return The type's first raw class.
 	 */
 	public static Class<?> raw(final Type type) {
-		// TODO: Consolidate with GenericUtils.
-		return GenericUtils.getClass(type);
+		if (type == null) return null;
+		if (type instanceof Class) return (Class<?>) type;
+		final List<Class<?>> c = raws(type);
+		if (c == null || c.size() == 0) return null;
+		return c.get(0);
 	}
 
 	/**
@@ -131,8 +134,8 @@ public static Class<?> raw(final Type type) {
 	 * @see #raw
 	 */
 	public static List<Class<?>> raws(final Type type) {
-		// TODO: Consolidate with GenericUtils.
-		return GenericUtils.getClasses(type);
+		if (type == null) return null;
+		return GenericTypeReflector.getUpperBoundClassAndInterfaces(type);
 	}
 
 	public static Field field(final Class<?> c, final String name) {
@@ -144,6 +147,73 @@ public static Field field(final Class<?> c, final String name) {
 		return field(c.getSuperclass(), name);
 	}
 
+	/**
+	 * Gets the component type of the given array type, or null if not an array.
+	 */
+	public static Type component(final Type type) {
+		return GenericTypeReflector.getArrayComponentType(type);
+	}
+
+	/**
+	 * Returns the "safe" generic type of the given field, as viewed from the
+	 * given type. This may be narrower than what {@link Field#getGenericType()}
+	 * returns, if the field is declared in a superclass, or {@code type} has a
+	 * type parameter that is used in the type of the field.
+	 * <p>
+	 * For example, suppose we have the following three classes:
+	 * </p>
+	 *
+	 * <pre>
+	 * public class Thing&lt;T&gt; {
+	 *
+	 * 	public T thing;
+	 * }
+	 *
+	 * public class NumberThing&lt;N extends Number&gt; extends Thing&lt;N&gt; {}
+	 *
+	 * public class IntegerThing extends NumberThing&lt;Integer&gt; {}
+	 * </pre>
+	 *
+	 * Then this method operates as follows:
+	 *
+	 * <pre>
+	 * field = Types.field(Thing.class, "thing");
+	 *
+	 * field.getType(); // Object
+	 * field.getGenericType(); // T
+	 *
+	 * Types.type(field, Thing.class); // T
+	 * Types.type(field, NumberThing.class); // N extends Number
+	 * Types.type(field, IntegerThing.class); // Integer
+	 * </pre>
+	 */
+	public static Type type(final Field field, final Class<?> type) {
+		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
+		return GenericTypeReflector.getExactFieldType(field, wildType);
+	}
+
+	/**
+	 * As {@link #type(Field, Class)}, but with respect to the return type of the
+	 * given {@link Method} rather than a {@link Field}.
+	 */
+	public static Type returnType(final Method method, final Class<?> type) {
+		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
+		return GenericTypeReflector.getExactReturnType(method, wildType);
+	}
+
+	/**
+	 * Gets the given type's {@code n}th type parameter of the specified class.
+	 * <p>
+	 * For example, with class {@code StringList implements List<String>},
+	 * {@code Types.param(StringList.class, Collection.class, 0)} returns
+	 * {@code String}.
+	 * </p>
+	 */
+	public static Type param(final Type type, final Class<?> c, final int no) {
+		return GenericTypeReflector.getTypeParameter(type, c
+			.getTypeParameters()[no]);
+	}
+
 	/**
 	 * Discerns whether it would be legal to assign a reference of type
 	 * {@code source} to a reference of type {@code target}.
diff --git a/src/test/java/org/scijava/util/GenericUtilsTest.java b/src/test/java/org/scijava/util/TypesTest.java
similarity index 60%
rename from src/test/java/org/scijava/util/GenericUtilsTest.java
rename to src/test/java/org/scijava/util/TypesTest.java
index 389370007..ec8c1f2cc 100644
--- a/src/test/java/org/scijava/util/GenericUtilsTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -45,16 +45,16 @@
 import org.junit.Test;
 
 /**
- * Tests {@link GenericUtils}.
+ * Tests {@link Types}.
  * 
- * @author Mark Hiner
  * @author Curtis Rueden
+ * @author Mark Hiner
  */
-public class GenericUtilsTest {
+public class TypesTest {
 
-	/** Tests {@link GenericUtils#getClass(Type)}. */
+	/** Tests {@link Types#raw(Type)}. */
 	@Test
-	public void testGetClass() {
+	public void testRaw() {
 		@SuppressWarnings("unused")
 		class Struct {
 
@@ -65,17 +65,17 @@ class Struct {
 			private List<String> list;
 			private HashMap<Integer, Float> map;
 		}
-		assertSame(int[].class, getClass(Struct.class, "intArray"));
-		assertSame(double.class, getClass(Struct.class, "d"));
-		assertSame(String[][].class, getClass(Struct.class, "strings"));
-		assertSame(Void.class, getClass(Struct.class, "v"));
-		assertSame(List.class, getClass(Struct.class, "list"));
-		assertSame(HashMap.class, getClass(Struct.class, "map"));
+		assertSame(int[].class, raw(Struct.class, "intArray"));
+		assertSame(double.class, raw(Struct.class, "d"));
+		assertSame(String[][].class, raw(Struct.class, "strings"));
+		assertSame(Void.class, raw(Struct.class, "v"));
+		assertSame(List.class, raw(Struct.class, "list"));
+		assertSame(HashMap.class, raw(Struct.class, "map"));
 	}
 
-	/** Tests {@link GenericUtils#getComponentClass(Type)}. */
+	/** Tests {@link Types#component(Type)}. */
 	@Test
-	public void testGetComponentClass() {
+	public void testComponent() {
 		@SuppressWarnings("unused")
 		class Struct {
 
@@ -86,56 +86,67 @@ class Struct {
 			private List<String>[] list;
 			private HashMap<Integer, Float> map;
 		}
-		assertSame(int.class, getComponentClass(Struct.class, "intArray"));
-		assertNull(getComponentClass(Struct.class, "d"));
-		assertSame(String[].class, getComponentClass(Struct.class, "strings"));
-		assertSame(null, getComponentClass(Struct.class, "v"));
-		assertSame(List.class, getComponentClass(Struct.class, "list"));
-		assertSame(null, getComponentClass(Struct.class, "map"));
+		assertSame(int.class, componentType(Struct.class, "intArray"));
+		assertNull(componentType(Struct.class, "d"));
+		assertSame(String[].class, componentType(Struct.class, "strings"));
+		assertSame(null, componentType(Struct.class, "v"));
+		assertSame(List.class, componentType(Struct.class, "list"));
+		assertSame(null, componentType(Struct.class, "map"));
 	}
 
-	/**
-	 * Tests {@link GenericUtils#getFieldClasses(java.lang.reflect.Field, Class)}.
-	 */
+	/** Tests {@link Types#type(Field, Class)}. */
 	@Test
-	public void testGetFieldClasses() {
-		final Field field = ClassUtils.getField(Thing.class, "thing");
+	public void testTypeField() {
+		final Field field = Types.field(Thing.class, "thing");
 
 		// T
-		final Type tType = GenericUtils.getFieldType(field, Thing.class);
+		final Type tType = Types.type(field, Thing.class);
 		assertEquals("capture of ?", tType.toString());
 
 		// N extends Number
-		final Type nType = GenericUtils.getFieldType(field, NumberThing.class);
+		final Type nType = Types.type(field, NumberThing.class);
 		assertEquals("capture of ?", nType.toString());
 
 		// Integer
-		final Type iType = GenericUtils.getFieldType(field, IntegerThing.class);
+		final Type iType = Types.type(field, IntegerThing.class);
 		assertSame(Integer.class, iType);
 	}
 
-	/** Tests {@link GenericUtils#getFieldClasses(Field, Class)}. */
+	/** Tests {@link Types#raws}. */
 	@Test
-	public void testGetGenericType() {
-		final Field field = ClassUtils.getField(Thing.class, "thing");
+	public void testRaws() {
+		final Field field = Types.field(Thing.class, "thing");
 
 		// Object
-		assertAllTheSame(GenericUtils.getFieldClasses(field, Thing.class),
-			Object.class);
+		assertAllTheSame(Types.raws(Types.type(field, Thing.class)), Object.class);
 
 		// N extends Number
-		assertAllTheSame(GenericUtils.getFieldClasses(field, NumberThing.class),
+		assertAllTheSame(Types.raws(Types.type(field, NumberThing.class)),
 			Number.class);
 
 		// Integer
-		assertAllTheSame(GenericUtils.getFieldClasses(field, IntegerThing.class),
+		assertAllTheSame(Types.raws(Types.type(field, IntegerThing.class)),
 			Integer.class);
 
 		// Serializable & Cloneable
-		assertAllTheSame(GenericUtils.getFieldClasses(field, ComplexThing.class),
+		assertAllTheSame(Types.raws(Types.type(field, ComplexThing.class)),
 			Serializable.class, Cloneable.class);
 	}
 
+	/** Tests {@link Types#param}. */
+	@Test
+	public void testParam() {
+		class Struct {
+
+			@SuppressWarnings("unused")
+			private List<int[]> list;
+		}
+		final Type listType = type(Struct.class, "list");
+		final Type paramType = Types.param(listType, List.class, 0);
+		final Class<?> paramClass = Types.raw(paramType);
+		assertSame(int[].class, paramClass);
+	}
+
 	// -- Helper classes --
 
 	private static class Thing<T> {
@@ -161,22 +172,17 @@ private static class ComplexThing<T extends Serializable & Cloneable> extends
 
 	/** Convenience method to get the {@link Type} of a field. */
 	private Type type(final Class<?> c, final String fieldName) {
-		return ClassUtils.getField(c, fieldName).getGenericType();
+		return Types.field(c, fieldName).getGenericType();
 	}
 
-	/**
-	 * Convenience method to call {@link GenericUtils#getClass(Type)} on a field.
-	 */
-	private Class<?> getClass(final Class<?> c, final String fieldName) {
-		return GenericUtils.getClass(type(c, fieldName));
+	/** Convenience method to call {@link Types#raw} on a field. */
+	private Class<?> raw(final Class<?> c, final String fieldName) {
+		return Types.raw(type(c, fieldName));
 	}
 
-	/**
-	 * Convenience method to call {@link GenericUtils#getComponentClass(Type)} on
-	 * a field.
-	 */
-	private Class<?> getComponentClass(final Class<?> c, final String fieldName) {
-		return GenericUtils.getComponentClass(type(c, fieldName));
+	/** Convenience method to call {@link Types#component} on a field. */
+	private Class<?> componentType(final Class<?> c, final String fieldName) {
+		return Types.raw(Types.component(type(c, fieldName)));
 	}
 
 	private <T> void assertAllTheSame(final List<T> list, final T... values) {

From 9066d1dbe53c073d38880b48945f475c722149bf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Aug 2016 16:11:06 -0500
Subject: [PATCH 0720/1208] Eliminate uses of deprecated GenericUtils methods

We now use the consolidated Types utility class.
---
 .../scijava/command/CommandModuleItem.java    |  7 +++---
 .../scijava/convert/AbstractConverter.java    |  6 ++---
 .../org/scijava/convert/CastingConverter.java |  4 ++--
 .../scijava/convert/ConversionRequest.java    |  6 ++---
 .../org/scijava/convert/DefaultConverter.java | 22 +++++++++----------
 .../java/org/scijava/util/ClassUtils.java     | 16 +++++++++-----
 .../org/scijava/util/ConversionUtils.java     |  9 ++++----
 .../org/scijava/convert/ConverterTest.java    |  4 ++--
 8 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 01bc4d1af..f186743a2 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -46,7 +46,7 @@
 import org.scijava.plugin.Attr;
 import org.scijava.plugin.Parameter;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.GenericUtils;
+import org.scijava.util.Types;
 
 /**
  * {@link ModuleItem} implementation describing an input or output of a command.
@@ -76,8 +76,7 @@ public Parameter getParameter() {
 
 	@Override
 	public Class<T> getType() {
-		final Class<?> type =
-			GenericUtils.getFieldClasses(field, getDelegateClass()).get(0);
+		final Class<?> type = Types.raw(Types.type(field, getDelegateClass()));
 		@SuppressWarnings("unchecked")
 		final Class<T> typedType = (Class<T>) type;
 		return typedType;
@@ -85,7 +84,7 @@ public Class<T> getType() {
 
 	@Override
 	public Type getGenericType() {
-		return GenericUtils.getFieldType(field, getDelegateClass());
+		return Types.type(field, getDelegateClass());
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 3b1a299c5..f7a072ab9 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -39,7 +39,7 @@
 import org.scijava.plugin.AbstractHandlerPlugin;
 import org.scijava.plugin.Parameter;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.GenericUtils;
+import org.scijava.util.Types;
 
 /**
  * Abstract superclass for {@link Converter} plugins. Performs appropriate
@@ -117,7 +117,7 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 
 	@Override
 	public Object convert(final Object src, final Type dest) {
-		final Class<?> destClass = GenericUtils.getClass(dest);
+		final Class<?> destClass = Types.raw(dest);
 		return convert(src, destClass);
 	}
 
@@ -155,7 +155,7 @@ public Class<ConversionRequest> getType() {
 	@Override
 	@Deprecated
 	public boolean canConvert(final Class<?> src, final Type dest) {
-		final Class<?> destClass = GenericUtils.getClass(dest);
+		final Class<?> destClass = Types.raw(dest);
 		return canConvert(src, destClass);
 	}
 }
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 4ba3ed38a..fa877ec6f 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -35,7 +35,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.GenericUtils;
+import org.scijava.util.Types;
 
 /**
  * Minimal {@link Converter} implementation to do direct casting.
@@ -72,7 +72,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 		// rather than only Classes. However, the logic could become complex
 		// very quickly in various subclassing cases, generic parameters
 		// resolved vs. propagated, etc.
-		final Class<?> c = GenericUtils.getClass(dest);
+		final Class<?> c = Types.raw(dest);
 		return (T) ConversionUtils.cast(src, c);
 	}
 
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 961351b0b..409af735f 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -35,7 +35,7 @@
 import java.lang.reflect.Type;
 
 import org.scijava.plugin.HandlerService;
-import org.scijava.util.GenericUtils;
+import org.scijava.util.Types;
 
 /**
  * Currency for use in {@link Converter} and {@link ConvertService} methods.
@@ -100,7 +100,7 @@ public Type sourceType() {
 	 * @return Source class for conversion or lookup.
 	 */
 	public Class<?> sourceClass() {
-		return GenericUtils.getClass(srcType);
+		return Types.raw(srcType);
 	}
 
 	/**
@@ -121,7 +121,7 @@ public Type destType() {
 	 * @return Destination class for conversion.
 	 */
 	public Class<?> destClass() {
-		return GenericUtils.getClass(destType);
+		return Types.raw(destType);
 	}
 
 	// -- Setters --
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 46c3e7159..211e85b92 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -48,7 +48,7 @@
 import org.scijava.util.ArrayUtils;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.GenericUtils;
+import org.scijava.util.Types;
 
 /**
  * Default {@link Converter} implementation. Provides useful conversion
@@ -79,8 +79,10 @@ public class DefaultConverter extends AbstractConverter<Object, Object> {
 	public Object convert(final Object src, final Type dest) {
 
 		// Handle array types, including generic array types.
-		if (isArray(dest)) {
-			return convertToArray(src, GenericUtils.getComponentClass(dest));
+		final Type componentType = Types.component(dest);
+		if (componentType != null) {
+			// NB: Destination is an array type.
+			return convertToArray(src, Types.raw(componentType));
 		}
 
 		// Handle parameterized collection types.
@@ -89,7 +91,7 @@ public Object convert(final Object src, final Type dest) {
 		}
 
 		// This wasn't a collection or array, so convert it as a single element.
-		return convert(src, GenericUtils.getClass(dest));
+		return convert(src, Types.raw(dest));
 	}
 
 	@Override
@@ -100,7 +102,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 		// Handle array types
 		if (isArray(dest)) {
 			@SuppressWarnings("unchecked")
-			T array = (T) convertToArray(src, GenericUtils.getComponentClass(dest));
+			T array = (T) convertToArray(src, Types.raw(Types.component(dest)));
 			return array;
 		}
 
@@ -216,12 +218,11 @@ private Constructor<?> getConstructor(final Class<?> type,
 	}
 
 	private boolean isArray(final Type type) {
-		return GenericUtils.getComponentClass(type) != null;
+		return Types.component(type) != null;
 	}
 
 	private boolean isCollection(final Type type) {
-		return ConversionUtils.canCast(GenericUtils.getClass(type),
-			Collection.class);
+		return ConversionUtils.canCast(Types.raw(type), Collection.class);
 	}
 
 	private Object
@@ -247,8 +248,7 @@ private boolean isCollection(final Type type) {
 	private Object convertToCollection(final Object value,
 		final ParameterizedType pType)
 	{
-		final Collection<Object> collection =
-			createCollection(GenericUtils.getClass(pType));
+		final Collection<Object> collection = createCollection(Types.raw(pType));
 		if (collection == null) return null;
 
 		// Populate the collection.
@@ -298,7 +298,7 @@ public boolean canConvert(final Class<?> src, final Type dest) {
 
 		// Handle parameterized collection types.
 		if (dest instanceof ParameterizedType && isCollection(dest) &&
-			createCollection(GenericUtils.getClass(dest)) != null)
+			createCollection(Types.raw(dest)) != null)
 		{
 			return true;
 		}
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index e25eebca3..c508a7897 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -49,6 +49,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.scijava.util.Types;
+
 /**
  * Useful methods for working with {@link Class} objects and primitive types.
  *
@@ -623,8 +625,7 @@ public static void setValue(final Field field, final Object instance,
 			}
 			else {
 				// the given value needs to be converted to a compatible type
-				final Type fieldType =
-					GenericUtils.getFieldType(field, instance.getClass());
+				final Type fieldType = Types.type(field, instance.getClass());
 				@SuppressWarnings("deprecation")
 				final Object convertedValue = ConversionUtils.convert(value, fieldType);
 				compatibleValue = convertedValue;
@@ -804,17 +805,20 @@ public static <T> T getNullValue(final Class<T> type) {
 		return ConversionUtils.getNullValue(type);
 	}
 
-	/** @deprecated use {@link GenericUtils#getFieldClasses(Field, Class)} */
+	/**
+	 * @deprecated Use {@link Types#type(Field, Class)} and {@link Types#raws}
+	 *             instead.
+	 */
 	@Deprecated
 	public static List<Class<?>> getTypes(final Field field, final Class<?> type)
 	{
-		return GenericUtils.getFieldClasses(field, type);
+		return Types.raws(Types.type(field, type));
 	}
 
-	/** @deprecated use {@link GenericUtils#getFieldType(Field, Class)} */
+	/** @deprecated Use {@link Types#type(Field, Class)} instead. */
 	@Deprecated
 	public static Type getGenericType(final Field field, final Class<?> type) {
-		return GenericUtils.getFieldType(field, type);
+		return Types.type(field, type);
 	}
 
 	// -- Helper classes --
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index ea1decd9c..0beaaa3aa 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -38,6 +38,7 @@
 import org.scijava.convert.ConvertService;
 import org.scijava.convert.Converter;
 import org.scijava.convert.DefaultConverter;
+import org.scijava.util.Types;
 
 /**
  * Useful methods for converting and casting between classes and types.
@@ -316,16 +317,16 @@ public static boolean canConvert(final Object src, final Class<?> dest) {
 		return (handler == null ? false : handler.canConvert(src, dest));
 	}
 
-	/** @deprecated use {@link GenericUtils#getClass(Type)} */
+	/** @deprecated use {@link Types#raw} */
 	@Deprecated
 	public static Class<?> getClass(final Type type) {
-		return GenericUtils.getClass(type);
+		return Types.raw(type);
 	}
 
-	/** @deprecated use {@link GenericUtils#getComponentClass(Type)} */
+	/** @deprecated use {@link Types#raws} and {@link Types#component} */
 	@Deprecated
 	public static Class<?> getComponentClass(final Type type) {
-		return GenericUtils.getComponentClass(type);
+		return Types.raw(Types.component(type));
 	}
 
 //-- Helper methods --
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 25174a091..44c223c43 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -43,7 +43,7 @@
 
 import org.junit.Test;
 import org.scijava.util.ClassUtils;
-import org.scijava.util.GenericUtils;
+import org.scijava.util.Types;
 
 /**
  * Tests individual {@link Converter}s.
@@ -97,7 +97,7 @@ public void testCanConvertToGenericCollection() {
 		final CastingConverter cc = new CastingConverter();
 
 		final Field destField = ClassUtils.getField(getClass(), "collection");
-		final Type destType = GenericUtils.getFieldType(destField, getClass());
+		final Type destType = Types.type(destField, getClass());
 		assertTrue(cc.canConvert(ArrayList.class, destType));
 	}
 

From f99b82a431de715708718458297f9cd366a851b2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 12:24:26 -0500
Subject: [PATCH 0721/1208] TypesTest: fix heap pollution warning

There is no need for the generic parameter here.
---
 src/test/java/org/scijava/util/TypesTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index ec8c1f2cc..351926194 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -185,7 +185,7 @@ private Class<?> componentType(final Class<?> c, final String fieldName) {
 		return Types.raw(Types.component(type(c, fieldName)));
 	}
 
-	private <T> void assertAllTheSame(final List<T> list, final T... values) {
+	private void assertAllTheSame(final List<?> list, final Object... values) {
 		assertEquals(list.size(), values.length);
 		for (int i = 0; i < values.length; i++) {
 			assertSame(list.get(i), values[i]);

From 694f1fd8289b8d928d27e1b1f6b4d8d1ab15f854 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Aug 2016 16:11:57 -0500
Subject: [PATCH 0722/1208] ClassUtils: deprecate getField methods

There is now Types.field instead.
---
 .../java/org/scijava/util/ClassUtils.java     | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index c508a7897..5e6ace9d4 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -573,26 +573,6 @@ else if (Field.class.isAssignableFrom(objectClass)) {
 		}
 	}
 
-	/**
-	 * Gets the specified field of the given class, or null if it does not exist.
-	 */
-	public static Field getField(final String className, final String fieldName) {
-		return getField(loadClass(className), fieldName);
-	}
-
-	/**
-	 * Gets the specified field of the given class, or null if it does not exist.
-	 */
-	public static Field getField(final Class<?> c, final String fieldName) {
-		if (c == null) return null;
-		try {
-			return c.getDeclaredField(fieldName);
-		}
-		catch (final NoSuchFieldException e) {
-			return null;
-		}
-	}
-
 	/**
 	 * Gets the given field's value of the specified object instance, or null if
 	 * the value cannot be obtained.
@@ -821,6 +801,18 @@ public static Type getGenericType(final Field field, final Class<?> type) {
 		return Types.type(field, type);
 	}
 
+	/** @deprecated Use {@link Types#field} instead. */
+	@Deprecated
+	public static Field getField(final String className, final String fieldName) {
+		return Types.field(loadClass(className), fieldName);
+	}
+
+	/** @deprecated Use {@link Types#field} instead. */
+	@Deprecated
+	public static Field getField(final Class<?> c, final String fieldName) {
+		return Types.field(c, fieldName);
+	}
+
 	// -- Helper classes --
 
 	/**

From b2ac61d2c594d921d47fa2d8cfe25df512e87db7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Aug 2016 16:14:27 -0500
Subject: [PATCH 0723/1208] Stop using deprecated ClassUtils.getField methods

There is now Types.field instead.
---
 src/test/java/org/scijava/convert/ConvertServiceTest.java | 3 ++-
 src/test/java/org/scijava/convert/ConverterTest.java      | 3 +--
 src/test/java/org/scijava/util/ConversionUtilsTest.java   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 05884c385..50debdabe 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -76,6 +76,7 @@
 import org.scijava.util.LongArray;
 import org.scijava.util.PrimitiveArray;
 import org.scijava.util.ShortArray;
+import org.scijava.util.Types;
 
 /**
  * Tests {@link ConvertService}.
@@ -706,7 +707,7 @@ public void testDefaultConverterMatching() {
 	private void setFieldValue(final Object o, final String fieldName,
 		final Object value)
 	{
-		ClassUtils.setValue(ClassUtils.getField(o.getClass(), fieldName), o, value);
+		ClassUtils.setValue(Types.field(o.getClass(), fieldName), o, value);
 	}
 
 	/**
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 44c223c43..319a88d7f 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -42,7 +42,6 @@
 import java.util.Collection;
 
 import org.junit.Test;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.Types;
 
 /**
@@ -96,7 +95,7 @@ public void testCanConvert() {
 	public void testCanConvertToGenericCollection() {
 		final CastingConverter cc = new CastingConverter();
 
-		final Field destField = ClassUtils.getField(getClass(), "collection");
+		final Field destField = Types.field(getClass(), "collection");
 		final Type destType = Types.type(destField, getClass());
 		assertTrue(cc.canConvert(ArrayList.class, destType));
 	}
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index cadc051b2..ba75dc26d 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -52,6 +52,7 @@
 import java.util.Set;
 
 import org.junit.Test;
+import org.scijava.util.Types;
 
 /**
  * Tests {@link ConversionUtils}.
@@ -528,7 +529,7 @@ class Struct {
 	private void setFieldValue(final Object o, final String fieldName,
 		final Object value)
 	{
-		ClassUtils.setValue(ClassUtils.getField(o.getClass(), fieldName), o, value);
+		ClassUtils.setValue(Types.field(o.getClass(), fieldName), o, value);
 	}
 
 	/**

From f25e92a86e7807cd9dda25540342970c50babdfa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Aug 2016 17:15:59 -0500
Subject: [PATCH 0724/1208] Migrate ClassUtils.getArrayClass to Types.array

This also changes the behavior of the method to throw
IllegalArgumentException, rather than returning null, if
something goes wrong with the creation of the array type.
But the deprecated method preserves the legacy behavior,
for backwards compatibility.

The new behavior is more consistent with the other methods
of the Types class -- and it is better in general for a
reusable library to do proper exception handling. If the
behavior is too bothersome, we could add "boolean quietly"
flags to every method, but it would rather clutter things.
---
 .../java/org/scijava/util/ClassUtils.java     | 35 ++++++++----------
 src/main/java/org/scijava/util/Types.java     | 37 +++++++++++++++++++
 .../java/org/scijava/util/ClassUtilsTest.java | 11 ------
 src/test/java/org/scijava/util/TypesTest.java | 17 +++++++++
 4 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 5e6ace9d4..9b13fee63 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -35,7 +35,6 @@
 import java.io.File;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -221,25 +220,6 @@ public static Class<?> loadClass(final String name,
 		}
 	}
 
-	/**
-	 * Gets the array class corresponding to the given element type.
-	 * <p>
-	 * For example, {@code getArrayClass(double.class)} returns
-	 * {@code double[].class}.
-	 * </p>
-	 */
-	public static Class<?> getArrayClass(final Class<?> elementClass) {
-		if (elementClass == null) return null;
-		// NB: It appears the reflection API has no built-in way to do this.
-		// So unfortunately, we must allocate a new object and then inspect it.
-		try {
-			return Array.newInstance(elementClass, 0).getClass();
-		}
-		catch (final IllegalArgumentException exc) {
-			return null;
-		}
-	}
-
 	/** Checks whether a class with the given name exists. */
 	public static boolean hasClass(final String className) {
 		return hasClass(className, null);
@@ -689,6 +669,15 @@ public static int compare(final Class<?> c1, final Class<?> c2) {
 
 	// -- Helper methods --
 
+	private static Class<?> arrayOrNull(final Class<?> componentType) {
+		try {
+			return Types.array(componentType);
+		}
+		catch (final IllegalArgumentException exc) {
+			return null;
+		}
+	}
+
 	/**
 	 * Populates the cache of annotated elements for a particular class by looking
 	 * for all inherited and declared instances annotated with the specified
@@ -813,6 +802,12 @@ public static Field getField(final Class<?> c, final String fieldName) {
 		return Types.field(c, fieldName);
 	}
 
+	/** @deprecated Use {@link Types#array(Class)} instead. */
+	@Deprecated
+	public static Class<?> getArrayClass(final Class<?> elementClass) {
+		return Types.raw(arrayOrNull(elementClass));
+	}
+
 	// -- Helper classes --
 
 	/**
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 45b9263b3..bf9a895f8 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -147,6 +147,43 @@ public static Field field(final Class<?> c, final String name) {
 		return field(c.getSuperclass(), name);
 	}
 
+	/**
+	 * Gets the array class corresponding to the given element type.
+	 * <p>
+	 * For example, {@code arrayType(double.class)} returns {@code double[].class}
+	 * .
+	 * </p>
+	 * 
+	 * @param componentType The type of elements which the array possesses
+	 * @throws IllegalArgumentException if the type cannot be the component type
+	 *           of an array (this is the case e.g. for {@code void.class}).
+	 */
+	public static Class<?> array(final Class<?> componentType) {
+		if (componentType == null) return null;
+		// NB: It appears the reflection API has no built-in way to do this.
+		// So unfortunately, we must allocate a new object and then inspect it.
+		return Array.newInstance(componentType, 0).getClass();
+	}
+
+	/**
+	 * Gets the array type&mdash;which might be a {@link Class} or a
+	 * {@link GenericArrayType} depending on the argument&mdash;corresponding to
+	 * the given element type.
+	 * <p>
+	 * For example, {@code arrayType(double.class)} returns {@code double[].class}
+	 * .
+	 * </p>
+	 * 
+	 * @param componentType The type of elements which the array possesses
+	 */
+	public static Type array(final Type componentType) {
+		if (componentType == null) return null;
+		if (componentType instanceof Class) {
+			return array((Class<?>) componentType);
+		}
+		return new TypeUtils.GenericArrayTypeImpl(componentType);
+	}
+
 	/**
 	 * Gets the component type of the given array type, or null if not an array.
 	 */
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index a55dda743..1ce808516 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -127,17 +127,6 @@ public void testFailureLoud() {
 		ClassUtils.loadClass("a.non.existent.class", false);
 	}
 
-	@Test
-	public void testGetArrayClass() {
-		assertSame(boolean[].class, ClassUtils.getArrayClass(boolean.class));
-		assertSame(String[].class, ClassUtils.getArrayClass(String.class));
-		assertSame(Number[].class, ClassUtils.getArrayClass(Number.class));
-		assertSame(boolean[][].class, ClassUtils.getArrayClass(boolean[].class));
-		assertSame(String[][].class, ClassUtils.getArrayClass(String[].class));
-		assertSame(Number[][].class, ClassUtils.getArrayClass(Number[].class));
-		assertNull(ClassUtils.getArrayClass(void.class));
-	}
-
 	@Test
 	public void testUnpackedClass() throws IOException {
 		final File tmpDir = createTemporaryDirectory("class-utils-test-");
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 351926194..e225fd113 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -35,6 +35,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
@@ -133,6 +134,22 @@ public void testRaws() {
 			Serializable.class, Cloneable.class);
 	}
 
+	/** Tests {@link Types#array}. */
+	@Test
+	public void testArray() {
+		assertSame(boolean[].class, Types.array(boolean.class));
+		assertSame(String[].class, Types.array(String.class));
+		assertSame(Number[].class, Types.array(Number.class));
+		assertSame(boolean[][].class, Types.array(boolean[].class));
+		assertSame(String[][].class, Types.array(String[].class));
+		assertSame(Number[][].class, Types.array(Number[].class));
+		try {
+			Types.array(void.class);
+			fail("Unexpected success creating void[]");
+		}
+		catch (final IllegalArgumentException exc) { }
+	}
+
 	/** Tests {@link Types#param}. */
 	@Test
 	public void testParam() {

From e49c83add1a08e0ca057e5c66a5fb0f4f434b4e9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 Aug 2016 17:22:22 -0500
Subject: [PATCH 0725/1208] Types: allow creating multidimensional array types

---
 src/main/java/org/scijava/util/Types.java     | 17 +++++++++++++++++
 src/test/java/org/scijava/util/TypesTest.java | 11 +++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index bf9a895f8..c0914254c 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -165,6 +165,23 @@ public static Class<?> array(final Class<?> componentType) {
 		return Array.newInstance(componentType, 0).getClass();
 	}
 
+	/**
+	 * Gets the array class corresponding to the given element type and
+	 * dimensionality.
+	 * <p>
+	 * For example, {@code arrayType(double.class, 2)} returns
+	 * {@code double[][].class} .
+	 * </p>
+	 * 
+	 * @param componentType The type of elements which the array possesses
+	 * @param dim The dimensionality of the array
+	 */
+	public static Class<?> array(final Class<?> componentType, final int dim) {
+		if (dim < 0) throw new IllegalArgumentException("Negative dimension");
+		if (dim == 0) return componentType;
+		return array(array(componentType), dim - 1);
+	}
+
 	/**
 	 * Gets the array type&mdash;which might be a {@link Class} or a
 	 * {@link GenericArrayType} depending on the argument&mdash;corresponding to
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index e225fd113..6c81d901c 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -137,6 +137,7 @@ public void testRaws() {
 	/** Tests {@link Types#array}. */
 	@Test
 	public void testArray() {
+		// 1-dimensional cases
 		assertSame(boolean[].class, Types.array(boolean.class));
 		assertSame(String[].class, Types.array(String.class));
 		assertSame(Number[].class, Types.array(Number.class));
@@ -148,6 +149,16 @@ public void testArray() {
 			fail("Unexpected success creating void[]");
 		}
 		catch (final IllegalArgumentException exc) { }
+
+		// multidimensional cases
+		assertSame(Number[][].class, Types.array(Number.class, 2));
+		assertSame(boolean[][][].class, Types.array(boolean.class, 3));
+		assertSame(String.class, Types.array(String.class, 0));
+		try {
+			Types.array(char.class, -1);
+			fail("Unexpected success creating negative dimensional array");
+		}
+		catch (final IllegalArgumentException exc) { }
 	}
 
 	/** Tests {@link Types#param}. */

From 2517a4dbd4fe11e4bac41e89f4726d71fec142d8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 08:44:21 -0500
Subject: [PATCH 0726/1208] Eliminate now-redundant private method

We can now use Types.array(Class, int) instead.
---
 .../java/org/scijava/script/DefaultScriptService.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 1ee08c1b4..6fd526c20 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -68,6 +68,7 @@
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ColorRGB;
 import org.scijava.util.ColorRGBA;
+import org.scijava.util.Types;
 
 /**
  * Default service for working with scripts.
@@ -204,7 +205,7 @@ public synchronized Class<?> lookupClass(final String alias)
 		final Class<?> type = aliasMap().get(componentAlias);
 		if (type != null) {
 			final int arrayDim = (alias.length() - componentAlias.length()) / 2;
-			return makeArrayType(type, arrayDim);
+			return Types.array(type, arrayDim);
 		}
 
 		try {
@@ -405,10 +406,4 @@ private String stripArrayNotation(final String alias) {
 		if (!alias.endsWith("[]")) return alias;
 		return stripArrayNotation(alias.substring(0, alias.length() - 2));
 	}
-
-	private Class<?> makeArrayType(final Class<?> type, final int arrayDim) {
-		if (arrayDim <= 0) return type;
-		return makeArrayType(ClassUtils.getArrayClass(type), arrayDim - 1);
-	}
-
 }

From 704342139335a7e334e485df5c54fc10c2b8f428 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 14:56:08 -0500
Subject: [PATCH 0727/1208] Stop using deprecated ClassUtils.getArrayClass

There is now Types.array instead.
---
 .../java/org/scijava/util/ClassUtils.java     |  8 +++----
 .../java/org/scijava/util/ClassUtilsTest.java | 24 +++++++++++++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 9b13fee63..93aed50c1 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -48,8 +48,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.scijava.util.Types;
-
 /**
  * Useful methods for working with {@link Class} objects and primitive types.
  *
@@ -188,19 +186,19 @@ public static Class<?> loadClass(final String name,
 		// handle source style arrays (e.g.: "java.lang.String[]")
 		if (name.endsWith("[]")) {
 			final String elementClassName = name.substring(0, name.length() - 2);
-			return getArrayClass(loadClass(elementClassName, classLoader));
+			return Types.array(loadClass(elementClassName, classLoader));
 		}
 
 		// handle non-primitive internal arrays (e.g.: "[Ljava.lang.String;")
 		if (name.startsWith("[L") && name.endsWith(";")) {
 			final String elementClassName = name.substring(2, name.length() - 1);
-			return getArrayClass(loadClass(elementClassName, classLoader));
+			return Types.array(loadClass(elementClassName, classLoader));
 		}
 
 		// handle other internal arrays (e.g.: "[I", "[[I", "[[Ljava.lang.String;")
 		if (name.startsWith("[")) {
 			final String elementClassName = name.substring(1);
-			return getArrayClass(loadClass(elementClassName, classLoader));
+			return Types.array(loadClass(elementClassName, classLoader));
 		}
 
 		// load the class!
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 1ce808516..aa871dcf3 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -79,7 +79,6 @@ public void testLoadClass() {
 		assertLoaded(int[].class, "int[]");
 		assertLoaded(long[].class, "long[]");
 		assertLoaded(short[].class, "short[]");
-		assertLoaded(null, "void[]");
 		assertLoaded(String[].class, "string[]");
 		assertLoaded(Number[].class, "java.lang.Number[]");
 		assertLoaded(boolean[][].class, "boolean[][]");
@@ -90,7 +89,6 @@ public void testLoadClass() {
 		assertLoaded(int[][].class, "int[][]");
 		assertLoaded(long[][].class, "long[][]");
 		assertLoaded(short[][].class, "short[][]");
-		assertLoaded(null, "void[][]");
 		assertLoaded(String[][].class, "string[][]");
 		assertLoaded(Number[][].class, "java.lang.Number[][]");
 		assertLoaded(boolean[].class, "[Z");
@@ -101,7 +99,6 @@ public void testLoadClass() {
 		assertLoaded(int[].class, "[I");
 		assertLoaded(long[].class, "[J");
 		assertLoaded(short[].class, "[S");
-		assertLoaded(null, "[V");
 		assertLoaded(String[].class, "[Lstring;");
 		assertLoaded(Number[].class, "[Ljava.lang.Number;");
 		assertLoaded(boolean[][].class, "[[Z");
@@ -112,11 +109,30 @@ public void testLoadClass() {
 		assertLoaded(int[][].class, "[[I");
 		assertLoaded(long[][].class, "[[J");
 		assertLoaded(short[][].class, "[[S");
-		assertLoaded(null, "[[V");
 		assertLoaded(String[][].class, "[[Lstring;");
 		assertLoaded(Number[][].class, "[[Ljava.lang.Number;");
 	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray1D() {
+		ClassUtils.loadClass("void[]");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray1DShort() {
+		ClassUtils.loadClass("[V");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray2D() {
+		ClassUtils.loadClass("void[][]");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadClassVoidArray2DShort() {
+		ClassUtils.loadClass("[[V");
+	}
+
 	@Test
 	public void testFailureQuiet() {
 		assertNull(ClassUtils.loadClass("a.non.existent.class"));

From 37302c4d19ab83b870167838c325683d25bc54a2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 15:08:47 -0500
Subject: [PATCH 0728/1208] Types: fix whitespace

---
 src/main/java/org/scijava/util/Types.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index c0914254c..edb2df70d 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -84,7 +84,7 @@ private Types() {
 
 	/**
 	 * Gets a string representation of the given type.
-	 * 
+	 *
 	 * @param t Type whose name is desired.
 	 * @return The name of the given type.
 	 */
@@ -111,6 +111,7 @@ public static String name(final Type t) {
 	 * <p>
 	 * If you want <em>all</em> raw classes of the given type, use {@link #raws}.
 	 * </p>
+	 *
 	 * @param type The type from which to discern the (first) raw class.
 	 * @return The type's first raw class.
 	 */
@@ -153,7 +154,7 @@ public static Field field(final Class<?> c, final String name) {
 	 * For example, {@code arrayType(double.class)} returns {@code double[].class}
 	 * .
 	 * </p>
-	 * 
+	 *
 	 * @param componentType The type of elements which the array possesses
 	 * @throws IllegalArgumentException if the type cannot be the component type
 	 *           of an array (this is the case e.g. for {@code void.class}).
@@ -172,7 +173,7 @@ public static Class<?> array(final Class<?> componentType) {
 	 * For example, {@code arrayType(double.class, 2)} returns
 	 * {@code double[][].class} .
 	 * </p>
-	 * 
+	 *
 	 * @param componentType The type of elements which the array possesses
 	 * @param dim The dimensionality of the array
 	 */
@@ -190,7 +191,7 @@ public static Class<?> array(final Class<?> componentType, final int dim) {
 	 * For example, {@code arrayType(double.class)} returns {@code double[].class}
 	 * .
 	 * </p>
-	 * 
+	 *
 	 * @param componentType The type of elements which the array possesses
 	 */
 	public static Type array(final Type componentType) {
@@ -421,7 +422,7 @@ public static Map<TypeVariable<?>, Type> args(final Class<?> c,
 		return TypeUtils.determineTypeArguments(c, superType);
 	}
 
-		/**
+	/**
 	 * Create a parameterized type instance.
 	 *
 	 * @param raw the raw class to create a parameterized type instance for

From fa3c9db5e868d146ce425682207e3712f72f81bb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 15:12:02 -0500
Subject: [PATCH 0729/1208] Migrate ClassUtils.loadClass methods to Types.load

The Types utility class is the central place for
type-related utility methods going forward.
---
 .../java/org/scijava/util/ClassUtils.java     | 161 ++++--------------
 src/main/java/org/scijava/util/Types.java     | 137 +++++++++++++++
 .../java/org/scijava/util/ClassUtilsTest.java |  91 ----------
 src/test/java/org/scijava/util/TypesTest.java |  77 +++++++++
 4 files changed, 246 insertions(+), 220 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 93aed50c1..ba639ba32 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -89,135 +89,6 @@ private ClassUtils() {
 
 	// -- Class loading, querying and reflection --
 
-	/**
-	 * Loads the class with the given name, using the current thread's context
-	 * class loader, or null if it cannot be loaded.
-	 *
-	 * @param name The name of the class to load.
-	 * @return The loaded class, or null if the class could not be loaded.
-	 * @see #loadClass(String, ClassLoader, boolean)
-	 */
-	public static Class<?> loadClass(final String name) {
-		return loadClass(name, null, true);
-	}
-
-	/**
-	 * Loads the class with the given name, using the specified
-	 * {@link ClassLoader}, or null if it cannot be loaded.
-	 *
-	 * @param name The name of the class to load.
-	 * @param classLoader The class loader with which to load the class; if null,
-	 *          the current thread's context class loader will be used.
-	 * @return The loaded class, or null if the class could not be loaded.
-	 * @see #loadClass(String, ClassLoader, boolean)
-	 */
-	public static Class<?> loadClass(final String name,
-		final ClassLoader classLoader)
-	{
-		return loadClass(name, classLoader, true);
-	}
-
-	/**
-	 * Loads the class with the given name, using the current thread's context
-	 * class loader.
-	 *
-	 * @param className the name of the class to load
-	 * @param quietly Whether to return {@code null} (rather than throwing
-	 *          {@link IllegalArgumentException}) if something goes wrong loading
-	 *          the class
-	 * @return The loaded class, or {@code null} if the class could not be loaded
-	 *         and the {@code quietly} flag is set.
-	 * @see #loadClass(String, ClassLoader, boolean)
-	 * @throws IllegalArgumentException If the class cannot be loaded and the
-	 *           {@code quietly} flag is not set.
-	 */
-	public static Class<?> loadClass(final String className,
-		final boolean quietly)
-	{
-		return loadClass(className, null, quietly);
-	}
-
-	/**
-	 * Loads the class with the given name, using the specified
-	 * {@link ClassLoader}, or null if it cannot be loaded.
-	 * <p>
-	 * This method is capable of parsing several different class name syntaxes. In
-	 * particular, array classes (including primitives) represented using either
-	 * square brackets or internal Java array name syntax are supported. Examples:
-	 * </p>
-	 * <ul>
-	 * <li>{@code boolean} is loaded as {@code boolean.class}</li>
-	 * <li>{@code Z} is loaded as {@code boolean.class}</li>
-	 * <li>{@code double[]} is loaded as {@code double[].class}</li>
-	 * <li>{@code string[]} is loaded as {@code java.lang.String.class}</li>
-	 * <li>{@code [F} is loaded as {@code float[].class}</li>
-	 * </ul>
-	 *
-	 * @param name The name of the class to load.
-	 * @param classLoader The class loader with which to load the class; if null,
-	 *          the current thread's context class loader will be used.
-	 * @param quietly Whether to return {@code null} (rather than throwing
-	 *          {@link IllegalArgumentException}) if something goes wrong loading
-	 *          the class
-	 * @return The loaded class, or {@code null} if the class could not be loaded
-	 *         and the {@code quietly} flag is set.
-	 * @throws IllegalArgumentException If the class cannot be loaded and the
-	 *           {@code quietly} flag is not set.
-	 */
-	public static Class<?> loadClass(final String name,
-		final ClassLoader classLoader, final boolean quietly)
-	{
-		// handle primitive types
-		if (name.equals("Z") || name.equals("boolean")) return boolean.class;
-		if (name.equals("B") || name.equals("byte")) return byte.class;
-		if (name.equals("C") || name.equals("char")) return char.class;
-		if (name.equals("D") || name.equals("double")) return double.class;
-		if (name.equals("F") || name.equals("float")) return float.class;
-		if (name.equals("I") || name.equals("int")) return int.class;
-		if (name.equals("J") || name.equals("long")) return long.class;
-		if (name.equals("S") || name.equals("short")) return short.class;
-		if (name.equals("V") || name.equals("void")) return void.class;
-
-		// handle built-in class shortcuts
-		final String className;
-		if (name.equals("string")) className = "java.lang.String";
-		else className = name;
-
-		// handle source style arrays (e.g.: "java.lang.String[]")
-		if (name.endsWith("[]")) {
-			final String elementClassName = name.substring(0, name.length() - 2);
-			return Types.array(loadClass(elementClassName, classLoader));
-		}
-
-		// handle non-primitive internal arrays (e.g.: "[Ljava.lang.String;")
-		if (name.startsWith("[L") && name.endsWith(";")) {
-			final String elementClassName = name.substring(2, name.length() - 1);
-			return Types.array(loadClass(elementClassName, classLoader));
-		}
-
-		// handle other internal arrays (e.g.: "[I", "[[I", "[[Ljava.lang.String;")
-		if (name.startsWith("[")) {
-			final String elementClassName = name.substring(1);
-			return Types.array(loadClass(elementClassName, classLoader));
-		}
-
-		// load the class!
-		try {
-			final ClassLoader cl =
-				classLoader == null ? Thread.currentThread().getContextClassLoader()
-					: classLoader;
-			return cl.loadClass(className);
-		}
-		catch (final Throwable t) {
-			// NB: Do not allow any failure to load the class to crash us.
-			// Not ClassNotFoundException.
-			// Not NoClassDefFoundError.
-			// Not UnsupportedClassVersionError!
-			if (quietly) return null;
-			throw new IllegalArgumentException("Cannot load class: " + className, t);
-		}
-	}
-
 	/** Checks whether a class with the given name exists. */
 	public static boolean hasClass(final String className) {
 		return hasClass(className, null);
@@ -724,6 +595,38 @@ private static <T extends AnnotatedElement> void populateCache(
 
 	// -- Deprecated methods --
 
+	/** @deprecated Use {@link Types#load(String)} instead. */
+	@Deprecated
+	public static Class<?> loadClass(final String name) {
+		return Types.load(name);
+	}
+
+	/** @deprecated Use {@link Types#load(String, ClassLoader)} instead. */
+	@Deprecated
+	public static Class<?> loadClass(final String name,
+		final ClassLoader classLoader)
+	{
+		return Types.load(name, classLoader);
+	}
+
+	/** @deprecated Use {@link Types#load(String, boolean)} instead. */
+	@Deprecated
+	public static Class<?> loadClass(final String className,
+		final boolean quietly)
+	{
+		return Types.load(className, quietly);
+	}
+
+	/**
+	 * @deprecated Use {@link Types#load(String, ClassLoader, boolean)} instead.
+	 */
+	@Deprecated
+	public static Class<?> loadClass(final String name,
+		final ClassLoader classLoader, final boolean quietly)
+	{
+		return Types.load(name, classLoader, quietly);
+	}
+
 	/** @deprecated use {@link ConversionUtils#convert(Object, Class)} */
 	@Deprecated
 	public static <T> T convert(final Object value, final Class<T> type) {
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index edb2df70d..7af877cb4 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -82,6 +82,132 @@ private Types() {
 		// NB: Prevent instantiation of utility class.
 	}
 
+	/**
+	 * Loads the class with the given name, using the current thread's context
+	 * class loader, or null if it cannot be loaded.
+	 *
+	 * @param name The name of the class to load.
+	 * @return The loaded class, or null if the class could not be loaded.
+	 * @see #load(String, ClassLoader, boolean)
+	 */
+	public static Class<?> load(final String name) {
+		return load(name, null, true);
+	}
+
+	/**
+	 * Loads the class with the given name, using the specified
+	 * {@link ClassLoader}, or null if it cannot be loaded.
+	 *
+	 * @param name The name of the class to load.
+	 * @param classLoader The class loader with which to load the class; if null,
+	 *          the current thread's context class loader will be used.
+	 * @return The loaded class, or null if the class could not be loaded.
+	 * @see #load(String, ClassLoader, boolean)
+	 */
+	public static Class<?> load(final String name,
+		final ClassLoader classLoader)
+	{
+		return load(name, classLoader, true);
+	}
+
+	/**
+	 * Loads the class with the given name, using the current thread's context
+	 * class loader.
+	 *
+	 * @param className the name of the class to load.
+	 * @param quietly Whether to return {@code null} (rather than throwing
+	 *          {@link IllegalArgumentException}) if something goes wrong loading
+	 *          the class.
+	 * @return The loaded class, or {@code null} if the class could not be loaded
+	 *         and the {@code quietly} flag is set.
+	 * @see #load(String, ClassLoader, boolean)
+	 * @throws IllegalArgumentException If the class cannot be loaded and the
+	 *           {@code quietly} flag is not set.
+	 */
+	public static Class<?> load(final String className, final boolean quietly) {
+		return load(className, null, quietly);
+	}
+
+	/**
+	 * Loads the class with the given name, using the specified
+	 * {@link ClassLoader}, or null if it cannot be loaded.
+	 * <p>
+	 * This method is capable of parsing several different class name syntaxes. In
+	 * particular, array classes (including primitives) represented using either
+	 * square brackets or internal Java array name syntax are supported. Examples:
+	 * </p>
+	 * <ul>
+	 * <li>{@code boolean} is loaded as {@code boolean.class}</li>
+	 * <li>{@code Z} is loaded as {@code boolean.class}</li>
+	 * <li>{@code double[]} is loaded as {@code double[].class}</li>
+	 * <li>{@code string[]} is loaded as {@code java.lang.String.class}</li>
+	 * <li>{@code [F} is loaded as {@code float[].class}</li>
+	 * </ul>
+	 *
+	 * @param name The name of the class to load.
+	 * @param classLoader The class loader with which to load the class; if null,
+	 *          the current thread's context class loader will be used.
+	 * @param quietly Whether to return {@code null} (rather than throwing
+	 *          {@link IllegalArgumentException}) if something goes wrong loading
+	 *          the class
+	 * @return The loaded class, or {@code null} if the class could not be loaded
+	 *         and the {@code quietly} flag is set.
+	 * @throws IllegalArgumentException If the class cannot be loaded and the
+	 *           {@code quietly} flag is not set.
+	 */
+	public static Class<?> load(final String name, final ClassLoader classLoader,
+		final boolean quietly)
+	{
+		// handle primitive types
+		if (name.equals("Z") || name.equals("boolean")) return boolean.class;
+		if (name.equals("B") || name.equals("byte")) return byte.class;
+		if (name.equals("C") || name.equals("char")) return char.class;
+		if (name.equals("D") || name.equals("double")) return double.class;
+		if (name.equals("F") || name.equals("float")) return float.class;
+		if (name.equals("I") || name.equals("int")) return int.class;
+		if (name.equals("J") || name.equals("long")) return long.class;
+		if (name.equals("S") || name.equals("short")) return short.class;
+		if (name.equals("V") || name.equals("void")) return void.class;
+
+		// handle built-in class shortcuts
+		final String className;
+		if (name.equals("string")) className = "java.lang.String";
+		else className = name;
+
+		// handle source style arrays (e.g.: "java.lang.String[]")
+		if (name.endsWith("[]")) {
+			final String elementClassName = name.substring(0, name.length() - 2);
+			return arrayOrNull(load(elementClassName, classLoader));
+		}
+
+		// handle non-primitive internal arrays (e.g.: "[Ljava.lang.String;")
+		if (name.startsWith("[L") && name.endsWith(";")) {
+			final String elementClassName = name.substring(2, name.length() - 1);
+			return arrayOrNull(load(elementClassName, classLoader));
+		}
+
+		// handle other internal arrays (e.g.: "[I", "[[I", "[[Ljava.lang.String;")
+		if (name.startsWith("[")) {
+			final String elementClassName = name.substring(1);
+			return arrayOrNull(load(elementClassName, classLoader));
+		}
+
+		// load the class!
+		try {
+			final ClassLoader cl = classLoader == null ? Thread.currentThread()
+				.getContextClassLoader() : classLoader;
+			return cl.loadClass(className);
+		}
+		catch (final Throwable t) {
+			// NB: Do not allow any failure to load the class to crash us.
+			// Not ClassNotFoundException.
+			// Not NoClassDefFoundError.
+			// Not UnsupportedClassVersionError!
+			if (quietly) return null;
+			throw new IllegalArgumentException("Cannot load class: " + className, t);
+		}
+	}
+
 	/**
 	 * Gets a string representation of the given type.
 	 *
@@ -435,6 +561,17 @@ public static final ParameterizedType parameterize(final Class<?> raw,
 		return TypeUtils.parameterize(raw, typeArgMappings);
 	}
 
+	// -- Helper methods --
+
+	private static Class<?> arrayOrNull(final Class<?> componentType) {
+		try {
+			return Types.array(componentType);
+		}
+		catch (final IllegalArgumentException exc) {
+			return null;
+		}
+	}
+
 	// -- BEGIN FORK OF APACHE COMMONS LANG 3.4 CODE --
 
 	/*
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index aa871dcf3..283ff45cd 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -33,8 +33,6 @@
 package org.scijava.util;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.scijava.test.TestUtils.createTemporaryDirectory;
 
@@ -58,91 +56,6 @@
  */
 public class ClassUtilsTest {
 
-	@Test
-	public void testLoadClass() {
-		assertLoaded(boolean.class, "boolean");
-		assertLoaded(byte.class, "byte");
-		assertLoaded(char.class, "char");
-		assertLoaded(double.class, "double");
-		assertLoaded(float.class, "float");
-		assertLoaded(int.class, "int");
-		assertLoaded(long.class, "long");
-		assertLoaded(short.class, "short");
-		assertLoaded(void.class, "void");
-		assertLoaded(String.class, "string");
-		assertLoaded(Number.class, "java.lang.Number");
-		assertLoaded(boolean[].class, "boolean[]");
-		assertLoaded(byte[].class, "byte[]");
-		assertLoaded(char[].class, "char[]");
-		assertLoaded(double[].class, "double[]");
-		assertLoaded(float[].class, "float[]");
-		assertLoaded(int[].class, "int[]");
-		assertLoaded(long[].class, "long[]");
-		assertLoaded(short[].class, "short[]");
-		assertLoaded(String[].class, "string[]");
-		assertLoaded(Number[].class, "java.lang.Number[]");
-		assertLoaded(boolean[][].class, "boolean[][]");
-		assertLoaded(byte[][].class, "byte[][]");
-		assertLoaded(char[][].class, "char[][]");
-		assertLoaded(double[][].class, "double[][]");
-		assertLoaded(float[][].class, "float[][]");
-		assertLoaded(int[][].class, "int[][]");
-		assertLoaded(long[][].class, "long[][]");
-		assertLoaded(short[][].class, "short[][]");
-		assertLoaded(String[][].class, "string[][]");
-		assertLoaded(Number[][].class, "java.lang.Number[][]");
-		assertLoaded(boolean[].class, "[Z");
-		assertLoaded(byte[].class, "[B");
-		assertLoaded(char[].class, "[C");
-		assertLoaded(double[].class, "[D");
-		assertLoaded(float[].class, "[F");
-		assertLoaded(int[].class, "[I");
-		assertLoaded(long[].class, "[J");
-		assertLoaded(short[].class, "[S");
-		assertLoaded(String[].class, "[Lstring;");
-		assertLoaded(Number[].class, "[Ljava.lang.Number;");
-		assertLoaded(boolean[][].class, "[[Z");
-		assertLoaded(byte[][].class, "[[B");
-		assertLoaded(char[][].class, "[[C");
-		assertLoaded(double[][].class, "[[D");
-		assertLoaded(float[][].class, "[[F");
-		assertLoaded(int[][].class, "[[I");
-		assertLoaded(long[][].class, "[[J");
-		assertLoaded(short[][].class, "[[S");
-		assertLoaded(String[][].class, "[[Lstring;");
-		assertLoaded(Number[][].class, "[[Ljava.lang.Number;");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void testLoadClassVoidArray1D() {
-		ClassUtils.loadClass("void[]");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void testLoadClassVoidArray1DShort() {
-		ClassUtils.loadClass("[V");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void testLoadClassVoidArray2D() {
-		ClassUtils.loadClass("void[][]");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void testLoadClassVoidArray2DShort() {
-		ClassUtils.loadClass("[[V");
-	}
-
-	@Test
-	public void testFailureQuiet() {
-		assertNull(ClassUtils.loadClass("a.non.existent.class"));
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void testFailureLoud() {
-		ClassUtils.loadClass("a.non.existent.class", false);
-	}
-
 	@Test
 	public void testUnpackedClass() throws IOException {
 		final File tmpDir = createTemporaryDirectory("class-utils-test-");
@@ -200,8 +113,4 @@ private void copy(final InputStream in, final OutputStream out,
 		if (closeOut) out.close();
 	}
 
-	private void assertLoaded(final Class<?> c, final String name) {
-		assertSame(c, ClassUtils.loadClass(name));
-	}
-
 }
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 6c81d901c..76ba7f841 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -53,6 +53,79 @@
  */
 public class TypesTest {
 
+	/** Tests {@link Types#load}. */
+	@Test
+	public void testLoad() {
+		assertLoaded(boolean.class, "boolean");
+		assertLoaded(byte.class, "byte");
+		assertLoaded(char.class, "char");
+		assertLoaded(double.class, "double");
+		assertLoaded(float.class, "float");
+		assertLoaded(int.class, "int");
+		assertLoaded(long.class, "long");
+		assertLoaded(short.class, "short");
+		assertLoaded(void.class, "void");
+		assertLoaded(String.class, "string");
+		assertLoaded(Number.class, "java.lang.Number");
+		assertLoaded(boolean[].class, "boolean[]");
+		assertLoaded(byte[].class, "byte[]");
+		assertLoaded(char[].class, "char[]");
+		assertLoaded(double[].class, "double[]");
+		assertLoaded(float[].class, "float[]");
+		assertLoaded(int[].class, "int[]");
+		assertLoaded(long[].class, "long[]");
+		assertLoaded(short[].class, "short[]");
+		assertLoaded(null, "void[]");
+		assertLoaded(String[].class, "string[]");
+		assertLoaded(Number[].class, "java.lang.Number[]");
+		assertLoaded(boolean[][].class, "boolean[][]");
+		assertLoaded(byte[][].class, "byte[][]");
+		assertLoaded(char[][].class, "char[][]");
+		assertLoaded(double[][].class, "double[][]");
+		assertLoaded(float[][].class, "float[][]");
+		assertLoaded(int[][].class, "int[][]");
+		assertLoaded(long[][].class, "long[][]");
+		assertLoaded(short[][].class, "short[][]");
+		assertLoaded(null, "void[][]");
+		assertLoaded(String[][].class, "string[][]");
+		assertLoaded(Number[][].class, "java.lang.Number[][]");
+		assertLoaded(boolean[].class, "[Z");
+		assertLoaded(byte[].class, "[B");
+		assertLoaded(char[].class, "[C");
+		assertLoaded(double[].class, "[D");
+		assertLoaded(float[].class, "[F");
+		assertLoaded(int[].class, "[I");
+		assertLoaded(long[].class, "[J");
+		assertLoaded(short[].class, "[S");
+		assertLoaded(null, "[V");
+		assertLoaded(String[].class, "[Lstring;");
+		assertLoaded(Number[].class, "[Ljava.lang.Number;");
+		assertLoaded(boolean[][].class, "[[Z");
+		assertLoaded(byte[][].class, "[[B");
+		assertLoaded(char[][].class, "[[C");
+		assertLoaded(double[][].class, "[[D");
+		assertLoaded(float[][].class, "[[F");
+		assertLoaded(int[][].class, "[[I");
+		assertLoaded(long[][].class, "[[J");
+		assertLoaded(short[][].class, "[[S");
+		assertLoaded(null, "[[V");
+		assertLoaded(String[][].class, "[[Lstring;");
+		assertLoaded(Number[][].class, "[[Ljava.lang.Number;");
+	}
+
+	/** Tests {@link Types#load}. */
+	@Test
+	public void testLoadFailureQuiet() {
+		// test quiet failure
+		assertNull(Types.load("a.non.existent.class"));
+	}
+
+	/** Tests {@link Types#load}. */
+	@Test(expected = IllegalArgumentException.class)
+	public void testLoadFailureLoud() {
+		Types.load("a.non.existent.class", false);
+	}
+
 	/** Tests {@link Types#raw(Type)}. */
 	@Test
 	public void testRaw() {
@@ -213,6 +286,10 @@ private Class<?> componentType(final Class<?> c, final String fieldName) {
 		return Types.raw(Types.component(type(c, fieldName)));
 	}
 
+	private void assertLoaded(final Class<?> c, final String name) {
+		assertSame(c, Types.load(name));
+	}
+
 	private void assertAllTheSame(final List<?> list, final Object... values) {
 		assertEquals(list.size(), values.length);
 		for (int i = 0; i < values.length; i++) {

From 92d9ee9f9bad7ebc516b745953212185866cacf4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 15:40:18 -0500
Subject: [PATCH 0730/1208] Stop using deprecated ClassUtils.loadClass

There is now Types.load instead.
---
 src/main/java/org/scijava/Context.java                     | 5 +++--
 src/main/java/org/scijava/main/DefaultMainService.java     | 4 ++--
 src/main/java/org/scijava/main/run/MainCodeRunner.java     | 4 ++--
 src/main/java/org/scijava/menu/ShadowMenu.java             | 3 ++-
 src/main/java/org/scijava/module/DefaultModuleService.java | 4 ++--
 src/main/java/org/scijava/plugin/PluginInfo.java           | 3 ++-
 src/main/java/org/scijava/script/DefaultScriptService.java | 3 +--
 src/main/java/org/scijava/util/AppUtils.java               | 4 +++-
 src/main/java/org/scijava/util/ClassUtils.java             | 6 +++---
 9 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index a240ff78e..c3b928c2d 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -52,6 +52,7 @@
 import org.scijava.service.ServiceIndex;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.Query;
+import org.scijava.util.Types;
 
 /**
  * Top-level SciJava application context, which initializes and maintains a list
@@ -323,7 +324,7 @@ public <S extends Service> S service(final Class<S> c) {
 	 *           service.
 	 */
 	public Service service(final String className) {
-		final Class<?> c = ClassUtils.loadClass(className, false);
+		final Class<?> c = Types.load(className, false);
 		if (!Service.class.isAssignableFrom(c)) {
 			throw new IllegalArgumentException("Not a service class: " + c.getName());
 		}
@@ -342,7 +343,7 @@ public <S extends Service> S getService(final Class<S> c) {
 
 	/** Gets the service of the given class name (useful for scripts). */
 	public Service getService(final String className) {
-		final Class<?> c = ClassUtils.loadClass(className);
+		final Class<?> c = Types.load(className);
 		if (c == null) return null;
 		if (!Service.class.isAssignableFrom(c)) return null; // not a service class
 		@SuppressWarnings("unchecked")
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 48af811df..f706fbefb 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -42,7 +42,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * Default implementation of {@link MainService}.
@@ -102,7 +102,7 @@ public String[] args() {
 		@Override
 		public void exec() {
 			try {
-				final Class<?> mainClass = ClassUtils.loadClass(className, false);
+				final Class<?> mainClass = Types.load(className, false);
 				final Method main = mainClass.getMethod("main", String[].class);
 				main.invoke(null, new Object[] { args });
 			}
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 96735f982..2e86b3b5c 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -42,7 +42,7 @@
 import org.scijava.plugin.Plugin;
 import org.scijava.run.AbstractCodeRunner;
 import org.scijava.run.CodeRunner;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * Executes the given class's {@code main} method.
@@ -108,7 +108,7 @@ private Method getMain(final Object code) {
 
 	private Class<?> getClass(final Object code) {
 		if (code instanceof Class) return (Class<?>) code;
-		if (code instanceof String) return ClassUtils.loadClass((String) code);
+		if (code instanceof String) return Types.load((String) code);
 		return null;
 	}
 
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index c1d1c2524..63af31640 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -57,6 +57,7 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.MiscUtils;
+import org.scijava.util.Types;
 
 /**
  * A tree representing a menu structure independent of any particular user
@@ -234,7 +235,7 @@ public URL getIconURL() {
 		}
 		final String className = moduleInfo.getDelegateClassName();
 		try {
-			final Class<?> c = ClassUtils.loadClass(className, false);
+			final Class<?> c = Types.load(className, false);
 			final URL iconURL = c.getResource(iconPath);
 			if (iconURL == null) {
 				if (log != null) log.error("Could not load icon: " + iconPath);
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 893e846ff..4cd4da238 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -63,7 +63,7 @@
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * Default service for keeping track of and executing available modules.
@@ -370,7 +370,7 @@ private List<? extends PostprocessorPlugin> post(final boolean process) {
 	 * {@link ModuleInfo} argument is called).
 	 */
 	private Module getRegisteredModuleInstance(final ModuleInfo info) {
-		final Class<?> type = ClassUtils.loadClass(info.getDelegateClassName());
+		final Class<?> type = Types.load(info.getDelegateClassName());
 		if (type == null || !Module.class.isAssignableFrom(type)) return null;
 
 		// the module metadata's delegate class extends Module, so there is hope
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index ad6ef747c..d8738521a 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -47,6 +47,7 @@
 import org.scijava.input.Accelerator;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.StringMaker;
+import org.scijava.util.Types;
 import org.scijava.util.VersionUtils;
 
 /**
@@ -282,7 +283,7 @@ public String getClassName() {
 	public Class<? extends PT> loadClass() throws InstantiableException {
 		if (pluginClass == null) {
 			try {
-				final Class<?> c = ClassUtils.loadClass(className, classLoader, false);
+				final Class<?> c = Types.load(className, classLoader, false);
 				@SuppressWarnings("unchecked")
 				final Class<? extends PT> typedClass = (Class<? extends PT>) c;
 				pluginClass = typedClass;
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 6fd526c20..55e2c1291 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -65,7 +65,6 @@
 import org.scijava.plugin.SciJavaPlugin;
 import org.scijava.script.process.ScriptProcessorService;
 import org.scijava.service.Service;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.ColorRGB;
 import org.scijava.util.ColorRGBA;
 import org.scijava.util.Types;
@@ -209,7 +208,7 @@ public synchronized Class<?> lookupClass(final String alias)
 		}
 
 		try {
-			final Class<?> c = ClassUtils.loadClass(alias, false);
+			final Class<?> c = Types.load(alias, false);
 			aliasMap().put(alias, c);
 			return c;
 		}
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 6b7bd66c4..5c79ce0be 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -37,6 +37,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.scijava.util.Types;
+
 /**
  * Useful methods for obtaining details of the SciJava application environment.
  * 
@@ -51,7 +53,7 @@ public final class AppUtils {
 		// Get the class whose main method launched the application. The heuristic
 		// will fail if the main thread has terminated before this class loads.
 		final String className = DebugUtils.getMainClassName();
-		mainClass = className == null ? null : ClassUtils.loadClass(className);
+		mainClass = className == null ? null : Types.load(className);
 	}
 
 	private AppUtils() {
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index ba639ba32..35bc0b965 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -98,7 +98,7 @@ public static boolean hasClass(final String className) {
 	public static boolean hasClass(final String className,
 		final ClassLoader classLoader)
 	{
-		return loadClass(className, classLoader) != null;
+		return Types.load(className, classLoader) != null;
 	}
 
 	/**
@@ -141,7 +141,7 @@ public static URL getLocation(final String className) {
 	public static URL getLocation(final String className,
 		final ClassLoader classLoader)
 	{
-		final Class<?> c = loadClass(className, classLoader);
+		final Class<?> c = Types.load(className, classLoader);
 		return getLocation(c);
 	}
 
@@ -694,7 +694,7 @@ public static Type getGenericType(final Field field, final Class<?> type) {
 	/** @deprecated Use {@link Types#field} instead. */
 	@Deprecated
 	public static Field getField(final String className, final String fieldName) {
-		return Types.field(loadClass(className), fieldName);
+		return Types.field(Types.load(className), fieldName);
 	}
 
 	/** @deprecated Use {@link Types#field} instead. */

From 855e90c0ae6111f2b2aaa1fdc31e88b6a0d75b3a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 15:48:53 -0500
Subject: [PATCH 0731/1208] ClassUtils: deprecate hasClass methods

An implication of these methods is that they might somehow test for the
existence of classes without loading them, which is not actually true.
Better to recommend using Types.load directly and comparing vs null.
---
 .../java/org/scijava/util/ClassUtils.java     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 35bc0b965..80e22d77c 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -89,18 +89,6 @@ private ClassUtils() {
 
 	// -- Class loading, querying and reflection --
 
-	/** Checks whether a class with the given name exists. */
-	public static boolean hasClass(final String className) {
-		return hasClass(className, null);
-	}
-
-	/** Checks whether a class with the given name exists. */
-	public static boolean hasClass(final String className,
-		final ClassLoader classLoader)
-	{
-		return Types.load(className, classLoader) != null;
-	}
-
 	/**
 	 * Gets the base location of the given class.
 	 * <p>
@@ -627,6 +615,20 @@ public static Class<?> loadClass(final String name,
 		return Types.load(name, classLoader, quietly);
 	}
 
+	/** @deprecated Use {@link Types#load(String)} instead. */
+	@Deprecated
+	public static boolean hasClass(final String className) {
+		return Types.load(className) != null;
+	}
+
+	/** @deprecated Use {@link Types#load(String, ClassLoader)} instead. */
+	@Deprecated
+	public static boolean hasClass(final String className,
+		final ClassLoader classLoader)
+	{
+		return Types.load(className, classLoader) != null;
+	}
+
 	/** @deprecated use {@link ConversionUtils#convert(Object, Class)} */
 	@Deprecated
 	public static <T> T convert(final Object value, final Class<T> type) {

From aba07b7b185c57e8c5a629b4bb00a663c34cd4f6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 15:53:25 -0500
Subject: [PATCH 0732/1208] Migrate ClassUtils type querying methods to Types

The Types utility class is the central place for
type-related utility methods going forward.
---
 .../java/org/scijava/util/ClassUtils.java     | 102 ++++++++++--------
 src/main/java/org/scijava/util/Types.java     |  42 ++++++++
 2 files changed, 102 insertions(+), 42 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 80e22d77c..4d016699f 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -457,48 +457,6 @@ public static void setValue(final Field field, final Object instance,
 
 	// -- Type querying --
 
-	public static boolean isBoolean(final Class<?> type) {
-		return type == boolean.class || Boolean.class.isAssignableFrom(type);
-	}
-
-	public static boolean isByte(final Class<?> type) {
-		return type == byte.class || Byte.class.isAssignableFrom(type);
-	}
-
-	public static boolean isCharacter(final Class<?> type) {
-		return type == char.class || Character.class.isAssignableFrom(type);
-	}
-
-	public static boolean isDouble(final Class<?> type) {
-		return type == double.class || Double.class.isAssignableFrom(type);
-	}
-
-	public static boolean isFloat(final Class<?> type) {
-		return type == float.class || Float.class.isAssignableFrom(type);
-	}
-
-	public static boolean isInteger(final Class<?> type) {
-		return type == int.class || Integer.class.isAssignableFrom(type);
-	}
-
-	public static boolean isLong(final Class<?> type) {
-		return type == long.class || Long.class.isAssignableFrom(type);
-	}
-
-	public static boolean isShort(final Class<?> type) {
-		return type == short.class || Short.class.isAssignableFrom(type);
-	}
-
-	public static boolean isNumber(final Class<?> type) {
-		return Number.class.isAssignableFrom(type) || type == byte.class ||
-			type == double.class || type == float.class || type == int.class ||
-			type == long.class || type == short.class;
-	}
-
-	public static boolean isText(final Class<?> type) {
-		return String.class.isAssignableFrom(type) || isCharacter(type);
-	}
-
 	// -- Comparison --
 
 	/**
@@ -629,6 +587,66 @@ public static boolean hasClass(final String className,
 		return Types.load(className, classLoader) != null;
 	}
 
+	/** @deprecated Use {@link Types#isBoolean} instead. */
+	@Deprecated
+	public static boolean isBoolean(final Class<?> type) {
+		return Types.isBoolean(type);
+	}
+
+	/** @deprecated Use {@link Types#isByte} instead. */
+	@Deprecated
+	public static boolean isByte(final Class<?> type) {
+		return Types.isByte(type);
+	}
+
+	/** @deprecated Use {@link Types#isCharacter} instead. */
+	@Deprecated
+	public static boolean isCharacter(final Class<?> type) {
+		return Types.isCharacter(type);
+	}
+
+	/** @deprecated Use {@link Types#isDouble} instead. */
+	@Deprecated
+	public static boolean isDouble(final Class<?> type) {
+		return Types.isDouble(type);
+	}
+
+	/** @deprecated Use {@link Types#isFloat} instead. */
+	@Deprecated
+	public static boolean isFloat(final Class<?> type) {
+		return Types.isFloat(type);
+	}
+
+	/** @deprecated Use {@link Types#isInteger} instead. */
+	@Deprecated
+	public static boolean isInteger(final Class<?> type) {
+		return Types.isInteger(type);
+	}
+
+	/** @deprecated Use {@link Types#isLong} instead. */
+	@Deprecated
+	public static boolean isLong(final Class<?> type) {
+		return Types.isLong(type);
+	}
+
+	/** @deprecated Use {@link Types#isShort} instead. */
+	@Deprecated
+	public static boolean isShort(final Class<?> type) {
+		return Types.isShort(type);
+	}
+
+	/** @deprecated Use {@link Types#isNumber} instead. */
+	@Deprecated
+	public static boolean isNumber(final Class<?> type) {
+		return Types.isNumber(type);
+	}
+
+	/** @deprecated Use {@link Types#isText} instead. */
+	@Deprecated
+	public static boolean isText(final Class<?> type) {
+		return Types.isText(type);
+	}
+
 	/** @deprecated use {@link ConversionUtils#convert(Object, Class)} */
 	@Deprecated
 	public static <T> T convert(final Object value, final Class<T> type) {
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 7af877cb4..63c0967c3 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -265,6 +265,48 @@ public static List<Class<?>> raws(final Type type) {
 		return GenericTypeReflector.getUpperBoundClassAndInterfaces(type);
 	}
 
+	public static boolean isBoolean(final Class<?> type) {
+		return type == boolean.class || Boolean.class.isAssignableFrom(type);
+	}
+
+	public static boolean isByte(final Class<?> type) {
+		return type == byte.class || Byte.class.isAssignableFrom(type);
+	}
+
+	public static boolean isCharacter(final Class<?> type) {
+		return type == char.class || Character.class.isAssignableFrom(type);
+	}
+
+	public static boolean isDouble(final Class<?> type) {
+		return type == double.class || Double.class.isAssignableFrom(type);
+	}
+
+	public static boolean isFloat(final Class<?> type) {
+		return type == float.class || Float.class.isAssignableFrom(type);
+	}
+
+	public static boolean isInteger(final Class<?> type) {
+		return type == int.class || Integer.class.isAssignableFrom(type);
+	}
+
+	public static boolean isLong(final Class<?> type) {
+		return type == long.class || Long.class.isAssignableFrom(type);
+	}
+
+	public static boolean isShort(final Class<?> type) {
+		return type == short.class || Short.class.isAssignableFrom(type);
+	}
+
+	public static boolean isNumber(final Class<?> type) {
+		return Number.class.isAssignableFrom(type) || type == byte.class ||
+			type == double.class || type == float.class || type == int.class ||
+			type == long.class || type == short.class;
+	}
+
+	public static boolean isText(final Class<?> type) {
+		return String.class.isAssignableFrom(type) || isCharacter(type);
+	}
+
 	public static Field field(final Class<?> c, final String name) {
 		if (c == null) throw new IllegalArgumentException("No such field: " + name);
 		try {

From 4cb9c1df1b394cb333f30b8b06db4e0c2aeb3ec5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 15:59:12 -0500
Subject: [PATCH 0733/1208] ArrayUtils: tweak the class javadoc

---
 src/main/java/org/scijava/util/ArrayUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 0e168567c..52d1c3378 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -65,7 +65,7 @@
 import java.util.List;
 
 /**
- * Utility class for creating and manipulating {@link PrimitiveArray} instances.
+ * Utility class for working with arrays, particularly arrays of primitives.
  * 
  * @author Mark Hiner
  * @author Curtis Rueden

From 9d4b6fa73625edd095c125c584037c9de8084e99 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 16:58:00 -0500
Subject: [PATCH 0734/1208] TypesTest: add tests for Types.name

---
 src/test/java/org/scijava/util/TypesTest.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 76ba7f841..73ee6c320 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -126,6 +126,18 @@ public void testLoadFailureLoud() {
 		Types.load("a.non.existent.class", false);
 	}
 
+	/** Tests {@link Types#name}. */
+	public void testName() {
+		@SuppressWarnings("unused")
+		class Struct {
+
+			private List<String> list;
+		}
+		assertEquals("boolean", Types.name(boolean.class));
+		assertEquals("java.lang.String", Types.name(String.class));
+		assertEquals("List<String>[]", Types.name(type(Struct.class, "list")));
+	}
+
 	/** Tests {@link Types#raw(Type)}. */
 	@Test
 	public void testRaw() {

From 53431c0d505a237dd76e3b5fdbb84c2802112dec Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 16:59:15 -0500
Subject: [PATCH 0735/1208] TypesTest: make method order consistent with Types

---
 src/test/java/org/scijava/util/TypesTest.java | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 73ee6c320..1447913df 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -159,45 +159,6 @@ class Struct {
 		assertSame(HashMap.class, raw(Struct.class, "map"));
 	}
 
-	/** Tests {@link Types#component(Type)}. */
-	@Test
-	public void testComponent() {
-		@SuppressWarnings("unused")
-		class Struct {
-
-			private int[] intArray;
-			private double d;
-			private String[][] strings;
-			private Void v;
-			private List<String>[] list;
-			private HashMap<Integer, Float> map;
-		}
-		assertSame(int.class, componentType(Struct.class, "intArray"));
-		assertNull(componentType(Struct.class, "d"));
-		assertSame(String[].class, componentType(Struct.class, "strings"));
-		assertSame(null, componentType(Struct.class, "v"));
-		assertSame(List.class, componentType(Struct.class, "list"));
-		assertSame(null, componentType(Struct.class, "map"));
-	}
-
-	/** Tests {@link Types#type(Field, Class)}. */
-	@Test
-	public void testTypeField() {
-		final Field field = Types.field(Thing.class, "thing");
-
-		// T
-		final Type tType = Types.type(field, Thing.class);
-		assertEquals("capture of ?", tType.toString());
-
-		// N extends Number
-		final Type nType = Types.type(field, NumberThing.class);
-		assertEquals("capture of ?", nType.toString());
-
-		// Integer
-		final Type iType = Types.type(field, IntegerThing.class);
-		assertSame(Integer.class, iType);
-	}
-
 	/** Tests {@link Types#raws}. */
 	@Test
 	public void testRaws() {
@@ -246,6 +207,45 @@ public void testArray() {
 		catch (final IllegalArgumentException exc) { }
 	}
 
+	/** Tests {@link Types#component(Type)}. */
+	@Test
+	public void testComponent() {
+		@SuppressWarnings("unused")
+		class Struct {
+
+			private int[] intArray;
+			private double d;
+			private String[][] strings;
+			private Void v;
+			private List<String>[] list;
+			private HashMap<Integer, Float> map;
+		}
+		assertSame(int.class, componentType(Struct.class, "intArray"));
+		assertNull(componentType(Struct.class, "d"));
+		assertSame(String[].class, componentType(Struct.class, "strings"));
+		assertSame(null, componentType(Struct.class, "v"));
+		assertSame(List.class, componentType(Struct.class, "list"));
+		assertSame(null, componentType(Struct.class, "map"));
+	}
+
+	/** Tests {@link Types#type(Field, Class)}. */
+	@Test
+	public void testTypeField() {
+		final Field field = Types.field(Thing.class, "thing");
+
+		// T
+		final Type tType = Types.type(field, Thing.class);
+		assertEquals("capture of ?", tType.toString());
+
+		// N extends Number
+		final Type nType = Types.type(field, NumberThing.class);
+		assertEquals("capture of ?", nType.toString());
+
+		// Integer
+		final Type iType = Types.type(field, IntegerThing.class);
+		assertSame(Integer.class, iType);
+	}
+
 	/** Tests {@link Types#param}. */
 	@Test
 	public void testParam() {

From 43b5f3e6a1a289c3088ab362c229ce92a9321ba5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 17:04:16 -0500
Subject: [PATCH 0736/1208] TypesTest: add tests for Types.field

---
 src/test/java/org/scijava/util/TypesTest.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 1447913df..bf9948d12 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -35,11 +35,13 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.util.HashMap;
 import java.util.List;
 
@@ -180,6 +182,16 @@ public void testRaws() {
 			Serializable.class, Cloneable.class);
 	}
 
+	/** Tests {@link Types#field}. */
+	@Test
+	public void testField() {
+		final Field field = Types.field(Thing.class, "thing");
+		assertEquals("thing", field.getName());
+		assertSame(Object.class, field.getType());
+		assertTrue(field.getGenericType() instanceof TypeVariable);
+		assertEquals("T", ((TypeVariable<?>) field.getGenericType()).getName());
+	}
+
 	/** Tests {@link Types#array}. */
 	@Test
 	public void testArray() {

From ff499daa0a411a6e3d9896d09eb7f2c055e977b7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 21:51:41 -0500
Subject: [PATCH 0737/1208] ConversionUtils: fix whitespace

---
 src/main/java/org/scijava/util/ConversionUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 0beaaa3aa..cb5023a59 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -329,7 +329,7 @@ public static Class<?> getComponentClass(final Type type) {
 		return Types.raw(Types.component(type));
 	}
 
-//-- Helper methods --
+	//-- Helper methods --
 
 	/**
 	 * Gets the {@link Converter} to use for the given conversion request. If the

From 3f029c9e7cedef67ce940873867340d88e6cc9c9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 21:52:04 -0500
Subject: [PATCH 0738/1208] Types: eliminate GenTyRef use in component method

The implementation without it is simple enough.
---
 src/main/java/org/scijava/util/Types.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 63c0967c3..317a5bd94 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -374,7 +374,13 @@ public static Type array(final Type componentType) {
 	 * Gets the component type of the given array type, or null if not an array.
 	 */
 	public static Type component(final Type type) {
-		return GenericTypeReflector.getArrayComponentType(type);
+		if (type instanceof Class) {
+			return ((Class<?>) type).getComponentType();
+		}
+		if (type instanceof GenericArrayType) {
+			return ((GenericArrayType) type).getGenericComponentType();
+		}
+		return null;
 	}
 
 	/**

From 4e74d2b611d0b5eb4d7809bfc710eb1f01544bb4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 21:53:31 -0500
Subject: [PATCH 0739/1208] Migrate ConversionUtils.getNullValue to Types

---
 .../org/scijava/util/ConversionUtils.java     | 27 ++------
 src/main/java/org/scijava/util/Types.java     | 21 +++++++
 .../org/scijava/util/ConversionUtilsTest.java | 54 ----------------
 src/test/java/org/scijava/util/TypesTest.java | 63 +++++++++++++++++++
 4 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index cb5023a59..159135a07 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -218,27 +218,6 @@ public static <T> Class<T> getNonprimitiveType(final Class<T> type) {
 		return result;
 	}
 
-	/**
-	 * Gets the "null" value for the given type. For non-primitives, this will
-	 * actually be null. For primitives, it will be zero for numeric types, false
-	 * for boolean, and the null character for char.
-	 */
-	public static <T> T getNullValue(final Class<T> type) {
-		final Object defaultValue;
-		if (type == boolean.class) defaultValue = false;
-		else if (type == byte.class) defaultValue = (byte) 0;
-		else if (type == char.class) defaultValue = '\0';
-		else if (type == double.class) defaultValue = 0d;
-		else if (type == float.class) defaultValue = 0f;
-		else if (type == int.class) defaultValue = 0;
-		else if (type == long.class) defaultValue = 0L;
-		else if (type == short.class) defaultValue = (short) 0;
-		else defaultValue = null;
-		@SuppressWarnings("unchecked")
-		final T result = (T) defaultValue;
-		return result;
-	}
-
 	// -- ConvertService setter --
 
 	/**
@@ -329,6 +308,12 @@ public static Class<?> getComponentClass(final Type type) {
 		return Types.raw(Types.component(type));
 	}
 
+	/** @deprecated Use {@link Types#nullValue} instead. */
+	@Deprecated
+	public static <T> T getNullValue(final Class<T> type) {
+		return Types.nullValue(type);
+	}
+
 	//-- Helper methods --
 
 	/**
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 317a5bd94..536760bf0 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -307,6 +307,27 @@ public static boolean isText(final Class<?> type) {
 		return String.class.isAssignableFrom(type) || isCharacter(type);
 	}
 
+	/**
+	 * Gets the "null" value for the given type. For non-primitives, this will
+	 * actually be null. For primitives, it will be zero for numeric types, false
+	 * for boolean, and the null character for char.
+	 */
+	public static <T> T nullValue(final Class<T> type) {
+		final Object defaultValue;
+		if (type == boolean.class) defaultValue = false;
+		else if (type == byte.class) defaultValue = (byte) 0;
+		else if (type == char.class) defaultValue = '\0';
+		else if (type == double.class) defaultValue = 0d;
+		else if (type == float.class) defaultValue = 0f;
+		else if (type == int.class) defaultValue = 0;
+		else if (type == long.class) defaultValue = 0L;
+		else if (type == short.class) defaultValue = (short) 0;
+		else defaultValue = null;
+		@SuppressWarnings("unchecked")
+		final T result = (T) defaultValue;
+		return result;
+	}
+
 	public static Field field(final Class<?> c, final String name) {
 		if (c == null) throw new IllegalArgumentException("No such field: " + name);
 		try {
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index ba75dc26d..7846098ae 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -198,60 +198,6 @@ public void testGetNonprimitiveType() {
 		}
 	}
 
-	/** Tests {@link ConversionUtils#getNullValue(Class)}. */
-	@Test
-	public void testGetNullValue() {
-		final boolean booleanNull = ConversionUtils.getNullValue(boolean.class);
-		assertFalse(booleanNull);
-
-		final byte byteNull = ConversionUtils.getNullValue(byte.class);
-		assertEquals(0, byteNull);
-
-		final char charNull = ConversionUtils.getNullValue(char.class);
-		assertEquals('\0', charNull);
-
-		final double doubleNull = ConversionUtils.getNullValue(double.class);
-		assertEquals(0.0, doubleNull, 0.0);
-
-		final float floatNull = ConversionUtils.getNullValue(float.class);
-		assertEquals(0f, floatNull, 0f);
-
-		final int intNull = ConversionUtils.getNullValue(int.class);
-		assertEquals(0, intNull);
-
-		final long longNull = ConversionUtils.getNullValue(long.class);
-		assertEquals(0, longNull);
-
-		final short shortNull = ConversionUtils.getNullValue(short.class);
-		assertEquals(0, shortNull);
-
-		final Void voidNull = ConversionUtils.getNullValue(void.class);
-		assertNull(voidNull);
-
-		final Class<?>[] types = { //
-			Boolean.class, Byte.class, Character.class, Double.class, //
-				Float.class, Integer.class, Long.class, Short.class, //
-				Void.class, //
-				String.class, //
-				Number.class, BigInteger.class, BigDecimal.class, //
-				boolean[].class, byte[].class, char[].class, double[].class, //
-				float[].class, int[].class, long[].class, short[].class, //
-				Boolean[].class, Byte[].class, Character[].class, Double[].class, //
-				Float[].class, Integer[].class, Long[].class, Short[].class, //
-				Void[].class, //
-				Object.class, Object[].class, String[].class, //
-				Object[][].class, String[][].class, //
-				Collection.class, //
-				List.class, ArrayList.class, LinkedList.class, //
-				Set.class, HashSet.class, //
-				Map.class, HashMap.class, //
-				Collection[].class, List[].class, Set[].class, Map[].class };
-		for (final Class<?> c : types) {
-			final Object nullValue = ConversionUtils.getNullValue(c);
-			assertNull("Expected null for " + c.getName(), nullValue);
-		}
-	}
-
 	/**
 	 * Tests populating a primitive array.
 	 */
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index bf9948d12..3f7b3ab97 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -33,6 +33,7 @@
 package org.scijava.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -42,8 +43,16 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.junit.Test;
 
@@ -182,6 +191,60 @@ public void testRaws() {
 			Serializable.class, Cloneable.class);
 	}
 
+	/** Tests {@link Types#nullValue(Class)}. */
+	@Test
+	public void testNullValue() {
+		final boolean booleanNull = Types.nullValue(boolean.class);
+		assertFalse(booleanNull);
+
+		final byte byteNull = Types.nullValue(byte.class);
+		assertEquals(0, byteNull);
+
+		final char charNull = Types.nullValue(char.class);
+		assertEquals('\0', charNull);
+
+		final double doubleNull = Types.nullValue(double.class);
+		assertEquals(0.0, doubleNull, 0.0);
+
+		final float floatNull = Types.nullValue(float.class);
+		assertEquals(0f, floatNull, 0f);
+
+		final int intNull = Types.nullValue(int.class);
+		assertEquals(0, intNull);
+
+		final long longNull = Types.nullValue(long.class);
+		assertEquals(0, longNull);
+
+		final short shortNull = Types.nullValue(short.class);
+		assertEquals(0, shortNull);
+
+		final Void voidNull = Types.nullValue(void.class);
+		assertNull(voidNull);
+
+		final Class<?>[] types = { //
+			Boolean.class, Byte.class, Character.class, Double.class, //
+			Float.class, Integer.class, Long.class, Short.class, //
+			Void.class, //
+			String.class, //
+			Number.class, BigInteger.class, BigDecimal.class, //
+			boolean[].class, byte[].class, char[].class, double[].class, //
+			float[].class, int[].class, long[].class, short[].class, //
+			Boolean[].class, Byte[].class, Character[].class, Double[].class, //
+			Float[].class, Integer[].class, Long[].class, Short[].class, //
+			Void[].class, //
+			Object.class, Object[].class, String[].class, //
+			Object[][].class, String[][].class, //
+			Collection.class, //
+			List.class, ArrayList.class, LinkedList.class, //
+			Set.class, HashSet.class, //
+			Map.class, HashMap.class, //
+			Collection[].class, List[].class, Set[].class, Map[].class };
+		for (final Class<?> c : types) {
+			final Object nullValue = Types.nullValue(c);
+			assertNull("Expected null for " + c.getName(), nullValue);
+		}
+	}
+
 	/** Tests {@link Types#field}. */
 	@Test
 	public void testField() {

From 23404d52c2774d7779e57e38a0f6e8a2f79ded01 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 21:54:22 -0500
Subject: [PATCH 0740/1208] Types: tweak formatting

---
 src/main/java/org/scijava/util/Types.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 536760bf0..232415f60 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -460,8 +460,8 @@ public static Type returnType(final Method method, final Class<?> type) {
 	 * </p>
 	 */
 	public static Type param(final Type type, final Class<?> c, final int no) {
-		return GenericTypeReflector.getTypeParameter(type, c
-			.getTypeParameters()[no]);
+		return GenericTypeReflector.getTypeParameter(type, //
+			c.getTypeParameters()[no]);
 	}
 
 	/**

From d664a14c0d8989a7e230dbd91a8d553f72aff30e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 22:09:23 -0500
Subject: [PATCH 0741/1208] Migrate more ConversionUtils method to Types

Specifically, the following methods moved:

* ConversionUtils.getNonprimitiveType -> Types.box
* ConversionUtils.getPrimitiveType -> Types.unbox

And the unit tests for getNonprimitiveType moved as well, of course.
Unit tests for Types.box do not yet exist.
---
 .../org/scijava/util/ConversionUtils.java     | 86 +++----------------
 src/main/java/org/scijava/util/Types.java     | 70 +++++++++++++++
 .../org/scijava/util/ConversionUtilsTest.java | 63 --------------
 src/test/java/org/scijava/util/TypesTest.java | 54 ++++++++++++
 4 files changed, 136 insertions(+), 137 deletions(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 159135a07..fc281541b 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -144,80 +144,6 @@ public static boolean canCast(final Object src, final Class<?> dest) {
 		return src == null || canCast(src.getClass(), dest);
 	}
 
-	/**
-	 * Returns the primitive {@link Class} closest to the given type.
-	 * <p>
-	 * Specifically, the following type conversions are done:
-	 * </p>
-	 * <ul>
-	 * <li>Boolean.class becomes boolean.class</li>
-	 * <li>Byte.class becomes byte.class</li>
-	 * <li>Character.class becomes char.class</li>
-	 * <li>Double.class becomes double.class</li>
-	 * <li>Float.class becomes float.class</li>
-	 * <li>Integer.class becomes int.class</li>
-	 * <li>Long.class becomes long.class</li>
-	 * <li>Short.class becomes short.class</li>
-	 * <li>Void.class becomes void.class</li>
-	 * </ul>
-	 * <p>
-	 * All other types are unchanged.
-	 * </p>
-	 */
-	public static <T> Class<T> getPrimitiveType(final Class<T> type) {
-		final Class<?> destType;
-		if (type == Boolean.class) destType = boolean.class;
-		else if (type == Byte.class) destType = byte.class;
-		else if (type == Character.class) destType = char.class;
-		else if (type == Double.class) destType = double.class;
-		else if (type == Float.class) destType = float.class;
-		else if (type == Integer.class) destType = int.class;
-		else if (type == Long.class) destType = long.class;
-		else if (type == Short.class) destType = short.class;
-		else if (type == Void.class) destType = void.class;
-		else destType = type;
-		@SuppressWarnings("unchecked")
-		final Class<T> result = (Class<T>) destType;
-		return result;
-	}
-
-	/**
-	 * Returns the non-primitive {@link Class} closest to the given type.
-	 * <p>
-	 * Specifically, the following type conversions are done:
-	 * </p>
-	 * <ul>
-	 * <li>boolean.class becomes Boolean.class</li>
-	 * <li>byte.class becomes Byte.class</li>
-	 * <li>char.class becomes Character.class</li>
-	 * <li>double.class becomes Double.class</li>
-	 * <li>float.class becomes Float.class</li>
-	 * <li>int.class becomes Integer.class</li>
-	 * <li>long.class becomes Long.class</li>
-	 * <li>short.class becomes Short.class</li>
-	 * <li>void.class becomes Void.class</li>
-	 * </ul>
-	 * <p>
-	 * All other types are unchanged.
-	 * </p>
-	 */
-	public static <T> Class<T> getNonprimitiveType(final Class<T> type) {
-		final Class<?> destType;
-		if (type == boolean.class) destType = Boolean.class;
-		else if (type == byte.class) destType = Byte.class;
-		else if (type == char.class) destType = Character.class;
-		else if (type == double.class) destType = Double.class;
-		else if (type == float.class) destType = Float.class;
-		else if (type == int.class) destType = Integer.class;
-		else if (type == long.class) destType = Long.class;
-		else if (type == short.class) destType = Short.class;
-		else if (type == void.class) destType = Void.class;
-		else destType = type;
-		@SuppressWarnings("unchecked")
-		final Class<T> result = (Class<T>) destType;
-		return result;
-	}
-
 	// -- ConvertService setter --
 
 	/**
@@ -308,6 +234,18 @@ public static Class<?> getComponentClass(final Type type) {
 		return Types.raw(Types.component(type));
 	}
 
+	/** @deprecated use {@link Types#unbox} */
+	@Deprecated
+	public static <T> Class<T> getPrimitiveType(final Class<T> type) {
+		return Types.unbox(type);
+	}
+
+	/** @deprecated use {@link Types#box} */
+	@Deprecated
+	public static <T> Class<T> getNonprimitiveType(final Class<T> type) {
+		return Types.box(type);
+	}
+
 	/** @deprecated Use {@link Types#nullValue} instead. */
 	@Deprecated
 	public static <T> T getNullValue(final Class<T> type) {
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 232415f60..6a684cfb5 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -307,6 +307,76 @@ public static boolean isText(final Class<?> type) {
 		return String.class.isAssignableFrom(type) || isCharacter(type);
 	}
 
+	/**
+	 * Returns the non-primitive {@link Class} closest to the given type.
+	 * <p>
+	 * Specifically, the following type conversions are done:
+	 * <ul>
+	 * <li>boolean.class becomes Boolean.class</li>
+	 * <li>byte.class becomes Byte.class</li>
+	 * <li>char.class becomes Character.class</li>
+	 * <li>double.class becomes Double.class</li>
+	 * <li>float.class becomes Float.class</li>
+	 * <li>int.class becomes Integer.class</li>
+	 * <li>long.class becomes Long.class</li>
+	 * <li>short.class becomes Short.class</li>
+	 * <li>void.class becomes Void.class</li>
+	 * </ul>
+	 * All other types are unchanged.
+	 * </p>
+	 */
+	public static <T> Class<T> box(final Class<T> type) {
+		final Class<?> destType;
+		if (type == boolean.class) destType = Boolean.class;
+		else if (type == byte.class) destType = Byte.class;
+		else if (type == char.class) destType = Character.class;
+		else if (type == double.class) destType = Double.class;
+		else if (type == float.class) destType = Float.class;
+		else if (type == int.class) destType = Integer.class;
+		else if (type == long.class) destType = Long.class;
+		else if (type == short.class) destType = Short.class;
+		else if (type == void.class) destType = Void.class;
+		else destType = type;
+		@SuppressWarnings("unchecked")
+		final Class<T> result = (Class<T>) destType;
+		return result;
+	}
+
+	/**
+	 * Returns the primitive {@link Class} closest to the given type.
+	 * <p>
+	 * Specifically, the following type conversions are done:
+	 * <ul>
+	 * <li>Boolean.class becomes boolean.class</li>
+	 * <li>Byte.class becomes byte.class</li>
+	 * <li>Character.class becomes char.class</li>
+	 * <li>Double.class becomes double.class</li>
+	 * <li>Float.class becomes float.class</li>
+	 * <li>Integer.class becomes int.class</li>
+	 * <li>Long.class becomes long.class</li>
+	 * <li>Short.class becomes short.class</li>
+	 * <li>Void.class becomes void.class</li>
+	 * </ul>
+	 * All other types are unchanged.
+	 * </p>
+	 */
+	public static <T> Class<T> unbox(final Class<T> type) {
+		final Class<?> destType;
+		if (type == Boolean.class) destType = boolean.class;
+		else if (type == Byte.class) destType = byte.class;
+		else if (type == Character.class) destType = char.class;
+		else if (type == Double.class) destType = double.class;
+		else if (type == Float.class) destType = float.class;
+		else if (type == Integer.class) destType = int.class;
+		else if (type == Long.class) destType = long.class;
+		else if (type == Short.class) destType = short.class;
+		else if (type == Void.class) destType = void.class;
+		else destType = type;
+		@SuppressWarnings("unchecked")
+		final Class<T> result = (Class<T>) destType;
+		return result;
+	}
+
 	/**
 	 * Gets the "null" value for the given type. For non-primitives, this will
 	 * actually be null. For primitives, it will be zero for numeric types, false
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 7846098ae..86010a030 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -135,69 +135,6 @@ public void testConvertToEnum() {
 		assertNull(notAnEnum);
 	}
 
-	/** Tests {@link ConversionUtils#getNonprimitiveType(Class)}. */
-	@Test
-	public void testGetNonprimitiveType() {
-		final Class<Boolean> booleanType =
-			ConversionUtils.getNonprimitiveType(boolean.class);
-		assertSame(Boolean.class, booleanType);
-
-		final Class<Byte> byteType =
-			ConversionUtils.getNonprimitiveType(byte.class);
-		assertSame(Byte.class, byteType);
-
-		final Class<Character> charType =
-			ConversionUtils.getNonprimitiveType(char.class);
-		assertSame(Character.class, charType);
-
-		final Class<Double> doubleType =
-			ConversionUtils.getNonprimitiveType(double.class);
-		assertSame(Double.class, doubleType);
-
-		final Class<Float> floatType =
-			ConversionUtils.getNonprimitiveType(float.class);
-		assertSame(Float.class, floatType);
-
-		final Class<Integer> intType =
-			ConversionUtils.getNonprimitiveType(int.class);
-		assertSame(Integer.class, intType);
-
-		final Class<Long> longType =
-			ConversionUtils.getNonprimitiveType(long.class);
-		assertSame(Long.class, longType);
-
-		final Class<Short> shortType =
-			ConversionUtils.getNonprimitiveType(short.class);
-		assertSame(Short.class, shortType);
-
-		final Class<Void> voidType =
-			ConversionUtils.getNonprimitiveType(void.class);
-		assertSame(Void.class, voidType);
-
-		final Class<?>[] types = { //
-			Boolean.class, Byte.class, Character.class, Double.class, //
-				Float.class, Integer.class, Long.class, Short.class, //
-				Void.class, //
-				String.class, //
-				Number.class, BigInteger.class, BigDecimal.class, //
-				boolean[].class, byte[].class, char[].class, double[].class, //
-				float[].class, int[].class, long[].class, short[].class, //
-				Boolean[].class, Byte[].class, Character[].class, Double[].class, //
-				Float[].class, Integer[].class, Long[].class, Short[].class, //
-				Void[].class, //
-				Object.class, Object[].class, String[].class, //
-				Object[][].class, String[][].class, //
-				Collection.class, //
-				List.class, ArrayList.class, LinkedList.class, //
-				Set.class, HashSet.class, //
-				Map.class, HashMap.class, //
-				Collection[].class, List[].class, Set[].class, Map[].class };
-		for (final Class<?> c : types) {
-			final Class<?> type = ConversionUtils.getNonprimitiveType(c);
-			assertSame(c, type);
-		}
-	}
-
 	/**
 	 * Tests populating a primitive array.
 	 */
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 3f7b3ab97..5d9f6ab05 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -191,6 +191,60 @@ public void testRaws() {
 			Serializable.class, Cloneable.class);
 	}
 
+	/** Tests {@link Types#box(Class)}. */
+	@Test
+	public void testBox() {
+		final Class<Boolean> booleanType = Types.box(boolean.class);
+		assertSame(Boolean.class, booleanType);
+
+		final Class<Byte> byteType = Types.box(byte.class);
+		assertSame(Byte.class, byteType);
+
+		final Class<Character> charType = Types.box(char.class);
+		assertSame(Character.class, charType);
+
+		final Class<Double> doubleType = Types.box(double.class);
+		assertSame(Double.class, doubleType);
+
+		final Class<Float> floatType = Types.box(float.class);
+		assertSame(Float.class, floatType);
+
+		final Class<Integer> intType = Types.box(int.class);
+		assertSame(Integer.class, intType);
+
+		final Class<Long> longType = Types.box(long.class);
+		assertSame(Long.class, longType);
+
+		final Class<Short> shortType = Types.box(short.class);
+		assertSame(Short.class, shortType);
+
+		final Class<Void> voidType = Types.box(void.class);
+		assertSame(Void.class, voidType);
+
+		final Class<?>[] types = { //
+			Boolean.class, Byte.class, Character.class, Double.class, //
+				Float.class, Integer.class, Long.class, Short.class, //
+				Void.class, //
+				String.class, //
+				Number.class, BigInteger.class, BigDecimal.class, //
+				boolean[].class, byte[].class, char[].class, double[].class, //
+				float[].class, int[].class, long[].class, short[].class, //
+				Boolean[].class, Byte[].class, Character[].class, Double[].class, //
+				Float[].class, Integer[].class, Long[].class, Short[].class, //
+				Void[].class, //
+				Object.class, Object[].class, String[].class, //
+				Object[][].class, String[][].class, //
+				Collection.class, //
+				List.class, ArrayList.class, LinkedList.class, //
+				Set.class, HashSet.class, //
+				Map.class, HashMap.class, //
+				Collection[].class, List[].class, Set[].class, Map[].class };
+		for (final Class<?> c : types) {
+			final Class<?> type = Types.box(c);
+			assertSame(c, type);
+		}
+	}
+
 	/** Tests {@link Types#nullValue(Class)}. */
 	@Test
 	public void testNullValue() {

From 38b1e3a9b410febe515cac2779319c5d5eac59df Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 22:10:54 -0500
Subject: [PATCH 0742/1208] ConversionUtilsTest: remove unused imports

---
 src/test/java/org/scijava/util/ConversionUtilsTest.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 86010a030..e11d74fd9 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -39,15 +39,10 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 

From ec2e7c1cb45f98eb27d344fb4150750456715836 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 22:16:33 -0500
Subject: [PATCH 0743/1208] Stop using deprecated ConversionUtils methods

There is now the Types utility class instead.
---
 src/main/java/org/scijava/command/CommandModuleItem.java | 2 +-
 src/main/java/org/scijava/convert/AbstractConverter.java | 4 ++--
 src/main/java/org/scijava/convert/DefaultConverter.java  | 9 ++++-----
 src/main/java/org/scijava/convert/NullConverter.java     | 4 ++--
 .../org/scijava/convert/NumberToNumberConverter.java     | 4 ++--
 src/main/java/org/scijava/module/AbstractModuleInfo.java | 3 ++-
 .../scijava/module/process/DefaultValuePreprocessor.java | 4 ++--
 .../scijava/module/process/LoadInputsPreprocessor.java   | 4 ++--
 src/main/java/org/scijava/util/ClassUtils.java           | 8 ++++----
 src/main/java/org/scijava/util/Types.java                | 4 +---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 4 ++--
 .../scijava/convert/AbstractNumberConverterTests.java    | 5 ++---
 12 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index f186743a2..a3763475b 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -253,7 +253,7 @@ private T tValue(final String value) {
 
 	private <D> D tValue(final String value, final Class<D> type) {
 		if (value == null || value.isEmpty()) return null;
-		final Class<D> saneType = ConversionUtils.getNonprimitiveType(type);
+		final Class<D> saneType = Types.box(type);
 		return ConversionUtils.convert(value, saneType);
 	}
 
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index f7a072ab9..5b27469a1 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -109,8 +109,8 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
-		final Class<?> saneSrc = ConversionUtils.getNonprimitiveType(src);
-		final Class<?> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		final Class<?> saneSrc = Types.box(src);
+		final Class<?> saneDest = Types.box(dest);
 		return ConversionUtils.canCast(saneSrc, getInputType()) &&
 			ConversionUtils.canCast(getOutputType(), saneDest);
 	}
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 211e85b92..4ca4e3c99 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -97,7 +97,7 @@ public Object convert(final Object src, final Type dest) {
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		// ensure type is well-behaved, rather than a primitive type
-		final Class<T> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		final Class<T> saneDest = Types.box(dest);
 
 		// Handle array types
 		if (isArray(dest)) {
@@ -153,7 +153,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 			final String s = (String) src;
 			if (s.isEmpty()) {
 				// return null for empty strings
-				return ConversionUtils.getNullValue(dest);
+				return Types.nullValue(dest);
 			}
 
 			// use first character when converting to Character
@@ -310,11 +310,10 @@ public boolean canConvert(final Class<?> src, final Type dest) {
 	@Deprecated
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		// ensure type is well-behaved, rather than a primitive type
-		final Class<?> saneDest = ConversionUtils.getNonprimitiveType(dest);
+		final Class<?> saneDest = Types.box(dest);
 
 		// OK for numerical conversions
-		if (ConversionUtils.canCast(ConversionUtils.getNonprimitiveType(src),
-			Number.class) &&
+		if (ConversionUtils.canCast(Types.box(src), Number.class) &&
 			(ClassUtils.isByte(dest) || ClassUtils.isDouble(dest) ||
 					ClassUtils.isFloat(dest) || ClassUtils.isInteger(dest) ||
 					ClassUtils.isLong(dest) || ClassUtils.isShort(dest)))
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 72cf1de30..cc3977d8a 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -36,7 +36,7 @@
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * {@link Converter} implementation for handling {@code null} values. Performs
@@ -83,7 +83,7 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		if (dest == null) return null;
-		if (src == null) return ConversionUtils.getNullValue(dest);
+		if (src == null) return Types.nullValue(dest);
 
 		throw new IllegalArgumentException("Attempting non-null conversion: " +
 			src + " > " + dest + " using NullConverter.");
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index e74049a25..31e3358e6 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -32,7 +32,7 @@
 
 package org.scijava.convert;
 
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * Converts numbers to numbers, and throws IllegalArgumentException for null or
@@ -53,7 +53,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 				getInputType().getSimpleName() + ", but got " +
 				src.getClass().getSimpleName());
 		}
-		if (ConversionUtils.getNonprimitiveType(dest) != getOutputType()) {
+		if (Types.box(dest) != getOutputType()) {
 			throw new IllegalArgumentException(
 				"Expected output class of " + getOutputType().getSimpleName() +
 				", but got " + dest.getSimpleName());
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 87d792c96..2a00c6296 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -40,6 +40,7 @@
 
 import org.scijava.AbstractUIDetails;
 import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * Abstract superclass of {@link ModuleInfo} implementation.
@@ -168,7 +169,7 @@ private <T> ModuleItem<T> castItem(final ModuleItem<?> item,
 	{
 		final Class<?> itemType = item.getType();
 		// if (!type.isAssignableFrom(itemType)) {
-		final Class<?> saneItemType = ConversionUtils.getNonprimitiveType(itemType);
+		final Class<?> saneItemType = Types.box(itemType);
 		if (!ConversionUtils.canCast(type, saneItemType)) {
 			throw new IllegalArgumentException("Type " + type.getName() +
 				" is incompatible with item of type " + itemType.getName());
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 6044444b2..cc0d1f7d5 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -40,7 +40,7 @@
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * A preprocessor plugin that populates default parameter values.
@@ -74,7 +74,7 @@ private <T> void assignDefaultValue(final Module module,
 		final ModuleItem<T> item)
 	{
 		if (module.isInputResolved(item.getName())) return;
-		final T nullValue = ConversionUtils.getNullValue(item.getType());
+		final T nullValue = Types.nullValue(item.getType());
 		if (!Objects.equals(item.getValue(module), nullValue)) return;
 		final T defaultValue = moduleService.getDefaultValue(item);
 		if (defaultValue == null) return;
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index c9d1632b9..d44d96133 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -38,7 +38,7 @@
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 import org.scijava.widget.InputHarvester;
 
 /**
@@ -93,7 +93,7 @@ private <T> T getBestValue(final Object prefValue,
 		if (defaultValue != null) {
 			return conversionService.convert(defaultValue, type);
 		}
-		return ConversionUtils.getNullValue(type);
+		return Types.nullValue(type);
 	}
 
 }
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 4d016699f..6bddc03c0 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -683,16 +683,16 @@ public static boolean canCast(final Object obj, final Class<?> type) {
 		return ConversionUtils.canCast(obj, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#getNonprimitiveType(Class)} */
+	/** @deprecated use {@link Types#box(Class)} */
 	@Deprecated
 	public static <T> Class<T> getNonprimitiveType(final Class<T> type) {
-		return ConversionUtils.getNonprimitiveType(type);
+		return Types.box(type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#getNullValue(Class)} */
+	/** @deprecated use {@link Types#nullValue(Class)} */
 	@Deprecated
 	public static <T> T getNullValue(final Class<T> type) {
-		return ConversionUtils.getNullValue(type);
+		return Types.nullValue(type);
 	}
 
 	/**
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 6a684cfb5..484a35103 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -59,8 +59,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.scijava.util.ConversionUtils;
-
 /**
  * Utility class for working with generic types, fields and methods.
  * <p>
@@ -1647,7 +1645,7 @@ private static Map<TypeVariable<?>, Type> getTypeArguments(Class<?> cls,
 				}
 
 				// work with wrapper the wrapper class instead of the primitive
-				cls = ConversionUtils.getNonprimitiveType(cls);
+				cls = Types.box(cls);
 			}
 
 			// create a copy of the incoming map, or an empty one if it's null
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 7650b1065..1c86d472e 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -50,8 +50,8 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.ClassUtils;
-import org.scijava.util.ConversionUtils;
 import org.scijava.util.NumberUtils;
+import org.scijava.util.Types;
 
 /**
  * The backing data model for a particular {@link InputWidget}.
@@ -335,7 +335,7 @@ private Object ensureValid(final Object value, final List<?> list) {
 	/** Converts the given object to a number matching the input type. */
 	private Number toNumber(final Object value) {
 		final Class<?> type = item.getType();
-		final Class<?> saneType = ConversionUtils.getNonprimitiveType(type);
+		final Class<?> saneType = Types.box(type);
 		return NumberUtils.toNumber(value, saneType);
 	}
 
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 82fb0812b..99505256c 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -38,7 +38,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.scijava.util.ConversionUtils;
+import org.scijava.util.Types;
 
 /**
  * Tests converter plugins that convert from primitive numeric types to other
@@ -80,8 +80,7 @@ public void testWrapper() {
 	public void testPrimitive() {
 		final Number src = getSrc();
 		final Number expect = getExpectedValue();
-		assertEquals(expect, converter.convert(src, ConversionUtils
-			.getPrimitiveType(destType)));
+		assertEquals(expect, converter.convert(src, Types.unbox(destType)));
 	}
 
 	/**

From f8875f58e69bd3c13af8e83dd722a60e5501b611 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 22:20:49 -0500
Subject: [PATCH 0744/1208] Stop using deprecated ClassUtils methods

There is now the Types utility class instead.
---
 .../java/org/scijava/command/CommandInfo.java |  4 +--
 .../org/scijava/convert/DefaultConverter.java |  8 +++---
 .../scijava/module/AbstractModuleItem.java    |  4 +--
 .../java/org/scijava/util/NumberUtils.java    | 26 ++++++++++---------
 .../scijava/widget/DefaultWidgetModel.java    |  9 +++----
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 2efbe2c38..4acc3f163 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -57,6 +57,7 @@
 import org.scijava.plugin.PluginInfo;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.StringMaker;
+import org.scijava.util.Types;
 
 /**
  * A collection of metadata about a particular {@link Command}.
@@ -502,8 +503,7 @@ private void checkFields(final Class<?> type) {
 	private boolean isImmutable(final Class<?> type) {
 		// NB: All eight primitive types, as well as the boxed primitive
 		// wrapper classes, as well as strings, are immutable objects.
-		return ClassUtils.isNumber(type) || ClassUtils.isText(type) ||
-			ClassUtils.isBoolean(type);
+		return Types.isNumber(type) || Types.isText(type) || Types.isBoolean(type);
 	}
 
 	private Class<?> loadCommandClass() {
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 4ca4e3c99..f81eaca78 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -46,7 +46,6 @@
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.ConversionUtils;
 import org.scijava.util.Types;
 
@@ -313,10 +312,9 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		final Class<?> saneDest = Types.box(dest);
 
 		// OK for numerical conversions
-		if (ConversionUtils.canCast(Types.box(src), Number.class) &&
-			(ClassUtils.isByte(dest) || ClassUtils.isDouble(dest) ||
-					ClassUtils.isFloat(dest) || ClassUtils.isInteger(dest) ||
-					ClassUtils.isLong(dest) || ClassUtils.isShort(dest)))
+		if (ConversionUtils.canCast(Types.box(src), Number.class) && //
+			(Types.isByte(dest) || Types.isDouble(dest) || Types.isFloat(dest) ||
+				Types.isInteger(dest) || Types.isLong(dest) || Types.isShort(dest)))
 		{
 			return true;
 		}
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index c58024cda..3f881b944 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -39,11 +39,11 @@
 import org.scijava.AbstractBasicDetails;
 import org.scijava.ItemIO;
 import org.scijava.ItemVisibility;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.ConversionUtils;
 import org.scijava.util.NumberUtils;
 import org.scijava.util.Prefs;
 import org.scijava.util.StringMaker;
+import org.scijava.util.Types;
 
 /**
  * Abstract superclass of {@link ModuleItem} implementations.
@@ -264,7 +264,7 @@ public T getSoftMaximum() {
 
 	@Override
 	public Number getStepSize() {
-		if (!ClassUtils.isNumber(getType())) return null;
+		if (!Types.isNumber(getType())) return null;
 		return NumberUtils.toNumber("1", getType());
 	}
 
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 4f7aa6cac..f68e5ade1 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -35,6 +35,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.scijava.util.Types;
+
 
 /**
  * Useful methods for working with {@link Number} objects.
@@ -73,22 +75,22 @@ public static BigInteger asBigInteger(final Number n) {
 	}
 
 	public static Number getMinimumNumber(final Class<?> type) {
-		if (ClassUtils.isByte(type)) return Byte.MIN_VALUE;
-		if (ClassUtils.isShort(type)) return Short.MIN_VALUE;
-		if (ClassUtils.isInteger(type)) return Integer.MIN_VALUE;
-		if (ClassUtils.isLong(type)) return Long.MIN_VALUE;
-		if (ClassUtils.isFloat(type)) return -Float.MAX_VALUE;
-		if (ClassUtils.isDouble(type)) return -Double.MAX_VALUE;
+		if (Types.isByte(type)) return Byte.MIN_VALUE;
+		if (Types.isShort(type)) return Short.MIN_VALUE;
+		if (Types.isInteger(type)) return Integer.MIN_VALUE;
+		if (Types.isLong(type)) return Long.MIN_VALUE;
+		if (Types.isFloat(type)) return -Float.MAX_VALUE;
+		if (Types.isDouble(type)) return -Double.MAX_VALUE;
 		return null;
 	}
 
 	public static Number getMaximumNumber(final Class<?> type) {
-		if (ClassUtils.isByte(type)) return Byte.MAX_VALUE;
-		if (ClassUtils.isShort(type)) return Short.MAX_VALUE;
-		if (ClassUtils.isInteger(type)) return Integer.MAX_VALUE;
-		if (ClassUtils.isLong(type)) return Long.MAX_VALUE;
-		if (ClassUtils.isFloat(type)) return Float.MAX_VALUE;
-		if (ClassUtils.isDouble(type)) return Double.MAX_VALUE;
+		if (Types.isByte(type)) return Byte.MAX_VALUE;
+		if (Types.isShort(type)) return Short.MAX_VALUE;
+		if (Types.isInteger(type)) return Integer.MAX_VALUE;
+		if (Types.isLong(type)) return Long.MAX_VALUE;
+		if (Types.isFloat(type)) return Float.MAX_VALUE;
+		if (Types.isDouble(type)) return Double.MAX_VALUE;
 		return null;
 	}
 
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 1c86d472e..b11012be1 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -49,7 +49,6 @@
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.thread.ThreadService;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.NumberUtils;
 import org.scijava.util.Types;
 
@@ -253,22 +252,22 @@ public boolean isMessage() {
 
 	@Override
 	public boolean isText() {
-		return ClassUtils.isText(getItem().getType());
+		return Types.isText(getItem().getType());
 	}
 
 	@Override
 	public boolean isCharacter() {
-		return ClassUtils.isCharacter(getItem().getType());
+		return Types.isCharacter(getItem().getType());
 	}
 
 	@Override
 	public boolean isNumber() {
-		return ClassUtils.isNumber(getItem().getType());
+		return Types.isNumber(getItem().getType());
 	}
 
 	@Override
 	public boolean isBoolean() {
-		return ClassUtils.isBoolean(getItem().getType());
+		return Types.isBoolean(getItem().getType());
 	}
 
 	@Override

From 4aefc55a6fedad3a2ee585d9b117ef1ac5eccbc1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 22:35:21 -0500
Subject: [PATCH 0745/1208] Migrate casting ConversionUtils methods to Types

The following methods moved:

* ConversionUtils#canAssign(Class, Class) -> Types.isAssignable(Type, Type)
* ConversionUtils#canCast(Class, Class) -> Types.isAssignable(Type, Type)
* ConversionUtils#canAssign(Object, Class) -> Types.isInstance(Object, Class)
* ConversionUtils#canCast(Object, Class) -> Types.isInstance(Object, Class)
* ConversionUtils#cast(Object, Class) -> Types.cast(Object, class)

Note that Types.isAssignable(Type, Type) already existed; this migration
simply deprecates the ConversionUtils method and moves the unit tests.

This also changes Types.isAssignable to throw NullPointerException
if a null destination type is given, since it never makes sense to
cast from anything to a null type.
---
 .../org/scijava/util/ConversionUtils.java     | 99 ++++++++-----------
 src/main/java/org/scijava/util/Types.java     | 28 ++++++
 .../org/scijava/util/ConversionUtilsTest.java | 57 -----------
 src/test/java/org/scijava/util/TypesTest.java | 73 ++++++++++++++
 4 files changed, 140 insertions(+), 117 deletions(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index fc281541b..39914b1b5 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -87,63 +87,6 @@ public static <T> T convertToEnum(final String src, final Class<T> dest) {
 		}
 	}
 
-	/**
-	 * Casts the given object to the specified type, or null if the types are
-	 * incompatible.
-	 */
-	public static <T> T cast(final Object src, final Class<T> dest) {
-		if (!canCast(src, dest)) return null;
-		@SuppressWarnings("unchecked")
-		final T result = (T) src;
-		return result;
-	}
-
-	/**
-	 * Checks whether objects of the given class can be assigned to the specified
-	 * type. Unlike {@link Class#isAssignableFrom(Class)}, this method considers
-	 * auto-unboxing.
-	 * 
-	 * @return true If the destination class is assignable from the source one, or
-	 *         if the source class is null and destination class is non-null.
-	 */
-	public static boolean canAssign(final Class<?> src, final Class<?> dest) {
-		return canCast(src, dest);
-	}
-
-	/**
-	 * Checks whether the given object can be assigned to the specified type.
-	 * Unlike {@link Class#isAssignableFrom(Class)}, this method considers
-	 * auto-unboxing.
-	 * 
-	 * @return true If the destination class is assignable from the source
-	 *         object's class, or if the source object is null and destionation
-	 *         class is non-null.
-	 */
-	public static boolean canAssign(final Object src, final Class<?> dest) {
-		return canCast(src, dest);
-	}
-
-	/**
-	 * @deprecated use {@link #canAssign(Class, Class)} instead
-	 */
-	@Deprecated
-	public static boolean canCast(final Class<?> src, final Class<?> dest) {
-		if (dest == null) return false;
-		if (src == null) return true;
-		final Class<?> saneSrc = getNonprimitiveType(src);
-		final Class<?> saneDest = getNonprimitiveType(dest);
-		return saneDest.isAssignableFrom(saneSrc);
-	}
-
-	/**
-	 * @deprecated use {@link #canAssign(Object, Class)} instead
-	 */
-	@Deprecated
-	public static boolean canCast(final Object src, final Class<?> dest) {
-		if (dest == null) return false;
-		return src == null || canCast(src.getClass(), dest);
-	}
-
 	// -- ConvertService setter --
 
 	/**
@@ -152,8 +95,8 @@ public static boolean canCast(final Object src, final Class<?> dest) {
 	public static void setDelegateService(final ConvertService convertService,
 		final double priority)
 	{
-		if (ConversionUtils.convertService == null ||
-			Double.compare(priority, servicePriority) > 0)
+		if (ConversionUtils.convertService == null || Double.compare(priority,
+			servicePriority) > 0)
 		{
 			ConversionUtils.convertService = convertService;
 			servicePriority = priority;
@@ -228,6 +171,42 @@ public static Class<?> getClass(final Type type) {
 		return Types.raw(type);
 	}
 
+	/** @deprecated use {@link Types#cast} */
+	@Deprecated
+	public static <T> T cast(final Object src, final Class<T> dest) {
+		if (!canCast(src, dest)) return null;
+		@SuppressWarnings("unchecked")
+		final T result = (T) src;
+		return result;
+	}
+
+	/** @deprecated use {@link Types#isAssignable} */
+	@Deprecated
+	public static boolean canAssign(final Class<?> src, final Class<?> dest) {
+		return canCast(src, dest);
+	}
+
+	/** @deprecated use {@link Types#isInstance} */
+	@Deprecated
+	public static boolean canAssign(final Object src, final Class<?> dest) {
+		return canCast(src, dest);
+	}
+
+	/** @deprecated use {@link Types#isAssignable} */
+	@Deprecated
+	public static boolean canCast(final Class<?> src, final Class<?> dest) {
+		if (dest == null) return false;
+		if (src == null) return true;
+		return Types.isAssignable(Types.box(src), Types.box(dest));
+	}
+
+	/** @deprecated use {@link Types#isInstance} */
+	@Deprecated
+	public static boolean canCast(final Object src, final Class<?> dest) {
+		if (dest == null) return false;
+		return src == null || canCast(src.getClass(), dest);
+	}
+
 	/** @deprecated use {@link Types#raws} and {@link Types#component} */
 	@Deprecated
 	public static Class<?> getComponentClass(final Type type) {
@@ -252,7 +231,7 @@ public static <T> T getNullValue(final Class<T> type) {
 		return Types.nullValue(type);
 	}
 
-	//-- Helper methods --
+	// -- Helper methods --
 
 	/**
 	 * Gets the {@link Converter} to use for the given conversion request. If the
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 484a35103..ac97f6c25 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -546,6 +546,30 @@ public static boolean isAssignable(final Type source, final Type target) {
 		return TypeUtils.isAssignable(source, target);
 	}
 
+	/**
+	 * Checks whether the given object can be cast to the specified type.
+	 *
+	 * @return true If the destination class is assignable from the source
+	 *         object's class, or if the source object is null and destination
+	 *         class is non-null.
+	 * @see #cast(Object, Class)
+	 */
+	public static boolean isInstance(final Object obj, final Class<?> dest) {
+		if (dest == null) return false;
+		return obj == null || dest.isInstance(obj);
+	}
+
+	/**
+	 * Casts the given object to the specified type, or null if the types are
+	 * incompatible.
+	 */
+	public static <T> T cast(final Object src, final Class<T> dest) {
+		if (!isInstance(src, dest)) return null;
+		@SuppressWarnings("unchecked")
+		final T result = (T) src;
+		return result;
+	}
+
 	/**
 	 * Creates a new {@link ParameterizedType} of the given class together with
 	 * the specified type arguments.
@@ -978,8 +1002,12 @@ public int hashCode() {
 		 * @param type the subject type to be assigned to the target type
 		 * @param toType the target type
 		 * @return {@code true} if {@code type} is assignable to {@code toType}.
+		 * @throws NullPointerException if {@code toType} is null.
 		 */
 		public static boolean isAssignable(final Type type, final Type toType) {
+			if (toType == null) {
+				throw new NullPointerException("Destination type is null");
+			}
 			return isAssignable(type, toType, null);
 		}
 
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index e11d74fd9..20b61b73a 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -57,63 +57,6 @@
  */
 public class ConversionUtilsTest {
 
-	/** Tests {@link ConversionUtils#canCast(Class, Class)}. */
-	@Test
-	public void testCanCast() {
-		// check casting to superclass
-		assertTrue(ConversionUtils.canCast(String.class, Object.class));
-
-		// check casting to interface
-		assertTrue(ConversionUtils.canCast(ArrayList.class, Collection.class));
-
-		// casting numeric primitives is not supported
-		assertFalse(ConversionUtils.canCast(double.class, float.class));
-		assertFalse(ConversionUtils.canCast(float.class, double.class));
-
-		// check casting with boxing
-		assertTrue(ConversionUtils.canCast(int.class, Number.class));
-
-		// casting from null always works
-		final Class<?> nullClass = null;
-		assertTrue(ConversionUtils.canCast(nullClass, Object.class));
-		assertTrue(ConversionUtils.canCast(nullClass, int[].class));
-		final Object nullObject = null;
-		assertTrue(ConversionUtils.canCast(nullObject, Object.class));
-		assertTrue(ConversionUtils.canCast(nullObject, int[].class));
-
-		// casting to null is not allowed
-		assertFalse(ConversionUtils.canCast(nullClass, null));
-		assertFalse(ConversionUtils.canCast(Object.class, null));
-		assertFalse(ConversionUtils.canCast(nullObject, null));
-		assertFalse(ConversionUtils.canCast(new Object(), null));
-	}
-
-	/** Tests {@link ConversionUtils#cast(Object, Class)}. */
-	@Test
-	public void testCast() {
-		// check casting to superclass
-		final String string = "Hello";
-		final Object stringToObject = ConversionUtils.cast(string, Object.class);
-		assertSame(string, stringToObject);
-
-		// check casting to interface
-		final ArrayList<?> arrayList = new ArrayList<>();
-		final Collection<?> arrayListToCollection =
-			ConversionUtils.cast(arrayList, Collection.class);
-		assertSame(arrayList, arrayListToCollection);
-
-		// casting numeric primitives is not supported
-		final Float doubleToFloat = ConversionUtils.cast(5.1, float.class);
-		assertNull(doubleToFloat);
-		final Double floatToDouble = ConversionUtils.cast(5.1f, double.class);
-		assertNull(floatToDouble);
-
-		// boxing works though
-		final Number intToNumber = ConversionUtils.cast(5, Number.class);
-		assertSame(Integer.class, intToNumber.getClass());
-		assertEquals(5, intToNumber.intValue());
-	}
-
 	/** Tests {@link ConversionUtils#convertToEnum(String, Class)}. */
 	@Test
 	public void testConvertToEnum() {
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 5d9f6ab05..409eedbab 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -389,6 +389,79 @@ class Struct {
 		assertSame(int[].class, paramClass);
 	}
 
+	/** Tests {@link Types#isAssignable(Type, Type)}. */
+	@Test
+	public void testIsAssignable() {
+		// check casting to superclass
+		assertTrue(Types.isAssignable(String.class, Object.class));
+
+		// check casting to interface
+		assertTrue(Types.isAssignable(ArrayList.class, Collection.class));
+
+		// casting numeric primitives is not supported
+		assertFalse(Types.isAssignable(double.class, float.class));
+		assertFalse(Types.isAssignable(float.class, double.class));
+
+		// boxing is not reported to work
+		// TODO: Consider changing this behavior.
+		assertFalse(Types.isAssignable(int.class, Number.class));
+
+		// casting from null always works
+		assertTrue(Types.isAssignable(null, Object.class));
+		assertTrue(Types.isAssignable(null, int[].class));
+	}
+
+	/** Tests {@link Types#isAssignable(Type, Type)} from null to null. */
+	@Test(expected = NullPointerException.class)
+	public void testIsAssignableNullToNull() {
+		Types.isAssignable(null, null);
+	}
+
+	/** Tests {@link Types#isAssignable(Type, Type)} from Class to null. */
+	@Test(expected = NullPointerException.class)
+	public void testIsAssignableClassToNull() {
+		Types.isAssignable(Object.class, null);
+	}
+
+	/** Tests {@link Types#isInstance(Object, Class)}. */
+	@Test
+	public void testIsInstance() {
+		// casting from null always works
+		final Object nullObject = null;
+		assertTrue(Types.isInstance(nullObject, Object.class));
+		assertTrue(Types.isInstance(nullObject, int[].class));
+
+		// casting to null is not allowed
+		assertFalse(Types.isInstance(nullObject, null));
+		assertFalse(Types.isInstance(new Object(), null));
+	}
+
+	/** Tests {@link Types#cast(Object, Class)}. */
+	@Test
+	public void testCast() {
+		// check casting to superclass
+		final String string = "Hello";
+		final Object stringToObject = Types.cast(string, Object.class);
+		assertSame(string, stringToObject);
+
+		// check casting to interface
+		final ArrayList<?> arrayList = new ArrayList<>();
+		final Collection<?> arrayListToCollection = //
+			Types.cast(arrayList, Collection.class);
+		assertSame(arrayList, arrayListToCollection);
+
+		// casting numeric primitives is not supported
+		final Float doubleToFloat = Types.cast(5.1, float.class);
+		assertNull(doubleToFloat);
+		final Double floatToDouble = Types.cast(5.1f, double.class);
+		assertNull(floatToDouble);
+
+		// boxing works though
+		final Number intToNumber = Types.cast(5, Number.class);
+		assertSame(Integer.class, intToNumber.getClass());
+		assertEquals(5, intToNumber.intValue());
+	}
+
 	// -- Helper classes --
 
 	private static class Thing<T> {

From 8f7778d6a2d8ab591aa2849609c3d80193a4fdf4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 4 Aug 2016 22:43:39 -0500
Subject: [PATCH 0746/1208] Eliminate deprecated ConversionUtils casting usage

There is now the Types utility class instead.
---
 .../org/scijava/convert/AbstractConverter.java     |  5 ++---
 .../java/org/scijava/convert/CastingConverter.java | 12 +++---------
 .../java/org/scijava/convert/DefaultConverter.java | 14 ++++++++------
 .../org/scijava/module/AbstractModuleInfo.java     |  3 +--
 src/main/java/org/scijava/util/ClassUtils.java     | 12 ++++++------
 src/main/java/org/scijava/util/NumberUtils.java    |  2 +-
 src/main/java/org/scijava/util/ObjectArray.java    |  6 ++++--
 7 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 5b27469a1..2c6b4165c 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -38,7 +38,6 @@
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.AbstractHandlerPlugin;
 import org.scijava.plugin.Parameter;
-import org.scijava.util.ConversionUtils;
 import org.scijava.util.Types;
 
 /**
@@ -111,8 +110,8 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
 		final Class<?> saneSrc = Types.box(src);
 		final Class<?> saneDest = Types.box(dest);
-		return ConversionUtils.canCast(saneSrc, getInputType()) &&
-			ConversionUtils.canCast(getOutputType(), saneDest);
+		return Types.isAssignable(saneSrc, getInputType()) &&
+			Types.isAssignable(getOutputType(), saneDest);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index fa877ec6f..77f5479eb 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -33,8 +33,6 @@
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.ClassUtils;
-import org.scijava.util.ConversionUtils;
 import org.scijava.util.Types;
 
 /**
@@ -45,19 +43,15 @@
 @Plugin(type = Converter.class, priority = Priority.EXTREMELY_HIGH)
 public class CastingConverter extends AbstractConverter<Object, Object> {
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public boolean canConvert(final Object src, final Class<?> dest) {
-		return ClassUtils.canCast(src, dest);
+		return Types.isInstance(src, dest);
 	}
 
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		// OK if the existing object can be casted
-		if (ConversionUtils.canCast(src, dest))
-			return true;
-
-		return false;
+		return dest != null && Types.isAssignable(src, dest);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -73,7 +67,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 		// very quickly in various subclassing cases, generic parameters
 		// resolved vs. propagated, etc.
 		final Class<?> c = Types.raw(dest);
-		return (T) ConversionUtils.cast(src, c);
+		return (T) Types.cast(src, c);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index f81eaca78..f065627cf 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -209,7 +209,9 @@ private Constructor<?> getConstructor(final Class<?> type,
 	{
 		for (final Constructor<?> ctor : type.getConstructors()) {
 			final Class<?>[] params = ctor.getParameterTypes();
-			if (params.length == 1 && ConversionUtils.canCast(argType, params[0])) {
+			if (params.length == 1 && //
+				Types.isAssignable(Types.box(argType), Types.box(params[0])))
+			{
 				return ctor;
 			}
 		}
@@ -221,7 +223,7 @@ private boolean isArray(final Type type) {
 	}
 
 	private boolean isCollection(final Type type) {
-		return ConversionUtils.canCast(Types.raw(type), Collection.class);
+		return Types.isAssignable(Types.raw(type), Collection.class);
 	}
 
 	private Object
@@ -267,8 +269,8 @@ private Collection<Object> createCollection(final Class<?> type) {
 		if (type.isInterface() || Modifier.isAbstract(type.getModifiers())) {
 			// We don't have a concrete class. If it's a set or a list, we use
 			// the typical default implementation. Otherwise we won't convert.
-			if (ConversionUtils.canCast(type, List.class)) return new ArrayList<>();
-			if (ConversionUtils.canCast(type, Set.class)) return new HashSet<>();
+			if (Types.isAssignable(type, List.class)) return new ArrayList<>();
+			if (Types.isAssignable(type, Set.class)) return new HashSet<>();
 			return null;
 		}
 
@@ -312,7 +314,7 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		final Class<?> saneDest = Types.box(dest);
 
 		// OK for numerical conversions
-		if (ConversionUtils.canCast(Types.box(src), Number.class) && //
+		if (Types.isAssignable(Types.box(src), Number.class) && //
 			(Types.isByte(dest) || Types.isDouble(dest) || Types.isFloat(dest) ||
 				Types.isInteger(dest) || Types.isLong(dest) || Types.isShort(dest)))
 		{
@@ -322,7 +324,7 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		// OK if string
 		if (saneDest == String.class) return true;
 		
-		if (ConversionUtils.canCast(src, String.class)) {
+		if (Types.isAssignable(src, String.class)) {
 			// OK if source type is string and destination type is character
 			// (in this case, the first character of the string would be used)
 			if (saneDest == Character.class) return true;
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 2a00c6296..7020f24ed 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -39,7 +39,6 @@
 import java.util.Map;
 
 import org.scijava.AbstractUIDetails;
-import org.scijava.util.ConversionUtils;
 import org.scijava.util.Types;
 
 /**
@@ -170,7 +169,7 @@ private <T> ModuleItem<T> castItem(final ModuleItem<?> item,
 		final Class<?> itemType = item.getType();
 		// if (!type.isAssignableFrom(itemType)) {
 		final Class<?> saneItemType = Types.box(itemType);
-		if (!ConversionUtils.canCast(type, saneItemType)) {
+		if (!Types.isAssignable(type, saneItemType)) {
 			throw new IllegalArgumentException("Type " + type.getName() +
 				" is incompatible with item of type " + itemType.getName());
 		}
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 6bddc03c0..ce9a6e49c 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -665,22 +665,22 @@ public static boolean canConvert(final Object value, final Class<?> type) {
 		return ConversionUtils.canConvert(value, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#cast(Object, Class)} */
+	/** @deprecated use {@link Types#cast(Object, Class)} */
 	@Deprecated
 	public static <T> T cast(final Object obj, final Class<T> type) {
-		return ConversionUtils.cast(obj, type);
+		return Types.cast(obj, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#canCast(Class, Class)} */
+	/** @deprecated use {@link Types#isAssignable(Type, Type)} */
 	@Deprecated
 	public static boolean canCast(final Class<?> c, final Class<?> type) {
-		return ConversionUtils.canCast(c, type);
+		return Types.isAssignable(c, type);
 	}
 
-	/** @deprecated use {@link ConversionUtils#canCast(Object, Class)} */
+	/** @deprecated use {@link Types#isInstance(Object, Class)} */
 	@Deprecated
 	public static boolean canCast(final Object obj, final Class<?> type) {
-		return ConversionUtils.canCast(obj, type);
+		return Types.isInstance(obj, type);
 	}
 
 	/** @deprecated use {@link Types#box(Class)} */
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index f68e5ade1..d7b51272f 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -56,7 +56,7 @@ private NumberUtils() {
 	 */
 	public static Number toNumber(final Object value, final Class<?> type) {
 		final Object num = ConversionUtils.convert(value, type);
-		return num == null ? null : ConversionUtils.cast(num, Number.class);
+		return num == null ? null : Types.cast(num, Number.class);
 	}
 
 	public static BigDecimal asBigDecimal(final Number n) {
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index 88ec606c0..f1af6eb58 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -35,6 +35,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.scijava.util.Types;
+
 /**
  * An extensible, generic array of {@code Object} elements. Note that this class
  * is a {@link PrimitiveArray} but of course Objects are not primitives.
@@ -184,7 +186,7 @@ public boolean contains(final Object o) {
 	@Override
 	public boolean remove(final Object o) {
 		if (!compatibleClass(o)) return false;
-		final E value = ConversionUtils.cast(o, objectClass);
+		final E value = Types.cast(o, objectClass);
 		return removeValue(value);
 	}
 
@@ -216,7 +218,7 @@ public boolean removeAll(final Collection<?> c) {
 		boolean changed = false;
 		for (final Object o : c) {
 			if (!compatibleClass(o)) continue;
-			final E value = ConversionUtils.cast(o, objectClass);
+			final E value = Types.cast(o, objectClass);
 			final boolean result = removeValue(value);
 			if (result) changed = true;
 		}

From 6b71b7c7eb6e65d8e012ebd07756594736549e58 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 11:54:52 -0500
Subject: [PATCH 0747/1208] Fork GenTyRef into private Types inner classes

There is quite a bit of duplicate logic between GenTyRef and the
Apache Commons Lang TypeUtils class. Forking the GenTyRef code
here allows us to start massaging and unifying this logic into
a single cohesive core, which depends on neither project.
---
 NOTICE.txt                                | 206 ++++++++
 pom.xml                                   |   5 -
 src/main/java/org/scijava/util/Types.java | 604 +++++++++++++++++++++-
 3 files changed, 807 insertions(+), 8 deletions(-)
 create mode 100644 NOTICE.txt

diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 000000000..74385d300
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,206 @@
+This project contains code adapted from Apache Commons Lang
+(https://commons.apache.org/proper/commons-lang/) version 3.4,
+as well as GenTyRef (https://github.com/coekie/gentyref) version 1.1.0,
+both of which are licensed under the Apache 2.0 license, as follows:
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [2012] [MOJO Codehaus]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/pom.xml b/pom.xml
index 2c5fc4cb0..574c748a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,11 +172,6 @@ Konstanz, and KNIME GmbH.</license.copyrightOwners>
 		</dependency>
 
 		<!-- Third-party dependencies -->
-		<dependency>
-			<groupId>com.googlecode.gentyref</groupId>
-			<artifactId>gentyref</artifactId>
-			<version>1.1.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.bushe</groupId>
 			<artifactId>eventbus</artifactId>
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index ac97f6c25..3a954b587 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -36,10 +36,15 @@
 // org.apache.commons.lang3.Validate classes of
 // Apache Commons Lang 3.4, which is distributed
 // under the Apache 2 license.
-// See lines below starting with "BEGIN FORK".
-
-import com.googlecode.gentyref.GenericTypeReflector;
+// See lines below starting with "BEGIN FORK OF APACHE COMMONS LANG".
+//
+// Portions of this class were adapted from the GenTyRef project
+// by Wouter Coekaerts, which is distributed under the Apache 2 license.
+// See lines below starting with "BEGIN FORK OF GENTYREF".
+//
+// See NOTICE.txt for further details on third-party licenses.
 
+import java.io.Serializable;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
@@ -54,6 +59,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -2832,4 +2838,596 @@ private static <T> T[] validateNotEmpty(final T[] array,
 
 	// -- END FORK OF APACHE COMMONS LANG 3.4 CODE --
 
+	// -- BEGIN FORK OF GENTYREF 1.1.0 CODE --
+
+	/**
+	 * Utility class for doing reflection on types.
+	 * 
+	 * @author Wouter Coekaerts <wouter@coekaerts.be>
+	 */
+	private static class GenericTypeReflector {
+		private static final Type UNBOUND_WILDCARD = new TypeUtils.WildcardTypeImpl(new Type[]{Object.class}, new Type[]{});
+
+		/**
+		 * Returns the erasure of the given type.
+		 */
+		public static Class<?> erase(Type type) {
+			if (type instanceof Class) {
+				return (Class<?>)type;
+			} else if (type instanceof ParameterizedType) {
+				return (Class<?>)((ParameterizedType) type).getRawType();
+			} else if (type instanceof TypeVariable) {
+				TypeVariable<?> tv = (TypeVariable<?>)type;
+				if (tv.getBounds().length == 0)
+					return Object.class;
+				else
+					return erase(tv.getBounds()[0]);
+			} else if (type instanceof GenericArrayType) {
+				GenericArrayType aType = (GenericArrayType) type;
+				return array(erase(aType.getGenericComponentType()));
+			} else {
+				// TODO at least support CaptureType here
+				throw new RuntimeException("not supported: " + type.getClass());
+			}
+		}
+
+		/**
+		 * Maps type parameters in a type to their values. 
+		 * @param toMapType Type possibly containing type arguments
+		 * @param typeAndParams must be either ParameterizedType, or (in case there are no type arguments, or it's a raw type) Class
+		 * @return toMapType, but with type parameters from typeAndParams replaced.
+		 */
+		private static Type mapTypeParameters(Type toMapType, Type typeAndParams) {
+			if (isMissingTypeParameters(typeAndParams)) {
+				return erase(toMapType);
+			} else {
+				VarMap varMap = new VarMap();
+				Type handlingTypeAndParams = typeAndParams;
+				while(handlingTypeAndParams instanceof ParameterizedType) {
+					ParameterizedType pType = (ParameterizedType)handlingTypeAndParams;
+					Class<?> clazz = (Class<?>)pType.getRawType(); // getRawType should always be Class
+					varMap.addAll(clazz.getTypeParameters(), pType.getActualTypeArguments());
+					handlingTypeAndParams = pType.getOwnerType();
+				}
+				return varMap.map(toMapType);
+			}
+		}
+
+		/**
+		 * Checks if the given type is a class that is supposed to have type parameters, but doesn't.
+		 * In other words, if it's a really raw type.
+		 */
+		private static boolean isMissingTypeParameters(Type type) {
+			if (type instanceof Class) {
+				for (Class<?> clazz = (Class<?>) type; clazz != null; clazz = clazz.getEnclosingClass()) {
+					if (clazz.getTypeParameters().length != 0)
+						return true;
+				}
+				return false;
+			} else if (type instanceof ParameterizedType) {
+				return false;
+			} else {
+				throw new AssertionError("Unexpected type " + type.getClass());
+			}
+		}
+
+		/**
+		 * Returns a type representing the class, with all type parameters the unbound wildcard ("?").
+		 * For example, <tt>addWildcardParameters(Map.class)</tt> returns a type representing <tt>Map&lt;?,?&gt;</tt>.
+		 * @return <ul>
+		 * <li>If clazz is a class or interface without type parameters, clazz itself is returned.</li>
+		 * <li>If clazz is a class or interface with type parameters, an instance of ParameterizedType is returned.</li>
+		 * <li>if clazz is an array type, an array type is returned with unbound wildcard parameters added in the the component type.   
+		 * </ul>
+		 */
+		public static Type addWildcardParameters(Class<?> clazz) {
+			if (clazz.isArray()) {
+				return array(addWildcardParameters(clazz.getComponentType()));
+			} else if (isMissingTypeParameters(clazz)) {
+				TypeVariable<?>[] vars = clazz.getTypeParameters();
+				Type[] arguments = new Type[vars.length];
+				Arrays.fill(arguments, UNBOUND_WILDCARD);
+				Type owner = clazz.getDeclaringClass() == null ? null : addWildcardParameters(clazz.getDeclaringClass());
+				return newParameterizedType(clazz, owner, arguments);
+			} else {
+				return clazz;
+			}
+		}
+
+		/**
+		 * Finds the most specific supertype of <tt>type</tt> whose erasure is <tt>searchClass</tt>.
+		 * In other words, returns a type representing the class <tt>searchClass</tt> plus its exact type parameters in <tt>type</tt>.
+		 * 
+		 * <ul>
+		 * <li>Returns an instance of {@link ParameterizedType} if <tt>searchClass</tt> is a real class or interface and <tt>type</tt> has parameters for it</li>
+		 * <li>Returns an instance of {@link GenericArrayType} if <tt>searchClass</tt> is an array type, and <tt>type</tt> has type parameters for it</li>
+		 * <li>Returns an instance of {@link Class} if <tt>type</tt> is a raw type, or has no type parameters for <tt>searchClass</tt></li>
+		 * <li>Returns null if <tt>searchClass</tt> is not a superclass of type.</li>
+		 * </ul>
+		 * 
+		 * <p>For example, with <tt>class StringList implements List&lt;String&gt;</tt>, <tt>getExactSuperType(StringList.class, Collection.class)</tt>
+		 * returns a {@link ParameterizedType} representing <tt>Collection&lt;String&gt;</tt>.
+		 * </p>
+		 */
+		public static Type getExactSuperType(Type type, Class<?> searchClass) {
+			if (type instanceof ParameterizedType || type instanceof Class || type instanceof GenericArrayType) {
+				Class<?> clazz = erase(type);
+
+				if (searchClass == clazz) {
+					return type;
+				}
+
+				if (! searchClass.isAssignableFrom(clazz))
+					return null;
+			}
+
+			for (Type superType: getExactDirectSuperTypes(type)) {
+				Type result = getExactSuperType(superType, searchClass);
+				if (result != null)
+					return result;
+			}
+
+			return null;
+		}
+
+		/**
+		 * Gets the type parameter for a given type that is the value for a given type variable.
+		 * For example, with <tt>class StringList implements List&lt;String&gt;</tt>,
+		 * <tt>getTypeParameter(StringList.class, Collection.class.getTypeParameters()[0])</tt>
+		 * returns <tt>String</tt>. 
+		 *  
+		 * @param type The type to inspect.
+		 * @param variable The type variable to find the value for.
+		 * @return The type parameter for the given variable. Or null if type is not a subtype of the
+		 * 	type that declares the variable, or if the variable isn't known (because of raw types).
+		 */
+		public static Type getTypeParameter(Type type, TypeVariable<? extends Class<?>> variable) {
+			Class<?> clazz = variable.getGenericDeclaration();
+			Type superType = getExactSuperType(type, clazz);
+			if (superType instanceof ParameterizedType) {
+				int index = Arrays.asList(clazz.getTypeParameters()).indexOf(variable);
+				return ((ParameterizedType)superType).getActualTypeArguments()[index];
+			} else {
+				return null;
+			}
+		}
+
+		/**
+		 * Checks if the capture of subType is a subtype of superType
+		 */
+		public static boolean isSuperType(Type superType, Type subType) {
+			if (superType instanceof ParameterizedType || superType instanceof Class || superType instanceof GenericArrayType) {
+				Class<?> superClass = erase(superType);
+				Type mappedSubType = getExactSuperType(capture(subType), superClass);
+				if (mappedSubType == null) {
+					return false;
+				} else if (superType instanceof Class<?>) {
+					return true;
+				} else if (mappedSubType instanceof Class<?>) {
+					// TODO treat supertype by being raw type differently ("supertype, but with warnings")
+					return true; // class has no parameters, or it's a raw type
+				} else if (mappedSubType instanceof GenericArrayType) {
+					Type superComponentType = getArrayComponentType(superType);
+					assert superComponentType != null;
+					Type mappedSubComponentType = getArrayComponentType(mappedSubType);
+					assert mappedSubComponentType != null;
+					return isSuperType(superComponentType, mappedSubComponentType);
+				} else {
+					assert mappedSubType instanceof ParameterizedType;
+					ParameterizedType pMappedSubType = (ParameterizedType) mappedSubType;
+					assert pMappedSubType.getRawType() == superClass;
+					ParameterizedType pSuperType = (ParameterizedType)superType;
+
+					Type[] superTypeArgs = pSuperType.getActualTypeArguments();
+					Type[] subTypeArgs = pMappedSubType.getActualTypeArguments();
+					assert superTypeArgs.length == subTypeArgs.length;
+					for (int i = 0; i < superTypeArgs.length; i++) {
+						if (! contains(superTypeArgs[i], subTypeArgs[i])) {
+							return false;
+						}
+					}
+					// params of the class itself match, so if the owner types are supertypes too, it's a supertype.
+					return pSuperType.getOwnerType() == null || isSuperType(pSuperType.getOwnerType(), pMappedSubType.getOwnerType());
+				}
+			} else if (superType instanceof CaptureType) {
+				if (superType.equals(subType))
+					return true;
+				for (Type lowerBound : ((CaptureType) superType).getLowerBounds()) {
+					if (isSuperType(lowerBound, subType)) {
+						return true;
+					}
+				}
+				return false;
+			} else if (superType instanceof GenericArrayType) {
+				return isArraySupertype(superType, subType);
+			} else {
+				throw new RuntimeException("not implemented: " + superType.getClass());
+			}
+		}
+
+		private static boolean isArraySupertype(Type arraySuperType, Type subType) {
+			Type superTypeComponent = getArrayComponentType(arraySuperType);
+			assert superTypeComponent != null;
+			Type subTypeComponent = getArrayComponentType(subType);
+			if (subTypeComponent == null) { // subType is not an array type
+				return false;
+			} else {
+				return isSuperType(superTypeComponent, subTypeComponent);
+			}
+		}
+
+		/**
+		 * If type is an array type, returns the type of the component of the array.
+		 * Otherwise, returns null.
+		 */
+		public static Type getArrayComponentType(Type type) {
+			if (type instanceof Class) {
+				Class<?> clazz = (Class<?>)type;
+				return clazz.getComponentType();
+			} else if (type instanceof GenericArrayType) {
+				GenericArrayType aType = (GenericArrayType) type;
+				return aType.getGenericComponentType();
+			} else {
+				return null;
+			}
+		}
+
+		private static boolean contains(Type containingType, Type containedType) {
+			if (containingType instanceof WildcardType) {
+				WildcardType wContainingType = (WildcardType)containingType;
+				for (Type upperBound : wContainingType.getUpperBounds()) {
+					if (! isSuperType(upperBound, containedType)) {
+						return false;
+					}
+				}
+				for (Type lowerBound : wContainingType.getLowerBounds()) {
+					if (! isSuperType(containedType, lowerBound)) {
+						return false;
+					}
+				}
+				return true;
+			} else {
+				return containingType.equals(containedType);
+			}
+		}
+
+		/**
+		 * Returns the direct supertypes of the given type. Resolves type parameters.
+		 */
+		private static Type[] getExactDirectSuperTypes(Type type) {
+			if (type instanceof ParameterizedType || type instanceof Class) {
+				Class<?> clazz;
+				if (type instanceof ParameterizedType) {
+					clazz = (Class<?>)((ParameterizedType)type).getRawType();
+				} else {
+					// TODO primitive types?
+					clazz = (Class<?>)type;
+					if (clazz.isArray())
+						return getArrayExactDirectSuperTypes(clazz);
+				}
+
+				Type[] superInterfaces = clazz.getGenericInterfaces();
+				Type superClass = clazz.getGenericSuperclass();
+				Type[] result;
+				int resultIndex;
+				if (superClass == null) {
+					result = new Type[superInterfaces.length];
+					resultIndex = 0;
+				} else {
+					result = new Type[superInterfaces.length + 1];
+					resultIndex = 1;
+					result[0] = mapTypeParameters(superClass, type);
+				}
+				for (Type superInterface : superInterfaces) {
+					result[resultIndex++] = mapTypeParameters(superInterface, type);
+				}
+
+				return result;
+			} else if (type instanceof TypeVariable) {
+				TypeVariable<?> tv = (TypeVariable<?>) type;
+				return tv.getBounds();
+			} else if (type instanceof WildcardType) {
+				// This should be a rare case: normally this wildcard is already captured.
+				// But it does happen if the upper bound of a type variable contains a wildcard
+				// TODO shouldn't upper bound of type variable have been captured too? (making this case impossible?)
+				return ((WildcardType) type).getUpperBounds();
+			} else if (type instanceof CaptureType) {
+				return ((CaptureType)type).getUpperBounds();
+			} else if (type instanceof GenericArrayType) {
+				return getArrayExactDirectSuperTypes(type);
+			} else {
+				throw new RuntimeException("not implemented type: " + type);
+			}
+		}
+
+		private static Type[] getArrayExactDirectSuperTypes(Type arrayType) {
+			// see http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.10.3
+			Type typeComponent = getArrayComponentType(arrayType);
+
+			Type[] result;
+			int resultIndex;
+			if (typeComponent instanceof Class && ((Class<?>)typeComponent).isPrimitive()) {
+				resultIndex = 0;
+				result = new Type[3];
+			} else {
+				Type[] componentSupertypes = getExactDirectSuperTypes(typeComponent);
+				result = new Type[componentSupertypes.length + 3];
+				for (resultIndex = 0; resultIndex < componentSupertypes.length; resultIndex++) {
+					result[resultIndex] = array(componentSupertypes[resultIndex]);
+				}
+			}
+			result[resultIndex++] = Object.class;
+			result[resultIndex++] = Cloneable.class;
+			result[resultIndex++] = Serializable.class;
+			return result;
+		}
+
+		/**
+		 * Returns the exact return type of the given method in the given type.
+		 * This may be different from <tt>m.getGenericReturnType()</tt> when the method was declared in a superclass,
+		 * or <tt>type</tt> has a type parameter that is used in the return type, or <tt>type</tt> is a raw type.
+		 */
+		public static Type getExactReturnType(Method m, Type type) {
+			Type returnType = m.getGenericReturnType();
+			Type exactDeclaringType = getExactSuperType(capture(type), m.getDeclaringClass());
+			if (exactDeclaringType == null) { // capture(type) is not a subtype of m.getDeclaringClass()
+				throw new IllegalArgumentException("The method " + m + " is not a member of type " + type);
+			}
+			return mapTypeParameters(returnType, exactDeclaringType);
+		}
+
+		/**
+		 * Returns the exact type of the given field in the given type.
+		 * This may be different from <tt>f.getGenericType()</tt> when the field was declared in a superclass,
+		 * or <tt>type</tt> has a type parameter that is used in the type of the field, or <tt>type</tt> is a raw type.
+		 */
+		public static Type getExactFieldType(Field f, Type type) {
+			Type returnType = f.getGenericType();
+			Type exactDeclaringType = getExactSuperType(capture(type), f.getDeclaringClass());
+			if (exactDeclaringType == null) { // capture(type) is not a subtype of f.getDeclaringClass()
+				throw new IllegalArgumentException("The field " + f + " is not a member of type " + type);
+			}
+			return mapTypeParameters(returnType, exactDeclaringType);
+		}
+
+		/**
+		 * Returns the exact parameter types of the given method in the given type.
+		 * This may be different from <tt>m.getGenericParameterTypes()</tt> when the method was declared in a superclass,
+		 * or <tt>type</tt> has a type parameter that is used in one of the parameters, or <tt>type</tt> is a raw type.
+		 */
+		public static Type[] getExactParameterTypes(Method m, Type type) {
+			Type[] parameterTypes = m.getGenericParameterTypes();
+			Type exactDeclaringType = getExactSuperType(capture(type), m.getDeclaringClass());
+			if (exactDeclaringType == null) { // capture(type) is not a subtype of m.getDeclaringClass()
+				throw new IllegalArgumentException("The method " + m + " is not a member of type " + type);
+			}
+
+			Type[] result = new Type[parameterTypes.length];
+			for (int i = 0; i < parameterTypes.length; i++) {
+				result[i] = mapTypeParameters(parameterTypes[i], exactDeclaringType);
+			}
+			return result;
+		}
+
+		/**
+		 * Applies capture conversion to the given type.
+		 */
+		public static Type capture(Type type) {
+			VarMap varMap = new VarMap();
+			List<CaptureTypeImpl> toInit = new ArrayList<CaptureTypeImpl>();
+			if (type instanceof ParameterizedType) {
+				ParameterizedType pType = (ParameterizedType)type;
+				Class<?> clazz = (Class<?>)pType.getRawType();
+				Type[] arguments = pType.getActualTypeArguments();
+				TypeVariable<?>[] vars = clazz.getTypeParameters();
+				Type[] capturedArguments = new Type[arguments.length];
+				assert arguments.length == vars.length;
+				for (int i = 0; i < arguments.length; i++) {
+					Type argument = arguments[i];
+					if (argument instanceof WildcardType) {
+						CaptureTypeImpl captured = new CaptureTypeImpl((WildcardType)argument, vars[i]);
+						argument = captured;
+						toInit.add(captured);
+					}
+					capturedArguments[i] = argument;
+					varMap.add(vars[i], argument);
+				}
+				for (CaptureTypeImpl captured : toInit) {
+					captured.init(varMap);
+				}
+				Type ownerType = (pType.getOwnerType() == null) ? null : capture(pType.getOwnerType());
+				return newParameterizedType(clazz, ownerType, capturedArguments);
+			} else {
+				return type;
+			}
+		}
+
+		/**
+		 * Returns the display name of a Type.
+		 */
+		public static String getTypeName(Type type) {
+			if(type instanceof Class) {
+				Class<?> clazz = (Class<?>) type;
+				return clazz.isArray() ? (getTypeName(clazz.getComponentType()) + "[]") : clazz.getName();
+			} else {
+				return type.toString();
+			}
+		}
+
+		/**
+		 * Returns list of classes and interfaces that are supertypes of the given type.
+		 * For example given this class:
+		 * <tt>class Foo&lt;A extends Number & Iterable&lt;A&gt;, B extends A&gt;</tt><br>
+		 * calling this method on type parameters <tt>B</tt> (<tt>Foo.class.getTypeParameters()[1]</tt>)
+		 * returns a list containing <tt>Number</tt> and <tt>Iterable</tt>.
+		 * <p>
+		 * This is mostly useful if you get a type from one of the other methods in <tt>GenericTypeReflector</tt>,
+		 * but you don't want to deal with all the different sorts of types,
+		 * and you are only really interested in concrete classes and interfaces.
+		 * </p>
+		 *  
+		 * @return A List of classes, each of them a supertype of the given type.
+		 * 	If the given type is a class or interface itself, returns a List with just the given type.
+		 *  The list contains no duplicates, and is ordered in the order the upper bounds are defined on the type.
+		 */
+		public static List<Class<?>> getUpperBoundClassAndInterfaces(Type type) {
+			LinkedHashSet<Class<?>> result = new LinkedHashSet<Class<?>>();
+			buildUpperBoundClassAndInterfaces(type, result);
+			return new ArrayList<Class<?>>(result);
+		}
+
+		/**
+		 * Helper method for getUpperBoundClassAndInterfaces, adding the result to the given set.
+		 */
+		private static void buildUpperBoundClassAndInterfaces(Type type, Set<Class<?>> result) {
+			if (type instanceof ParameterizedType || type instanceof Class<?>) {
+				result.add(erase(type));
+				return;
+			}
+
+			for (Type superType: getExactDirectSuperTypes(type)) {
+				buildUpperBoundClassAndInterfaces(superType, result);
+			}
+		}
+	}
+
+	/**
+	 * CaptureType represents a wildcard that has gone through capture conversion.
+	 * It is a custom subinterface of Type, not part of the java builtin Type hierarchy.
+	 * 
+	 * @author Wouter Coekaerts <wouter@coekaerts.be>
+	 */
+	private interface CaptureType extends Type {
+		/**
+		 * Returns an array of <tt>Type</tt> objects representing the upper
+		 * bound(s) of this capture. This includes both the upper bound of a <tt>? extends</tt> wildcard,
+		 * and the bounds declared with the type variable.
+		 * References to other (or the same) type variables in bounds coming from the type variable are
+		 * replaced by their matching capture.
+		 */
+		Type[] getUpperBounds();
+
+		/**
+		 * Returns an array of <tt>Type</tt> objects representing the 
+		 * lower bound(s) of this type variable. This is the bound of a <tt>? super</tt> wildcard.
+		 * This normally contains only one or no types; it is an array for consistency with {@link WildcardType#getLowerBounds()}.
+		 */
+		Type[] getLowerBounds();
+	}
+
+	private static class CaptureTypeImpl implements CaptureType {
+		private final WildcardType wildcard;
+		private final TypeVariable<?> variable;
+		private final Type[] lowerBounds;
+		private Type[] upperBounds;
+
+		/**
+		 * Creates an uninitialized CaptureTypeImpl. Before using this type, {@link #init(VarMap)} must be called.
+		 * @param wildcard The wildcard this is a capture of
+		 * @param variable The type variable where the wildcard is a parameter for.
+		 */
+		public CaptureTypeImpl(WildcardType wildcard, TypeVariable<?> variable) {
+			this.wildcard = wildcard;
+			this.variable = variable;
+			this.lowerBounds = wildcard.getLowerBounds();
+		}
+
+		/**
+		 * Initialize this CaptureTypeImpl.
+		 * This is needed for type variable bounds referring to each other: we need the capture of the argument.
+		 */
+		void init(VarMap varMap) {
+			ArrayList<Type> upperBoundsList = new ArrayList<Type>();
+			upperBoundsList.addAll(Arrays.asList(varMap.map(variable.getBounds())));
+
+			List<Type> wildcardUpperBounds = Arrays.asList(wildcard.getUpperBounds());
+			if (wildcardUpperBounds.size() > 0 && wildcardUpperBounds.get(0) == Object.class) {
+				// skip the Object bound, we already have a first upper bound from 'variable'
+				upperBoundsList.addAll(wildcardUpperBounds.subList(1, wildcardUpperBounds.size()));
+			} else {
+				upperBoundsList.addAll(wildcardUpperBounds);
+			}
+			upperBounds = new Type[upperBoundsList.size()]; 
+			upperBoundsList.toArray(upperBounds);
+		}
+
+		/*
+		 * @see com.googlecode.gentyref.CaptureType#getLowerBounds()
+		 */
+		public Type[] getLowerBounds() {
+			return lowerBounds.clone();
+		}
+
+		/*
+		 * @see com.googlecode.gentyref.CaptureType#getUpperBounds()
+		 */
+		public Type[] getUpperBounds() {
+			assert upperBounds != null;
+			return upperBounds.clone();
+		}
+
+		@Override
+		public String toString() {
+			return "capture of " + wildcard;
+		}
+	}
+
+	/**
+	 * Mapping between type variables and actual parameters.
+	 * 
+	 * @author Wouter Coekaerts <wouter@coekaerts.be>
+	 */
+	private static class VarMap {
+		private final Map<TypeVariable<?>, Type> map = new HashMap<TypeVariable<?>, Type>();
+
+		/**
+		 * Creates an empty VarMap
+		 */
+		VarMap() {
+		}
+
+		void add(TypeVariable<?> variable, Type value) {
+			map.put(variable, value);
+		}
+
+		void addAll(TypeVariable<?>[] variables, Type[] values) {
+			assert variables.length == values.length;
+			for (int i = 0; i < variables.length; i++) {
+				map.put(variables[i], values[i]);
+			}
+		}
+
+		VarMap(TypeVariable<?>[] variables, Type[] values) {
+			addAll(variables, values);
+		}
+
+		Type map(Type type) {
+			if (type instanceof Class) {
+				return type;
+			} else if (type instanceof TypeVariable) {
+				assert map.containsKey(type);
+				return map.get(type);
+			} else if (type instanceof ParameterizedType) {
+				ParameterizedType pType = (ParameterizedType) type;
+				return newParameterizedType((Class<?>)pType.getRawType(), pType.getOwnerType() == null ? pType.getOwnerType() : map(pType.getOwnerType()), map(pType.getActualTypeArguments()));
+			} else if (type instanceof WildcardType) {
+				WildcardType wType = (WildcardType) type;
+				return new TypeUtils.WildcardTypeImpl(map(wType.getUpperBounds()), map(wType.getLowerBounds()));
+			} else if (type instanceof GenericArrayType) {
+				return array(map(((GenericArrayType)type).getGenericComponentType()));
+			} else {
+				throw new RuntimeException("not implemented: mapping " + type.getClass() + " (" + type + ")");
+			}
+		}
+
+		Type[] map(Type[] types) {
+			Type[] result = new Type[types.length];
+			for (int i = 0; i < types.length; i++) {
+				result[i] = map(types[i]);
+			}
+			return result;
+		}
+	}
+
+	// -- END FORK OF GENTYREF 1.1.0 CODE --
 }

From 89072d77500643ad81fc702cd5393303a51bb4c9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 11:58:02 -0500
Subject: [PATCH 0748/1208] Types: format code style of GenTyRef classes

---
 src/main/java/org/scijava/util/Types.java | 635 +++++++++++++---------
 1 file changed, 388 insertions(+), 247 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 3a954b587..f956b9a97 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2842,51 +2842,64 @@ private static <T> T[] validateNotEmpty(final T[] array,
 
 	/**
 	 * Utility class for doing reflection on types.
-	 * 
+	 *
 	 * @author Wouter Coekaerts <wouter@coekaerts.be>
 	 */
 	private static class GenericTypeReflector {
-		private static final Type UNBOUND_WILDCARD = new TypeUtils.WildcardTypeImpl(new Type[]{Object.class}, new Type[]{});
+
+		private static final Type UNBOUND_WILDCARD = new TypeUtils.WildcardTypeImpl(
+			new Type[] { Object.class }, new Type[] {});
 
 		/**
 		 * Returns the erasure of the given type.
 		 */
-		public static Class<?> erase(Type type) {
+		public static Class<?> erase(final Type type) {
 			if (type instanceof Class) {
-				return (Class<?>)type;
-			} else if (type instanceof ParameterizedType) {
-				return (Class<?>)((ParameterizedType) type).getRawType();
-			} else if (type instanceof TypeVariable) {
-				TypeVariable<?> tv = (TypeVariable<?>)type;
-				if (tv.getBounds().length == 0)
-					return Object.class;
-				else
-					return erase(tv.getBounds()[0]);
-			} else if (type instanceof GenericArrayType) {
-				GenericArrayType aType = (GenericArrayType) type;
+				return (Class<?>) type;
+			}
+			else if (type instanceof ParameterizedType) {
+				return (Class<?>) ((ParameterizedType) type).getRawType();
+			}
+			else if (type instanceof TypeVariable) {
+				final TypeVariable<?> tv = (TypeVariable<?>) type;
+				if (tv.getBounds().length == 0) return Object.class;
+				else return erase(tv.getBounds()[0]);
+			}
+			else if (type instanceof GenericArrayType) {
+				final GenericArrayType aType = (GenericArrayType) type;
 				return array(erase(aType.getGenericComponentType()));
-			} else {
+			}
+			else {
 				// TODO at least support CaptureType here
 				throw new RuntimeException("not supported: " + type.getClass());
 			}
 		}
 
 		/**
-		 * Maps type parameters in a type to their values. 
+		 * Maps type parameters in a type to their values.
+		 * 
 		 * @param toMapType Type possibly containing type arguments
-		 * @param typeAndParams must be either ParameterizedType, or (in case there are no type arguments, or it's a raw type) Class
+		 * @param typeAndParams must be either ParameterizedType, or (in case there
+		 *          are no type arguments, or it's a raw type) Class
 		 * @return toMapType, but with type parameters from typeAndParams replaced.
 		 */
-		private static Type mapTypeParameters(Type toMapType, Type typeAndParams) {
+		private static Type mapTypeParameters(final Type toMapType,
+			final Type typeAndParams)
+		{
 			if (isMissingTypeParameters(typeAndParams)) {
 				return erase(toMapType);
-			} else {
-				VarMap varMap = new VarMap();
+			}
+			else {
+				final VarMap varMap = new VarMap();
 				Type handlingTypeAndParams = typeAndParams;
-				while(handlingTypeAndParams instanceof ParameterizedType) {
-					ParameterizedType pType = (ParameterizedType)handlingTypeAndParams;
-					Class<?> clazz = (Class<?>)pType.getRawType(); // getRawType should always be Class
-					varMap.addAll(clazz.getTypeParameters(), pType.getActualTypeArguments());
+				while (handlingTypeAndParams instanceof ParameterizedType) {
+					final ParameterizedType pType =
+						(ParameterizedType) handlingTypeAndParams;
+					final Class<?> clazz = (Class<?>) pType.getRawType(); // getRawType
+																																// should always
+																																// be Class
+					varMap.addAll(clazz.getTypeParameters(), pType
+						.getActualTypeArguments());
 					handlingTypeAndParams = pType.getOwnerType();
 				}
 				return varMap.map(toMapType);
@@ -2894,100 +2907,130 @@ private static Type mapTypeParameters(Type toMapType, Type typeAndParams) {
 		}
 
 		/**
-		 * Checks if the given type is a class that is supposed to have type parameters, but doesn't.
-		 * In other words, if it's a really raw type.
+		 * Checks if the given type is a class that is supposed to have type
+		 * parameters, but doesn't. In other words, if it's a really raw type.
 		 */
-		private static boolean isMissingTypeParameters(Type type) {
+		private static boolean isMissingTypeParameters(final Type type) {
 			if (type instanceof Class) {
-				for (Class<?> clazz = (Class<?>) type; clazz != null; clazz = clazz.getEnclosingClass()) {
-					if (clazz.getTypeParameters().length != 0)
-						return true;
+				for (Class<?> clazz = (Class<?>) type; clazz != null; clazz = clazz
+					.getEnclosingClass())
+				{
+					if (clazz.getTypeParameters().length != 0) return true;
 				}
 				return false;
-			} else if (type instanceof ParameterizedType) {
+			}
+			else if (type instanceof ParameterizedType) {
 				return false;
-			} else {
+			}
+			else {
 				throw new AssertionError("Unexpected type " + type.getClass());
 			}
 		}
 
 		/**
-		 * Returns a type representing the class, with all type parameters the unbound wildcard ("?").
-		 * For example, <tt>addWildcardParameters(Map.class)</tt> returns a type representing <tt>Map&lt;?,?&gt;</tt>.
-		 * @return <ul>
-		 * <li>If clazz is a class or interface without type parameters, clazz itself is returned.</li>
-		 * <li>If clazz is a class or interface with type parameters, an instance of ParameterizedType is returned.</li>
-		 * <li>if clazz is an array type, an array type is returned with unbound wildcard parameters added in the the component type.   
-		 * </ul>
-		 */
-		public static Type addWildcardParameters(Class<?> clazz) {
+		 * Returns a type representing the class, with all type parameters the
+		 * unbound wildcard ("?"). For example,
+		 * <tt>addWildcardParameters(Map.class)</tt> returns a type representing
+		 * <tt>Map&lt;?,?&gt;</tt>.
+		 * 
+		 * @return
+		 *         <ul>
+		 *         <li>If clazz is a class or interface without type parameters,
+		 *         clazz itself is returned.</li>
+		 *         <li>If clazz is a class or interface with type parameters, an
+		 *         instance of ParameterizedType is returned.</li>
+		 *         <li>if clazz is an array type, an array type is returned with
+		 *         unbound wildcard parameters added in the the component type.
+		 *         </ul>
+		 */
+		public static Type addWildcardParameters(final Class<?> clazz) {
 			if (clazz.isArray()) {
 				return array(addWildcardParameters(clazz.getComponentType()));
-			} else if (isMissingTypeParameters(clazz)) {
-				TypeVariable<?>[] vars = clazz.getTypeParameters();
-				Type[] arguments = new Type[vars.length];
+			}
+			else if (isMissingTypeParameters(clazz)) {
+				final TypeVariable<?>[] vars = clazz.getTypeParameters();
+				final Type[] arguments = new Type[vars.length];
 				Arrays.fill(arguments, UNBOUND_WILDCARD);
-				Type owner = clazz.getDeclaringClass() == null ? null : addWildcardParameters(clazz.getDeclaringClass());
+				final Type owner = clazz.getDeclaringClass() == null ? null
+					: addWildcardParameters(clazz.getDeclaringClass());
 				return newParameterizedType(clazz, owner, arguments);
-			} else {
+			}
+			else {
 				return clazz;
 			}
 		}
 
 		/**
-		 * Finds the most specific supertype of <tt>type</tt> whose erasure is <tt>searchClass</tt>.
-		 * In other words, returns a type representing the class <tt>searchClass</tt> plus its exact type parameters in <tt>type</tt>.
-		 * 
+		 * Finds the most specific supertype of <tt>type</tt> whose erasure is
+		 * <tt>searchClass</tt>. In other words, returns a type representing the
+		 * class <tt>searchClass</tt> plus its exact type parameters in
+		 * <tt>type</tt>.
 		 * <ul>
-		 * <li>Returns an instance of {@link ParameterizedType} if <tt>searchClass</tt> is a real class or interface and <tt>type</tt> has parameters for it</li>
-		 * <li>Returns an instance of {@link GenericArrayType} if <tt>searchClass</tt> is an array type, and <tt>type</tt> has type parameters for it</li>
-		 * <li>Returns an instance of {@link Class} if <tt>type</tt> is a raw type, or has no type parameters for <tt>searchClass</tt></li>
-		 * <li>Returns null if <tt>searchClass</tt> is not a superclass of type.</li>
+		 * <li>Returns an instance of {@link ParameterizedType} if
+		 * <tt>searchClass</tt> is a real class or interface and <tt>type</tt> has
+		 * parameters for it</li>
+		 * <li>Returns an instance of {@link GenericArrayType} if
+		 * <tt>searchClass</tt> is an array type, and <tt>type</tt> has type
+		 * parameters for it</li>
+		 * <li>Returns an instance of {@link Class} if <tt>type</tt> is a raw type,
+		 * or has no type parameters for <tt>searchClass</tt></li>
+		 * <li>Returns null if <tt>searchClass</tt> is not a superclass of type.
+		 * </li>
 		 * </ul>
-		 * 
-		 * <p>For example, with <tt>class StringList implements List&lt;String&gt;</tt>, <tt>getExactSuperType(StringList.class, Collection.class)</tt>
-		 * returns a {@link ParameterizedType} representing <tt>Collection&lt;String&gt;</tt>.
+		 * <p>
+		 * For example, with
+		 * <tt>class StringList implements List&lt;String&gt;</tt>,
+		 * <tt>getExactSuperType(StringList.class, Collection.class)</tt> returns a
+		 * {@link ParameterizedType} representing <tt>Collection&lt;String&gt;</tt>.
 		 * </p>
 		 */
-		public static Type getExactSuperType(Type type, Class<?> searchClass) {
-			if (type instanceof ParameterizedType || type instanceof Class || type instanceof GenericArrayType) {
-				Class<?> clazz = erase(type);
+		public static Type getExactSuperType(final Type type,
+			final Class<?> searchClass)
+		{
+			if (type instanceof ParameterizedType || type instanceof Class ||
+				type instanceof GenericArrayType)
+			{
+				final Class<?> clazz = erase(type);
 
 				if (searchClass == clazz) {
 					return type;
 				}
 
-				if (! searchClass.isAssignableFrom(clazz))
-					return null;
+				if (!searchClass.isAssignableFrom(clazz)) return null;
 			}
 
-			for (Type superType: getExactDirectSuperTypes(type)) {
-				Type result = getExactSuperType(superType, searchClass);
-				if (result != null)
-					return result;
+			for (final Type superType : getExactDirectSuperTypes(type)) {
+				final Type result = getExactSuperType(superType, searchClass);
+				if (result != null) return result;
 			}
 
 			return null;
 		}
 
 		/**
-		 * Gets the type parameter for a given type that is the value for a given type variable.
-		 * For example, with <tt>class StringList implements List&lt;String&gt;</tt>,
+		 * Gets the type parameter for a given type that is the value for a given
+		 * type variable. For example, with
+		 * <tt>class StringList implements List&lt;String&gt;</tt>,
 		 * <tt>getTypeParameter(StringList.class, Collection.class.getTypeParameters()[0])</tt>
-		 * returns <tt>String</tt>. 
-		 *  
+		 * returns <tt>String</tt>.
+		 * 
 		 * @param type The type to inspect.
 		 * @param variable The type variable to find the value for.
-		 * @return The type parameter for the given variable. Or null if type is not a subtype of the
-		 * 	type that declares the variable, or if the variable isn't known (because of raw types).
+		 * @return The type parameter for the given variable. Or null if type is not
+		 *         a subtype of the type that declares the variable, or if the
+		 *         variable isn't known (because of raw types).
 		 */
-		public static Type getTypeParameter(Type type, TypeVariable<? extends Class<?>> variable) {
-			Class<?> clazz = variable.getGenericDeclaration();
-			Type superType = getExactSuperType(type, clazz);
+		public static Type getTypeParameter(final Type type,
+			final TypeVariable<? extends Class<?>> variable)
+		{
+			final Class<?> clazz = variable.getGenericDeclaration();
+			final Type superType = getExactSuperType(type, clazz);
 			if (superType instanceof ParameterizedType) {
-				int index = Arrays.asList(clazz.getTypeParameters()).indexOf(variable);
-				return ((ParameterizedType)superType).getActualTypeArguments()[index];
-			} else {
+				final int index = Arrays.asList(clazz.getTypeParameters()).indexOf(
+					variable);
+				return ((ParameterizedType) superType).getActualTypeArguments()[index];
+			}
+			else {
 				return null;
 			}
 		}
@@ -2995,63 +3038,84 @@ public static Type getTypeParameter(Type type, TypeVariable<? extends Class<?>>
 		/**
 		 * Checks if the capture of subType is a subtype of superType
 		 */
-		public static boolean isSuperType(Type superType, Type subType) {
-			if (superType instanceof ParameterizedType || superType instanceof Class || superType instanceof GenericArrayType) {
-				Class<?> superClass = erase(superType);
-				Type mappedSubType = getExactSuperType(capture(subType), superClass);
+		public static boolean isSuperType(final Type superType,
+			final Type subType)
+		{
+			if (superType instanceof ParameterizedType ||
+				superType instanceof Class || superType instanceof GenericArrayType)
+			{
+				final Class<?> superClass = erase(superType);
+				final Type mappedSubType = getExactSuperType(capture(subType),
+					superClass);
 				if (mappedSubType == null) {
 					return false;
-				} else if (superType instanceof Class<?>) {
+				}
+				else if (superType instanceof Class<?>) {
 					return true;
-				} else if (mappedSubType instanceof Class<?>) {
-					// TODO treat supertype by being raw type differently ("supertype, but with warnings")
+				}
+				else if (mappedSubType instanceof Class<?>) {
+					// TODO treat supertype by being raw type differently ("supertype, but
+					// with warnings")
 					return true; // class has no parameters, or it's a raw type
-				} else if (mappedSubType instanceof GenericArrayType) {
-					Type superComponentType = getArrayComponentType(superType);
+				}
+				else if (mappedSubType instanceof GenericArrayType) {
+					final Type superComponentType = getArrayComponentType(superType);
 					assert superComponentType != null;
-					Type mappedSubComponentType = getArrayComponentType(mappedSubType);
+					final Type mappedSubComponentType = getArrayComponentType(
+						mappedSubType);
 					assert mappedSubComponentType != null;
 					return isSuperType(superComponentType, mappedSubComponentType);
-				} else {
+				}
+				else {
 					assert mappedSubType instanceof ParameterizedType;
-					ParameterizedType pMappedSubType = (ParameterizedType) mappedSubType;
+					final ParameterizedType pMappedSubType =
+						(ParameterizedType) mappedSubType;
 					assert pMappedSubType.getRawType() == superClass;
-					ParameterizedType pSuperType = (ParameterizedType)superType;
+					final ParameterizedType pSuperType = (ParameterizedType) superType;
 
-					Type[] superTypeArgs = pSuperType.getActualTypeArguments();
-					Type[] subTypeArgs = pMappedSubType.getActualTypeArguments();
+					final Type[] superTypeArgs = pSuperType.getActualTypeArguments();
+					final Type[] subTypeArgs = pMappedSubType.getActualTypeArguments();
 					assert superTypeArgs.length == subTypeArgs.length;
 					for (int i = 0; i < superTypeArgs.length; i++) {
-						if (! contains(superTypeArgs[i], subTypeArgs[i])) {
+						if (!contains(superTypeArgs[i], subTypeArgs[i])) {
 							return false;
 						}
 					}
-					// params of the class itself match, so if the owner types are supertypes too, it's a supertype.
-					return pSuperType.getOwnerType() == null || isSuperType(pSuperType.getOwnerType(), pMappedSubType.getOwnerType());
+					// params of the class itself match, so if the owner types are
+					// supertypes too, it's a supertype.
+					return pSuperType.getOwnerType() == null || isSuperType(pSuperType
+						.getOwnerType(), pMappedSubType.getOwnerType());
 				}
-			} else if (superType instanceof CaptureType) {
-				if (superType.equals(subType))
-					return true;
-				for (Type lowerBound : ((CaptureType) superType).getLowerBounds()) {
+			}
+			else if (superType instanceof CaptureType) {
+				if (superType.equals(subType)) return true;
+				for (final Type lowerBound : ((CaptureType) superType)
+					.getLowerBounds())
+				{
 					if (isSuperType(lowerBound, subType)) {
 						return true;
 					}
 				}
 				return false;
-			} else if (superType instanceof GenericArrayType) {
+			}
+			else if (superType instanceof GenericArrayType) {
 				return isArraySupertype(superType, subType);
-			} else {
+			}
+			else {
 				throw new RuntimeException("not implemented: " + superType.getClass());
 			}
 		}
 
-		private static boolean isArraySupertype(Type arraySuperType, Type subType) {
-			Type superTypeComponent = getArrayComponentType(arraySuperType);
+		private static boolean isArraySupertype(final Type arraySuperType,
+			final Type subType)
+		{
+			final Type superTypeComponent = getArrayComponentType(arraySuperType);
 			assert superTypeComponent != null;
-			Type subTypeComponent = getArrayComponentType(subType);
+			final Type subTypeComponent = getArrayComponentType(subType);
 			if (subTypeComponent == null) { // subType is not an array type
 				return false;
-			} else {
+			}
+			else {
 				return isSuperType(superTypeComponent, subTypeComponent);
 			}
 		}
@@ -3060,99 +3124,121 @@ private static boolean isArraySupertype(Type arraySuperType, Type subType) {
 		 * If type is an array type, returns the type of the component of the array.
 		 * Otherwise, returns null.
 		 */
-		public static Type getArrayComponentType(Type type) {
+		public static Type getArrayComponentType(final Type type) {
 			if (type instanceof Class) {
-				Class<?> clazz = (Class<?>)type;
+				final Class<?> clazz = (Class<?>) type;
 				return clazz.getComponentType();
-			} else if (type instanceof GenericArrayType) {
-				GenericArrayType aType = (GenericArrayType) type;
+			}
+			else if (type instanceof GenericArrayType) {
+				final GenericArrayType aType = (GenericArrayType) type;
 				return aType.getGenericComponentType();
-			} else {
+			}
+			else {
 				return null;
 			}
 		}
 
-		private static boolean contains(Type containingType, Type containedType) {
+		private static boolean contains(final Type containingType,
+			final Type containedType)
+		{
 			if (containingType instanceof WildcardType) {
-				WildcardType wContainingType = (WildcardType)containingType;
-				for (Type upperBound : wContainingType.getUpperBounds()) {
-					if (! isSuperType(upperBound, containedType)) {
+				final WildcardType wContainingType = (WildcardType) containingType;
+				for (final Type upperBound : wContainingType.getUpperBounds()) {
+					if (!isSuperType(upperBound, containedType)) {
 						return false;
 					}
 				}
-				for (Type lowerBound : wContainingType.getLowerBounds()) {
-					if (! isSuperType(containedType, lowerBound)) {
+				for (final Type lowerBound : wContainingType.getLowerBounds()) {
+					if (!isSuperType(containedType, lowerBound)) {
 						return false;
 					}
 				}
 				return true;
-			} else {
+			}
+			else {
 				return containingType.equals(containedType);
 			}
 		}
 
 		/**
-		 * Returns the direct supertypes of the given type. Resolves type parameters.
+		 * Returns the direct supertypes of the given type. Resolves type
+		 * parameters.
 		 */
-		private static Type[] getExactDirectSuperTypes(Type type) {
+		private static Type[] getExactDirectSuperTypes(final Type type) {
 			if (type instanceof ParameterizedType || type instanceof Class) {
 				Class<?> clazz;
 				if (type instanceof ParameterizedType) {
-					clazz = (Class<?>)((ParameterizedType)type).getRawType();
-				} else {
+					clazz = (Class<?>) ((ParameterizedType) type).getRawType();
+				}
+				else {
 					// TODO primitive types?
-					clazz = (Class<?>)type;
-					if (clazz.isArray())
-						return getArrayExactDirectSuperTypes(clazz);
+					clazz = (Class<?>) type;
+					if (clazz.isArray()) return getArrayExactDirectSuperTypes(clazz);
 				}
 
-				Type[] superInterfaces = clazz.getGenericInterfaces();
-				Type superClass = clazz.getGenericSuperclass();
+				final Type[] superInterfaces = clazz.getGenericInterfaces();
+				final Type superClass = clazz.getGenericSuperclass();
 				Type[] result;
 				int resultIndex;
 				if (superClass == null) {
 					result = new Type[superInterfaces.length];
 					resultIndex = 0;
-				} else {
+				}
+				else {
 					result = new Type[superInterfaces.length + 1];
 					resultIndex = 1;
 					result[0] = mapTypeParameters(superClass, type);
 				}
-				for (Type superInterface : superInterfaces) {
+				for (final Type superInterface : superInterfaces) {
 					result[resultIndex++] = mapTypeParameters(superInterface, type);
 				}
 
 				return result;
-			} else if (type instanceof TypeVariable) {
-				TypeVariable<?> tv = (TypeVariable<?>) type;
+			}
+			else if (type instanceof TypeVariable) {
+				final TypeVariable<?> tv = (TypeVariable<?>) type;
 				return tv.getBounds();
-			} else if (type instanceof WildcardType) {
-				// This should be a rare case: normally this wildcard is already captured.
-				// But it does happen if the upper bound of a type variable contains a wildcard
-				// TODO shouldn't upper bound of type variable have been captured too? (making this case impossible?)
+			}
+			else if (type instanceof WildcardType) {
+				// This should be a rare case: normally this wildcard is already
+				// captured.
+				// But it does happen if the upper bound of a type variable contains a
+				// wildcard
+				// TODO shouldn't upper bound of type variable have been captured too?
+				// (making this case impossible?)
 				return ((WildcardType) type).getUpperBounds();
-			} else if (type instanceof CaptureType) {
-				return ((CaptureType)type).getUpperBounds();
-			} else if (type instanceof GenericArrayType) {
+			}
+			else if (type instanceof CaptureType) {
+				return ((CaptureType) type).getUpperBounds();
+			}
+			else if (type instanceof GenericArrayType) {
 				return getArrayExactDirectSuperTypes(type);
-			} else {
+			}
+			else {
 				throw new RuntimeException("not implemented type: " + type);
 			}
 		}
 
-		private static Type[] getArrayExactDirectSuperTypes(Type arrayType) {
-			// see http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.10.3
-			Type typeComponent = getArrayComponentType(arrayType);
+		private static Type[] getArrayExactDirectSuperTypes(final Type arrayType) {
+			// see
+			// http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.10.3
+			final Type typeComponent = getArrayComponentType(arrayType);
 
 			Type[] result;
 			int resultIndex;
-			if (typeComponent instanceof Class && ((Class<?>)typeComponent).isPrimitive()) {
+			if (typeComponent instanceof Class && ((Class<?>) typeComponent)
+				.isPrimitive())
+			{
 				resultIndex = 0;
 				result = new Type[3];
-			} else {
-				Type[] componentSupertypes = getExactDirectSuperTypes(typeComponent);
+			}
+			else {
+				final Type[] componentSupertypes = getExactDirectSuperTypes(
+					typeComponent);
 				result = new Type[componentSupertypes.length + 3];
-				for (resultIndex = 0; resultIndex < componentSupertypes.length; resultIndex++) {
+				for (resultIndex =
+					0; resultIndex < componentSupertypes.length; resultIndex++)
+				{
 					result[resultIndex] = array(componentSupertypes[resultIndex]);
 				}
 			}
@@ -3163,46 +3249,61 @@ private static Type[] getArrayExactDirectSuperTypes(Type arrayType) {
 		}
 
 		/**
-		 * Returns the exact return type of the given method in the given type.
-		 * This may be different from <tt>m.getGenericReturnType()</tt> when the method was declared in a superclass,
-		 * or <tt>type</tt> has a type parameter that is used in the return type, or <tt>type</tt> is a raw type.
+		 * Returns the exact return type of the given method in the given type. This
+		 * may be different from <tt>m.getGenericReturnType()</tt> when the method
+		 * was declared in a superclass, or <tt>type</tt> has a type parameter that
+		 * is used in the return type, or <tt>type</tt> is a raw type.
 		 */
-		public static Type getExactReturnType(Method m, Type type) {
-			Type returnType = m.getGenericReturnType();
-			Type exactDeclaringType = getExactSuperType(capture(type), m.getDeclaringClass());
-			if (exactDeclaringType == null) { // capture(type) is not a subtype of m.getDeclaringClass()
-				throw new IllegalArgumentException("The method " + m + " is not a member of type " + type);
+		public static Type getExactReturnType(final Method m, final Type type) {
+			final Type returnType = m.getGenericReturnType();
+			final Type exactDeclaringType = getExactSuperType(capture(type), m
+				.getDeclaringClass());
+			if (exactDeclaringType == null) {
+				// capture(type) is not a subtype of m.getDeclaringClass()
+				throw new IllegalArgumentException("The method " + m +
+					" is not a member of type " + type);
 			}
 			return mapTypeParameters(returnType, exactDeclaringType);
 		}
 
 		/**
-		 * Returns the exact type of the given field in the given type.
-		 * This may be different from <tt>f.getGenericType()</tt> when the field was declared in a superclass,
-		 * or <tt>type</tt> has a type parameter that is used in the type of the field, or <tt>type</tt> is a raw type.
+		 * Returns the exact type of the given field in the given type. This may be
+		 * different from <tt>f.getGenericType()</tt> when the field was declared in
+		 * a superclass, or <tt>type</tt> has a type parameter that is used in the
+		 * type of the field, or <tt>type</tt> is a raw type.
 		 */
-		public static Type getExactFieldType(Field f, Type type) {
-			Type returnType = f.getGenericType();
-			Type exactDeclaringType = getExactSuperType(capture(type), f.getDeclaringClass());
-			if (exactDeclaringType == null) { // capture(type) is not a subtype of f.getDeclaringClass()
-				throw new IllegalArgumentException("The field " + f + " is not a member of type " + type);
+		public static Type getExactFieldType(final Field f, final Type type) {
+			final Type returnType = f.getGenericType();
+			final Type exactDeclaringType = getExactSuperType(capture(type), f
+				.getDeclaringClass());
+			if (exactDeclaringType == null) {
+				// capture(type) is not a subtype of f.getDeclaringClass()
+				throw new IllegalArgumentException("The field " + f +
+					" is not a member of type " + type);
 			}
 			return mapTypeParameters(returnType, exactDeclaringType);
 		}
 
 		/**
 		 * Returns the exact parameter types of the given method in the given type.
-		 * This may be different from <tt>m.getGenericParameterTypes()</tt> when the method was declared in a superclass,
-		 * or <tt>type</tt> has a type parameter that is used in one of the parameters, or <tt>type</tt> is a raw type.
+		 * This may be different from <tt>m.getGenericParameterTypes()</tt> when the
+		 * method was declared in a superclass, or <tt>type</tt> has a type
+		 * parameter that is used in one of the parameters, or <tt>type</tt> is a
+		 * raw type.
 		 */
-		public static Type[] getExactParameterTypes(Method m, Type type) {
-			Type[] parameterTypes = m.getGenericParameterTypes();
-			Type exactDeclaringType = getExactSuperType(capture(type), m.getDeclaringClass());
-			if (exactDeclaringType == null) { // capture(type) is not a subtype of m.getDeclaringClass()
-				throw new IllegalArgumentException("The method " + m + " is not a member of type " + type);
+		public static Type[] getExactParameterTypes(final Method m,
+			final Type type)
+		{
+			final Type[] parameterTypes = m.getGenericParameterTypes();
+			final Type exactDeclaringType = getExactSuperType(capture(type), m
+				.getDeclaringClass());
+			if (exactDeclaringType == null) { // capture(type) is not a subtype of
+																				// m.getDeclaringClass()
+				throw new IllegalArgumentException("The method " + m +
+					" is not a member of type " + type);
 			}
 
-			Type[] result = new Type[parameterTypes.length];
+			final Type[] result = new Type[parameterTypes.length];
 			for (int i = 0; i < parameterTypes.length; i++) {
 				result[i] = mapTypeParameters(parameterTypes[i], exactDeclaringType);
 			}
@@ -3212,32 +3313,35 @@ public static Type[] getExactParameterTypes(Method m, Type type) {
 		/**
 		 * Applies capture conversion to the given type.
 		 */
-		public static Type capture(Type type) {
-			VarMap varMap = new VarMap();
-			List<CaptureTypeImpl> toInit = new ArrayList<CaptureTypeImpl>();
+		public static Type capture(final Type type) {
+			final VarMap varMap = new VarMap();
+			final List<CaptureTypeImpl> toInit = new ArrayList<>();
 			if (type instanceof ParameterizedType) {
-				ParameterizedType pType = (ParameterizedType)type;
-				Class<?> clazz = (Class<?>)pType.getRawType();
-				Type[] arguments = pType.getActualTypeArguments();
-				TypeVariable<?>[] vars = clazz.getTypeParameters();
-				Type[] capturedArguments = new Type[arguments.length];
+				final ParameterizedType pType = (ParameterizedType) type;
+				final Class<?> clazz = (Class<?>) pType.getRawType();
+				final Type[] arguments = pType.getActualTypeArguments();
+				final TypeVariable<?>[] vars = clazz.getTypeParameters();
+				final Type[] capturedArguments = new Type[arguments.length];
 				assert arguments.length == vars.length;
 				for (int i = 0; i < arguments.length; i++) {
 					Type argument = arguments[i];
 					if (argument instanceof WildcardType) {
-						CaptureTypeImpl captured = new CaptureTypeImpl((WildcardType)argument, vars[i]);
+						final CaptureTypeImpl captured = new CaptureTypeImpl(
+							(WildcardType) argument, vars[i]);
 						argument = captured;
 						toInit.add(captured);
 					}
 					capturedArguments[i] = argument;
 					varMap.add(vars[i], argument);
 				}
-				for (CaptureTypeImpl captured : toInit) {
+				for (final CaptureTypeImpl captured : toInit) {
 					captured.init(varMap);
 				}
-				Type ownerType = (pType.getOwnerType() == null) ? null : capture(pType.getOwnerType());
+				final Type ownerType = (pType.getOwnerType() == null) ? null : capture(
+					pType.getOwnerType());
 				return newParameterizedType(clazz, ownerType, capturedArguments);
-			} else {
+			}
+			else {
 				return type;
 			}
 		}
@@ -3245,47 +3349,58 @@ public static Type capture(Type type) {
 		/**
 		 * Returns the display name of a Type.
 		 */
-		public static String getTypeName(Type type) {
-			if(type instanceof Class) {
-				Class<?> clazz = (Class<?>) type;
-				return clazz.isArray() ? (getTypeName(clazz.getComponentType()) + "[]") : clazz.getName();
-			} else {
+		public static String getTypeName(final Type type) {
+			if (type instanceof Class) {
+				final Class<?> clazz = (Class<?>) type;
+				return clazz.isArray() ? (getTypeName(clazz.getComponentType()) + "[]")
+					: clazz.getName();
+			}
+			else {
 				return type.toString();
 			}
 		}
 
 		/**
-		 * Returns list of classes and interfaces that are supertypes of the given type.
-		 * For example given this class:
-		 * <tt>class Foo&lt;A extends Number & Iterable&lt;A&gt;, B extends A&gt;</tt><br>
-		 * calling this method on type parameters <tt>B</tt> (<tt>Foo.class.getTypeParameters()[1]</tt>)
-		 * returns a list containing <tt>Number</tt> and <tt>Iterable</tt>.
+		 * Returns list of classes and interfaces that are supertypes of the given
+		 * type. For example given this class:
+		 * <tt>class Foo&lt;A extends Number & Iterable&lt;A&gt;, B extends A&gt;</tt>
+		 * <br>
+		 * calling this method on type parameters <tt>B</tt>
+		 * (<tt>Foo.class.getTypeParameters()[1]</tt>) returns a list containing
+		 * <tt>Number</tt> and <tt>Iterable</tt>.
 		 * <p>
-		 * This is mostly useful if you get a type from one of the other methods in <tt>GenericTypeReflector</tt>,
-		 * but you don't want to deal with all the different sorts of types,
-		 * and you are only really interested in concrete classes and interfaces.
+		 * This is mostly useful if you get a type from one of the other methods in
+		 * <tt>GenericTypeReflector</tt>, but you don't want to deal with all the
+		 * different sorts of types, and you are only really interested in concrete
+		 * classes and interfaces.
 		 * </p>
-		 *  
-		 * @return A List of classes, each of them a supertype of the given type.
-		 * 	If the given type is a class or interface itself, returns a List with just the given type.
-		 *  The list contains no duplicates, and is ordered in the order the upper bounds are defined on the type.
+		 * 
+		 * @return A List of classes, each of them a supertype of the given type. If
+		 *         the given type is a class or interface itself, returns a List
+		 *         with just the given type. The list contains no duplicates, and is
+		 *         ordered in the order the upper bounds are defined on the type.
 		 */
-		public static List<Class<?>> getUpperBoundClassAndInterfaces(Type type) {
-			LinkedHashSet<Class<?>> result = new LinkedHashSet<Class<?>>();
+		public static List<Class<?>> getUpperBoundClassAndInterfaces(
+			final Type type)
+		{
+			final LinkedHashSet<Class<?>> result = new LinkedHashSet<>();
 			buildUpperBoundClassAndInterfaces(type, result);
-			return new ArrayList<Class<?>>(result);
+			return new ArrayList<>(result);
 		}
 
 		/**
-		 * Helper method for getUpperBoundClassAndInterfaces, adding the result to the given set.
+		 * Helper method for getUpperBoundClassAndInterfaces, adding the result to
+		 * the given set.
 		 */
-		private static void buildUpperBoundClassAndInterfaces(Type type, Set<Class<?>> result) {
+		private static void buildUpperBoundClassAndInterfaces(final Type type,
+			final Set<Class<?>> result)
+		{
 			if (type instanceof ParameterizedType || type instanceof Class<?>) {
 				result.add(erase(type));
 				return;
 			}
 
-			for (Type superType: getExactDirectSuperTypes(type)) {
+			for (final Type superType : getExactDirectSuperTypes(type)) {
 				buildUpperBoundClassAndInterfaces(superType, result);
 			}
 		}
@@ -3293,67 +3408,82 @@ private static void buildUpperBoundClassAndInterfaces(Type type, Set<Class<?>> r
 
 	/**
 	 * CaptureType represents a wildcard that has gone through capture conversion.
-	 * It is a custom subinterface of Type, not part of the java builtin Type hierarchy.
-	 * 
+	 * It is a custom subinterface of Type, not part of the java builtin Type
+	 * hierarchy.
+	 *
 	 * @author Wouter Coekaerts <wouter@coekaerts.be>
 	 */
 	private interface CaptureType extends Type {
+
 		/**
-		 * Returns an array of <tt>Type</tt> objects representing the upper
-		 * bound(s) of this capture. This includes both the upper bound of a <tt>? extends</tt> wildcard,
-		 * and the bounds declared with the type variable.
-		 * References to other (or the same) type variables in bounds coming from the type variable are
-		 * replaced by their matching capture.
+		 * Returns an array of <tt>Type</tt> objects representing the upper bound(s)
+		 * of this capture. This includes both the upper bound of a
+		 * <tt>? extends</tt> wildcard, and the bounds declared with the type
+		 * variable. References to other (or the same) type variables in bounds
+		 * coming from the type variable are replaced by their matching capture.
 		 */
 		Type[] getUpperBounds();
 
 		/**
-		 * Returns an array of <tt>Type</tt> objects representing the 
-		 * lower bound(s) of this type variable. This is the bound of a <tt>? super</tt> wildcard.
-		 * This normally contains only one or no types; it is an array for consistency with {@link WildcardType#getLowerBounds()}.
+		 * Returns an array of <tt>Type</tt> objects representing the lower bound(s)
+		 * of this type variable. This is the bound of a <tt>? super</tt> wildcard.
+		 * This normally contains only one or no types; it is an array for
+		 * consistency with {@link WildcardType#getLowerBounds()}.
 		 */
 		Type[] getLowerBounds();
 	}
 
 	private static class CaptureTypeImpl implements CaptureType {
+
 		private final WildcardType wildcard;
 		private final TypeVariable<?> variable;
 		private final Type[] lowerBounds;
 		private Type[] upperBounds;
 
 		/**
-		 * Creates an uninitialized CaptureTypeImpl. Before using this type, {@link #init(VarMap)} must be called.
+		 * Creates an uninitialized CaptureTypeImpl. Before using this type,
+		 * {@link #init(VarMap)} must be called.
+		 * 
 		 * @param wildcard The wildcard this is a capture of
 		 * @param variable The type variable where the wildcard is a parameter for.
 		 */
-		public CaptureTypeImpl(WildcardType wildcard, TypeVariable<?> variable) {
+		public CaptureTypeImpl(final WildcardType wildcard,
+			final TypeVariable<?> variable)
+		{
 			this.wildcard = wildcard;
 			this.variable = variable;
 			this.lowerBounds = wildcard.getLowerBounds();
 		}
 
 		/**
-		 * Initialize this CaptureTypeImpl.
-		 * This is needed for type variable bounds referring to each other: we need the capture of the argument.
+		 * Initialize this CaptureTypeImpl. This is needed for type variable bounds
+		 * referring to each other: we need the capture of the argument.
 		 */
-		void init(VarMap varMap) {
-			ArrayList<Type> upperBoundsList = new ArrayList<Type>();
+		void init(final VarMap varMap) {
+			final ArrayList<Type> upperBoundsList = new ArrayList<>();
 			upperBoundsList.addAll(Arrays.asList(varMap.map(variable.getBounds())));
 
-			List<Type> wildcardUpperBounds = Arrays.asList(wildcard.getUpperBounds());
-			if (wildcardUpperBounds.size() > 0 && wildcardUpperBounds.get(0) == Object.class) {
-				// skip the Object bound, we already have a first upper bound from 'variable'
-				upperBoundsList.addAll(wildcardUpperBounds.subList(1, wildcardUpperBounds.size()));
-			} else {
+			final List<Type> wildcardUpperBounds = Arrays.asList(wildcard
+				.getUpperBounds());
+			if (wildcardUpperBounds.size() > 0 && wildcardUpperBounds.get(
+				0) == Object.class)
+			{
+				// skip the Object bound, we already have a first upper bound from
+				// 'variable'
+				upperBoundsList.addAll(wildcardUpperBounds.subList(1,
+					wildcardUpperBounds.size()));
+			}
+			else {
 				upperBoundsList.addAll(wildcardUpperBounds);
 			}
-			upperBounds = new Type[upperBoundsList.size()]; 
+			upperBounds = new Type[upperBoundsList.size()];
 			upperBoundsList.toArray(upperBounds);
 		}
 
 		/*
 		 * @see com.googlecode.gentyref.CaptureType#getLowerBounds()
 		 */
+		@Override
 		public Type[] getLowerBounds() {
 			return lowerBounds.clone();
 		}
@@ -3361,6 +3491,7 @@ public Type[] getLowerBounds() {
 		/*
 		 * @see com.googlecode.gentyref.CaptureType#getUpperBounds()
 		 */
+		@Override
 		public Type[] getUpperBounds() {
 			assert upperBounds != null;
 			return upperBounds.clone();
@@ -3374,54 +3505,64 @@ public String toString() {
 
 	/**
 	 * Mapping between type variables and actual parameters.
-	 * 
+	 *
 	 * @author Wouter Coekaerts <wouter@coekaerts.be>
 	 */
 	private static class VarMap {
-		private final Map<TypeVariable<?>, Type> map = new HashMap<TypeVariable<?>, Type>();
+
+		private final Map<TypeVariable<?>, Type> map =
+			new HashMap<>();
 
 		/**
 		 * Creates an empty VarMap
 		 */
-		VarMap() {
-		}
+		VarMap() {}
 
-		void add(TypeVariable<?> variable, Type value) {
+		void add(final TypeVariable<?> variable, final Type value) {
 			map.put(variable, value);
 		}
 
-		void addAll(TypeVariable<?>[] variables, Type[] values) {
+		void addAll(final TypeVariable<?>[] variables, final Type[] values) {
 			assert variables.length == values.length;
 			for (int i = 0; i < variables.length; i++) {
 				map.put(variables[i], values[i]);
 			}
 		}
 
-		VarMap(TypeVariable<?>[] variables, Type[] values) {
+		VarMap(final TypeVariable<?>[] variables, final Type[] values) {
 			addAll(variables, values);
 		}
 
-		Type map(Type type) {
+		Type map(final Type type) {
 			if (type instanceof Class) {
 				return type;
-			} else if (type instanceof TypeVariable) {
+			}
+			else if (type instanceof TypeVariable) {
 				assert map.containsKey(type);
 				return map.get(type);
-			} else if (type instanceof ParameterizedType) {
-				ParameterizedType pType = (ParameterizedType) type;
-				return newParameterizedType((Class<?>)pType.getRawType(), pType.getOwnerType() == null ? pType.getOwnerType() : map(pType.getOwnerType()), map(pType.getActualTypeArguments()));
-			} else if (type instanceof WildcardType) {
-				WildcardType wType = (WildcardType) type;
-				return new TypeUtils.WildcardTypeImpl(map(wType.getUpperBounds()), map(wType.getLowerBounds()));
-			} else if (type instanceof GenericArrayType) {
-				return array(map(((GenericArrayType)type).getGenericComponentType()));
-			} else {
-				throw new RuntimeException("not implemented: mapping " + type.getClass() + " (" + type + ")");
+			}
+			else if (type instanceof ParameterizedType) {
+				final ParameterizedType pType = (ParameterizedType) type;
+				return newParameterizedType((Class<?>) pType.getRawType(), pType
+					.getOwnerType() == null ? pType.getOwnerType() : map(pType
+						.getOwnerType()), map(pType.getActualTypeArguments()));
+			}
+			else if (type instanceof WildcardType) {
+				final WildcardType wType = (WildcardType) type;
+				return new TypeUtils.WildcardTypeImpl(map(wType.getUpperBounds()), map(
+					wType.getLowerBounds()));
+			}
+			else if (type instanceof GenericArrayType) {
+				return array(map(((GenericArrayType) type).getGenericComponentType()));
+			}
+			else {
+				throw new RuntimeException("not implemented: mapping " + type
+					.getClass() + " (" + type + ")");
 			}
 		}
 
-		Type[] map(Type[] types) {
-			Type[] result = new Type[types.length];
+		Type[] map(final Type[] types) {
+			final Type[] result = new Type[types.length];
 			for (int i = 0; i < types.length; i++) {
 				result[i] = map(types[i]);
 			}

From c08cb966959d09f455916edf7dd75cd215f5e047 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 11:58:53 -0500
Subject: [PATCH 0749/1208] Types: eliminate unnecessary else clauses

---
 src/main/java/org/scijava/util/Types.java | 48 +++++++++--------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index f956b9a97..a4733d484 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2863,7 +2863,7 @@ else if (type instanceof ParameterizedType) {
 			else if (type instanceof TypeVariable) {
 				final TypeVariable<?> tv = (TypeVariable<?>) type;
 				if (tv.getBounds().length == 0) return Object.class;
-				else return erase(tv.getBounds()[0]);
+				return erase(tv.getBounds()[0]);
 			}
 			else if (type instanceof GenericArrayType) {
 				final GenericArrayType aType = (GenericArrayType) type;
@@ -2889,21 +2889,19 @@ private static Type mapTypeParameters(final Type toMapType,
 			if (isMissingTypeParameters(typeAndParams)) {
 				return erase(toMapType);
 			}
-			else {
-				final VarMap varMap = new VarMap();
-				Type handlingTypeAndParams = typeAndParams;
-				while (handlingTypeAndParams instanceof ParameterizedType) {
-					final ParameterizedType pType =
-						(ParameterizedType) handlingTypeAndParams;
-					final Class<?> clazz = (Class<?>) pType.getRawType(); // getRawType
-																																// should always
-																																// be Class
-					varMap.addAll(clazz.getTypeParameters(), pType
-						.getActualTypeArguments());
-					handlingTypeAndParams = pType.getOwnerType();
-				}
-				return varMap.map(toMapType);
+			final VarMap varMap = new VarMap();
+			Type handlingTypeAndParams = typeAndParams;
+			while (handlingTypeAndParams instanceof ParameterizedType) {
+				final ParameterizedType pType =
+					(ParameterizedType) handlingTypeAndParams;
+				final Class<?> clazz = (Class<?>) pType.getRawType(); // getRawType
+																															// should always
+																															// be Class
+				varMap.addAll(clazz.getTypeParameters(), pType
+					.getActualTypeArguments());
+				handlingTypeAndParams = pType.getOwnerType();
 			}
+			return varMap.map(toMapType);
 		}
 
 		/**
@@ -3030,9 +3028,7 @@ public static Type getTypeParameter(final Type type,
 					variable);
 				return ((ParameterizedType) superType).getActualTypeArguments()[index];
 			}
-			else {
-				return null;
-			}
+			return null;
 		}
 
 		/**
@@ -3115,9 +3111,7 @@ private static boolean isArraySupertype(final Type arraySuperType,
 			if (subTypeComponent == null) { // subType is not an array type
 				return false;
 			}
-			else {
-				return isSuperType(superTypeComponent, subTypeComponent);
-			}
+			return isSuperType(superTypeComponent, subTypeComponent);
 		}
 
 		/**
@@ -3155,9 +3149,7 @@ private static boolean contains(final Type containingType,
 				}
 				return true;
 			}
-			else {
-				return containingType.equals(containedType);
-			}
+			return containingType.equals(containedType);
 		}
 
 		/**
@@ -3341,9 +3333,7 @@ public static Type capture(final Type type) {
 					pType.getOwnerType());
 				return newParameterizedType(clazz, ownerType, capturedArguments);
 			}
-			else {
-				return type;
-			}
+			return type;
 		}
 
 		/**
@@ -3355,9 +3345,7 @@ public static String getTypeName(final Type type) {
 				return clazz.isArray() ? (getTypeName(clazz.getComponentType()) + "[]")
 					: clazz.getName();
 			}
-			else {
-				return type.toString();
-			}
+			return type.toString();
 		}
 
 		/**

From a95c5fbc5df9bf98737e1d003326261130017a32 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 18:55:56 -0500
Subject: [PATCH 0750/1208] Types: use array(Type) method as appropriate

---
 src/main/java/org/scijava/util/Types.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index a4733d484..c1a84bfb3 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2146,8 +2146,8 @@ public static Class<?> getRawType(final Type type,
 				final Class<?> rawComponentType = getRawType(((GenericArrayType) type)
 					.getGenericComponentType(), assigningType);
 
-				// create array type from raw component type and return its class
-				return Array.newInstance(rawComponentType, 0).getClass();
+				// return the corresponding array type
+				return array(rawComponentType);
 			}
 
 			// (hand-waving) this is not the method you're looking for

From a61b506793182fad4131be018d1c41b5e26b7ef5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 18:56:18 -0500
Subject: [PATCH 0751/1208] Types: add paramTypes(Method, Class) method

This is like returnType(Method, Class), but for method
parameter types, rather than its return type. it leans on
GenTyRef's getExactParameterTypes to do the work.
---
 src/main/java/org/scijava/util/Types.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index c1a84bfb3..15be0c5d8 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -525,6 +525,15 @@ public static Type returnType(final Method method, final Class<?> type) {
 		return GenericTypeReflector.getExactReturnType(method, wildType);
 	}
 
+	/**
+	 * As {@link #type(Field, Class)}, but with respect to the parameter types of
+	 * the given {@link Method} rather than a {@link Field}.
+	 */
+	public static Type[] paramTypes(final Method method, final Class<?> type) {
+		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
+		return GenericTypeReflector.getExactParameterTypes(method, wildType);
+	}
+
 	/**
 	 * Gets the given type's {@code n}th type parameter of the specified class.
 	 * <p>

From f843c98c99288fb898cae4ccada88ada20b3a064 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 18:57:24 -0500
Subject: [PATCH 0752/1208] Types: unify name and getTypeName methods

The difference was that getTypeName(Type) handled array types, too.
---
 src/main/java/org/scijava/util/Types.java | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 15be0c5d8..27d6c5ef6 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -219,9 +219,11 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 	 * @return The name of the given type.
 	 */
 	public static String name(final Type t) {
-		// NB: It is annoying that Class.toString() prepends "class " or
-		// "interface "; this method exists to work around that behavior.
-		return t instanceof Class ? ((Class<?>) t).getName() : t.toString();
+		if (t instanceof Class) {
+			final Class<?> c = (Class<?>) t;
+			return c.isArray() ? (name(component(c)) + "[]") : c.getName();
+		}
+		return t.toString();
 	}
 
 	/**
@@ -3345,18 +3347,6 @@ public static Type capture(final Type type) {
 			return type;
 		}
 
-		/**
-		 * Returns the display name of a Type.
-		 */
-		public static String getTypeName(final Type type) {
-			if (type instanceof Class) {
-				final Class<?> clazz = (Class<?>) type;
-				return clazz.isArray() ? (getTypeName(clazz.getComponentType()) + "[]")
-					: clazz.getName();
-			}
-			return type.toString();
-		}
-
 		/**
 		 * Returns list of classes and interfaces that are supertypes of the given
 		 * type. For example given this class:

From aeb16f74a75518791900670c0e3b63eb6ef71b9b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 18:58:54 -0500
Subject: [PATCH 0753/1208] Types: remove unused VarMap constructor

---
 src/main/java/org/scijava/util/Types.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 27d6c5ef6..4f00505b7 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -3516,10 +3516,6 @@ void addAll(final TypeVariable<?>[] variables, final Type[] values) {
 			}
 		}
 
-		VarMap(final TypeVariable<?>[] variables, final Type[] values) {
-			addAll(variables, values);
-		}
-
 		Type map(final Type type) {
 			if (type instanceof Class) {
 				return type;

From 213aa204f8d591c8b87bc93ba06edae4bd89705e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 28 Aug 2016 20:27:54 -0500
Subject: [PATCH 0754/1208] Types: remove non-javadoc comments

---
 src/main/java/org/scijava/util/Types.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 4f00505b7..183fe5fd9 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -3467,17 +3467,11 @@ void init(final VarMap varMap) {
 			upperBoundsList.toArray(upperBounds);
 		}
 
-		/*
-		 * @see com.googlecode.gentyref.CaptureType#getLowerBounds()
-		 */
 		@Override
 		public Type[] getLowerBounds() {
 			return lowerBounds.clone();
 		}
 
-		/*
-		 * @see com.googlecode.gentyref.CaptureType#getUpperBounds()
-		 */
 		@Override
 		public Type[] getUpperBounds() {
 			assert upperBounds != null;

From 732f49064303fcc077439098493338bc233a5a69 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Aug 2016 15:33:08 -0500
Subject: [PATCH 0755/1208] Types: add javadoc for field method

---
 src/main/java/org/scijava/util/Types.java | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 183fe5fd9..0adc4dc5e 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -404,6 +404,30 @@ public static <T> T nullValue(final Class<T> type) {
 		return result;
 	}
 
+	/**
+	 * Gets the field with the specified name, of the given class, or superclass
+	 * thereof.
+	 * <p>
+	 * Unlike {@link Class#getField(String)}, this method will return fields of
+	 * any visibility, not just {@code public}. And unlike
+	 * {@link Class#getDeclaredField(String)}, it will do so recursively,
+	 * returning the first field of the given name from the class's superclass
+	 * hierarchy.
+	 * </p>
+	 * <p>
+	 * Note that this method does not guarantee that the returned field is
+	 * accessible; if the field is not {@code public}, calling code will need to
+	 * use {@link Field#setAccessible(boolean)} in order to manipulate the field's
+	 * contents.
+	 * </p>
+	 * 
+	 * @param c The class (or subclass thereof) containing the desired field.
+	 * @param name
+	 * @return The first field with the given name in the class's superclass
+	 *         hierarchy.
+	 * @throws IllegalArgumentException if the specified class does not contain a
+	 *           method with the given name
+	 */
 	public static Field field(final Class<?> c, final String name) {
 		if (c == null) throw new IllegalArgumentException("No such field: " + name);
 		try {

From 3c27af45cb5459e3585a62bdabb090fabb4fbe9d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Aug 2016 15:33:58 -0500
Subject: [PATCH 0756/1208] Types: add @see reference for array method

---
 src/main/java/org/scijava/util/Types.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 0adc4dc5e..b664d5388 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -482,6 +482,7 @@ public static Class<?> array(final Class<?> componentType, final int dim) {
 	 * </p>
 	 *
 	 * @param componentType The type of elements which the array possesses
+	 * @see #component
 	 */
 	public static Type array(final Type componentType) {
 		if (componentType == null) return null;

From 3f50b9631d742701b6ce58d985b136e3d416f12f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Aug 2016 15:34:18 -0500
Subject: [PATCH 0757/1208] Types: expand javadoc for component method

---
 src/main/java/org/scijava/util/Types.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index b664d5388..0272f3d44 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -494,6 +494,13 @@ public static Type array(final Type componentType) {
 
 	/**
 	 * Gets the component type of the given array type, or null if not an array.
+	 * <p>
+	 * If you have a {@link Class}, you can call {@link Class#getComponentType()}
+	 * for a narrower return type.
+	 * </p>
+	 * <p>
+	 * This is the opposite of {@link #array(Type)}.
+	 * </p>
 	 */
 	public static Type component(final Type type) {
 		if (type instanceof Class) {

From 84c21d49369f88428caa463b0f5ef5e636d507ad Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Aug 2016 15:35:34 -0500
Subject: [PATCH 0758/1208] Types: rename a couple of methods, for clarity

The following methods were renamed:

* type(Field, Class) -> fieldType(Field, Class)
* returnType(Method, Class) -> methodReturnType(Method, Class)
* paramTypes(Method, Class) -> methodParamTypes(Method, Class)

These methods are all very similar: they all narrow the generic types
using information from the given subclass w.r.t. where the
field/method in question was originally defined.
---
 .../scijava/command/CommandModuleItem.java    |  4 ++--
 .../java/org/scijava/util/ClassUtils.java     | 10 ++++----
 .../java/org/scijava/util/GenericUtils.java   | 12 +++++-----
 src/main/java/org/scijava/util/Types.java     | 24 +++++++++++--------
 .../org/scijava/convert/ConverterTest.java    |  2 +-
 src/test/java/org/scijava/util/TypesTest.java | 18 +++++++-------
 6 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index a3763475b..862bc3643 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -76,7 +76,7 @@ public Parameter getParameter() {
 
 	@Override
 	public Class<T> getType() {
-		final Class<?> type = Types.raw(Types.type(field, getDelegateClass()));
+		final Class<?> type = Types.raw(Types.fieldType(field, getDelegateClass()));
 		@SuppressWarnings("unchecked")
 		final Class<T> typedType = (Class<T>) type;
 		return typedType;
@@ -84,7 +84,7 @@ public Class<T> getType() {
 
 	@Override
 	public Type getGenericType() {
-		return Types.type(field, getDelegateClass());
+		return Types.fieldType(field, getDelegateClass());
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index ce9a6e49c..93e207e3b 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -442,7 +442,7 @@ public static void setValue(final Field field, final Object instance,
 			}
 			else {
 				// the given value needs to be converted to a compatible type
-				final Type fieldType = Types.type(field, instance.getClass());
+				final Type fieldType = Types.fieldType(field, instance.getClass());
 				@SuppressWarnings("deprecation")
 				final Object convertedValue = ConversionUtils.convert(value, fieldType);
 				compatibleValue = convertedValue;
@@ -696,19 +696,19 @@ public static <T> T getNullValue(final Class<T> type) {
 	}
 
 	/**
-	 * @deprecated Use {@link Types#type(Field, Class)} and {@link Types#raws}
+	 * @deprecated Use {@link Types#fieldType(Field, Class)} and {@link Types#raws}
 	 *             instead.
 	 */
 	@Deprecated
 	public static List<Class<?>> getTypes(final Field field, final Class<?> type)
 	{
-		return Types.raws(Types.type(field, type));
+		return Types.raws(Types.fieldType(field, type));
 	}
 
-	/** @deprecated Use {@link Types#type(Field, Class)} instead. */
+	/** @deprecated Use {@link Types#fieldType(Field, Class)} instead. */
 	@Deprecated
 	public static Type getGenericType(final Field field, final Class<?> type) {
-		return Types.type(field, type);
+		return Types.fieldType(field, type);
 	}
 
 	/** @deprecated Use {@link Types#field} instead. */
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index b653a67aa..5fd08e324 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -74,21 +74,21 @@ public static Class<?> getComponentClass(final Type type) {
 		return Types.raw(Types.component(type));
 	}
 
-	/** @deprecated Use {@link Types#type(Field, Class)} instead. */
+	/** @deprecated Use {@link Types#fieldType(Field, Class)} instead. */
 	@Deprecated
 	public static Type getFieldType(final Field field, final Class<?> type) {
-		return Types.type(field, type);
+		return Types.fieldType(field, type);
 	}
 
 	/**
-	 * @deprecated Use {@link Types#type(Field, Class)} and {@link Types#raws}
+	 * @deprecated Use {@link Types#fieldType(Field, Class)} and {@link Types#raws}
 	 *             instead.
 	 */
 	@Deprecated
 	public static List<Class<?>> getFieldClasses(final Field field,
 		final Class<?> type)
 	{
-		return Types.raws(Types.type(field, type));
+		return Types.raws(Types.fieldType(field, type));
 	}
 
 	/** @deprecated Use {@link Types#returnType} instead. */
@@ -96,7 +96,7 @@ public static List<Class<?>> getFieldClasses(final Field field,
 	public static Type getMethodReturnType(final Method method,
 		final Class<?> type)
 	{
-		return Types.returnType(method, type);
+		return Types.methodReturnType(method, type);
 	}
 
 	/**
@@ -106,7 +106,7 @@ public static Type getMethodReturnType(final Method method,
 	public static List<Class<?>> getMethodReturnClasses(final Method method,
 		final Class<?> type)
 	{
-		return Types.raws(Types.returnType(method, type));
+		return Types.raws(Types.methodReturnType(method, type));
 	}
 
 	/** @deprecated Use {@link Types#param} instead. */
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 0272f3d44..17dec9c29 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -540,30 +540,34 @@ public static Type component(final Type type) {
 	 * field.getType(); // Object
 	 * field.getGenericType(); // T
 	 *
-	 * Types.type(field, Thing.class); // T
-	 * Types.type(field, NumberThing.class); // N extends Number
-	 * Types.type(field, IntegerThing.class); // Integer
+	 * Types.fieldType(field, Thing.class); // T
+	 * Types.fieldType(field, NumberThing.class); // N extends Number
+	 * Types.fieldType(field, IntegerThing.class); // Integer
 	 * </pre>
 	 */
-	public static Type type(final Field field, final Class<?> type) {
+	public static Type fieldType(final Field field, final Class<?> type) {
 		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
 		return GenericTypeReflector.getExactFieldType(field, wildType);
 	}
 
 	/**
-	 * As {@link #type(Field, Class)}, but with respect to the return type of the
-	 * given {@link Method} rather than a {@link Field}.
+	 * As {@link #fieldType(Field, Class)}, but with respect to the return type of
+	 * the given {@link Method} rather than a {@link Field}.
 	 */
-	public static Type returnType(final Method method, final Class<?> type) {
+	public static Type methodReturnType(final Method method,
+		final Class<?> type)
+	{
 		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
 		return GenericTypeReflector.getExactReturnType(method, wildType);
 	}
 
 	/**
-	 * As {@link #type(Field, Class)}, but with respect to the parameter types of
-	 * the given {@link Method} rather than a {@link Field}.
+	 * As {@link #fieldType(Field, Class)}, but with respect to the parameter
+	 * types of the given {@link Method} rather than a {@link Field}.
 	 */
-	public static Type[] paramTypes(final Method method, final Class<?> type) {
+	public static Type[] methodParamTypes(final Method method,
+		final Class<?> type)
+	{
 		final Type wildType = GenericTypeReflector.addWildcardParameters(type);
 		return GenericTypeReflector.getExactParameterTypes(method, wildType);
 	}
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 319a88d7f..3a89f4785 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -96,7 +96,7 @@ public void testCanConvertToGenericCollection() {
 		final CastingConverter cc = new CastingConverter();
 
 		final Field destField = Types.field(getClass(), "collection");
-		final Type destType = Types.type(destField, getClass());
+		final Type destType = Types.fieldType(destField, getClass());
 		assertTrue(cc.canConvert(ArrayList.class, destType));
 	}
 
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 409eedbab..ad5eaaf24 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -176,18 +176,18 @@ public void testRaws() {
 		final Field field = Types.field(Thing.class, "thing");
 
 		// Object
-		assertAllTheSame(Types.raws(Types.type(field, Thing.class)), Object.class);
+		assertAllTheSame(Types.raws(Types.fieldType(field, Thing.class)), Object.class);
 
 		// N extends Number
-		assertAllTheSame(Types.raws(Types.type(field, NumberThing.class)),
+		assertAllTheSame(Types.raws(Types.fieldType(field, NumberThing.class)),
 			Number.class);
 
 		// Integer
-		assertAllTheSame(Types.raws(Types.type(field, IntegerThing.class)),
+		assertAllTheSame(Types.raws(Types.fieldType(field, IntegerThing.class)),
 			Integer.class);
 
 		// Serializable & Cloneable
-		assertAllTheSame(Types.raws(Types.type(field, ComplexThing.class)),
+		assertAllTheSame(Types.raws(Types.fieldType(field, ComplexThing.class)),
 			Serializable.class, Cloneable.class);
 	}
 
@@ -357,21 +357,21 @@ class Struct {
 		assertSame(null, componentType(Struct.class, "map"));
 	}
 
-	/** Tests {@link Types#type(Field, Class)}. */
+	/** Tests {@link Types#fieldType(Field, Class)}. */
 	@Test
-	public void testTypeField() {
+	public void testFieldType() {
 		final Field field = Types.field(Thing.class, "thing");
 
 		// T
-		final Type tType = Types.type(field, Thing.class);
+		final Type tType = Types.fieldType(field, Thing.class);
 		assertEquals("capture of ?", tType.toString());
 
 		// N extends Number
-		final Type nType = Types.type(field, NumberThing.class);
+		final Type nType = Types.fieldType(field, NumberThing.class);
 		assertEquals("capture of ?", nType.toString());
 
 		// Integer
-		final Type iType = Types.type(field, IntegerThing.class);
+		final Type iType = Types.fieldType(field, IntegerThing.class);
 		assertSame(Integer.class, iType);
 	}
 

From 25a4e940a18f79b713c3f925236988a62054f6eb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 30 Aug 2016 10:32:20 -0500
Subject: [PATCH 0759/1208] Types: shorten names of type creator methods

The following methods are renamed:

* newWildcardType -> wildcard
* newParameterizedType -> parameterize

I was originally concerned that without the "new" prefix, it would not
be clear that these methods are creating new Type instances, rather than
somehow extracting them. But the distinction is sort of artificial --
there are other methods in Types that also create new Type instances
internally, but do not have a "new" prefix. I think the new names read
just fine (e.g., Types.wildcard()) and the "new" is not needed here.
---
 src/main/java/org/scijava/util/Types.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 17dec9c29..f83a65ab2 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -631,10 +631,10 @@ public static <T> T cast(final Object src, final Class<T> dest) {
 	 * @param typeArgs The type arguments to use in parameterizing it.
 	 * @return The newly created {@link ParameterizedType}.
 	 */
-	public static ParameterizedType newParameterizedType(final Class<?> rawType,
+	public static ParameterizedType parameterize(final Class<?> rawType,
 		final Type... typeArgs)
 	{
-		return newParameterizedType(rawType, rawType.getDeclaringClass(), typeArgs);
+		return parameterize(rawType, rawType.getDeclaringClass(), typeArgs);
 	}
 
 	/**
@@ -646,7 +646,7 @@ public static ParameterizedType newParameterizedType(final Class<?> rawType,
 	 * @param typeArgs The type arguments to use in parameterizing it.
 	 * @return The newly created {@link ParameterizedType}.
 	 */
-	public static ParameterizedType newParameterizedType(final Class<?> rawType,
+	public static ParameterizedType parameterize(final Class<?> rawType,
 		final Type ownerType, final Type... typeArgs)
 	{
 		return new TypeUtils.ParameterizedTypeImpl(rawType, ownerType, typeArgs);
@@ -658,8 +658,8 @@ public static ParameterizedType newParameterizedType(final Class<?> rawType,
 	 *
 	 * @return The newly created {@link WildcardType}.
 	 */
-	public static WildcardType newWildcardType() {
-		return newWildcardType(null, null);
+	public static WildcardType wildcard() {
+		return wildcard((Type) null, (Type) null);
 	}
 
 	/**
@@ -669,7 +669,7 @@ public static WildcardType newWildcardType() {
 	 * @param lowerBound Lower bound of the wildcard, or null for none.
 	 * @return The newly created {@link WildcardType}.
 	 */
-	public static WildcardType newWildcardType(final Type upperBound,
+	public static WildcardType wildcard(final Type upperBound,
 		final Type lowerBound)
 	{
 		return new TypeUtils.WildcardTypeImpl(upperBound, lowerBound);
@@ -2998,7 +2998,7 @@ else if (isMissingTypeParameters(clazz)) {
 				Arrays.fill(arguments, UNBOUND_WILDCARD);
 				final Type owner = clazz.getDeclaringClass() == null ? null
 					: addWildcardParameters(clazz.getDeclaringClass());
-				return newParameterizedType(clazz, owner, arguments);
+				return parameterize(clazz, owner, arguments);
 			}
 			else {
 				return clazz;
@@ -3378,7 +3378,7 @@ public static Type capture(final Type type) {
 				}
 				final Type ownerType = (pType.getOwnerType() == null) ? null : capture(
 					pType.getOwnerType());
-				return newParameterizedType(clazz, ownerType, capturedArguments);
+				return parameterize(clazz, ownerType, capturedArguments);
 			}
 			return type;
 		}
@@ -3556,7 +3556,7 @@ else if (type instanceof TypeVariable) {
 			}
 			else if (type instanceof ParameterizedType) {
 				final ParameterizedType pType = (ParameterizedType) type;
-				return newParameterizedType((Class<?>) pType.getRawType(), pType
+				return parameterize((Class<?>) pType.getRawType(), pType
 					.getOwnerType() == null ? pType.getOwnerType() : map(pType
 						.getOwnerType()), map(pType.getActualTypeArguments()));
 			}

From 2bbf597967a16dd698daf2df7ef361681f06e100 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 30 Aug 2016 10:36:22 -0500
Subject: [PATCH 0760/1208] Types: add wildcard method for multiple bounds

In some cases -- especially internally -- it is helpful to have a
wildcard type with multiple upper and/or lower bounds. While this is not
allowed by the Java compiler at the source level, there are scenarios
where it is helpful to have such types when reasoning about generics.
---
 src/main/java/org/scijava/util/Types.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index f83a65ab2..6b47d686c 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -675,6 +675,20 @@ public static WildcardType wildcard(final Type upperBound,
 		return new TypeUtils.WildcardTypeImpl(upperBound, lowerBound);
 	}
 
+	/**
+	 * Creates a new {@link WildcardType} with the given upper and/or lower
+	 * bounds.
+	 *
+	 * @param upperBounds Upper bounds of the wildcard, or null for none.
+	 * @param lowerBounds Lower bounds of the wildcard, or null for none.
+	 * @return The newly created {@link WildcardType}.
+	 */
+	public static WildcardType wildcard(final Type[] upperBounds,
+		final Type[] lowerBounds)
+	{
+		return new TypeUtils.WildcardTypeImpl(upperBounds, lowerBounds);
+	}
+
 	/**
 	 * Learn, recursively, whether any of the type parameters associated with
 	 * {@code type} are bound to variables.

From 70ee8ef6adb0558cf947b91d901068d335032b6e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Sep 2016 13:38:43 -0700
Subject: [PATCH 0761/1208] Migrate convertToEnum method to Types.enumValue

---
 .../org/scijava/util/ConversionUtils.java     | 37 ++++++-------------
 src/main/java/org/scijava/util/Types.java     | 21 +++++++++++
 .../org/scijava/util/ConversionUtilsTest.java | 23 ------------
 src/test/java/org/scijava/util/TypesTest.java | 28 ++++++++++++++
 4 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 39914b1b5..c7260fa57 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -61,32 +61,6 @@ private ConversionUtils() {
 		// prevent instantiation of utility class
 	}
 
-	// -- Type casting --
-
-	/**
-	 * Converts the given string value to an enumeration constant of the specified
-	 * type.
-	 *
-	 * @param src The value to convert.
-	 * @param dest The type of the enumeration constant.
-	 * @return The converted enumeration constant, or null if the type is not an
-	 *         enumeration type or has no such constant.
-	 */
-	public static <T> T convertToEnum(final String src, final Class<T> dest) {
-		if (src == null || !dest.isEnum()) return null;
-		try {
-			@SuppressWarnings({ "rawtypes", "unchecked" })
-			final Enum result = Enum.valueOf((Class) dest, src);
-			@SuppressWarnings("unchecked")
-			final T typedResult = (T) result;
-			return typedResult;
-		}
-		catch (final IllegalArgumentException exc) {
-			// no such enum constant
-			return null;
-		}
-	}
-
 	// -- ConvertService setter --
 
 	/**
@@ -165,6 +139,17 @@ public static boolean canConvert(final Object src, final Class<?> dest) {
 		return (handler == null ? false : handler.canConvert(src, dest));
 	}
 
+	/** @deprecated use {@link Types#enumValue} */
+	@Deprecated
+	public static <T> T convertToEnum(final String src, final Class<T> dest) {
+		try {
+			return Types.enumValue(src,  dest);
+		}
+		catch (final IllegalArgumentException exc) {
+			return null;
+		}
+	}
+
 	/** @deprecated use {@link Types#raw} */
 	@Deprecated
 	public static Class<?> getClass(final Type type) {
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 6b47d686c..84b587290 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -623,6 +623,27 @@ public static <T> T cast(final Object src, final Class<T> dest) {
 		return result;
 	}
 
+	/**
+	 * Converts the given string value to an enumeration constant of the specified
+	 * type.
+	 *
+	 * @param name The value to convert.
+	 * @param dest The type of the enumeration constant.
+	 * @return The converted enumeration constant.
+	 * @throws IllegalArgumentException if the type is not an enumeration type, or
+	 *           has no such constant.
+	 */
+	public static <T> T enumValue(final String name, final Class<T> dest) {
+		if (!dest.isEnum()) {
+			throw new IllegalArgumentException("Not an enum type: " + name(dest));
+		}
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		final Enum result = Enum.valueOf((Class) dest, name);
+		@SuppressWarnings("unchecked")
+		final T typedResult = (T) result;
+		return typedResult;
+	}
+
 	/**
 	 * Creates a new {@link ParameterizedType} of the given class together with
 	 * the specified type arguments.
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 20b61b73a..0cc63ea83 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -33,10 +33,8 @@
 package org.scijava.util;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
@@ -57,22 +55,6 @@
  */
 public class ConversionUtilsTest {
 
-	/** Tests {@link ConversionUtils#convertToEnum(String, Class)}. */
-	@Test
-	public void testConvertToEnum() {
-		final Words foo = ConversionUtils.convertToEnum("FOO", Words.class);
-		assertSame(Words.FOO, foo);
-		final Words bar = ConversionUtils.convertToEnum("BAR", Words.class);
-		assertSame(Words.BAR, bar);
-		final Words fubar = ConversionUtils.convertToEnum("FUBAR", Words.class);
-		assertSame(Words.FUBAR, fubar);
-		final Words noConstant = ConversionUtils.convertToEnum("NONE", Words.class);
-		assertNull(noConstant);
-		final String notAnEnum =
-			ConversionUtils.convertToEnum("HOOYAH", String.class);
-		assertNull(notAnEnum);
-	}
-
 	/**
 	 * Tests populating a primitive array.
 	 */
@@ -457,9 +439,4 @@ public static class StringListExtension extends ArrayList<String> {
 		// NB: No implementation needed.
 	}
 
-	/** Enumeration for testing conversion to enum types. */
-	public static enum Words {
-		FOO, BAR, FUBAR
-	}
-
 }
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index ad5eaaf24..88b6348fc 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -462,6 +462,29 @@ public void testCast() {
 		assertEquals(5, intToNumber.intValue());
 	}
 
+	/** Tests {@link Types#enumValue(String, Class)}. */
+	@Test
+	public void testEnumValue() {
+		final Words foo = Types.enumValue("FOO", Words.class);
+		assertSame(Words.FOO, foo);
+		final Words bar = Types.enumValue("BAR", Words.class);
+		assertSame(Words.BAR, bar);
+		final Words fubar = Types.enumValue("FUBAR", Words.class);
+		assertSame(Words.FUBAR, fubar);
+	}
+
+	/** Tests {@link Types#enumValue(String, Class)} for invalid value. */
+	@Test(expected = IllegalArgumentException.class)
+	public void testEnumValueNoConstant() {
+		Types.enumValue("NONE", Words.class);
+	}
+
+	/** Tests {@link Types#enumValue(String, Class)} for non-enum class. */
+	@Test(expected = IllegalArgumentException.class)
+	public void testEnumValueNonEnum() {
+		Types.enumValue("HOOYAH", String.class);
+	}
+
 	// -- Helper classes --
 
 	private static class Thing<T> {
@@ -483,6 +506,11 @@ private static class ComplexThing<T extends Serializable & Cloneable> extends
 		// NB: No implementation needed.
 	}
 
+	/** Enumeration for testing conversion to enum types. */
+	public static enum Words {
+		FOO, BAR, FUBAR
+	}
+
 	// -- Helper methods --
 
 	/** Convenience method to get the {@link Type} of a field. */

From 4db455785ecd768c7d3706bc4eeefe76e024ea09 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Sep 2016 13:51:06 -0700
Subject: [PATCH 0762/1208] ConversionUtilsTest: remove unneeded helper method

---
 .../org/scijava/util/ConversionUtilsTest.java | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 0cc63ea83..69e08bc91 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -38,6 +38,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -66,7 +67,7 @@ class Struct {
 		}
 		final Struct struct = new Struct();
 
-		final List<Integer> intVals = getValueList(4, 3, 7);
+		final List<Integer> intVals = Arrays.asList(4, 3, 7);
 		setFieldValue(struct, "intArray", intVals);
 
 		for (int i = 0; i < struct.intArray.length; i++) {
@@ -93,7 +94,7 @@ class Struct {
 		final Struct struct = new Struct();
 
 		// Verify behavior setting an array of Objects (Doubles)
-		final List<Double> doubleVals = getValueList(1.0, 2.0, 3.0);
+		final List<Double> doubleVals = Arrays.asList(1.0, 2.0, 3.0);
 		setFieldValue(struct, "doubleArray", doubleVals);
 
 		for (int i = 0; i < struct.doubleArray.length; i++) {
@@ -113,7 +114,7 @@ class Struct {
 		final Struct struct = new Struct();
 
 		// Verify behavior setting a List of Objects (Strings)
-		final List<String> stringVals = getValueList("ok", "still ok");
+		final List<String> stringVals = Arrays.asList("ok", "still ok");
 		setFieldValue(struct, "stringList", stringVals);
 
 		for (int i = 0; i < struct.stringList.size(); i++) {
@@ -319,7 +320,7 @@ class Struct {
 		}
 		final Struct struct = new Struct();
 
-		setFieldValue(struct, "listWrapper", getValueList(4, 8, 2));
+		setFieldValue(struct, "listWrapper", Arrays.asList(4, 8, 2));
 		assertNotNull(struct.listWrapper);
 	}
 
@@ -335,16 +336,6 @@ private void setFieldValue(final Object o, final String fieldName,
 		ClassUtils.setValue(Types.field(o.getClass(), fieldName), o, value);
 	}
 
-	/**
-	 * Convenience method to convert an array of values to a collection.
-	 */
-	private <T> List<T> getValueList(final T... values) {
-		final List<T> list = new ArrayList<>();
-		for (final T value : values)
-			list.add(value);
-		return list;
-	}
-
 	// -- Helper Classes --
 
 	/**

From 4151adfc44ea1ed05281add7f98d1a844b92068f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Sep 2016 13:56:30 -0700
Subject: [PATCH 0763/1208] Deprecate ConversionUtils class as a whole

All public methods (except for setDelegateService, which only
exists for backwards compatibility with already-deprecated
methods) are now deprecated in favor of ConvertService and
Types. So let's explicitly recommend those classes instead.
---
 src/main/java/org/scijava/util/ConversionUtils.java | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index c7260fa57..e2e5428da 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -40,15 +40,8 @@
 import org.scijava.convert.DefaultConverter;
 import org.scijava.util.Types;
 
-/**
- * Useful methods for converting and casting between classes and types.
- * <p>
- * For extensible type conversion, use {@link ConvertService}.
- * </p>
- *
- * @author Curtis Rueden
- * @author Mark Hiner
- */
+/** @deprecated use {@link ConvertService} and {@link Types} */
+@Deprecated
 public class ConversionUtils {
 
 	private static ConvertService convertService;

From 5b2c5c75c5f7db9f4e21ef4768951b308cc9320d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Sep 2016 14:36:29 -0700
Subject: [PATCH 0764/1208] Migrate ClassUtils.getLocation to Types.location

---
 .../java/org/scijava/util/ClassUtils.java     | 127 +++---------------
 src/main/java/org/scijava/util/Types.java     |  66 +++++++++
 src/test/java/org/scijava/util/TypesTest.java |  71 +++++++++-
 3 files changed, 156 insertions(+), 108 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 93e207e3b..0406b8c62 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -32,13 +32,11 @@
 
 package org.scijava.util;
 
-import java.io.File;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -89,111 +87,6 @@ private ClassUtils() {
 
 	// -- Class loading, querying and reflection --
 
-	/**
-	 * Gets the base location of the given class.
-	 * <p>
-	 * If the class is directly on the file system (e.g.,
-	 * "/path/to/my/package/MyClass.class") then it will return the base directory
-	 * (e.g., "/path/to").
-	 * </p>
-	 * <p>
-	 * If the class is within a JAR file (e.g.,
-	 * "/path/to/my-jar.jar!/my/package/MyClass.class") then it will return the
-	 * path to the JAR (e.g., "/path/to/my-jar.jar").
-	 * </p>
-	 *
-	 * @param className The name of the class whose location is desired.
-	 * @see FileUtils#urlToFile(URL) to convert the result to a {@link File}.
-	 */
-	public static URL getLocation(final String className) {
-		return getLocation(className, null);
-	}
-
-	/**
-	 * Gets the base location of the given class.
-	 * <p>
-	 * If the class is directly on the file system (e.g.,
-	 * "/path/to/my/package/MyClass.class") then it will return the base directory
-	 * (e.g., "/path/to").
-	 * </p>
-	 * <p>
-	 * If the class is within a JAR file (e.g.,
-	 * "/path/to/my-jar.jar!/my/package/MyClass.class") then it will return the
-	 * path to the JAR (e.g., "/path/to/my-jar.jar").
-	 * </p>
-	 *
-	 * @param className The name of the class whose location is desired.
-	 * @param classLoader The class loader to use when loading the class.
-	 * @see FileUtils#urlToFile(URL) to convert the result to a {@link File}.
-	 */
-	public static URL getLocation(final String className,
-		final ClassLoader classLoader)
-	{
-		final Class<?> c = Types.load(className, classLoader);
-		return getLocation(c);
-	}
-
-	/**
-	 * Gets the base location of the given class.
-	 * <p>
-	 * If the class is directly on the file system (e.g.,
-	 * "/path/to/my/package/MyClass.class") then it will return the base directory
-	 * (e.g., "file:/path/to").
-	 * </p>
-	 * <p>
-	 * If the class is within a JAR file (e.g.,
-	 * "/path/to/my-jar.jar!/my/package/MyClass.class") then it will return the
-	 * path to the JAR (e.g., "file:/path/to/my-jar.jar").
-	 * </p>
-	 *
-	 * @param c The class whose location is desired.
-	 * @see FileUtils#urlToFile(URL) to convert the result to a {@link File}.
-	 */
-	public static URL getLocation(final Class<?> c) {
-		if (c == null) return null; // could not load the class
-
-		// try the easy way first
-		try {
-			final URL codeSourceLocation =
-				c.getProtectionDomain().getCodeSource().getLocation();
-			if (codeSourceLocation != null) return codeSourceLocation;
-		}
-		catch (final SecurityException e) {
-			// NB: Cannot access protection domain.
-		}
-		catch (final NullPointerException e) {
-			// NB: Protection domain or code source is null.
-		}
-
-		// NB: The easy way failed, so we try the hard way. We ask for the class
-		// itself as a resource, then strip the class's path from the URL string,
-		// leaving the base path.
-
-		// get the class's raw resource path
-		final URL classResource = c.getResource(c.getSimpleName() + ".class");
-		if (classResource == null) return null; // cannot find class resource
-
-		final String url = classResource.toString();
-		final String suffix = c.getCanonicalName().replace('.', '/') + ".class";
-		if (!url.endsWith(suffix)) return null; // weird URL
-
-		// strip the class's path from the URL string
-		final String base = url.substring(0, url.length() - suffix.length());
-
-		String path = base;
-
-		// remove the "jar:" prefix and "!/" suffix, if present
-		if (path.startsWith("jar:")) path = path.substring(4, path.length() - 2);
-
-		try {
-			return new URL(path);
-		}
-		catch (final MalformedURLException e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
 	/**
 	 * Gets the given class's {@link Method}s marked with the annotation of the
 	 * specified class.
@@ -587,6 +480,26 @@ public static boolean hasClass(final String className,
 		return Types.load(className, classLoader) != null;
 	}
 
+	/** @deprecated Use {@link Types#location} and {@link Types#load} instead. */
+	@Deprecated
+	public static URL getLocation(final String className) {
+		return Types.location(Types.load(className));
+	}
+
+	/** @deprecated Use {@link Types#location} and {@link Types#load} instead. */
+	@Deprecated
+	public static URL getLocation(final String className,
+		final ClassLoader classLoader)
+	{
+		return Types.location(Types.load(className, classLoader));
+	}
+
+	/** @deprecated Use {@link Types#location} and {@link Types#load} instead. */
+	@Deprecated
+	public static URL getLocation(final Class<?> c) {
+		return Types.location(c);
+	}
+
 	/** @deprecated Use {@link Types#isBoolean} instead. */
 	@Deprecated
 	public static boolean isBoolean(final Class<?> type) {
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 84b587290..0a10a2c68 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -31,6 +31,8 @@
 
 package org.scijava.util;
 
+import java.io.File;
+
 // Portions of this class were adapted from the
 // org.apache.commons.lang3.reflect.TypeUtils and
 // org.apache.commons.lang3.Validate classes of
@@ -54,6 +56,8 @@
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -65,6 +69,8 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.scijava.util.FileUtils;
+
 /**
  * Utility class for working with generic types, fields and methods.
  * <p>
@@ -212,6 +218,66 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 		}
 	}
 
+	/**
+	 * Gets the base location of the given class.
+	 * <p>
+	 * If the class is directly on the file system (e.g.,
+	 * "/path/to/my/package/MyClass.class") then it will return the base directory
+	 * (e.g., "file:/path/to").
+	 * </p>
+	 * <p>
+	 * If the class is within a JAR file (e.g.,
+	 * "/path/to/my-jar.jar!/my/package/MyClass.class") then it will return the
+	 * path to the JAR (e.g., "file:/path/to/my-jar.jar").
+	 * </p>
+	 *
+	 * @param c The class whose location is desired.
+	 * @return URL pointing to the class, or null if the location could not be
+	 *         determined.
+	 * @see FileUtils#urlToFile(URL) to convert the result to a {@link File}.
+	 */
+	public static URL location(final Class<?> c) {
+		// try the easy way first
+		try {
+			final URL codeSourceLocation =
+				c.getProtectionDomain().getCodeSource().getLocation();
+			if (codeSourceLocation != null) return codeSourceLocation;
+		}
+		catch (final SecurityException exc) {
+			// NB: Cannot access protection domain.
+		}
+		catch (final NullPointerException exc) {
+			// NB: Protection domain or code source is null.
+		}
+
+		// NB: The easy way failed, so we try the hard way. We ask for the class
+		// itself as a resource, then strip the class's path from the URL string,
+		// leaving the base path.
+
+		// get the class's raw resource path
+		final URL classResource = c.getResource(c.getSimpleName() + ".class");
+		if (classResource == null) return null; // cannot find class resource
+
+		final String url = classResource.toString();
+		final String suffix = c.getCanonicalName().replace('.', '/') + ".class";
+		if (!url.endsWith(suffix)) return null; // weird URL
+
+		// strip the class's path from the URL string
+		final String base = url.substring(0, url.length() - suffix.length());
+
+		String path = base;
+
+		// remove the "jar:" prefix and "!/" suffix, if present
+		if (path.startsWith("jar:")) path = path.substring(4, path.length() - 2);
+
+		try {
+			return new URL(path);
+		}
+		catch (final MalformedURLException e) {
+			return null;
+		}
+	}
+
 	/**
 	 * Gets a string representation of the given type.
 	 *
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 88b6348fc..2a4379b53 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -38,13 +38,21 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.scijava.test.TestUtils.createTemporaryDirectory;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -53,14 +61,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
 
 import org.junit.Test;
-
+import org.scijava.util.FileUtils;
 /**
  * Tests {@link Types}.
  * 
  * @author Curtis Rueden
  * @author Mark Hiner
+ * @author Johannes Schindelin
  */
 public class TypesTest {
 
@@ -137,6 +148,43 @@ public void testLoadFailureLoud() {
 		Types.load("a.non.existent.class", false);
 	}
 
+	/** Tests {@link Types#location} with a class on the file system. */
+	@Test
+	public void testLocationUnpackedClass() throws IOException {
+		final File tmpDir = createTemporaryDirectory("class-utils-test-");
+		final String path = getClass().getName().replace('.', '/') + ".class";
+		final File classFile = new File(tmpDir, path);
+		assertTrue(classFile.getParentFile().exists() ||
+			classFile.getParentFile().mkdirs());
+		copy(getClass().getResource("/" + path).openStream(),
+			new FileOutputStream(classFile), true);
+
+		final ClassLoader classLoader =
+			new URLClassLoader(new URL[] { tmpDir.toURI().toURL() }, null);
+		final Class<?> c = Types.load(getClass().getName(), classLoader);
+		final URL location = Types.location(c);
+		assertEquals(tmpDir, FileUtils.urlToFile(location));
+		FileUtils.deleteRecursively(tmpDir);
+	}
+
+	/** Tests {@link Types#location} with a class in a JAR file. */
+	@Test
+	public void testLocationClassInJar() throws IOException {
+		final File tmpDir = createTemporaryDirectory("class-utils-test-");
+		final File jar = new File(tmpDir, "test.jar");
+		final JarOutputStream out = new JarOutputStream(new FileOutputStream(jar));
+		final String path = getClass().getName().replace('.', '/') + ".class";
+		out.putNextEntry(new ZipEntry(path));
+		copy(getClass().getResource("/" + path).openStream(), out, true);
+
+		final ClassLoader classLoader =
+			new URLClassLoader(new URL[] { jar.toURI().toURL() }, null);
+		final Class<?> c = Types.load(getClass().getName(), classLoader);
+		final URL location = Types.location(c);
+		assertEquals(jar, FileUtils.urlToFile(location));
+		jar.deleteOnExit();
+	}
+
 	/** Tests {@link Types#name}. */
 	public void testName() {
 		@SuppressWarnings("unused")
@@ -513,6 +561,27 @@ public static enum Words {
 
 	// -- Helper methods --
 
+	/**
+	 * Copies bytes from an {@link InputStream} to an {@link OutputStream}.
+	 * 
+	 * @param in the source
+	 * @param out the sink
+	 * @param closeOut whether to close the sink after we're done
+	 * @throws IOException
+	 */
+	private void copy(final InputStream in, final OutputStream out,
+		final boolean closeOut) throws IOException
+	{
+		final byte[] buffer = new byte[16384];
+		for (;;) {
+			final int count = in.read(buffer);
+			if (count < 0) break;
+			out.write(buffer, 0, count);
+		}
+		in.close();
+		if (closeOut) out.close();
+	}
+
 	/** Convenience method to get the {@link Type} of a field. */
 	private Type type(final Class<?> c, final String fieldName) {
 		return Types.field(c, fieldName).getGenericType();

From fdc133560b5e76cd4f0c5010b4151c68df968e71 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Sep 2016 15:02:29 -0700
Subject: [PATCH 0765/1208] Types: factor out common exception throwing logic

---
 src/main/java/org/scijava/util/Types.java | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 0a10a2c68..f5cecefa2 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -214,7 +214,7 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 			// Not NoClassDefFoundError.
 			// Not UnsupportedClassVersionError!
 			if (quietly) return null;
-			throw new IllegalArgumentException("Cannot load class: " + className, t);
+			throw iae(t, "Cannot load class: " + className);
 		}
 	}
 
@@ -495,7 +495,7 @@ public static <T> T nullValue(final Class<T> type) {
 	 *           method with the given name
 	 */
 	public static Field field(final Class<?> c, final String name) {
-		if (c == null) throw new IllegalArgumentException("No such field: " + name);
+		if (c == null) throw iae("No such field: " + name);
 		try {
 			return c.getDeclaredField(name);
 		}
@@ -533,7 +533,7 @@ public static Class<?> array(final Class<?> componentType) {
 	 * @param dim The dimensionality of the array
 	 */
 	public static Class<?> array(final Class<?> componentType, final int dim) {
-		if (dim < 0) throw new IllegalArgumentException("Negative dimension");
+		if (dim < 0) throw iae("Negative dimension");
 		if (dim == 0) return componentType;
 		return array(array(componentType), dim - 1);
 	}
@@ -700,9 +700,7 @@ public static <T> T cast(final Object src, final Class<T> dest) {
 	 *           has no such constant.
 	 */
 	public static <T> T enumValue(final String name, final Class<T> dest) {
-		if (!dest.isEnum()) {
-			throw new IllegalArgumentException("Not an enum type: " + name(dest));
-		}
+		if (!dest.isEnum()) throw iae("Not an enum type: " + name(dest));
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		final Enum result = Enum.valueOf((Class) dest, name);
 		@SuppressWarnings("unchecked")
@@ -878,6 +876,19 @@ public static final ParameterizedType parameterize(final Class<?> raw,
 
 	// -- Helper methods --
 
+	private static IllegalArgumentException iae(final String... s) {
+		return iae(null, s);
+	}
+
+	private static IllegalArgumentException iae(final Throwable cause,
+		final String... notes)
+	{
+		final String s = String.join(", ", notes);
+		final IllegalArgumentException exc = new IllegalArgumentException(s);
+		if (cause != null) exc.initCause(cause);
+		throw exc;
+	}
+
 	private static Class<?> arrayOrNull(final Class<?> componentType) {
 		try {
 			return Types.array(componentType);

From 1389a55482b3a568f8b5c211c0b4408490edc32c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 13 Sep 2016 15:25:13 -0700
Subject: [PATCH 0766/1208] Add Types.location which throws an exception

Like Types.load, this provides another signature with a
"quietly" flag for toggling the exception throwing behavior.

To test it, we load a class from a byte array,
to ensure there is no discernable location.
---
 src/main/java/org/scijava/util/Types.java     | 55 +++++++++++++++----
 src/test/java/org/scijava/util/TypesTest.java | 40 ++++++++++++++
 2 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index f5cecefa2..ac5884968 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -58,6 +58,7 @@
 import java.lang.reflect.WildcardType;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.security.CodeSource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -218,6 +219,18 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 		}
 	}
 
+	/**
+	 * Gets the base location of the given class.
+	 *
+	 * @param c The class whose location is desired.
+	 * @return URL pointing to the class, or null if the location could not be
+	 *         determined.
+	 * @see #location(Class, boolean)
+	 */
+	public static URL location(final Class<?> c) {
+		return location(c, true);
+	}
+
 	/**
 	 * Gets the base location of the given class.
 	 * <p>
@@ -232,22 +245,33 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 	 * </p>
 	 *
 	 * @param c The class whose location is desired.
+	 * @param quietly Whether to return {@code null} (rather than throwing
+	 *          {@link IllegalArgumentException}) if something goes wrong
+	 *          determining the location.
 	 * @return URL pointing to the class, or null if the location could not be
-	 *         determined.
+	 *         determined and the {@code quietly} flag is set.
+	 * @throws IllegalArgumentException If the location cannot be determined and
+	 *           the {@code quietly} flag is not set.
 	 * @see FileUtils#urlToFile(URL) to convert the result to a {@link File}.
 	 */
-	public static URL location(final Class<?> c) {
+	public static URL location(final Class<?> c, final boolean quietly) {
+		Exception cause = null;
+		String why = null;
+
 		// try the easy way first
 		try {
-			final URL codeSourceLocation =
-				c.getProtectionDomain().getCodeSource().getLocation();
-			if (codeSourceLocation != null) return codeSourceLocation;
+			final CodeSource codeSource = c.getProtectionDomain().getCodeSource();
+			if (codeSource != null) {
+				final URL location = codeSource.getLocation();
+				if (location != null) return location;
+				why = "null code source location";
+			}
+			else why = "null code source";
 		}
 		catch (final SecurityException exc) {
 			// NB: Cannot access protection domain.
-		}
-		catch (final NullPointerException exc) {
-			// NB: Protection domain or code source is null.
+			cause = exc;
+			why = "cannot access protection domain";
 		}
 
 		// NB: The easy way failed, so we try the hard way. We ask for the class
@@ -256,11 +280,19 @@ public static URL location(final Class<?> c) {
 
 		// get the class's raw resource path
 		final URL classResource = c.getResource(c.getSimpleName() + ".class");
-		if (classResource == null) return null; // cannot find class resource
+		if (classResource == null) {
+			// cannot find class resource
+			if (quietly) return null;
+			throw iae(cause, "No class resource for class: " + name(c), why);
+		}
 
 		final String url = classResource.toString();
 		final String suffix = c.getCanonicalName().replace('.', '/') + ".class";
-		if (!url.endsWith(suffix)) return null; // weird URL
+		if (!url.endsWith(suffix)) {
+			// weird URL
+			if (quietly) return null;
+			throw iae(cause, "Unsupported URL format: " + url, why);
+		}
 
 		// strip the class's path from the URL string
 		final String base = url.substring(0, url.length() - suffix.length());
@@ -274,7 +306,8 @@ public static URL location(final Class<?> c) {
 			return new URL(path);
 		}
 		catch (final MalformedURLException e) {
-			return null;
+			if (quietly) return null;
+			throw iae(e, "Malformed URL", why);
 		}
 	}
 
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 2a4379b53..8a85cc20c 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -185,6 +185,22 @@ public void testLocationClassInJar() throws IOException {
 		jar.deleteOnExit();
 	}
 
+	/** Tests quiet behavior of {@link Types#location(Class, boolean)}. */
+	@Test
+	public void testLocationFailureQuiet() {
+		final Class<?> weirdClass = loadCustomClass();
+		assertEquals("Hello", weirdClass.getName());
+		assertNull(Types.location(weirdClass));
+	}
+
+	/** Tests exceptions from {@link Types#location(Class, boolean)}. */
+	@Test(expected = IllegalArgumentException.class)
+	public void testLocationFailureLoud() {
+		final Class<?> weirdClass = loadCustomClass();
+		assertEquals("Hello", weirdClass.getName());
+		Types.location(weirdClass, false);
+	}
+
 	/** Tests {@link Types#name}. */
 	public void testName() {
 		@SuppressWarnings("unused")
@@ -582,6 +598,30 @@ private void copy(final InputStream in, final OutputStream out,
 		if (closeOut) out.close();
 	}
 
+	private Class<?> loadCustomClass() {
+		// NB: The bytecode below was compiled from the following source:
+		//
+		//     public class Hello {}
+		//
+		final byte[] bytecode = { -54, -2, -70, -66, 0, 0, 0, 52, 0, 13, 10, 0, 3,
+			0, 10, 7, 0, 11, 7, 0, 12, 1, 0, 6, 60, 105, 110, 105, 116, 62, 1, 0, 3,
+			40, 41, 86, 1, 0, 4, 67, 111, 100, 101, 1, 0, 15, 76, 105, 110, 101, 78,
+			117, 109, 98, 101, 114, 84, 97, 98, 108, 101, 1, 0, 10, 83, 111, 117, 114,
+			99, 101, 70, 105, 108, 101, 1, 0, 10, 72, 101, 108, 108, 111, 46, 106, 97,
+			118, 97, 12, 0, 4, 0, 5, 1, 0, 5, 72, 101, 108, 108, 111, 1, 0, 16, 106,
+			97, 118, 97, 47, 108, 97, 110, 103, 47, 79, 98, 106, 101, 99, 116, 0, 33,
+			0, 2, 0, 3, 0, 0, 0, 0, 0, 1, 0, 1, 0, 4, 0, 5, 0, 1, 0, 6, 0, 0, 0, 29,
+			0, 1, 0, 1, 0, 0, 0, 5, 42, -73, 0, 1, -79, 0, 0, 0, 1, 0, 7, 0, 0, 0, 6,
+			0, 1, 0, 0, 0, 1, 0, 1, 0, 8, 0, 0, 0, 2, 0, 9 };
+
+		class BytesClassLoader extends ClassLoader {
+			public Class<?> load(final String name, final byte[] b) {
+				return defineClass(name, b, 0, b.length);
+			}
+		}
+		return new BytesClassLoader().load("Hello", bytecode);
+	}
+
 	/** Convenience method to get the {@link Type} of a field. */
 	private Type type(final Class<?> c, final String fieldName) {
 		return Types.field(c, fieldName).getGenericType();

From 7f386be67284e066017494dfe75fb612cf40c9a8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 19 Sep 2016 09:02:17 -0500
Subject: [PATCH 0767/1208] Types: add method accessor

This is analogous to the field accessor, but for methods.
---
 src/main/java/org/scijava/util/Types.java     | 35 +++++++++++++++++++
 src/test/java/org/scijava/util/TypesTest.java | 23 ++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index ac5884968..474889a7a 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -536,6 +536,41 @@ public static Field field(final Class<?> c, final String name) {
 		return field(c.getSuperclass(), name);
 	}
 
+	/**
+	 * Gets the method with the specified name and argument types, of the given
+	 * class, or superclass thereof.
+	 * <p>
+	 * Unlike {@link Class#getMethod(String, Class[])}, this method will return
+	 * methods of any visibility, not just {@code public}. And unlike
+	 * {@link Class#getDeclaredMethod(String, Class[])}, it will do so
+	 * recursively, returning the first method of the given name and argument
+	 * types from the class's superclass hierarchy.
+	 * </p>
+	 * <p>
+	 * Note that this method does not guarantee that the returned method is
+	 * accessible; if the method is not {@code public}, calling code will need to
+	 * use {@link Method#setAccessible(boolean)} in order to invoke the method.
+	 * </p>
+	 * 
+	 * @param c The class (or subclass thereof) containing the desired method.
+	 * @param name Name of the method.
+	 * @param parameterTypes Types of the method parameters.
+	 * @return The first method with the given name and argument types in the
+	 *         class's superclass hierarchy.
+	 * @throws IllegalArgumentException If the specified class does not contain a
+	 *           method with the given name and argument types.
+	 */
+	public static Method method(final Class<?> c, final String name,
+		final Class<?>... parameterTypes)
+	{
+		if (c == null) throw iae("No such field: " + name);
+		try {
+			return c.getDeclaredMethod(name, parameterTypes);
+		}
+		catch (final NoSuchMethodException exc) {}
+		return method(c.getSuperclass(), name, parameterTypes);
+	}
+
 	/**
 	 * Gets the array class corresponding to the given element type.
 	 * <p>
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 8a85cc20c..597037454 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -47,6 +47,7 @@
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.math.BigDecimal;
@@ -373,6 +374,28 @@ public void testField() {
 		assertEquals("T", ((TypeVariable<?>) field.getGenericType()).getName());
 	}
 
+	/** Tests {@link Types#method}. */
+	@Test
+	public void testMethod() {
+		final Method objectMethod = Types.method(Thing.class, "toString");
+		assertSame(Object.class, objectMethod.getDeclaringClass());
+		assertEquals("toString", objectMethod.getName());
+		assertSame(String.class, objectMethod.getReturnType());
+		assertEquals(0, objectMethod.getParameterTypes().length);
+
+		final Method wordsMethod = //
+			Types.method(Words.class, "valueOf", String.class);
+		// NB: What is going on under the hood to make the Enum
+		// subtype Words be the declaring class for the 'valueOf'
+		// method? The compiler must internally override the valueOf
+		// method for each enum type, to narrow the return type...
+		assertSame(Words.class, wordsMethod.getDeclaringClass());
+		assertEquals("valueOf", wordsMethod.getName());
+		assertSame(Words.class, wordsMethod.getReturnType());
+		assertEquals(1, wordsMethod.getParameterTypes().length);
+		assertSame(String.class, wordsMethod.getParameterTypes()[0]);
+	}
+
 	/** Tests {@link Types#array}. */
 	@Test
 	public void testArray() {

From 184005b98f933193a47b7845727ffa5a26d6bd88 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 19 Sep 2016 09:03:21 -0500
Subject: [PATCH 0768/1208] Types: fix some formatting issues

---
 src/main/java/org/scijava/util/Types.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 474889a7a..860610291 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -3121,9 +3121,8 @@ private static Type mapTypeParameters(final Type toMapType,
 			while (handlingTypeAndParams instanceof ParameterizedType) {
 				final ParameterizedType pType =
 					(ParameterizedType) handlingTypeAndParams;
-				final Class<?> clazz = (Class<?>) pType.getRawType(); // getRawType
-																															// should always
-																															// be Class
+				// getRawType should always be Class
+				final Class<?> clazz = (Class<?>) pType.getRawType();
 				varMap.addAll(clazz.getTypeParameters(), pType
 					.getActualTypeArguments());
 				handlingTypeAndParams = pType.getOwnerType();
@@ -3516,8 +3515,8 @@ public static Type[] getExactParameterTypes(final Method m,
 			final Type[] parameterTypes = m.getGenericParameterTypes();
 			final Type exactDeclaringType = getExactSuperType(capture(type), m
 				.getDeclaringClass());
-			if (exactDeclaringType == null) { // capture(type) is not a subtype of
-																				// m.getDeclaringClass()
+			if (exactDeclaringType == null) {
+				// capture(type) is not a subtype of m.getDeclaringClass()
 				throw new IllegalArgumentException("The method " + m +
 					" is not a member of type " + type);
 			}

From 5ec169636189d42e15797a049ed11af3d876e421 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 19 Jun 2017 18:41:33 +0200
Subject: [PATCH 0769/1208] Stop using deprecated ClassUtils#getLocation

There is now the Types#location method instead.
---
 src/main/java/org/scijava/Locatable.java                  | 4 ++--
 src/main/java/org/scijava/menu/ShadowMenu.java            | 2 +-
 src/main/java/org/scijava/module/ModuleInfo.java          | 4 ++--
 src/main/java/org/scijava/plugin/PluginInfo.java          | 2 +-
 src/main/java/org/scijava/script/ScriptLanguageIndex.java | 4 ++--
 src/main/java/org/scijava/test/TestUtils.java             | 4 ++--
 src/main/java/org/scijava/util/AppUtils.java              | 2 +-
 src/main/java/org/scijava/util/Manifest.java              | 2 +-
 src/main/java/org/scijava/util/POM.java                   | 2 +-
 src/main/java/org/scijava/util/XML.java                   | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index a10968865..c9b0e7039 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -34,7 +34,7 @@
 
 import java.net.URL;
 
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * An object whose location is defined by a URL string.
@@ -45,7 +45,7 @@ public interface Locatable {
 
 	/** Gets the URL string defining the object's location. */
 	default String getLocation() {
-		final URL location = ClassUtils.getLocation(getClass());
+		final URL location = Types.location(getClass());
 		return location == null ? null : location.toExternalForm();
 	}
 
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 63af31640..4a067692e 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -569,7 +569,7 @@ private String details(final ModuleInfo info) {
 		try {
 			final Class<?> c = info.loadDelegateClass();
 			className = c.getName();
-			classLocation = ClassUtils.getLocation(c).toString();
+			classLocation = Types.location(c).toString();
 		}
 		catch (final ClassNotFoundException exc) {
 			className = info.getDelegateClassName();
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index 3a454338d..b442b4300 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -42,7 +42,7 @@
 import org.scijava.Versioned;
 import org.scijava.event.EventService;
 import org.scijava.module.event.ModulesUpdatedEvent;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 import org.scijava.util.VersionUtils;
 
 /**
@@ -220,7 +220,7 @@ default String getLocation() {
 		// If the same delegate class is used for more than one module, though,
 		// it may need to override this method to indicate a different location.
 		try {
-			return ClassUtils.getLocation(loadDelegateClass()).toExternalForm();
+			return Types.location(loadDelegateClass()).toExternalForm();
 		}
 		catch (final ClassNotFoundException exc) {
 			return null;
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index d8738521a..420323dbf 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -333,7 +333,7 @@ public String getIdentifier() {
 	@Override
 	public String getLocation() {
 		try {
-			return ClassUtils.getLocation(loadClass()).toExternalForm();
+			return Types.location(loadClass()).toExternalForm();
 		}
 		catch (InstantiableException exc) {
 			return null;
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 755f43bbd..68fe4d6db 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -41,8 +41,8 @@
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.log.LogService;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
+import org.scijava.util.Types;
 
 /**
  * Data structure for managing registered scripting languages.
@@ -184,6 +184,6 @@ private String overwriteMessage(final boolean overwrite, final String type,
 	/** Helper method of {@link #overwriteMessage}. */
 	private String details(final ScriptLanguage language) {
 		final Class<?> c = language.getClass();
-		return c.getName() + " [" + ClassUtils.getLocation(c);
+		return c.getName() + " [" + Types.location(c);
 	}
 }
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index f32fd2fda..3244499c7 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -38,8 +38,8 @@
 import java.util.AbstractMap;
 import java.util.Map;
 
-import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
+import org.scijava.util.Types;
 
 /**
  * A bunch of helpful functions for unit tests.
@@ -128,7 +128,7 @@ public static File createTemporaryDirectory(final String prefix,
 	public static File createTemporaryDirectory(final String prefix,
 		final Class<?> forClass, final String suffix) throws IOException
 	{
-		final URL directory = ClassUtils.getLocation(forClass);
+		final URL directory = Types.location(forClass);
 		if (directory == null) {
 			throw new IllegalArgumentException("No location for class " + forClass);
 		}
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 5c79ce0be..0f75d9671 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -135,7 +135,7 @@ public static File getBaseDirectory(final Class<?> c,
 		// see: http://stackoverflow.com/a/12733172/1207769
 
 		// step 1: convert Class to URL
-		final URL location = ClassUtils.getLocation(c);
+		final URL location = Types.location(c);
 
 		// step 2: convert URL to File
 		File baseFile;
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index e30f0b85c..aad982446 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -139,7 +139,7 @@ public Map<Object, Object> getAll() {
 	/** Gets the JAR manifest associated with the given class. */
 	public static Manifest getManifest(final Class<?> c) {
 		try {
-			return getManifest(new URL("jar:" + ClassUtils.getLocation(c) + "!/"));
+			return getManifest(new URL("jar:" + Types.location(c) + "!/"));
 		}
 		catch (final IOException e) {
 			return null;
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 9458301f8..a6420398f 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -227,7 +227,7 @@ public static POM getPOM(final Class<?> c, final String groupId,
 		final String artifactId)
 	{
 		try {
-			final URL location = ClassUtils.getLocation(c);
+			final URL location = Types.location(c);
 			if (!location.getProtocol().equals("file") ||
 				location.toString().endsWith(".jar"))
 			{
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 6e6a9d65f..ab904e876 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -129,7 +129,7 @@ public XML(final String path, final Document doc) {
 		// configured services, including the
 		// com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl).
 		if (debug) {
-			System.err.println(ClassUtils.getLocation(XPathFactory.class));
+			System.err.println(Types.location(XPathFactory.class));
 		}
 
 		XPath xp = null;
@@ -147,7 +147,7 @@ public XML(final String path, final Document doc) {
 					} catch (Throwable t) {
 						if (debug) {
 							System.err.println("There was a problem with " + xp.getClass() +
-								" in " + ClassUtils.getLocation(xp.getClass()) + ":");
+								" in " + Types.location(xp.getClass()) + ":");
 							t.printStackTrace();
 						}
 						throw new Error(t);

From 38a9e9a55e3ce4a8d3baf8834c54e9b8c7398380 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Mar 2018 16:37:30 -0600
Subject: [PATCH 0770/1208] POM: update pom-scijava parent to 19.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 574c748a0..7260ae0a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>17.1.1</version>
+		<version>19.2.0</version>
 		<relativePath />
 	</parent>
 

From 5ac9cf5ac110f6fa823d2a4ad31515be116616cc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 5 Mar 2018 09:31:01 -0600
Subject: [PATCH 0771/1208] Fix javadoc errors

---
 src/main/java/org/scijava/util/GenericUtils.java | 4 ++--
 src/main/java/org/scijava/util/Types.java        | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index 5fd08e324..75b52c44f 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -91,7 +91,7 @@ public static List<Class<?>> getFieldClasses(final Field field,
 		return Types.raws(Types.fieldType(field, type));
 	}
 
-	/** @deprecated Use {@link Types#returnType} instead. */
+	/** @deprecated Use {@link Types#methodReturnType} instead. */
 	@Deprecated
 	public static Type getMethodReturnType(final Method method,
 		final Class<?> type)
@@ -100,7 +100,7 @@ public static Type getMethodReturnType(final Method method,
 	}
 
 	/**
-	 * @deprecated Use {@link Types#returnType} and {@link Types#raws} instead.
+	 * @deprecated Use {@link Types#methodReturnType} and {@link Types#raws} instead.
 	 */
 	@Deprecated
 	public static List<Class<?>> getMethodReturnClasses(final Method method,
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 860610291..6fa21447a 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -76,6 +76,7 @@
  * Utility class for working with generic types, fields and methods.
  * <p>
  * Logic and inspiration were drawn from the following excellent libraries:
+ * </p>
  * <ul>
  * <li>Google Guava's {@code com.google.common.reflect} package.</li>
  * <li>Apache Commons Lang 3's {@code org.apache.commons.lang3.reflect} package.
@@ -83,7 +84,6 @@
  * <li><a href="https://github.com/coekarts/gentyref">GenTyRef</a> (Generic Type
  * Reflector), a library for runtime generic type introspection.</li>
  * </ul>
- * </p>
  *
  * @author Curtis Rueden
  */
@@ -416,6 +416,7 @@ public static boolean isText(final Class<?> type) {
 	 * Returns the non-primitive {@link Class} closest to the given type.
 	 * <p>
 	 * Specifically, the following type conversions are done:
+	 * </p>
 	 * <ul>
 	 * <li>boolean.class becomes Boolean.class</li>
 	 * <li>byte.class becomes Byte.class</li>
@@ -427,6 +428,7 @@ public static boolean isText(final Class<?> type) {
 	 * <li>short.class becomes Short.class</li>
 	 * <li>void.class becomes Void.class</li>
 	 * </ul>
+	 * <p>
 	 * All other types are unchanged.
 	 * </p>
 	 */
@@ -451,6 +453,7 @@ public static <T> Class<T> box(final Class<T> type) {
 	 * Returns the primitive {@link Class} closest to the given type.
 	 * <p>
 	 * Specifically, the following type conversions are done:
+	 * </p>
 	 * <ul>
 	 * <li>Boolean.class becomes boolean.class</li>
 	 * <li>Byte.class becomes byte.class</li>
@@ -462,6 +465,7 @@ public static <T> Class<T> box(final Class<T> type) {
 	 * <li>Short.class becomes short.class</li>
 	 * <li>Void.class becomes void.class</li>
 	 * </ul>
+	 * <p>
 	 * All other types are unchanged.
 	 * </p>
 	 */

From 1605778ecc4e9fd1325ad2d5e8ca95d2ce619a0e Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Tue, 10 Apr 2018 15:02:34 +0200
Subject: [PATCH 0772/1208] Always use UTF-8 when loading scripts from URL

---
 src/main/java/org/scijava/script/ScriptInfo.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 1bd3995a7..ef8802b5a 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -40,6 +40,7 @@
 import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -132,7 +133,7 @@ public ScriptInfo(final Context context, final String path) {
 	public ScriptInfo(final Context context, final URL url, final String path)
 		throws IOException
 	{
-		this(context, url, path, new InputStreamReader(url.openStream()));
+		this(context, url, path, new InputStreamReader(url.openStream(), StandardCharsets.UTF_8));
 	}
 
 	/**

From 81b75fb9f0650bea69199a163e3df3e0ab3972a6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 27 Apr 2018 15:17:36 -0700
Subject: [PATCH 0773/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7260ae0a4..2761c3d0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.70.0-SNAPSHOT</version>
+	<version>2.70.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From e22290301b3fa988138728644257e459b46b2c2a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 13:32:12 -0700
Subject: [PATCH 0774/1208] DisplayViewer: add defensive null checks

Avoids exceptions like:

  java.lang.NullPointerException
    at org.scijava.ui.viewer.DisplayViewer.onDisplayDeletedEvent(DisplayViewer.java:105)
    at org.scijava.ui.DefaultUIService.onEvent(DefaultUIService.java:393)
---
 src/main/java/org/scijava/ui/viewer/DisplayViewer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index 35e8e8216..5dcf26401 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -93,6 +93,7 @@ public interface DisplayViewer<T> extends RichPlugin, Disposable {
 
 	/** Synchronizes the user interface appearance with the display model. */
 	default void onDisplayUpdatedEvent(final DisplayUpdatedEvent e) {
+		if (getPanel() == null) return;
 		if (e.getLevel() == DisplayUpdateLevel.REBUILD) {
 			getPanel().redoLayout();
 		}
@@ -102,6 +103,7 @@ default void onDisplayUpdatedEvent(final DisplayUpdatedEvent e) {
 	/** Removes the user interface when the display is deleted. */
 	@SuppressWarnings("unused")
 	default void onDisplayDeletedEvent(final DisplayDeletedEvent e) {
+		if (getPanel() == null || getPanel().getWindow() == null) return;
 		getPanel().getWindow().close();
 	}
 
@@ -112,6 +114,7 @@ default void onDisplayDeletedEvent(final DisplayDeletedEvent e) {
 	 */
 	@SuppressWarnings("unused")
 	default void onDisplayActivatedEvent(final DisplayActivatedEvent e) {
+		if (getPanel() == null || getPanel().getWindow() == null) return;
 		getPanel().getWindow().requestFocus();
 	}
 

From fe9ac40a4dd262d9ace56e0a617bd507e4e9a404 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 15:48:30 -0700
Subject: [PATCH 0775/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2761c3d0e..986931802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.70.1-SNAPSHOT</version>
+	<version>2.70.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From ac4f1fbb24200ea380b3b62c4692238ac560150d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 20:56:55 -0700
Subject: [PATCH 0776/1208] DefaultUIService: fix bug in default UI logic

The discoverUIs() initialization logic checks the scijava.ui property,
and assigns the default UI accordingly. But the getDefaultUI() method
was not forcing initialization before checking the value of the
defaultUI field, so it was null even when the property was set.

This commit forces initialization before getDefaultUI() proceeds,
so that the correct default UI is returned.
---
 src/main/java/org/scijava/ui/DefaultUIService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index e88f94e55..49368efc8 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -190,6 +190,7 @@ public boolean isHeadless() {
 
 	@Override
 	public UserInterface getDefaultUI() {
+		if (!initialized) discoverUIs();
 		if (isHeadless()) return uiMap().get(HeadlessUI.NAME);
 		if (defaultUI != null) return defaultUI;
 		return uiList().isEmpty() ? null : uiList().get(0);

From 7709d73daf6b40010842c4d16a752f1ac841b2d9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 22:23:32 -0700
Subject: [PATCH 0777/1208] Add service for queuing startup operations

This will be useful for multiple reasons:

* The ImageJ Server's --server flag can now be combined with --headless
  to launch a blocking server, without --server blocking in UI mode.
* We may finally be able to fix imagej/imagej-legacy#89 by
  queuing the operation with the StartupService.
---
 pom.xml                                       |  2 +-
 .../java/org/scijava/AbstractGateway.java     |  9 +++
 src/main/java/org/scijava/Gateway.java        |  8 +++
 .../startup/DefaultStartupService.java        | 66 +++++++++++++++++++
 .../org/scijava/startup/StartupService.java   | 52 +++++++++++++++
 .../java/org/scijava/ContextCreationTest.java |  1 +
 6 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/startup/DefaultStartupService.java
 create mode 100644 src/main/java/org/scijava/startup/StartupService.java

diff --git a/pom.xml b/pom.xml
index 986931802..6fe0a5cef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.70.2-SNAPSHOT</version>
+	<version>2.71.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 8b686230a..4f8362194 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -58,6 +58,7 @@
 import org.scijava.prefs.PrefService;
 import org.scijava.script.ScriptService;
 import org.scijava.service.Service;
+import org.scijava.startup.StartupService;
 import org.scijava.text.TextService;
 import org.scijava.thread.ThreadService;
 import org.scijava.tool.IconService;
@@ -102,6 +103,9 @@ public void launch(final String... args) {
 		// NB: When running headless, the HeadlessUI will be used.
 		if (mainCount == 0) ui().showUI();
 
+		// perform all pending startup operations
+		startup().executeOperations();
+
 		if (ui().isHeadless()) {
 			// now that CLI processing/execution is done, we can shut down
 			getContext().dispose();
@@ -233,6 +237,11 @@ public ScriptService script() {
 		return get(ScriptService.class);
 	}
 
+	@Override
+	public StartupService startup() {
+		return get(StartupService.class);
+	}
+
 	@Override
 	public StatusService status() {
 		return get(StatusService.class);
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 2b5633aa9..37a5b6403 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -56,6 +56,7 @@
 import org.scijava.plugin.RichPlugin;
 import org.scijava.script.ScriptService;
 import org.scijava.service.Service;
+import org.scijava.startup.StartupService;
 import org.scijava.text.TextService;
 import org.scijava.thread.ThreadService;
 import org.scijava.tool.IconService;
@@ -311,6 +312,13 @@ public interface Gateway extends RichPlugin {
 	 */
 	ScriptService script();
 
+	/**
+	 * Gets this application context's {@link StartupService}.
+	 *
+	 * @return The {@link StartupService} of this application context.
+	 */
+	StartupService startup();
+
 	/**
 	 * Gets this application context's {@link StatusService}.
 	 *
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
new file mode 100644
index 000000000..8811e9731
--- /dev/null
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.startup;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+import org.scijava.plugin.Plugin;
+import org.scijava.service.AbstractService;
+import org.scijava.service.Service;
+
+/**
+ * Default implementation of {@link StartupService}.
+ * 
+ * @author Curtis Rueden
+ */
+@Plugin(type = Service.class)
+public class DefaultStartupService extends AbstractService implements
+	StartupService
+{
+
+	private final Deque<Runnable> operations = new ArrayDeque<>();
+
+	@Override
+	public void addOperation(final Runnable operation) {
+		operations.add(operation);
+	}
+
+	@Override
+	public void executeOperations() {
+		while (!operations.isEmpty()) {
+			final Runnable operation = operations.pop();
+			operation.run();
+		}
+	}
+}
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
new file mode 100644
index 000000000..8f1e56f47
--- /dev/null
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.startup;
+
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for service managing startup operations.
+ * 
+ * @author Curtis Rueden
+ */
+public interface StartupService extends SciJavaService {
+
+	/** Adds an operation that will run as soon as the application starts up. */
+	void addOperation(Runnable r);
+
+	/**
+	 * Execute all registered startup operations, in the order they were
+	 * registered, blocking until complete.
+	 */
+	void executeOperations();
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index bfcce46e5..9c6e15c82 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -114,6 +114,7 @@ public void testFull() {
 				org.scijava.run.DefaultRunService.class,
 				org.scijava.script.DefaultScriptHeaderService.class,
 				org.scijava.script.process.DefaultScriptProcessorService.class,
+				org.scijava.startup.DefaultStartupService.class,
 				org.scijava.task.DefaultTaskService.class,
 				org.scijava.text.DefaultTextService.class,
 				org.scijava.thread.DefaultThreadService.class,

From 9c9add3815c1eee5dea395dd0c2aa297dcb3a7c8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 22:46:05 -0700
Subject: [PATCH 0778/1208] HeadlessArgument: tweak whitespace

---
 src/main/java/org/scijava/ui/console/HeadlessArgument.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index 012fa2fe0..97551d667 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -70,11 +70,11 @@ public void handle(final LinkedList<String> args) {
 
 		uiService.setHeadless(true);
 	}
+
 	// -- Typed methods --
 
 	@Override
 	public boolean supports(final LinkedList<String> args) {
 		return uiService != null && super.supports(args);
 	}
-
 }

From 17ead5d52564b9d24c7502ec709b55fc50608900 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 22:48:34 -0700
Subject: [PATCH 0779/1208] OpenArgument: make all services optional

And do not handle the argument if any are missing.

This pattern reduces the likelihood of plugin initialization
errors when the context does not contain all needed services.
---
 .../java/org/scijava/io/console/OpenArgument.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 23180281a..afa38b98d 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -51,13 +51,13 @@
 @Plugin(type = ConsoleArgument.class)
 public class OpenArgument extends AbstractConsoleArgument {
 
-	@Parameter
+	@Parameter(required = false)
 	private IOService ioService;
 
-	@Parameter
+	@Parameter(required = false)
 	private DisplayService displayService;
 
-	@Parameter
+	@Parameter(required = false)
 	private LogService log;
 
 	// -- Constructor --
@@ -80,7 +80,14 @@ public void handle(final LinkedList<String> args) {
 			displayService.createDisplay(o);
 		}
 		catch (IOException exc) {
-			log.error(exc);
+			if (log != null) log.error(exc);
 		}
 	}
+
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		return ioService != null && displayService != null && super.supports(args);
+	}
 }

From c53149ef6c13ce04daa59263aa722605c142b5c0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 22:50:01 -0700
Subject: [PATCH 0780/1208] OpenArgument: defer opening until UI is visible

Otherwise, the data is opened, but then not displayed.
---
 .../org/scijava/io/console/OpenArgument.java  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index afa38b98d..fa05f8afc 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -42,6 +42,7 @@
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.startup.StartupService;
 
 /**
  * Handles the {@code --open} command line argument.
@@ -57,6 +58,9 @@ public class OpenArgument extends AbstractConsoleArgument {
 	@Parameter(required = false)
 	private DisplayService displayService;
 
+	@Parameter(required = false)
+	private StartupService startupService;
+
 	@Parameter(required = false)
 	private LogService log;
 
@@ -75,19 +79,23 @@ public void handle(final LinkedList<String> args) {
 		args.removeFirst(); // --open
 		final String source = args.removeFirst();
 
-		try {
-			final Object o = ioService.open(source);
-			displayService.createDisplay(o);
-		}
-		catch (IOException exc) {
-			if (log != null) log.error(exc);
-		}
+		// open the source after the UI is shown
+		startupService.addOperation(() -> {
+			try {
+				final Object o = ioService.open(source);
+				displayService.createDisplay(o);
+			}
+			catch (final IOException exc) {
+				if (log != null) log.error(exc);
+			}
+		});
 	}
 
 	// -- Typed methods --
 
 	@Override
 	public boolean supports(final LinkedList<String> args) {
-		return ioService != null && displayService != null && super.supports(args);
+		return startupService != null && ioService != null &&
+			displayService != null && super.supports(args);
 	}
 }

From 8d3a36288b2e9201252c760e9ab4fabc142f22e7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 23:16:53 -0700
Subject: [PATCH 0781/1208] RunArgument: defer running until UI is visible

---
 .../org/scijava/run/console/RunArgument.java  | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index ffb036613..0ee722664 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -43,6 +43,7 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.run.RunService;
+import org.scijava.startup.StartupService;
 
 /**
  * Handles the {@code --run} command line argument.
@@ -55,6 +56,9 @@ public class RunArgument extends AbstractConsoleArgument {
 	@Parameter
 	private RunService runService;
 
+	@Parameter
+	private StartupService startupService;
+
 	@Parameter
 	private ParseService parser;
 
@@ -78,22 +82,24 @@ public void handle(final LinkedList<String> args) {
 		final String arg = getParam(args);
 		if (arg != null) args.removeFirst(); // argument list was given
 
-		try {
-			if (arg == null) runService.run(code);
-			else {
-				final Items items = parser.parse(arg);
-				if (items.isMap()) runService.run(code, items.asMap());
-				else if (items.isList()) runService.run(code, items.toArray());
+		startupService.addOperation(() -> {
+			try {
+				if (arg == null) runService.run(code);
 				else {
-					throw new IllegalArgumentException("Arguments are inconsistent. " +
-						"Please pass either a list of key/value pairs, " +
-						"or a list of values.");
+					final Items items = parser.parse(arg);
+					if (items.isMap()) runService.run(code, items.asMap());
+					else if (items.isList()) runService.run(code, items.toArray());
+					else {
+						throw new IllegalArgumentException("Arguments are inconsistent. " +
+							"Please pass either a list of key/value pairs, " +
+							"or a list of values.");
+					}
 				}
 			}
-		}
-		catch (final InvocationTargetException exc) {
-			throw new RuntimeException(exc);
-		}
+			catch (final InvocationTargetException exc) {
+				throw new RuntimeException(exc);
+			}
+		});
 	}
 
 	// -- Typed methods --

From e2e6c5c86e59fd3347a631d0f02b75ef5fa7cc1d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 23:42:01 -0700
Subject: [PATCH 0782/1208] DefaultStartupService: defend against exceptions

A startup operation might throw an unchecked exception.
We don't want that to kill the application startup.
Rather, let's just log an error.
---
 .../org/scijava/startup/DefaultStartupService.java   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index 8811e9731..2a4d8ab4c 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -35,6 +35,8 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
@@ -51,6 +53,9 @@ public class DefaultStartupService extends AbstractService implements
 
 	private final Deque<Runnable> operations = new ArrayDeque<>();
 
+	@Parameter(required = false)
+	private LogService log;
+
 	@Override
 	public void addOperation(final Runnable operation) {
 		operations.add(operation);
@@ -60,7 +65,12 @@ public void addOperation(final Runnable operation) {
 	public void executeOperations() {
 		while (!operations.isEmpty()) {
 			final Runnable operation = operations.pop();
-			operation.run();
+			try {
+				operation.run();
+			}
+			catch (final RuntimeException exc) {
+				if (log != null) log.error(exc);
+			}
 		}
 	}
 }

From ccfb5c49e85df0618b4222fb5975201562f37d98 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 28 Apr 2018 23:46:30 -0700
Subject: [PATCH 0783/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6fe0a5cef..1ae95df43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.71.0-SNAPSHOT</version>
+	<version>2.71.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From d10f86f5de8cbcc4f00bd87abbd4d59614fdf2d0 Mon Sep 17 00:00:00 2001
From: Kyle Harrington <kharrington@uidaho.edu>
Date: Sun, 29 Apr 2018 13:29:12 -0700
Subject: [PATCH 0784/1208] Fix behavior of ClassUtils.getField

It should return null if no such field.
---
 src/main/java/org/scijava/util/ClassUtils.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 0406b8c62..ea0d8fef7 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -627,13 +627,21 @@ public static Type getGenericType(final Field field, final Class<?> type) {
 	/** @deprecated Use {@link Types#field} instead. */
 	@Deprecated
 	public static Field getField(final String className, final String fieldName) {
-		return Types.field(Types.load(className), fieldName);
+		try {
+			return Types.field(Types.load(className), fieldName);
+		} catch (final IllegalArgumentException e) {
+			return null;
+		}
 	}
 
 	/** @deprecated Use {@link Types#field} instead. */
 	@Deprecated
 	public static Field getField(final Class<?> c, final String fieldName) {
-		return Types.field(c, fieldName);
+		try {
+			return Types.field(c, fieldName);
+		} catch (final IllegalArgumentException e) {
+			return null;
+		}
 	}
 
 	/** @deprecated Use {@link Types#array(Class)} instead. */

From bc98213a9d1d88fac8b9ffeedf30545bb6b599d7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 29 Apr 2018 15:37:52 -0700
Subject: [PATCH 0785/1208] Types: make toString(Type) work for CaptureTypes

---
 src/main/java/org/scijava/util/Types.java | 49 +++++++++++++++++------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 6fa21447a..9be037e44 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2771,6 +2771,9 @@ private static String toString(final Type type, final Set<Type> done) {
 			if (type instanceof WildcardType) {
 				return wildcardTypeToString((WildcardType) type, done);
 			}
+			if (type instanceof CaptureType) {
+				return captureTypeToString((CaptureType) type, done);
+			}
 			if (type instanceof TypeVariable) {
 				return typeVariableToString((TypeVariable<?>) type, done);
 			}
@@ -2944,18 +2947,25 @@ private static String wildcardTypeToString(final WildcardType w,
 			final StringBuilder buf = new StringBuilder().append('?');
 			if (done.contains(w)) return buf.toString();
 			done.add(w);
-			final Type[] lowerBounds = w.getLowerBounds();
-			final Type[] upperBounds = w.getUpperBounds();
-			if (lowerBounds.length > 1 || lowerBounds.length == 1 &&
-				lowerBounds[0] != null)
-			{
-				appendAllTo(buf.append(" super "), " & ", done, lowerBounds);
-			}
-			else if (upperBounds.length > 1 || upperBounds.length == 1 &&
-				!Object.class.equals(upperBounds[0]))
-			{
-				appendAllTo(buf.append(" extends "), " & ", done, upperBounds);
-			}
+			appendTypeBounds(buf, w.getLowerBounds(), w.getUpperBounds(), done);
+			return buf.toString();
+		}
+
+		/**
+		 * Format a {@link CaptureType} as a {@link String}.
+		 *
+		 * @param t {@code CaptureType} to format
+		 * @param done list of already-encountered types
+		 * @return String
+		 * @since 3.2
+		 */
+		private static String captureTypeToString(final CaptureType t,
+			final Set<Type> done)
+		{
+			final StringBuilder buf = new StringBuilder().append("capture of ?");
+			if (done.contains(t)) return buf.toString();
+			done.add(t);
+			appendTypeBounds(buf, t.getLowerBounds(), t.getUpperBounds(), done);
 			return buf.toString();
 		}
 
@@ -2970,6 +2980,21 @@ private static String genericArrayTypeToString(final GenericArrayType g) {
 			return String.format("%s[]", toString(g.getGenericComponentType()));
 		}
 
+		private static void appendTypeBounds(final StringBuilder buf,
+			final Type[] lowerBounds, final Type[] upperBounds, final Set<Type> done)
+		{
+			if (lowerBounds.length > 1 || lowerBounds.length == 1 &&
+				lowerBounds[0] != null)
+			{
+				appendAllTo(buf.append(" super "), " & ", done, lowerBounds);
+			}
+			else if (upperBounds.length > 1 || upperBounds.length == 1 &&
+				!Object.class.equals(upperBounds[0]))
+			{
+				appendAllTo(buf.append(" extends "), " & ", done, upperBounds);
+			}
+		}
+
 		/**
 		 * Append {@code types} to {@code buf} with separator {@code sep}.
 		 *

From f0cc7f4c16ff9e11df6d952d607c5e03ab6b945d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 29 Apr 2018 15:49:39 -0700
Subject: [PATCH 0786/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1ae95df43..0f2bc3b59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.71.1-SNAPSHOT</version>
+	<version>2.71.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 8fc8deef25377fdb771273519021bdcbeb502b47 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 30 Apr 2018 10:46:46 -0700
Subject: [PATCH 0787/1208] DisplayViewer: add view(UserInterface, Display)

This method allow DisplayViewer implementations to customize exactly how
they work for each supported UserInterface.

The default implementation tells the UserInterface to create its usual
flavor of DisplayWindow around the Display, invokes view(DisplayWindow,
Display), then DisplayWindow#showDisplay(Display), and finally
Display#update(), as AbstractUserInterface was previously doing.

DisplayViewer implementations needing more control (e.g., if a window
already exists, and we don't want the SwingUI to create another one) may
now override view(UserInterface, Display) to customize this process.

This will be useful in particular for SciView
(https://github.com/scenerygraphics/SciView).
---
 pom.xml                                       |  2 +-
 .../org/scijava/ui/AbstractUserInterface.java |  7 +------
 .../org/scijava/ui/viewer/DisplayViewer.java  | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0f2bc3b59..59d04d92c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.71.2-SNAPSHOT</version>
+	<version>2.72.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index f7f5e8a7b..9f430eb06 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -44,7 +44,6 @@
 import org.scijava.prefs.PrefService;
 import org.scijava.thread.ThreadService;
 import org.scijava.ui.viewer.DisplayViewer;
-import org.scijava.ui.viewer.DisplayWindow;
 
 /**
  * Abstract superclass for {@link UserInterface} implementations.
@@ -138,12 +137,8 @@ public void show(final Display<?> display) {
 		threadService.queue(new Runnable() {
 			@Override
 			public void run() {
-				final DisplayWindow displayWindow = createDisplayWindow(display);
-				finalViewer.view(displayWindow, display);
-				displayWindow.setTitle(display.getName());
+				finalViewer.view(AbstractUserInterface.this, display);
 				uiService.addDisplayViewer(finalViewer);
-				displayWindow.showDisplay(true);
-				display.update();
 			}
 		});
 	}
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index 5dcf26401..d7ac3f89b 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -67,6 +67,27 @@ public interface DisplayViewer<T> extends RichPlugin, Disposable {
 	 */
 	boolean canView(Display<?> d);
 
+	/**
+	 * Begins viewing the given display.
+	 * <p>
+	 * The default behavior of this method is to ask the given
+	 * {@link UserInterface} to create a {@link DisplayWindow} via
+	 * {@link UserInterface#createDisplayWindow(Display)} and then pass it to
+	 * {@link #view(DisplayWindow, Display)}. Viewers needing to customize details
+	 * of the {@link DisplayWindow} creation can do so via this method.
+	 * </p>
+	 * 
+	 * @param ui The user interface with which the viewer will be associated.
+	 * @param d the model for the display to show.
+	 */
+	default void view(final UserInterface ui, final Display<?> d) {
+		final DisplayWindow w = ui.createDisplayWindow(d);
+		w.setTitle(d.getName());
+		view(w, d);
+		w.showDisplay(true);
+		d.update();
+	}
+
 	/**
 	 * Begins viewing the given display.
 	 * 

From d872c5413bf437b35d979ee4f4d4e10a462bb6b2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 30 Apr 2018 12:44:53 -0700
Subject: [PATCH 0788/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 59d04d92c..ee87921f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.72.0-SNAPSHOT</version>
+	<version>2.72.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 95f416424381f51b9012869e970209d38d575b2f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 9 May 2018 13:31:48 -0500
Subject: [PATCH 0789/1208] Add a general-purpose tree node data structure

This will come in handy for the ImageJ-OMERO project's ROI support.
---
 pom.xml                                       |  2 +-
 .../org/scijava/util/DefaultTreeNode.java     | 82 +++++++++++++++++++
 src/main/java/org/scijava/util/TreeNode.java  | 67 +++++++++++++++
 3 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/util/DefaultTreeNode.java
 create mode 100644 src/main/java/org/scijava/util/TreeNode.java

diff --git a/pom.xml b/pom.xml
index ee87921f4..e48357eba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.72.1-SNAPSHOT</version>
+	<version>2.73.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
new file mode 100644
index 000000000..c4f722ab3
--- /dev/null
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Default implementation of {@link TreeNode}.
+ *
+ * @author Alison Walter
+ * @param <T> type of data associated with the node
+ */
+public class DefaultTreeNode<T> implements TreeNode<T> {
+
+	private TreeNode<?> parent;
+	private final List<TreeNode<?>> children;
+	private final T data;
+
+	/**
+	 * Creates a new tree node wrapping the given data, located in the tree
+	 * beneath the specified parent.
+	 * 
+	 * @param data The data to wrap.
+	 * @param parent The parent node of the tree.
+	 */
+	public DefaultTreeNode(final T data, final TreeNode<?> parent) {
+		this.data = data;
+		this.parent = parent;
+		children = new ArrayList<>();
+	}
+
+	@Override
+	public T data() {
+		return data;
+	}
+
+	@Override
+	public TreeNode<?> parent() {
+		return parent;
+	}
+
+	@Override
+	public void setParent(final TreeNode<?> parent) {
+		this.parent = parent;
+	}
+
+	@Override
+	public List<TreeNode<?>> children() {
+		return children;
+	}
+}
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
new file mode 100644
index 000000000..5f2063349
--- /dev/null
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -0,0 +1,67 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.util;
+
+import java.util.List;
+
+/**
+ * A wrapper around a data object, for storing it in a tree structure.
+ *
+ * @author Alison Walter
+ * @param <T> type of data associated with the node
+ */
+public interface TreeNode<T> {
+
+	/** Gets the data associated with the node. */
+	T data();
+
+	/** Gets the parent of this node. */
+	TreeNode<?> parent();
+
+	void setParent(TreeNode<?> parent);
+
+	/**
+	 * Gets the node's children. If this list is mutated, the children will be
+	 * affected accordingly. It is the responsibility of the caller to ensure
+	 * continued integrity, particularly of parent linkages.
+	 */
+	List<TreeNode<?>> children();
+
+	/** Adds the given list of children to this node. */
+	default void addChildren(final List<? extends TreeNode<?>> nodes) {
+		for (final TreeNode<?> child : nodes) {
+			child.setParent(parent());
+		}
+		children().addAll(nodes);
+	}
+}

From 5641c206c127d2d153cd1a511aafba1892877772 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 9 May 2018 14:43:43 -0500
Subject: [PATCH 0790/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e48357eba..039f1181d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.73.0-SNAPSHOT</version>
+	<version>2.73.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From f7ba6453969793f8ff0a5799379c58204c8b7589 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 11 May 2018 14:09:28 -0500
Subject: [PATCH 0791/1208] AppUtils: be defensive if no main class found

Otherwise, Types.location throws NPE later.
---
 src/main/java/org/scijava/util/AppUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 0f75d9671..f4836730d 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -104,7 +104,8 @@ public static File getBaseDirectory(final String sysProp, final Class<?> c,
 		// repository cache (~/.m2/repository), so the corePath will be null.
 		// However, the classes of the launching project will be located in
 		// target/classes, so we search up the tree from one of those.
-		final File appPath = AppUtils.getBaseDirectory(AppUtils.getMainClass());
+		final Class<?> mc = AppUtils.getMainClass();
+		final File appPath = mc == null ? null : AppUtils.getBaseDirectory(mc);
 		if (appPath != null) return appPath;
 
 		// last resort: use current working directory

From ca47c958c43f1e439aeef782b90ba93848c9cc45 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 11 May 2018 14:09:59 -0500
Subject: [PATCH 0792/1208] Types: tweak formatting

---
 src/main/java/org/scijava/util/Types.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 9be037e44..f0c1683b6 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -205,8 +205,8 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 
 		// load the class!
 		try {
-			final ClassLoader cl = classLoader == null ? Thread.currentThread()
-				.getContextClassLoader() : classLoader;
+			final ClassLoader cl = classLoader == null ? //
+				Thread.currentThread().getContextClassLoader() : classLoader;
 			return cl.loadClass(className);
 		}
 		catch (final Throwable t) {

From 562c402338a5403c6565e117d68195eed31a15f3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 11 May 2018 14:13:33 -0500
Subject: [PATCH 0793/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 039f1181d..1be8b5cc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.73.1-SNAPSHOT</version>
+	<version>2.73.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 6a287efc0cdb9138aa54f0efb339ab746ba98ec0 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Sun, 6 May 2018 15:12:56 +0200
Subject: [PATCH 0794/1208] DataHandleService: Add a method to check if the
 source of a handle exists.

---
 .../org/scijava/io/handle/DataHandleService.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index 97175e4d9..5d4f1a77e 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -32,6 +32,8 @@
 
 package org.scijava.io.handle;
 
+import java.io.IOException;
+
 import org.scijava.io.IOService;
 import org.scijava.io.location.Location;
 import org.scijava.plugin.WrapperService;
@@ -63,4 +65,18 @@ default Class<DataHandle<Location>> getPluginType() {
 	default Class<Location> getType() {
 		return Location.class;
 	}
+
+	/**
+	 * Convenience method to test whether it describes an existing file.
+	 *
+	 * @param location the location to test
+	 * @return The result of {@link DataHandle#exists()} on a newly created handle
+	 *         on this location
+	 * @throws IOException
+	 */
+	default boolean exists(final Location location) throws IOException {
+		try (DataHandle<Location> handle = create(location)) {
+			return handle.exists();
+		}
+	}
 }

From 8224eeb08bc45df470f70ec71959391c2d089d41 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 25 Aug 2017 19:01:27 +0200
Subject: [PATCH 0795/1208] Add AbstractHigherOrderDataHandle

Abstract superclass for DataHandles that operate over other DataHandles
---
 .../io/handle/AbstractHigherOrderHandle.java  | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java

diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
new file mode 100644
index 000000000..b77c674a0
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -0,0 +1,113 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.IOException;
+
+import org.scijava.io.location.Location;
+
+/**
+ * Abstract superclass for {@link DataHandle}s that operate over other
+ * {@link DataHandle}s.
+ *
+ * @author Gabriel Einsdorf
+ */
+public abstract class AbstractHigherOrderHandle<L extends Location> extends
+	AbstractDataHandle<L>
+{
+
+	private final DataHandle<L> handle;
+	private boolean closed;
+
+	public AbstractHigherOrderHandle(final DataHandle<L> handle) {
+		this.handle = handle;
+		set(handle.get()); // provides access to underlying location
+	}
+
+	@Override
+	public boolean isReadable() {
+		return !closed && handle.isReadable();
+	}
+
+	@Override
+	public boolean isWritable() {
+		return !closed && handle.isWritable();
+	}
+
+	@Override
+	public long length() throws IOException {
+		return handle.length();
+	}
+
+	@Override
+	public Class<L> getType() {
+		return handle.getType();
+	}
+
+	@Override
+	public boolean exists() throws IOException {
+		return handle.exists();
+	}
+
+	@Override
+	public void close() throws IOException {
+		if (!closed) {
+			cleanup();
+			closed = true;
+			handle.close();
+		}
+	}
+
+	protected void ensureOpen() throws IOException {
+		if (closed) {
+			throw new IOException("This handle is closed!");
+		}
+	}
+
+	/**
+	 * Clean up data structures after a handle has been closed in the
+	 * {@link #close()} method.
+	 *
+	 * @throws IOException
+	 */
+	protected abstract void cleanup() throws IOException;
+
+	/**
+	 * @return the {@link DataHandle} wrapped by this
+	 *         {@link AbstractHigherOrderHandle}
+	 */
+	protected DataHandle<L> handle() {
+		return handle;
+	}
+
+}

From 42567de2e9802d04489c0b174235d0211dfcb27b Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 6 Sep 2017 14:49:52 +0200
Subject: [PATCH 0796/1208] DataHandles: Add helper methods for read- / write-
 only handles

This reduced the amount of repetion in the code
---
 src/main/java/org/scijava/io/handle/DataHandles.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index d0494d76e..9bed1a516 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -112,6 +112,15 @@ private static synchronized void initUTFMethod() {
 				"No usable DataOutputStream.writeUTF(String, DataOutput)", exc);
 		}
 	}
+	
+	protected static IOException readOnlyException() {
+		return new IOException("This handle is read-only!");
+	}
+
+	protected static IOException writeOnlyException() {
+		return new IOException("This handle is write-only!");
+	}
+
 
 	/**
 	 * Copies all bytes from the input to the output handle. Reading and writing

From ff8deab8fa97fc6b7b9979af8114c2c83ca36361 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 6 Sep 2017 14:51:42 +0200
Subject: [PATCH 0797/1208] Add ReadBufferDataHandle

This Handle acts as a transparent buffer which wraps any other
DataHandle and buffers reads from that handle.
---
 .../io/handle/ReadBufferDataHandle.java       | 300 ++++++++++++++++++
 .../io/handle/ReadBufferDataHandleTest.java   | 144 +++++++++
 2 files changed, 444 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
 create mode 100644 src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java

diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
new file mode 100644
index 000000000..b54ebe950
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -0,0 +1,300 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.scijava.io.location.Location;
+
+/**
+ * Read-only buffered {@link DataHandle}. It buffers the underlying handle into
+ * a fixed number of pages, swapping them out when necessary.
+ */
+public class ReadBufferDataHandle extends AbstractHigherOrderHandle<Location> {
+
+	private static final int DEFAULT_PAGE_SIZE = 10_000;
+	private static final int DEFAULT_NUM_PAGES = 10;
+
+	private final int pageSize;
+	private final List<byte[]> pages;
+	private final int[] slotToPage;
+	private final LRUReplacementStrategy replacementStrategy;
+	private final Map<Integer, Integer> pageToSlot;
+
+	private long offset = 0l;
+	private byte[] currentPage;
+	private int currentPageID = -1;
+
+	/**
+	 * Creates a {@link ReadBufferDataHandle} wrapping the provided handle using the
+	 * default values for the size of the pages ({@value #DEFAULT_PAGE_SIZE} byte)
+	 * and number of pages ({@link #DEFAULT_NUM_PAGES}).
+	 *
+	 * @param handle
+	 *            the handle to wrap
+	 */
+	public ReadBufferDataHandle(final DataHandle<Location> handle) {
+		this(handle, DEFAULT_PAGE_SIZE);
+	}
+
+	/**
+	 * Creates a {@link ReadBufferDataHandle} wrapping the provided handle using the
+	 * default value for the number of pages ({@link #DEFAULT_NUM_PAGES}).
+	 *
+	 * @param handle
+	 *            the handle to wrap
+	 * @param pageSize
+	 *            the size of the used pages
+	 */
+	public ReadBufferDataHandle(final DataHandle<Location> handle, final int pageSize) {
+		this(handle, pageSize, DEFAULT_NUM_PAGES);
+	}
+
+	/**
+	 * Creates a {@link ReadBufferDataHandle} wrapping the provided handle.
+	 *
+	 * @param handle
+	 *            the handle to wrap
+	 * @param pageSize
+	 *            the size of the used pages
+	 * @param numPages
+	 *            the number of pages to use
+	 */
+	public ReadBufferDataHandle(final DataHandle<Location> handle, final int pageSize, final int numPages) {
+		super(handle);
+		this.pageSize = pageSize;
+
+		// init maps
+		slotToPage = new int[numPages];
+		Arrays.fill(slotToPage, -1);
+
+		pages = new ArrayList<>(numPages);
+		for (int i = 0; i < numPages; i++) {
+			pages.add(null);
+		}
+
+		pageToSlot = new HashMap<>();
+		replacementStrategy = new LRUReplacementStrategy(numPages);
+	}
+
+	/**
+	 * Ensures that the byte at the given offset is buffered, and sets the current
+	 * page to be the one containing the specified location.
+	 */
+	private void ensureBuffered(final long globalOffset) throws IOException {
+		ensureOpen();
+		final int pageID = (int) (globalOffset / pageSize);
+		if (pageID == currentPageID)
+			return;
+
+		final int slotID = pageToSlot.computeIfAbsent(pageID, replacementStrategy::pickVictim);
+		final int inSlotID = slotToPage[slotID];
+
+		if (inSlotID != pageID) { // desired page is not buffered
+			// update the mappings
+			slotToPage[slotID] = pageID;
+			pageToSlot.put(pageID, slotID);
+			pageToSlot.put(inSlotID, null);
+
+			// read the page
+			currentPage = readPage(pageID, slotID);
+		} else {
+			currentPage = pages.get(slotID);
+		}
+		replacementStrategy.accessed(slotID);
+		currentPageID = pageID;
+	}
+
+	/**
+	 * Reads the page with the id <code>pageID</code> into the slot with the id
+	 * <code>slotID</code>.
+	 *
+	 * @param pageID
+	 *            the id of the page to read
+	 * @param slotID
+	 *            the id of the slot to read the page into
+	 * @return the read page
+	 * @throws IOException
+	 *             if the reading fails
+	 */
+	private byte[] readPage(final int pageID, final int slotID) throws IOException {
+		replacementStrategy.accessed(slotID);
+		byte[] page = pages.get(slotID);
+		if (page == null) {
+			// lazy initialization
+			page = new byte[pageSize];
+			pages.set(slotID, page);
+		}
+
+		final long startOfPage = pageID * (long) pageSize;
+		if (handle().offset() != startOfPage) {
+			handle().seek(startOfPage);
+		}
+		handle().read(page);
+		return page;
+	}
+
+	/**
+	 * Calculates the offset in the current page for the given global offset
+	 */
+	private int globalToLocalOffset(final long off) {
+		return (int) off % pageSize;
+	}
+
+	@Override
+	public void seek(final long pos) throws IOException {
+		this.offset = pos;
+	}
+
+	@Override
+	public int read(final byte[] b, final int targetOffset, final int len)
+		throws IOException
+	{
+		if (len == 0) return 0;
+
+		// the last position we will read
+		final long endPos = offset + len;
+
+		// the number of bytes we plan to read
+		final int readLength = (int) (endPos < length() ? len : length() - offset);
+
+		int read = 0; // the number of bytes we have read
+		int localTargetOff = targetOffset;
+
+		while (read < readLength) {
+			ensureBuffered(offset);
+
+			// calculate local offsets
+			final int pageOffset = globalToLocalOffset(offset);
+			int localLength = pageSize - pageOffset;
+			if (read + localLength > readLength) {
+				localLength = readLength - read;
+			}
+
+			// copy the data
+			System.arraycopy(currentPage, pageOffset, b, localTargetOff, localLength);
+
+			// update offsets
+			read += localLength;
+			offset += localLength;
+			localTargetOff += localLength;
+		}
+		// return -1 if we tried to read at least one byte but failed
+		return read != 0 ? read : -1;
+	}
+
+	@Override
+	public byte readByte() throws IOException {
+		ensureBuffered(offset);
+		return currentPage[globalToLocalOffset(offset++)];
+	}
+
+	@Override
+	public boolean isReadable() {
+		return true;
+	}
+
+	@Override
+	public long offset() throws IOException {
+		return offset;
+	}
+
+	@Override
+	protected void cleanup() {
+		pages.clear();
+		currentPage = null;
+	}
+
+	@Override
+	public void write(final int b) throws IOException {
+		throw DataHandles.readOnlyException();
+	}
+
+	@Override
+	public void write(final byte[] b, final int off, final int len) throws IOException {
+		throw DataHandles.readOnlyException();
+	}
+
+	@Override
+	public void setLength(final long length) throws IOException {
+		throw DataHandles.readOnlyException();
+	}
+
+	/**
+	 * Simple strategy to pick the slot that get's evicted from the cache. This
+	 * strategy always picks the least recently used slot.
+	 */
+	private class LRUReplacementStrategy {
+
+		private final Deque<Integer> queue;
+
+		/**
+		 * Creates a {@link LRUReplacementStrategy} with the specified number of slots.
+		 *
+		 * @param numSlots
+		 *            the number of slots to use
+		 */
+		public LRUReplacementStrategy(final int numSlots) {
+			queue = new ArrayDeque<>(numSlots);
+
+			// fill the que
+			for (int i = 0; i < numSlots; i++) {
+				queue.add(i);
+			}
+		}
+
+		/**
+		 * Notifies this strategy that a slot has been accessed, pushing it to the end
+		 * of the queue.
+		 *
+		 * @param slotID
+		 *            the id of the slot that has been accessed
+		 */
+		public void accessed(final int slotID) {
+			// put accessed element to the end of the que
+			queue.remove(slotID);
+			queue.add(slotID);
+		}
+
+		public int pickVictim(final int pageID) {
+			return queue.peek();
+		}
+	}
+}
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
new file mode 100644
index 000000000..a2a987a5e
--- /dev/null
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -0,0 +1,144 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.io.location.BytesLocation;
+import org.scijava.io.location.Location;
+
+/**
+ * Tests {@link ReadBufferDataHandle}
+ *
+ * @author Gabriel Einsdorf
+ */
+public class ReadBufferDataHandleTest extends DataHandleTest {
+
+	private Context context;
+	private DataHandleService dataHandleService;
+
+	@Override
+	@Test
+	public void testDataHandle() throws IOException {
+
+		final Location loc = createLocation();
+		try (final DataHandle<Location> handle = //
+			dataHandleService.create(loc);
+				AbstractDataHandle<Location> bufferedHandle = //
+					new ReadBufferDataHandle(handle))
+		{
+			checkReads(bufferedHandle);
+		}
+	}
+
+	@Test
+	public void testSmallBuffer() throws IOException {
+
+		final Location loc = createLocation();
+		try (final DataHandle<Location> handle = //
+			dataHandleService.create(loc);
+				AbstractDataHandle<Location> bufferedHandle = //
+					new ReadBufferDataHandle(handle, 5))
+		{
+			// check with small buffersize
+			checkReads(bufferedHandle);
+		}
+	}
+
+	@Test
+	public void testLargeRead() throws Exception {
+
+		final int size = 10_00;
+		final byte[] bytes = new byte[size];
+		Random r = new Random(42);
+		r.nextBytes(bytes);
+
+		final Location loc = new BytesLocation(bytes);
+		try (final DataHandle<Location> handle = //
+			dataHandleService.create(loc);
+				AbstractDataHandle<Location> bufferedHandle = //
+					new ReadBufferDataHandle(handle, 12, 3))
+		{
+			// check with small buffersize
+			final byte[] actual = new byte[size];
+
+			// create evenly sized slice ranges
+			int slices = 60;
+			int range = (size + slices - 1) / slices;
+			List<SimpleEntry<Integer, Integer>> ranges = new ArrayList<>();
+			for (int i = 0; i < slices; i++) {
+				int start = range * i;
+				int end = range * (i + 1);
+				ranges.add(new SimpleEntry<>(start, end));
+			}
+			Collections.shuffle(ranges, r);
+
+			for (SimpleEntry<Integer, Integer> e : ranges) {
+				bufferedHandle.seek(e.getKey());
+				bufferedHandle.read(actual, e.getKey(), e.getValue() - e.getKey());
+			}
+
+			assertArrayEquals(bytes, actual);
+		}
+	}
+
+	@Before
+	public void setup() {
+		context = new Context(DataHandleService.class);
+		dataHandleService = context.service(DataHandleService.class);
+	}
+
+	@Override
+	public Class<? extends DataHandle<?>> getExpectedHandleType() {
+		return null;
+	}
+
+	@Override
+	public Location createLocation() throws IOException {
+		try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+			populateData(out);
+			return new BytesLocation(out.toByteArray());
+		}
+	}
+}

From b87811995330f24c066143b26d7d0c4baa15e286 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 6 Sep 2017 13:00:48 +0200
Subject: [PATCH 0798/1208] Add mockito based mock testing for
 ReadBufferDataHandle

---
 pom.xml                                       |   5 +
 .../handle/ReadBufferDataHandleMockTest.java  | 128 ++++++++++++++++++
 2 files changed, 133 insertions(+)
 create mode 100644 src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java

diff --git a/pom.xml b/pom.xml
index 1be8b5cc2..179bd21f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,11 @@ Konstanz, and KNIME GmbH.</license.copyrightOwners>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+			</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
new file mode 100644
index 000000000..cc1b992d2
--- /dev/null
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -0,0 +1,128 @@
+
+package org.scijava.io.handle;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.AdditionalMatchers.aryEq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+
+import org.scijava.io.location.DummyLocation;
+import org.scijava.io.location.Location;
+
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+
+public class ReadBufferDataHandleMockTest {
+
+	private DataHandle<Location> mock;
+	private AbstractDataHandle<Location> buf;
+	private byte[] byteArrayLen10;
+	private long innerOffset;
+
+	@SuppressWarnings("unchecked")
+	@Before
+	public void setup() throws IOException {
+		innerOffset = 0l;
+		mock = mock(DataHandle.class);
+
+		// needed to get around type checking in AbstractWrapperPlugin
+		when(mock.get()).thenReturn(new DummyLocation());
+		when(mock.getType()).thenReturn(Location.class);
+
+		buf = new ReadBufferDataHandle(mock, 10, 2);
+		byteArrayLen10 = new byte[10];
+
+		// update offset on mock read
+		when(mock.read(any(byte[].class))).thenAnswer(inv -> {
+			innerOffset += inv.<byte[]> getArgument(0).length;
+			return null;
+		});
+
+		// update offset on mock seek
+		doAnswer(inv -> {
+			innerOffset = inv.getArgument(0);
+			return null;
+		}).when(mock).seek(anyLong());
+
+		// mock offset
+		when(mock.offset()).then(inv -> {
+			return innerOffset;
+		});
+	}
+
+	@Test
+	public void testBufferingSequence() throws IOException {
+
+		// set length of stubbed handle
+		when(mock.length()).thenReturn(30l);
+
+		// read the first byte
+		buf.read();
+		verify(mock, times(0)).seek(0);
+		// buffer should read a whole page
+		verify(mock).read(aryEq(byteArrayLen10));
+
+		buf.seek(0);
+		// ensure seek was not called again
+		verify(mock, times(0)).seek(0);
+
+		// read over the edge of the current page
+		buf.read(new byte[12]);
+		verify(mock, times(0)).seek(anyLong());
+		verify(mock, times(2)).read(aryEq(byteArrayLen10));
+
+		assertEquals(12, buf.offset());
+
+		// read the last page
+		buf.read(new byte[12]);
+		verify(mock, times(0)).seek(anyLong());
+		verify(mock, times(3)).read(aryEq(byteArrayLen10));
+
+		// first page should no longer be buffered, must be reread in
+		buf.seek(0);
+		buf.read();
+		verify(mock).seek(0);
+		verify(mock, times(4)).read(aryEq(byteArrayLen10));
+	}
+
+	/**
+	 * Tests that we do not buffer pages that are not needed and
+	 *
+	 * @throws IOException
+	 */
+	@Test
+	public void testSkipForward() throws IOException {
+
+		// set length of stubbed handle
+		when(mock.length()).thenReturn(40l);
+
+		// read the first byte
+		buf.read();
+		verify(mock, times(0)).seek(anyLong());
+		verify(mock).read(aryEq(byteArrayLen10));
+
+		// skip the second page
+		buf.seek(30l);
+		buf.read();
+
+		// read the third page
+		verify(mock).seek(30l);
+		verify(mock, times(2)).read(aryEq(byteArrayLen10));
+
+		// go back to already buffered page
+		buf.seek(0l);
+		buf.read();
+
+		verify(mock, times(1)).seek(anyLong());
+
+		// go back to third page
+		buf.seek(35);
+		buf.read();
+		verify(mock, times(1)).seek(anyLong());
+		verify(mock, times(2)).read(any());
+	}
+}

From ef1268b3f93da68b4eadf7caca7728d62ad858a3 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 6 Sep 2017 14:52:56 +0200
Subject: [PATCH 0799/1208] Add WriteBufferDataHandle

---
 .../io/handle/WriteBufferDataHandle.java      | 206 ++++++++++++++++++
 .../io/handle/WriteBufferDataHandleTest.java  | 109 +++++++++
 2 files changed, 315 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
 create mode 100644 src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java

diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
new file mode 100644
index 000000000..41c1603a8
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -0,0 +1,206 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import org.scijava.io.location.Location;
+
+/**
+ * Wraps a {@link DataHandle} and acts as a write buffer.
+ *
+ * @author Gabriel Einsdorf
+ */
+public class WriteBufferDataHandle extends AbstractHigherOrderHandle<Location> {
+
+	private static final int DEFAULT_BUFFERSIZE = 10_000;
+	private long offset = 0;
+	private int nextPos = 0;
+
+	private byte[] buffer;
+	private final int bufferSize;
+
+	/**
+	 * Creates a {@link WriteBufferDataHandle} that wraps the given
+	 * {@link DataHandle}, the default size for the buffer is used
+	 * ({@value #DEFAULT_BUFFERSIZE} bytes).
+	 *
+	 * @param handle the handle to wrap
+	 */
+	public WriteBufferDataHandle(final DataHandle<Location> handle) {
+		this(handle, DEFAULT_BUFFERSIZE);
+	}
+
+	/**
+	 * Creates a {@link WriteBufferDataHandle} that wraps the given
+	 * {@link DataHandle}
+	 *
+	 * @param handle the handle to wrap
+	 * @param bufferSize the size of the write buffer in bytes
+	 */
+	public WriteBufferDataHandle(final DataHandle<Location> handle,
+		final int bufferSize)
+	{
+		super(handle);
+		this.bufferSize = bufferSize;
+	}
+
+	@Override
+	public void write(final int b) throws IOException {
+		ensureOpen();
+		// if buffer is full flush
+		if (nextPos >= buffer.length) {
+			flush();
+		}
+		// buffer the byte
+		buffer[nextPos] = (byte) b;
+		nextPos++;
+		offset++;
+	}
+
+	@Override
+	public void write(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		ensureOpen();
+		// ensure the range is valid
+		if ((off < 0) || (off > b.length) || (len < 0) || ((off +
+			len) > b.length) || ((off + len) < 0))
+		{
+			throw new IndexOutOfBoundsException();
+		}
+		else if (len == 0) {
+			return; // nothing to do
+		}
+
+		// skip the buffering and write directly to the handle
+		if (len > buffer.length) {
+			flush();
+			handle().write(b, off, len);
+			offset += len;
+			return;
+		}
+
+		// copy to buffer / flush if necessary
+		int start = off;
+		final int total = off + len;
+		while (start < total) {
+			final int numItems = Math.min(buffer.length - nextPos, total - start);
+			System.arraycopy(b, start, buffer, nextPos, numItems);
+			start += numItems;
+			nextPos += numItems;
+			if (nextPos >= buffer.length) {
+				flush();
+			}
+		}
+	}
+
+	/**
+	 * Write the buffer content to the underlying handle
+	 */
+	private void flush() throws IOException {
+		ensureOpen();
+		if (nextPos == 0) return;
+
+		handle().write(buffer, 0, nextPos);
+		nextPos = 0;
+	}
+
+	@Override
+	public long length() throws IOException {
+		// data written out + data in the buffer
+		return handle().length() + nextPos - 1;
+	}
+
+	@Override
+	public void setLength(final long length) throws IOException {
+		ensureOpen();
+		handle().setLength(length);
+	}
+
+	@Override
+	public boolean isReadable() {
+		return false;
+	}
+
+	/**
+	 * @throws IOException if this handle has been closed
+	 */
+	@Override
+	protected void ensureOpen() throws IOException {
+		super.ensureOpen();
+		if (buffer == null) {
+			buffer = new byte[bufferSize];
+		}
+	}
+
+	@Override
+	public long offset() throws IOException {
+		return offset;
+	}
+
+	@Override
+	public void seek(final long pos) throws IOException {
+		ensureOpen();
+		if (pos >= length()) {
+			throw new EOFException();
+		}
+		flush();
+		offset = pos;
+		handle().seek(offset);
+	}
+
+	@Override
+	public long skip(final long n) throws IOException {
+		throw new IOException("Operation 'skip' is not supported!");
+	}
+
+	@Override
+	public byte readByte() throws IOException {
+		throw DataHandles.writeOnlyException();
+	}
+
+	@Override
+	public int read(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		throw DataHandles.writeOnlyException();
+	}
+
+	@Override
+	protected void cleanup() throws IOException {
+		flush();
+		buffer = null;
+	}
+}
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
new file mode 100644
index 000000000..b17d4037a
--- /dev/null
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -0,0 +1,109 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.io.location.BytesLocation;
+import org.scijava.io.location.Location;
+
+public class WriteBufferDataHandleTest extends DataHandleTest {
+
+	private Location loc;
+
+	@Override
+	public Class<? extends DataHandle<?>> getExpectedHandleType() {
+		// not needed
+		return null;
+	}
+
+	@Override
+	@Test
+	public void testDataHandle() throws IOException {
+		final Context context = new Context(DataHandleService.class);
+		final DataHandleService dataHandleService = context.service(
+			DataHandleService.class);
+
+		loc = createLocation();
+		try (final DataHandle<Location> handle = //
+			dataHandleService.create(loc);
+				final DataHandle<Location> buffer = //
+					new WriteBufferDataHandle(handle))
+		{
+			checkWrites(buffer);
+		}
+	}
+
+	@Override
+	public Location createLocation() throws IOException {
+
+		final ByteArrayOutputStream out = new ByteArrayOutputStream();
+		populateData(out);
+		return new BytesLocation(out.toByteArray());
+	}
+
+	@Override
+	protected <L extends Location> void checkWrites(final DataHandle<L> handle)
+		throws IOException
+	{
+		final byte[] copy = BYTES.clone();
+
+		// change the data
+		handle.seek(7);
+		final String splice = "there";
+		for (int i = 0; i < splice.length(); i++) {
+			final char c = splice.charAt(i);
+			handle.write(c);
+			copy[7 + i] = (byte) c;
+		}
+		handle.close();
+
+		final Context context = new Context(DataHandleService.class);
+		final DataHandleService dataHandleService = context.service(
+			DataHandleService.class);
+
+		try (final DataHandle<? extends Location> readHandle = //
+			dataHandleService.create(loc))
+		{
+			readHandle.seek(0);
+			for (int i = 0; i < copy.length; i++) {
+				assertEquals(msg(i), 0xff & copy[i], readHandle.read());
+			}
+		}
+	}
+}

From b65ff9a8d5dd072fb99202ed20fa28ea1b0789db Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 21 Feb 2018 15:09:54 +0100
Subject: [PATCH 0800/1208] DataHandleService: Prominently expose
 ReadBufferDataHandle and WriteBufferDataHandle

---
 .../scijava/io/handle/DataHandleService.java  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index 5d4f1a77e..f2a24ba6d 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -33,6 +33,7 @@
 package org.scijava.io.handle;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import org.scijava.io.IOService;
 import org.scijava.io.location.Location;
@@ -79,4 +80,40 @@ default boolean exists(final Location location) throws IOException {
 			return handle.exists();
 		}
 	}
+
+	/**
+	 * Wraps the provided {@link DataHandle} in a read-only buffer for accelerated
+	 * reading.
+	 *
+	 * @param handle the handle to wrap
+	 * @see ReadBufferDataHandle#ReadBufferDataHandle(DataHandle)
+	 */
+	default DataHandle<Location> readBuffer(final DataHandle<Location> handle) {
+		Objects.nonNull(handle);
+		return new ReadBufferDataHandle(handle);
+	}
+
+	/**
+	 * Creates a {@link DataHandle} on the provided {@link Location} wrapped in a
+	 * read-only buffer for accelerated reading.
+	 *
+	 * @param location the handle to wrap
+	 * @see ReadBufferDataHandle#ReadBufferDataHandle(DataHandle)
+	 */
+	default DataHandle<Location> readBuffer(final Location location) {
+		final DataHandle<Location> handle = create(location);
+		return handle == null ? null : new ReadBufferDataHandle(handle);
+	}
+
+	/**
+	 * Wraps the provided {@link DataHandle} in a write-only buffer for
+	 * accelerated writing.
+	 *
+	 * @param handle the handle to wrap
+	 * @see WriteBufferDataHandle#WriteBufferDataHandle(DataHandle)
+	 */
+	default DataHandle<Location> writeBuffer(final DataHandle<Location> handle) {
+		Objects.nonNull(handle);
+		return new WriteBufferDataHandle(handle);
+	}
 }

From 61ff8ea624cfbaaa959cfc724e91702890a1a106 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Sun, 6 May 2018 15:01:51 +0200
Subject: [PATCH 0801/1208] AbstractHigherOrderDataHandle: null wrapped handle
 on close.

---
 .../java/org/scijava/io/handle/AbstractHigherOrderHandle.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index b77c674a0..ae2a73451 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -46,7 +46,7 @@ public abstract class AbstractHigherOrderHandle<L extends Location> extends
 	AbstractDataHandle<L>
 {
 
-	private final DataHandle<L> handle;
+	private DataHandle<L> handle;
 	private boolean closed;
 
 	public AbstractHigherOrderHandle(final DataHandle<L> handle) {
@@ -66,6 +66,7 @@ public boolean isWritable() {
 
 	@Override
 	public long length() throws IOException {
+		ensureOpen();
 		return handle.length();
 	}
 
@@ -85,6 +86,7 @@ public void close() throws IOException {
 			cleanup();
 			closed = true;
 			handle.close();
+			handle = null;
 		}
 	}
 

From b6e16a235c945ea484beca6c4d9681cca3dc69ff Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 30 May 2018 12:58:01 +0100
Subject: [PATCH 0802/1208] POM: bump minor version

Previous commits added new API.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 179bd21f9..74714a117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.73.2-SNAPSHOT</version>
+	<version>2.74.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 6383fb8ff58c4e2a512a3148a63120f64107e628 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 30 May 2018 12:54:43 +0100
Subject: [PATCH 0803/1208] Fix compilation with Java 9 and 10

The annotation processor does something evil: it catches
FileNotFoundException to detect when a file does not exist. But
in Java 9, the relevant code changed internally to use java.nio,
which throws NoSuchFileException instead in this circumstance.
For now, we do a "quick fix" and simply catch either exception.

Closes imagej/imagej#199.
---
 src/main/java/org/scijava/annotations/AnnotationProcessor.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 4a7907a1b..8982527e0 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -40,6 +40,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -234,7 +235,7 @@ public InputStream openInput(final String annotationName)
 				return filer.getResource(StandardLocation.CLASS_OUTPUT, "",
 					Index.INDEX_PREFIX + annotationName).openInputStream();
 			}
-			catch (final FileNotFoundException e) {
+			catch (final FileNotFoundException | NoSuchFileException e) {
 				return null;
 			}
 		}

From a99f2c8694c32058f279c8058775b8b4d52ef7b0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Jun 2018 12:02:48 +0200
Subject: [PATCH 0804/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 74714a117..f39d86924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.74.0-SNAPSHOT</version>
+	<version>2.74.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From df8af2e579e1272c0881f2846b658b77256418bd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Jun 2018 18:33:58 +0200
Subject: [PATCH 0805/1208] AbstractUserInterface: register viewer first

At the conclusion of DisplayViewer.view(UserInterface, Display),
a Display.update() fires, which triggers a DisplayUpdatedEvent. Since
the DisplayViewer.view happens on the EDT (in the Swing case), the
Display.update() also happens on the EDT, the DisplayUpdatedEvent is
published on the EDT immediately (via publishNow, which simply calls the
code directly). Therefore, the DisplayUpdatedEvent happens _before_ any
subsequent code after the DisplayViewer.view. So we need the new
DisplayViewer to have already been registered with the service.
Otherwise, the update will have no effect, because it does a lookup of a
DisplayViewer for the the Display in question, which will still be null.
---
 src/main/java/org/scijava/ui/AbstractUserInterface.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 9f430eb06..0e429808e 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -137,8 +137,8 @@ public void show(final Display<?> display) {
 		threadService.queue(new Runnable() {
 			@Override
 			public void run() {
-				finalViewer.view(AbstractUserInterface.this, display);
 				uiService.addDisplayViewer(finalViewer);
+				finalViewer.view(AbstractUserInterface.this, display);
 			}
 		});
 	}

From 041b9913d9dc4b1548d7b13a8d83da306f808c5a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 4 Jun 2018 18:56:01 +0200
Subject: [PATCH 0806/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f39d86924..ef60f18cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.74.1-SNAPSHOT</version>
+	<version>2.74.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 0a6709e88e3ea69f7b029262dd9fcdd341cb6de1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 5 Jun 2018 22:50:34 +0200
Subject: [PATCH 0807/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ef60f18cb..2a76b2e4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.74.2-SNAPSHOT</version>
+	<version>2.74.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From b5ad01afd90eab1df0aeb3971eb8a75116d1e653 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 19 Jun 2018 12:24:49 +0200
Subject: [PATCH 0808/1208] Add test that reproduces #329

---
 .../org/scijava/io/handle/FileHandleTest.java | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 0a51b4a14..3a82987de 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -35,10 +35,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.URI;
 
 import org.junit.Test;
 import org.scijava.Context;
@@ -108,4 +110,28 @@ public void testNotCreatedByClose() throws IOException {
 		handle.close();
 		assertFalse(nonExistentFile.exists());
 	}
+
+	@Test
+	public void testNotCreatedByRead() throws IOException {
+		final Context ctx = new Context();
+		final DataHandleService dhs = ctx.service(DataHandleService.class);
+
+		final File nonExistentFile = //
+			File.createTempFile("FileHandleTest", "none xistent file");
+		final URI uri = nonExistentFile.toURI();
+		assertTrue(nonExistentFile.delete());
+		assertFalse(nonExistentFile.exists());
+
+		final FileLocation loc = new FileLocation(uri);
+		try (final DataHandle<?> handle = dhs.create(loc)) {
+			assertFalse(handle.exists());
+			handle.read(); // this will fail as there is no underlying file!
+			fail("Read successfully from non-existing file!");
+		}
+		catch (final IOException exc) {
+			// should be thrown
+		}
+		assertFalse(nonExistentFile.exists());
+		// reading from the non-existing file should not create it!
+	}
 }

From 15b70a1d6cbb5bce602be3b689b574cc67affdb8 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 19 Jun 2018 12:25:38 +0200
Subject: [PATCH 0809/1208] Fix #329: Don't create empty RAF files on reading

When trying to read from a non-existing file, the FileHandle created a
RandomAccessFile, which resulted in an empty file appearing on disk.
---
 .../org/scijava/io/handle/FileHandle.java     | 122 ++++++++++++------
 1 file changed, 80 insertions(+), 42 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index db54d562f..87fad4386 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -60,9 +60,12 @@ public class FileHandle extends AbstractDataHandle<FileLocation> {
 
 	// -- FileHandle methods --
 
-	/** Gets the random access file object backing this FileHandle. */
+	/**
+	 * Gets the random access file object backing this FileHandle. If the
+	 * underlying file does not exist yet, it will be created.
+	 */
 	public RandomAccessFile getRandomAccessFile() throws IOException {
-		return raf();
+		return writer();
 	}
 
 	public String getMode() {
@@ -101,199 +104,199 @@ public Date lastModified() {
 
 	@Override
 	public long offset() throws IOException {
-		return raf().getFilePointer();
+		return exists() ? reader().getFilePointer() : 0;
 	}
 
 	@Override
 	public long length() throws IOException {
-		return exists() ? raf().length() : -1;
+		return exists() ? reader().length() : -1;
 	}
 
 	@Override
 	public void setLength(final long length) throws IOException {
-		raf().setLength(length);
+		writer().setLength(length);
 	}
 
 	@Override
 	public int read() throws IOException {
-		return raf().read();
+		return reader().read();
 	}
 
 	@Override
 	public int read(final byte[] b) throws IOException {
-		return raf().read(b);
+		return reader().read(b);
 	}
 
 	@Override
 	public int read(final byte[] b, final int off, final int len)
 		throws IOException
 	{
-		return raf().read(b, off, len);
+		return reader().read(b, off, len);
 	}
 
 	@Override
 	public void seek(final long pos) throws IOException {
-		raf().seek(pos);
+		reader().seek(pos);
 	}
 
 	// -- DataInput methods --
 
 	@Override
 	public boolean readBoolean() throws IOException {
-		return raf().readBoolean();
+		return reader().readBoolean();
 	}
 
 	@Override
 	public byte readByte() throws IOException {
-		return raf().readByte();
+		return reader().readByte();
 	}
 
 	@Override
 	public char readChar() throws IOException {
-		return raf().readChar();
+		return reader().readChar();
 	}
 
 	@Override
 	public double readDouble() throws IOException {
-		return raf().readDouble();
+		return reader().readDouble();
 	}
 
 	@Override
 	public float readFloat() throws IOException {
-		return raf().readFloat();
+		return reader().readFloat();
 	}
 
 	@Override
 	public void readFully(final byte[] b) throws IOException {
-		raf().readFully(b);
+		reader().readFully(b);
 	}
 
 	@Override
 	public void readFully(final byte[] b, final int off, final int len)
 		throws IOException
 	{
-		raf().readFully(b, off, len);
+		reader().readFully(b, off, len);
 	}
 
 	@Override
 	public int readInt() throws IOException {
-		return raf().readInt();
+		return reader().readInt();
 	}
 
 	@Override
 	public String readLine() throws IOException {
-		return raf().readLine();
+		return reader().readLine();
 	}
 
 	@Override
 	public long readLong() throws IOException {
-		return raf().readLong();
+		return reader().readLong();
 	}
 
 	@Override
 	public short readShort() throws IOException {
-		return raf().readShort();
+		return reader().readShort();
 	}
 
 	@Override
 	public int readUnsignedByte() throws IOException {
-		return raf().readUnsignedByte();
+		return reader().readUnsignedByte();
 	}
 
 	@Override
 	public int readUnsignedShort() throws IOException {
-		return raf().readUnsignedShort();
+		return reader().readUnsignedShort();
 	}
 
 	@Override
 	public String readUTF() throws IOException {
-		return raf().readUTF();
+		return reader().readUTF();
 	}
 
 	@Override
 	public int skipBytes(final int n) throws IOException {
-		return raf().skipBytes(n);
+		return reader().skipBytes(n);
 	}
 
 	// -- DataOutput methods --
 
 	@Override
 	public void write(final byte[] b) throws IOException {
-		raf().write(b);
+		writer().write(b);
 	}
 
 	@Override
 	public void write(final byte[] b, final int off, final int len)
 		throws IOException
 	{
-		raf().write(b, off, len);
+		writer().write(b, off, len);
 	}
 
 	@Override
 	public void write(final int b) throws IOException {
-		raf().write(b);
+		writer().write(b);
 	}
 
 	@Override
 	public void writeBoolean(final boolean v) throws IOException {
-		raf().writeBoolean(v);
+		writer().writeBoolean(v);
 	}
 
 	@Override
 	public void writeByte(final int v) throws IOException {
-		raf().writeByte(v);
+		writer().writeByte(v);
 	}
 
 	@Override
 	public void writeBytes(final String s) throws IOException {
-		raf().writeBytes(s);
+		writer().writeBytes(s);
 	}
 
 	@Override
 	public void writeChar(final int v) throws IOException {
-		raf().writeChar(v);
+		writer().writeChar(v);
 	}
 
 	@Override
 	public void writeChars(final String s) throws IOException {
-		raf().writeChars(s);
+		writer().writeChars(s);
 	}
 
 	@Override
 	public void writeDouble(final double v) throws IOException {
-		raf().writeDouble(v);
+		writer().writeDouble(v);
 	}
 
 	@Override
 	public void writeFloat(final float v) throws IOException {
-		raf().writeFloat(v);
+		writer().writeFloat(v);
 	}
 
 	@Override
 	public void writeInt(final int v) throws IOException {
-		raf().writeInt(v);
+		writer().writeInt(v);
 	}
 
 	@Override
 	public void writeLong(final long v) throws IOException {
-		raf().writeLong(v);
+		writer().writeLong(v);
 	}
 
 	@Override
 	public void writeShort(final int v) throws IOException {
-		raf().writeShort(v);
+		writer().writeShort(v);
 	}
 
 	@Override
 	public void writeUTF(final String str) throws IOException {
-		raf().writeUTF(str);
+		writer().writeUTF(str);
 	}
 
 	// -- Closeable methods --
 
 	@Override
 	public synchronized void close() throws IOException {
-		if (raf != null) raf().close();
+		if (raf != null) raf.close();
 		closed = true;
 	}
 
@@ -306,12 +309,47 @@ public Class<FileLocation> getType() {
 
 	// -- Helper methods --
 
-	private RandomAccessFile raf() throws IOException {
-		if (raf == null) initRAF();
+	/**
+	 * Access method for the internal {@link RandomAccessFile}, that succeeds
+	 * independently of the underlying file existing on disk. This allows us to
+	 * create a new file for writing.
+	 *
+	 * @return the internal {@link RandomAccessFile} creating a new file on disk
+	 *         if needed.
+	 * @throws IOException if the {@link RandomAccessFile} could not be created.
+	 */
+	private RandomAccessFile writer() throws IOException {
+		if (raf == null) initRAF(true);
 		return raf;
 	}
 
-	private synchronized void initRAF() throws IOException {
+	/**
+	 * Access method for the internal {@link RandomAccessFile}, that only succeeds
+	 * if the underlying file exists on disk. This prevents accidental creation of
+	 * an empty file when calling read operations on a non-existent file.
+	 *
+	 * @return the internal {@link RandomAccessFile}.
+	 * @throws IOException if the {@link RandomAccessFile} could not be created,
+	 *           or the backing file does not exists.
+	 */
+	private RandomAccessFile reader() throws IOException {
+		if (raf == null) initRAF(false);
+		return raf;
+	}
+
+	/**
+	 * Initializes the {@link RandomAccessFile}.
+	 *
+	 * @param create whether to create the {@link RandomAccessFile} if the
+	 *          underlying file does not exist yet.
+	 * @throws IOException if the {@link RandomAccessFile} could not be created,
+	 *           or the backing file does not exist and the {@code create}
+	 *           parameter was set to {@code false}.
+	 */
+	private synchronized void initRAF(final boolean create) throws IOException {
+		if (!create && !exists()) {
+			throw new IOException("Trying to read from non-existent file!");
+		}
 		if (closed) throw new IOException("Handle already closed");
 		if (raf != null) return;
 		raf = new RandomAccessFile(get().getFile(), getMode());

From 759e2ee78e4416af59279d66fc949a2ebb588b91 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Sun, 24 Sep 2017 15:19:09 +0200
Subject: [PATCH 0810/1208] When processing #@script, register module with
 ModuleService

Also set the priority of ScriptDirectiveScriptProcessor to high to allow processing directives before other script parameters.
---
 .../script/process/ScriptDirectiveScriptProcessor.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index eefbb4a76..212495c1d 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -38,6 +38,7 @@
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.module.ModuleInfo;
+import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
@@ -95,7 +96,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = ScriptProcessor.class)
+@Plugin(type = ScriptProcessor.class, priority=Priority.HIGH)
 public class ScriptDirectiveScriptProcessor extends DirectiveScriptProcessor {
 
 	public ScriptDirectiveScriptProcessor() {
@@ -104,6 +105,9 @@ public ScriptDirectiveScriptProcessor() {
 
 	@Parameter
 	private LogService log;
+	
+	@Parameter
+	private ModuleService moduleService;
 
 	// -- Internal DirectiveScriptProcessor methods --
 
@@ -114,6 +118,7 @@ protected String process(final String directive,
 		for (final String k : attrs.keySet()) {
 			assignAttribute(k == null ? "name" : k, attrs.get(k));
 		}
+		moduleService.addModule(info()); // TODO how to handle duplicate names?
 		return "";
 	}
 

From 908ddb473bc534fd712ccd9130ae02f527faaaa5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 27 Jun 2018 21:32:53 -0500
Subject: [PATCH 0811/1208] Do not spawn a new thread for every widget refresh

---
 .../java/org/scijava/widget/DefaultWidgetModel.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index b11012be1..aaece9fcc 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -169,14 +169,10 @@ public void setValue(final Object value) {
 		module.setInput(name, convertedInput);
 
 		if (initialized) {
-			threadService.run(new Runnable() {
-
-				@Override
-				public void run() {
-					callback();
-					inputPanel.refresh(); // must be on AWT thread?
-					module.preview();
-				}
+			threadService.queue(() -> {
+				callback();
+				inputPanel.refresh(); // must be on AWT thread?
+				module.preview();
 			});
 		}
 	}

From ba1a8dccd12b8c83483eacc12d7caa3447943ed6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 2 Jul 2018 14:39:08 -0500
Subject: [PATCH 0812/1208] URLLocation: fix typo in javadoc

---
 src/main/java/org/scijava/io/location/URLLocation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index 14b96a4b0..7311dc874 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -61,7 +61,7 @@ public URL getURL() {
 
 	/**
 	 * Gets the associated {@link URI}, or null if this URL is not formatted
-	 * strictly according to to RFC2396 and cannot be converted to a URI.
+	 * strictly according to RFC2396 and cannot be converted to a URI.
 	 */
 	@Override
 	public URI getURI() {

From 1094cbab353695f27bd50bf3c2404dd0b221c73e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 2 Jul 2018 14:39:20 -0500
Subject: [PATCH 0813/1208] AbstractUIInputWidget: use lambda syntax

---
 src/main/java/org/scijava/ui/AbstractUIInputWidget.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index 96505d1ff..3aa8d4214 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -80,12 +80,7 @@ public void refreshWidget() {
 	  // on the EDT.
 		if (ui().requiresEDT()) {
 			try {
-				threadService.invoke(new Runnable() {
-					@Override
-					public void run() {
-						doRefresh();
-					}
-				});
+				threadService.invoke(() -> doRefresh());
 			}
 			catch (InterruptedException e) {
 				log.error("Interrupted while refresh widget: " + getClass(), e);

From 85700ecaff008465a45b8b217bafcea2db012e10 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 3 Jul 2018 19:00:30 +0200
Subject: [PATCH 0814/1208] SingletonService: use lambda expression instead of
 anonymous class.

---
 src/main/java/org/scijava/plugin/SingletonService.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 8784d34b2..4099afbdc 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -35,7 +35,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scijava.object.LazyObjects;
 import org.scijava.object.ObjectService;
 
 /**
@@ -95,13 +94,7 @@ default <P extends PT> P create(final Class<P> pluginClass) {
 	@Override
 	default void initialize() {
 		// add singleton instances to the object index... IN THE FUTURE!
-		objectService().getIndex().addLater(new LazyObjects<Object>() {
-
-			@Override
-			public ArrayList<Object> get() {
-				return new ArrayList<>(getInstances());
-			}
-		});
+		objectService().getIndex().addLater(() -> new ArrayList<>(getInstances()));
 	}
 
 }

From ecf6cbb381b7fbaa6fb007aea388dc48ef2baaed Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 3 Jul 2018 19:06:01 +0200
Subject: [PATCH 0815/1208] AbstractSingletonService: update instances when
 plugins change.

- The service now listens to PluginAddedEvent and PluginRemovedEvent and
updates its instances accordingly.
---
 .../plugin/AbstractSingletonService.java      | 62 ++++++++++++++++---
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index b5791f769..ee5dc7cef 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -32,13 +32,17 @@
 
 package org.scijava.plugin;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.scijava.event.EventHandler;
 import org.scijava.log.LogService;
 import org.scijava.object.ObjectService;
+import org.scijava.plugin.event.PluginsAddedEvent;
+import org.scijava.plugin.event.PluginsRemovedEvent;
 
 /**
  * Abstract base class for {@link SingletonService}s.
@@ -56,9 +60,6 @@ public abstract class AbstractSingletonService<PT extends SingletonPlugin>
 	@Parameter
 	private ObjectService objectService;
 
-	// TODO: Listen for PluginsAddedEvent and PluginsRemovedEvent
-	// and update the list of singletons accordingly.
-
 	/** List of singleton plugin instances. */
 	private List<PT> instances;
 
@@ -74,7 +75,7 @@ public ObjectService objectService() {
 	@Override
 	public List<PT> getInstances() {
 		if (instances == null) initInstances();
-		return instances;
+		return Collections.unmodifiableList(instances);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -84,20 +85,63 @@ public <P extends PT> P getInstance(final Class<P> pluginClass) {
 		return (P) instanceMap.get(pluginClass);
 	}
 
+//-- Event handlers --
+
+	@EventHandler
+	protected void onEvent(final PluginsRemovedEvent event) {
+		if (instanceMap == null) return;
+		for (final PluginInfo<?> info : event.getItems()) {
+			final PT obj = instanceMap.remove(info.getPluginClass());
+			if (obj != null) { // we actually removed a plugin
+				instances.remove(obj);
+				objectService.removeObject(obj);
+			}
+		}
+	}
+
+	@EventHandler
+	protected void onEvent(final PluginsAddedEvent event) {
+		if (instanceMap == null) return;
+		// collect singleton plugins
+		final List<PluginInfo<PT>> singletons = new ArrayList<>();
+		for (final PluginInfo<?> pluginInfo : event.getItems()) {
+			if (getPluginType().isAssignableFrom(pluginInfo.getPluginType())) {
+				@SuppressWarnings("unchecked")
+				final PT plugin = pluginService().createInstance(
+					(PluginInfo<PT>) pluginInfo);
+				@SuppressWarnings("unchecked")
+				final Class<? extends PT> pluginClass = (Class<? extends PT>) plugin
+					.getClass();
+				instanceMap.put(pluginClass, plugin);
+				instances.add(plugin);
+			}
+		}
+
+		for (final PluginInfo<PT> pluginInfo : singletons) {
+			final PT plugin = pluginService().createInstance(pluginInfo);
+			@SuppressWarnings("unchecked")
+			final Class<? extends PT> pluginClass = (Class<? extends PT>) plugin
+				.getClass();
+			instanceMap.put(pluginClass, plugin);
+			instances.add(plugin);
+		}
+
+	}
+
 	// -- Helper methods --
 
 	private synchronized void initInstances() {
 		if (instances != null) return;
 
-		final List<PT> list = Collections.unmodifiableList(filterInstances(
-			pluginService().createInstancesOfType(getPluginType())));
+		@SuppressWarnings("unchecked")
+		final List<PT> list = (List<PT>) filterInstances(pluginService()
+			.createInstancesOfType(getPluginType()));
 
-		final HashMap<Class<? extends PT>, PT> map =
-			new HashMap<>();
+		final Map<Class<? extends PT>, PT> map = new HashMap<>();
 
 		for (final PT plugin : list) {
 			@SuppressWarnings("unchecked")
-			final Class<? extends PT> ptClass =
+			final Class<? extends PT> ptClass = //
 				(Class<? extends PT>) plugin.getClass();
 			map.put(ptClass, plugin);
 		}

From 46bd65449059563910ba5a2c24f8b55e5a695763 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 3 Jul 2018 19:06:55 +0200
Subject: [PATCH 0816/1208] Add SingletonServiceTest: tests listening to plugin
 change events.

---
 .../scijava/plugin/SingletonServiceTest.java  | 119 ++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 src/test/java/org/scijava/plugin/SingletonServiceTest.java

diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
new file mode 100644
index 000000000..2ecf95b86
--- /dev/null
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -0,0 +1,119 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2018 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.plugin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.scijava.Context;
+
+/**
+ * Tests for the {@link SingletonService}
+ *
+ * @author Gabriel Einsdorf KNIME GmbH
+ */
+public class SingletonServiceTest {
+
+	@Test
+	public void testListenToRemove() {
+
+		final Context ctx = new Context(PluginService.class, DummySingletonService.class,
+				DummySingletonService2.class);
+
+		final DummySingletonService dss = ctx.getService(
+			DummySingletonService.class);
+
+		final DummySingletonService2 dss2 = ctx.getService(
+			DummySingletonService2.class);
+
+		final List<DummyPlugin> instances = dss.getInstances();
+		final DummyPlugin dummy = instances.get(0);
+
+		assertFalse("Service not correctly initialized", dss2.getInstances()
+			.isEmpty());
+
+		// test successful removal
+		final PluginService ps = ctx.getService(PluginService.class);
+		ps.removePlugin(dummy.getInfo());
+
+		assertFalse("Plugin was removed from wrong service!", dss2.getInstances()
+			.isEmpty());
+		assertTrue("Plugin was not removed!", dss.getInstances().isEmpty());
+
+		// test successful add
+		ps.addPlugin(dummy.getInfo());
+		assertEquals("Wrong number of plugins in service:", 1, dss.getInstances()
+			.size());
+		assertEquals("Wrong number of plugins in independent service:", 1, dss2
+			.getInstances().size());
+	}
+
+	@Plugin(type = DummyPlugin.class)
+	public static class DummyPlugin extends AbstractRichPlugin implements
+		SingletonPlugin
+	{
+		// NB: No implementation needed.
+	}
+
+	public static class DummySingletonService extends
+		AbstractSingletonService<DummyPlugin>
+	{
+
+		@Override
+		public Class<DummyPlugin> getPluginType() {
+			return DummyPlugin.class;
+		}
+	}
+
+	@Plugin(type = DummyPlugin2.class)
+	public static class DummyPlugin2 extends AbstractRichPlugin implements
+		SingletonPlugin
+	{
+		// NB: No implementation needed.
+	}
+
+	public static class DummySingletonService2 extends
+		AbstractSingletonService<DummyPlugin2>
+	{
+
+		@Override
+		public Class<DummyPlugin2> getPluginType() {
+			return DummyPlugin2.class;
+		}
+	}
+
+}

From 821c8294f753535c86a23dad9e277f78d572a79b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 4 Jul 2018 11:00:53 -0500
Subject: [PATCH 0817/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2a76b2e4f..72e6d868c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.74.3-SNAPSHOT</version>
+	<version>2.74.4-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 4f40d016c63f0d0f20946a9b05a3efdd53b5bf04 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jul 2018 21:43:45 -0500
Subject: [PATCH 0818/1208] ScriptService: use lambda syntax

---
 .../java/org/scijava/script/DefaultScriptService.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 55e2c1291..0db559c0a 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -226,14 +226,8 @@ public void initialize() {
 		super.initialize();
 
 		// add scripts to the module index... only when needed!
-		moduleService.getIndex().addLater(new LazyObjects<ScriptInfo>() {
-
-			@Override
-			public Collection<ScriptInfo> get() {
-				return scripts().values();
-			}
-
-		});
+		final LazyObjects<ScriptInfo> lazyScripts = () -> scripts().values();
+		moduleService.getIndex().addLater(lazyScripts);
 	}
 
 	// -- Helper methods - lazy initialization --

From 8b1256257f7e5d4e373763d5309b8646fe884bd5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jul 2018 21:44:16 -0500
Subject: [PATCH 0819/1208] ScriptService: fix bug in getOrCreate

Without this change, the cache missed every time, due to the wrong
key (a File rather than a String path) being used for the lookup.

Thanks Eclipse for the warning.
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 0db559c0a..86dc1df9d 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -353,7 +353,7 @@ private synchronized void initAliasMap() {
 	 * are registered with the service.
 	 */
 	private ScriptInfo getOrCreate(final File file) {
-		final ScriptInfo info = scripts().get(file);
+		final ScriptInfo info = scripts().get(file.getAbsolutePath());
 		if (info != null) return info;
 		return new ScriptInfo(getContext(), file);
 	}

From 7a74934a3c0671ec0241d949e28f195725792378 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jul 2018 22:52:45 -0500
Subject: [PATCH 0820/1208] DebugUtils: add more thread dump utility methods

Sometimes we have a Thread and want to format its current call stack as
a string. Sometimes we have a Thread and snapshot of an earlier call
stack as a StackTraceElement[], and want to format that as a string.
---
 pom.xml                                       |  2 +-
 .../java/org/scijava/util/DebugUtils.java     | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 72e6d868c..37854a6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.74.4-SNAPSHOT</version>
+	<version>2.75.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 0c7c6a268..8d705a985 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -67,6 +67,32 @@ public static String getStackTrace(final Throwable t) {
 		}
 	}
 
+	/**
+	 * Provides a stack dump of the given thread.
+	 * <p>
+	 * The output is similar to a subset of that given when Ctrl+\ (or Ctrl+Pause
+	 * on Windows) is pressed from the console.
+	 * </p>
+	 */
+	public static String getStackDump(final Thread thread) {
+		return getStackDump(thread, thread.getStackTrace());
+	}
+
+	/**
+	 * Provides a stack dump of the given thread + call stack.
+	 * <p>
+	 * The output is similar to a subset of that given when Ctrl+\ (or Ctrl+Pause
+	 * on Windows) is pressed from the console.
+	 * </p>
+	 */
+	public static String getStackDump(final Thread thread,
+		final StackTraceElement[] stackTrace)
+	{
+		final StringBuilder sb = new StringBuilder();
+		dumpThread(thread, stackTrace, sb);
+		return sb.toString();
+	}
+
 	/**
 	 * Provides a complete stack dump of all threads.
 	 * <p>

From 2dd1ccdab77e756116d529f919f3246408087388 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jul 2018 22:54:14 -0500
Subject: [PATCH 0821/1208] SciJavaEvent: add utility method for dumping stack

This gives us a stack trace showing where the event was published.
---
 src/main/java/org/scijava/event/SciJavaEvent.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index f61edc56b..7d50772f3 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -33,6 +33,7 @@
 package org.scijava.event;
 
 import org.scijava.AbstractContextual;
+import org.scijava.util.DebugUtils;
 
 /**
  * Base class for all SciJava events.
@@ -83,6 +84,14 @@ public StackTraceElement[] getStackTrace() {
 		return stackTrace;
 	}
 
+	/**
+	 * Gets a stack trace for the calling thread when the event was published.
+	 * This method is useful for debugging what triggered an event.
+	 */
+	public String dumpStack() {
+		return DebugUtils.getStackDump(getCallingThread(), getStackTrace());
+	}
+
 	// Object methods --
 
 	@Override

From e7d8bd32c284262cf981ede04f43860e91373368 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jul 2018 22:55:08 -0500
Subject: [PATCH 0822/1208] MenuService: tweak formatting

---
 src/main/java/org/scijava/menu/DefaultMenuService.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index e231a8819..470402d76 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -165,9 +165,7 @@ private synchronized void addModules(final Collection<ModuleInfo> items,
 	 * </p>
 	 */
 	private HashMap<String, ShadowMenu> rootMenus() {
-		if (rootMenus == null) {
-			initRootMenus();
-		}
+		if (rootMenus == null) initRootMenus();
 		return rootMenus;
 	}
 

From c4de618d958510e3ecfd20ff54001216e8a51f43 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jul 2018 22:55:22 -0500
Subject: [PATCH 0823/1208] MenuService: do not initialize menus so eagerly

When a ModulesAddedEvent, ModulesRemovedEvent or ModulesUpdatedEvent
is published, we only care if we have already initialized the menu
structure, and that structure would thus need to be updated.

In the case where no menu structure has yet been generated, we can
ignore the module events. We just need to be careful if module events
come in while we are generating the menu structure. If that happens, we
block (thanks to the event handling methods being synchronized now)
until menus are created, and then update them in response to the event.

Among other benefits, this commit fixes a bug in ImageJ on macOS whereby
scripts in legacy directories (i.e.: in plugins and plugins/Scripts)
were no longer appearing in the menu structure. It was happening because
the following order of events occurred:

1. The DefaultPlatformService initialized the MacOSPlatform.
2. The MacOSPlatform edited app commands (About, Quit and Preferences)
   to remove their menu paths, since they are specially handled.
3. The MacOSPlatform fired a ModulesUpdatedEvent to notify others of it.
4. The DefaultMenuService subscribed to the ModulesUpdatedEvent; in
   response, its event handler method eagerly initialized the menus.
5. The menu initialization code looped over ModuleService.getModules().
6. The call to getModules() triggered the deferred addition of modules.
7. The deferred addition of modules triggered the DefaultScriptService
   to discover scripts in the currently registered script directories.

All of the above happened before the LegacyService initialized, and
therefore the DefaultScriptService did not yet know about the legacy
script directories to include in its script discovery process. Once the
scripts have been discovered, adding the additional script directories
has no effect (i.e., no additional script discovery is triggered).

This commit addresses step (4), changing the DefaultMenuService to do
nothing when modules change in the case of menus still uninitialized.

After this change, the order of events now becomes:

1. The DefaultPlatformService initializes the MacOSPlatform.
2. The MacOSPlatform edits the app command menu paths.
3. The MacOSPlatform fires a ModulesUpdatedEvent to notify others.
4. The DefaultMenuService still receives the ModulesUpdatedEvent, but
   does nothing in response.
5. Later, the LegacyService loops over ModuleService.getModules().
6. The call to getModules() triggers the deferred addition of modules.
7. The deferred addition of modules triggers the DefaultScriptService
   to discover scripts in the currently registered script directories,
   which include the legacy directories added by the LegacyService.

So the problem is solved, at least for now.

There are still questions and potential issues with the design:

- Why does the DefaultPlatformService (at priority normal) initialize
  before the LegacyService (at priority normal+1)?

- What if some other service triggers script discovery before the
  additional script directories can be registered? There are many
  code paths and service calls, such as MenuService and ModuleService
  methods, that would do so. Should we make the ScriptService smarter
  such that scripts are rescanned when additional script directories
  are registered after initial script discovery has taken place?
  Doing so would be more robust, but substantially complicate things.
---
 .../java/org/scijava/menu/DefaultMenuService.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 470402d76..4145342a3 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -79,25 +79,22 @@ public ShadowMenu getMenu(final String menuRoot) {
 	// -- Event handlers --
 
 	@EventHandler
-	protected void onEvent(final ModulesAddedEvent event) {
-		if (rootMenus == null) {
-			// add *all* known modules, which includes the ones given here
-			rootMenus();
-			return;
-		}
-		// data structure already exists; add *these* modules only
+	protected synchronized void onEvent(final ModulesAddedEvent event) {
+		if (rootMenus == null) return; // menus not yet initialized
 		addModules(event.getItems());
 	}
 
 	@EventHandler
-	protected void onEvent(final ModulesRemovedEvent event) {
+	protected synchronized void onEvent(final ModulesRemovedEvent event) {
+		if (rootMenus == null) return; // menus not yet initialized
 		for (final ShadowMenu menu : rootMenus().values()) {
 			menu.removeAll(event.getItems());
 		}
 	}
 
 	@EventHandler
-	protected void onEvent(final ModulesUpdatedEvent event) {
+	protected synchronized void onEvent(final ModulesUpdatedEvent event) {
+		if (rootMenus == null) return; // menus not yet initialized
 		for (final ShadowMenu menu : rootMenus().values()) {
 			menu.updateAll(event.getItems());
 		}

From 65f3d5f0f59893308528df32b114480b541debcc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jul 2018 21:38:30 -0500
Subject: [PATCH 0824/1208] Make the ScriptService normal priority

It was made high priority years ago in order to cause its scripts
to be registered before the MenuService built the menu; see
imagej/imagej@34be53a8373bf1b21ad81c03efccf549d70532c1.

But it does not seem necessary anymore.
---
 src/main/java/org/scijava/script/DefaultScriptService.java | 2 +-
 src/test/java/org/scijava/ContextCreationTest.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 86dc1df9d..699c0986e 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -75,7 +75,7 @@
  * @author Johannes Schindelin
  * @author Curtis Rueden
  */
-@Plugin(type = Service.class, priority = Priority.HIGH)
+@Plugin(type = Service.class)
 public class DefaultScriptService extends
 	AbstractSingletonService<ScriptLanguage> implements ScriptService
 {
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 9c6e15c82..0be58b788 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -87,7 +87,6 @@ public void testNoPlugins() {
 	public void testFull() {
 		final Class<?>[] expected =
 			{ org.scijava.event.DefaultEventService.class,
-				org.scijava.script.DefaultScriptService.class,
 				org.scijava.app.DefaultAppService.class,
 				org.scijava.app.DefaultStatusService.class,
 				org.scijava.command.DefaultCommandService.class,
@@ -113,6 +112,7 @@ public void testFull() {
 				org.scijava.prefs.DefaultPrefService.class,
 				org.scijava.run.DefaultRunService.class,
 				org.scijava.script.DefaultScriptHeaderService.class,
+				org.scijava.script.DefaultScriptService.class,
 				org.scijava.script.process.DefaultScriptProcessorService.class,
 				org.scijava.startup.DefaultStartupService.class,
 				org.scijava.task.DefaultTaskService.class,

From dd8e6062f27b457556e36fd6c821de1b155306e2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 25 Jul 2018 09:22:32 -0500
Subject: [PATCH 0825/1208] FileHandleTest: use try-with-resources block

---
 src/test/java/org/scijava/io/handle/FileHandleTest.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 3a82987de..b003f3b31 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -103,11 +103,10 @@ public void testNotCreatedByClose() throws IOException {
 		assertFalse(nonExistentFile.exists());
 
 		final FileLocation loc = new FileLocation(nonExistentFile);
-		final DataHandle<?> handle = dhs.create(loc);
-		assertTrue(handle instanceof FileHandle);
-		assertFalse(handle.exists());
-
-		handle.close();
+		try (final DataHandle<?> handle = dhs.create(loc)) {
+			assertTrue(handle instanceof FileHandle);
+			assertFalse(handle.exists());
+		}
 		assertFalse(nonExistentFile.exists());
 	}
 

From f436b7d3bb5f616d9d79b429b4f86a7a9985cd35 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 25 Jul 2018 09:27:03 -0500
Subject: [PATCH 0826/1208] Work around Windows file deletion problems

See http://forum.imagej.net/t/11888/10
---
 .../org/scijava/io/handle/FileHandleTest.java | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index b003f3b31..8257438f2 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -46,6 +46,7 @@
 import org.scijava.Context;
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.util.PlatformUtils;
 
 /**
  * Tests {@link FileHandle}.
@@ -75,21 +76,22 @@ public void testExists() throws IOException {
 
 		final File nonExistentFile = //
 			File.createTempFile("FileHandleTest", "nonexistent-file");
-		assertTrue(nonExistentFile.delete());
-		assertFalse(nonExistentFile.exists());
+		final boolean deleted = delete(nonExistentFile);
 
 		final FileLocation loc = new FileLocation(nonExistentFile);
 		final DataHandle<?> handle = dhs.create(loc);
 		assertTrue(handle instanceof FileHandle);
-		assertFalse(handle.exists());
-		assertEquals(-1, handle.length());
+		if (deleted) {
+			assertFalse(handle.exists());
+			assertEquals(-1, handle.length());
+		}
 
 		handle.writeBoolean(true);
 		assertTrue(handle.exists());
 		assertEquals(1, handle.length());
 
 		// Clean up.
-		assertTrue(nonExistentFile.delete());
+		delete(nonExistentFile);
 	}
 
 	@Test
@@ -118,8 +120,7 @@ public void testNotCreatedByRead() throws IOException {
 		final File nonExistentFile = //
 			File.createTempFile("FileHandleTest", "none xistent file");
 		final URI uri = nonExistentFile.toURI();
-		assertTrue(nonExistentFile.delete());
-		assertFalse(nonExistentFile.exists());
+		delete(nonExistentFile);
 
 		final FileLocation loc = new FileLocation(uri);
 		try (final DataHandle<?> handle = dhs.create(loc)) {
@@ -133,4 +134,15 @@ public void testNotCreatedByRead() throws IOException {
 		assertFalse(nonExistentFile.exists());
 		// reading from the non-existing file should not create it!
 	}
+
+	/** A workaround for Windows being bad at deleting files. */
+	private boolean delete(final File file) {
+		final boolean success = file.delete();
+		if (!success) file.deleteOnExit();
+		if (!PlatformUtils.isWindows()) {
+			assertTrue(success);
+			assertFalse(file.exists());
+		}
+		return success;
+	}
 }

From 9554f8f35f6aa1319f7b02587e266064a3873181 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Aug 2018 08:11:17 -0500
Subject: [PATCH 0827/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 37854a6db..194b35c18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.75.0-SNAPSHOT</version>
+	<version>2.75.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From c0bc5cbd956be42581dd2d915b9ea08ceaa81023 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Fri, 17 Aug 2018 13:58:12 +0200
Subject: [PATCH 0828/1208] Use try-with-resources on DataHandle in
 FileHandleTest

---
 .../org/scijava/io/handle/FileHandleTest.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 8257438f2..d199eb1f9 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -79,17 +79,18 @@ public void testExists() throws IOException {
 		final boolean deleted = delete(nonExistentFile);
 
 		final FileLocation loc = new FileLocation(nonExistentFile);
-		final DataHandle<?> handle = dhs.create(loc);
-		assertTrue(handle instanceof FileHandle);
-		if (deleted) {
-			assertFalse(handle.exists());
-			assertEquals(-1, handle.length());
+		try (final DataHandle<?> handle = dhs.create(loc)) {
+			assertTrue(handle instanceof FileHandle);
+			if (deleted) {
+				assertFalse(handle.exists());
+				assertEquals(-1, handle.length());
+			}
+
+			handle.writeBoolean(true);
+			assertTrue(handle.exists());
+			assertEquals(1, handle.length());			
 		}
 
-		handle.writeBoolean(true);
-		assertTrue(handle.exists());
-		assertEquals(1, handle.length());
-
 		// Clean up.
 		delete(nonExistentFile);
 	}

From 0d3a59cbd330bc9eae8cc6418fa0c88c49480cfc Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Fri, 17 Aug 2018 14:04:24 +0200
Subject: [PATCH 0829/1208] Revert commit f436b7d3 (Work around Windows file
 deletion problems)

... and resolve conflicts with previous commit.
This workaround is no longer necessary when using try-with-resources introduced with the previous commit.
---
 .../org/scijava/io/handle/FileHandleTest.java | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index d199eb1f9..df43ef347 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -46,7 +46,6 @@
 import org.scijava.Context;
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
-import org.scijava.util.PlatformUtils;
 
 /**
  * Tests {@link FileHandle}.
@@ -76,15 +75,14 @@ public void testExists() throws IOException {
 
 		final File nonExistentFile = //
 			File.createTempFile("FileHandleTest", "nonexistent-file");
-		final boolean deleted = delete(nonExistentFile);
+		assertTrue(nonExistentFile.delete());
+		assertFalse(nonExistentFile.exists());
 
 		final FileLocation loc = new FileLocation(nonExistentFile);
 		try (final DataHandle<?> handle = dhs.create(loc)) {
 			assertTrue(handle instanceof FileHandle);
-			if (deleted) {
-				assertFalse(handle.exists());
-				assertEquals(-1, handle.length());
-			}
+			assertFalse(handle.exists());
+			assertEquals(-1, handle.length());
 
 			handle.writeBoolean(true);
 			assertTrue(handle.exists());
@@ -92,7 +90,7 @@ public void testExists() throws IOException {
 		}
 
 		// Clean up.
-		delete(nonExistentFile);
+		assertTrue(nonExistentFile.delete());
 	}
 
 	@Test
@@ -121,7 +119,8 @@ public void testNotCreatedByRead() throws IOException {
 		final File nonExistentFile = //
 			File.createTempFile("FileHandleTest", "none xistent file");
 		final URI uri = nonExistentFile.toURI();
-		delete(nonExistentFile);
+		assertTrue(nonExistentFile.delete());
+		assertFalse(nonExistentFile.exists());
 
 		final FileLocation loc = new FileLocation(uri);
 		try (final DataHandle<?> handle = dhs.create(loc)) {
@@ -135,15 +134,4 @@ public void testNotCreatedByRead() throws IOException {
 		assertFalse(nonExistentFile.exists());
 		// reading from the non-existing file should not create it!
 	}
-
-	/** A workaround for Windows being bad at deleting files. */
-	private boolean delete(final File file) {
-		final boolean success = file.delete();
-		if (!success) file.deleteOnExit();
-		if (!PlatformUtils.isWindows()) {
-			assertTrue(success);
-			assertFalse(file.exists());
-		}
-		return success;
-	}
 }

From 6123ff144a76bc84b8f9a0b7303daf51a86e4b86 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 24 Aug 2018 13:06:54 +0200
Subject: [PATCH 0830/1208] DataHandleService: improve robustness of handle
 access

No longer throws NullPointerException when a handle can not be
created.
---
 .../java/org/scijava/io/handle/DataHandleService.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index f2a24ba6d..0547e4cc8 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -33,7 +33,6 @@
 package org.scijava.io.handle;
 
 import java.io.IOException;
-import java.util.Objects;
 
 import org.scijava.io.IOService;
 import org.scijava.io.location.Location;
@@ -77,7 +76,7 @@ default Class<Location> getType() {
 	 */
 	default boolean exists(final Location location) throws IOException {
 		try (DataHandle<Location> handle = create(location)) {
-			return handle.exists();
+			return handle == null ? false : handle.exists();
 		}
 	}
 
@@ -89,8 +88,7 @@ default boolean exists(final Location location) throws IOException {
 	 * @see ReadBufferDataHandle#ReadBufferDataHandle(DataHandle)
 	 */
 	default DataHandle<Location> readBuffer(final DataHandle<Location> handle) {
-		Objects.nonNull(handle);
-		return new ReadBufferDataHandle(handle);
+		return handle == null ? null : new ReadBufferDataHandle(handle);
 	}
 
 	/**
@@ -113,7 +111,6 @@ default DataHandle<Location> readBuffer(final Location location) {
 	 * @see WriteBufferDataHandle#WriteBufferDataHandle(DataHandle)
 	 */
 	default DataHandle<Location> writeBuffer(final DataHandle<Location> handle) {
-		Objects.nonNull(handle);
-		return new WriteBufferDataHandle(handle);
+		return handle == null ? null : new WriteBufferDataHandle(handle);
 	}
 }

From 581f98129a2a8fd3e61b87af2c2f4c2ab99ced1b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 10 Sep 2018 13:20:48 -0500
Subject: [PATCH 0831/1208] POM: tweak location of comment

---
 pom.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 194b35c18..418d62143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,18 +192,18 @@ Konstanz, and KNIME GmbH.</license.copyrightOwners>
 	</dependencies>
 
 	<build>
-		<!--
-		SciJava Common provides a plugin indexer which handles its
-		@Plugin annotations, in the form of a compile-time annotation
-		processor. SJC also provides plugins of various sorts, such
-		as the core Service plugin implementations.
-
-		In order for these to be processed correctly and avoid a
-		chicken-and-egg problem with annotation processing here, we
-		disable annotation processing during compilation, and instead
-		run the plugin indexer manually in the process-classes phase.
-		-->
 		<plugins>
+			<!--
+			SciJava Common provides a plugin indexer which handles its
+			@Plugin annotations, in the form of a compile-time annotation
+			processor. SJC also provides plugins of various sorts, such
+			as the core Service plugin implementations.
+
+			In order for these to be processed correctly and avoid a
+			chicken-and-egg problem with annotation processing here, we
+			disable annotation processing during compilation, and instead
+			run the plugin indexer manually in the process-classes phase.
+			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>

From 513137198cdd66cdd5bb69b2fa5c47f10e7c73a4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 11 Sep 2018 13:57:35 -0500
Subject: [PATCH 0832/1208] Add defensive code for handler & converter plugins

None of the following should throw an exception (checked or otherwise):

* Instantiating a plugin.
* Calling Typed.supports(...) on a TypedPlugin.
* Calling getInputType() or getOutputType() on a Converter.

Any exceptions thrown in those scenarios indicate a malfunction.
The relevant service layers now log such exceptions and continue.
---
 .../java/org/scijava/convert/AbstractConvertService.java | 8 +++++++-
 src/main/java/org/scijava/plugin/HandlerService.java     | 7 ++++++-
 src/main/java/org/scijava/plugin/TypedService.java       | 9 +++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index b15c52de0..c9a79dc53 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -150,7 +150,13 @@ public Collection<Class<?>> getCompatibleOutputClasses(final Class<?> source) {
 		final Set<Class<?>> compatibleClasses = new HashSet<>();
 
 		for (final Converter<?, ?> converter : getInstances()) {
-			addIfMatches(source, converter.getInputType(), converter.getOutputType(), compatibleClasses);
+			try {
+				addIfMatches(source, converter.getInputType(), converter.getOutputType(), compatibleClasses);
+			}
+			catch (final Throwable t) {
+				log().error("Malfunctioning converter plugin: " + //
+					converter.getClass().getName(), t);
+			}
 		}
 
 		return compatibleClasses;
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 21eaf4e80..dd4cc1b7c 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -57,7 +57,12 @@ public interface HandlerService<DT, PT extends HandlerPlugin<DT>> extends
 	 */
 	default PT getHandler(final DT data) {
 		for (final PT handler : getInstances()) {
-			if (handler.supports(data)) return handler;
+			try {
+				if (handler.supports(data)) return handler;
+			}
+			catch (final Throwable t) {
+				log().error("Malfunctioning plugin: " + handler.getClass().getName(), t);
+			}
 		}
 		return null;
 	}
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 11c5a1b0b..b1c8263f9 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -68,8 +68,13 @@ public interface TypedService<DT, PT extends TypedPlugin<DT>> extends
 	 */
 	default PT find(final DT data) {
 		for (final PluginInfo<PT> plugin : getPlugins()) {
-			final PT instance = pluginService().createInstance(plugin);
-			if (instance != null && instance.supports(data)) return instance;
+			try {
+				final PT instance = pluginService().createInstance(plugin);
+				if (instance != null && instance.supports(data)) return instance;
+			}
+			catch (final Throwable t) {
+				log().error("Malfunctioning plugin: " + plugin.getClassName(), t);
+			}
 		}
 		return null;
 	}

From db59c302cad50a6b937f97d65501ca4cbb255d25 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 14 Sep 2018 16:57:18 +0200
Subject: [PATCH 0833/1208] DataHandleService: document behavior when
 encountering null

---
 .../org/scijava/io/handle/DataHandleService.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index 0547e4cc8..8bc55a2b6 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -71,8 +71,9 @@ default Class<Location> getType() {
 	 *
 	 * @param location the location to test
 	 * @return The result of {@link DataHandle#exists()} on a newly created handle
-	 *         on this location
-	 * @throws IOException
+	 *         on this location. Also returns {@code false} if the handle can not
+	 *         be created.
+	 * @throws IOException if the creation of the handle fails exceptionally
 	 */
 	default boolean exists(final Location location) throws IOException {
 		try (DataHandle<Location> handle = create(location)) {
@@ -85,6 +86,8 @@ default boolean exists(final Location location) throws IOException {
 	 * reading.
 	 *
 	 * @param handle the handle to wrap
+	 * @return The handle wrapped in a read-only buffer, or {@code null} if the
+	 *         input handle is {@code null}
 	 * @see ReadBufferDataHandle#ReadBufferDataHandle(DataHandle)
 	 */
 	default DataHandle<Location> readBuffer(final DataHandle<Location> handle) {
@@ -95,7 +98,10 @@ default DataHandle<Location> readBuffer(final DataHandle<Location> handle) {
 	 * Creates a {@link DataHandle} on the provided {@link Location} wrapped in a
 	 * read-only buffer for accelerated reading.
 	 *
-	 * @param location the handle to wrap
+	 * @param location the Location to create a buffered handle on.
+	 * @return A {@link DataHandle} on the provided location wrapped in a
+	 *         read-only buffer, or {@code null} if no handle could be created for
+	 *         the location.
 	 * @see ReadBufferDataHandle#ReadBufferDataHandle(DataHandle)
 	 */
 	default DataHandle<Location> readBuffer(final Location location) {
@@ -108,6 +114,8 @@ default DataHandle<Location> readBuffer(final Location location) {
 	 * accelerated writing.
 	 *
 	 * @param handle the handle to wrap
+	 * @return the handle wrapped in a write-only buffer or {@code null} if the
+	 *         provided handle is {@code null}
 	 * @see WriteBufferDataHandle#WriteBufferDataHandle(DataHandle)
 	 */
 	default DataHandle<Location> writeBuffer(final DataHandle<Location> handle) {

From 5098b2cf08eb9e7e1748c1fa7f24fab9028fd5f6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 1 Oct 2018 13:38:39 -0500
Subject: [PATCH 0834/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 418d62143..2aded5aee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.75.1-SNAPSHOT</version>
+	<version>2.75.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 5e4a79b1a3265f5912055bfaec72d89b2276f681 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Thu, 4 Oct 2018 14:17:24 +0200
Subject: [PATCH 0835/1208] SingletonServiceTest: extend with tests from #271.

---
 .../scijava/plugin/SingletonServiceTest.java  | 174 +++++++++++++++++-
 1 file changed, 172 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index 2ecf95b86..1f91581f0 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -34,25 +34,195 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.convert.AbstractConverter;
+import org.scijava.convert.ConvertService;
+import org.scijava.convert.Converter;
+import org.scijava.plugin.event.PluginsAddedEvent;
+import org.scijava.plugin.event.PluginsRemovedEvent;
 
 /**
  * Tests for the {@link SingletonService}
  *
  * @author Gabriel Einsdorf KNIME GmbH
+ * @author Stefan Helfrich KNIME GmbH
  */
 public class SingletonServiceTest {
 
+	private PluginService pluginService;
+	private ConvertService convertService;
+
+	@Before
+	public void setUp() {
+		final Context context = new Context(PluginService.class,
+			ConvertService.class);
+		pluginService = context.service(PluginService.class);
+		convertService = context.service(ConvertService.class);
+	}
+
+	@After
+	public void tearDown() {
+		pluginService.context().dispose();
+	}
+
+	/**
+	 * Tests that the {@link AbstractSingletonService} properly handles
+	 * {@link PluginsAddedEvent}s originating from the {@link PluginService}.
+	 */
+	@Test
+	public void testSingletonServicePluginsAddedHandling() {
+		@SuppressWarnings("rawtypes")
+		final PluginInfo<Converter> converterInfo = new PluginInfo<>(
+			FoodConverter.class, Converter.class);
+
+		pluginService.addPlugin(converterInfo);
+
+		assertNotNull(pluginService.getPlugin(FoodConverter.class));
+		assertTrue(convertService.supports(new Apple() {}, Peach.class));
+	}
+
+	/**
+	 * Tests that the {@link AbstractSingletonService} properly handles
+	 * {@link PluginsAddedEvent}s that replace an instance.
+	 */
+	@Test
+	public void testSingletonServicePluginsAddedHandlingDuplicates() {
+		@SuppressWarnings("rawtypes")
+		final PluginInfo<Converter> converterInfo = new PluginInfo<>(
+			FoodConverter.class, Converter.class);
+
+		pluginService.addPlugin(converterInfo);
+		final FoodConverter firstInstance = convertService.getInstance(
+			FoodConverter.class);
+
+		pluginService.addPlugin(converterInfo);
+		final FoodConverter secondInstance = convertService.getInstance(
+			FoodConverter.class);
+
+		assertNotSame(firstInstance, secondInstance);
+		assertTrue(convertService.supports(new Apple() {}, Peach.class));
+	}
+
+	/**
+	 * Tests that the {@link AbstractSingletonService} properly handles
+	 * {@link PluginsRemovedEvent}s originating from the {@link PluginService}.
+	 */
+	@Test
+	public void testSingletonServiceManuallyAddedPluginsRemovedHandling() {
+		@SuppressWarnings("rawtypes")
+		final PluginInfo<Converter> converterInfo = new PluginInfo<>(
+			FoodConverter.class, Converter.class);
+
+		pluginService.addPlugin(converterInfo);
+
+		// De-register DummyStringConverter
+		pluginService.removePlugin(converterInfo);
+
+		assertNull(pluginService.getPlugin(FoodConverter.class));
+		assertFalse(convertService.supports(new Apple() {}, Peach.class));
+	}
+
+	/**
+	 * Tests that the {@link AbstractSingletonService} properly handles
+	 * {@link PluginsRemovedEvent}s originating from the {@link PluginService}.
+	 */
+	@Test
+	public void testSingletonServiceCompileTimePluginsRemovedHandling() {
+		final PluginInfo<SciJavaPlugin> pluginInfo = pluginService.getPlugin(
+			DiscoveredFoodConverter.class);
+
+		// De-register DiscoveredFoodConverter
+		pluginService.removePlugin(pluginInfo);
+
+		assertNull(pluginService.getPlugin(DiscoveredFoodConverter.class));
+		assertFalse(convertService.supports(new Orange() {}, Peach.class));
+	}
+
+	/**
+	 * Dummy {@link Converter}.
+	 */
+	public static class FoodConverter extends AbstractConverter<Apple, Peach> {
+
+		@Override
+		public <T> T convert(final Object src, final Class<T> dest) {
+			return null;
+		}
+
+		@Override
+		public Class<Peach> getOutputType() {
+			return Peach.class;
+		}
+
+		@Override
+		public Class<Apple> getInputType() {
+			return Apple.class;
+		}
+	}
+
+	/**
+	 * Dummy {@link Converter} that is added automatically.
+	 */
+	@Plugin(type = Converter.class)
+	public static class DiscoveredFoodConverter extends
+		AbstractConverter<Orange, Peach>
+	{
+
+		@Override
+		public <T> T convert(final Object src, final Class<T> dest) {
+			return null;
+		}
+
+		@Override
+		public Class<Peach> getOutputType() {
+			return Peach.class;
+		}
+
+		@Override
+		public Class<Orange> getInputType() {
+			return Orange.class;
+		}
+	}
+
+	/**
+	 * Type interface for conversion
+	 */
+	public interface Apple {
+		// NB
+	}
+
+	/**
+	 * Type interface for conversion
+	 */
+	public interface Orange {
+		// NB
+	}
+
+	/**
+	 * Type interface for conversion
+	 */
+	public interface Peach {
+		// NB
+	}
+
+	/**
+	 * Tests that plugins are added to and removed from the correct singleton
+	 * service
+	 */
 	@Test
 	public void testListenToRemove() {
 
-		final Context ctx = new Context(PluginService.class, DummySingletonService.class,
-				DummySingletonService2.class);
+		final Context ctx = new Context(PluginService.class,
+			DummySingletonService.class, DummySingletonService2.class);
 
 		final DummySingletonService dss = ctx.getService(
 			DummySingletonService.class);

From 3e72152d0120313415d4f02c8000684e5dfa2104 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 28 Sep 2018 10:38:19 +0200
Subject: [PATCH 0836/1208] DataHandle: use Bytes helper methods for correct
 endian coding

This is both more consistent and correct
---
 .../org/scijava/io/handle/DataHandle.java     | 141 +++---------------
 1 file changed, 20 insertions(+), 121 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index db48caeee..98812e55a 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -43,6 +43,7 @@
 
 import org.scijava.io.location.Location;
 import org.scijava.plugin.WrapperPlugin;
+import org.scijava.util.Bytes;
 
 /**
  * A <em>data handle</em> is a plugin which provides both streaming and random
@@ -514,18 +515,10 @@ default int readUnsignedByte() throws IOException {
 
 	@Override
 	default short readShort() throws IOException {
-		final int ch0;
-		final int ch1;
-		if (isBigEndian()) {
-			ch0 = read();
-			ch1 = read();
-		}
-		else {
-			ch1 = read();
-			ch0 = read();
-		}
-		if ((ch0 | ch1) < 0) throw new EOFException();
-		return (short) ((ch0 << 8) + (ch1 << 0));
+		final byte[] buf = new byte[2];
+		final int read = read(buf, 0, 2);
+		if (read < 2) throw new EOFException();
+		return Bytes.toShort(buf, isLittleEndian());
 	}
 
 	@Override
@@ -540,68 +533,20 @@ default char readChar() throws IOException {
 
 	@Override
 	default int readInt() throws IOException {
-		final int ch0;
-		final int ch1;
-		final int ch2;
-		final int ch3;
-		if (isBigEndian()) {
-			ch0 = read();
-			ch1 = read();
-			ch2 = read();
-			ch3 = read();
-		}
-		else {
-			ch3 = read();
-			ch2 = read();
-			ch1 = read();
-			ch0 = read();
-		}
-		if ((ch0 | ch1 | ch2 | ch3) < 0) throw new EOFException();
-		return ((ch0 << 24) + (ch1 << 16) + (ch2 << 8) + (ch3 << 0));
+		final byte[] buf = new byte[4];
+		final int read = read(buf, 0, 4);
+		if (read < 4) throw new EOFException();
+		return Bytes.toInt(buf, isLittleEndian());
 	}
 
 	@Override
 	default long readLong() throws IOException {
-		final int ch0;
-		final int ch1;
-		final int ch2;
-		final int ch3;
-		final int ch4;
-		final int ch5;
-		final int ch6;
-		final int ch7;
-		if (isBigEndian()) {
-			ch0 = read();
-			ch1 = read();
-			ch2 = read();
-			ch3 = read();
-			ch4 = read();
-			ch5 = read();
-			ch6 = read();
-			ch7 = read();
-		}
-		else {
-			ch7 = read();
-			ch6 = read();
-			ch5 = read();
-			ch4 = read();
-			ch3 = read();
-			ch2 = read();
-			ch1 = read();
-			ch0 = read();
-		}
-		if ((ch0 | ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7) < 0) {
+		byte[] buf = new byte[8];
+		int read = read(buf, 0, 8);
+		if (read < 0) {
 			throw new EOFException();
 		}
-		// TODO: Double check this inconsistent code.
-		return ((long) ch0 << 56) + //
-			((long) (ch1 & 255) << 48) + //
-			((long) (ch2 & 255) << 40) + //
-			((long) (ch3 & 255) << 32) + //
-			((long) (ch4 & 255) << 24) + //
-			((ch5 & 255) << 16) + //
-			((ch6 & 255) << 8) + //
-			((ch7 & 255) << 0);
+		return Bytes.toLong(buf, isLittleEndian());
 	}
 
 	@Override
@@ -669,76 +614,32 @@ default void writeByte(final int v) throws IOException {
 
 	@Override
 	default void writeShort(final int v) throws IOException {
-		if (isBigEndian()) {
-			write((v >>> 8) & 0xFF);
-			write((v >>> 0) & 0xFF);
-		}
-		else {
-			write((v >>> 0) & 0xFF);
-			write((v >>> 8) & 0xFF);
-		}
+		write(Bytes.fromShort((short) v, isLittleEndian()));
 	}
 
 	@Override
 	default void writeChar(final int v) throws IOException {
-		if (isBigEndian()) {
-			write((v >>> 8) & 0xFF);
-			write((v >>> 0) & 0xFF);
-		}
-		else {
-			write((v >>> 0) & 0xFF);
-			write((v >>> 8) & 0xFF);
-		}
+		write(Bytes.fromShort((short) v, isLittleEndian()));
 	}
 
 	@Override
 	default void writeInt(final int v) throws IOException {
-		if (isBigEndian()) {
-			write((v >>> 24) & 0xFF);
-			write((v >>> 16) & 0xFF);
-			write((v >>> 8) & 0xFF);
-			write((v >>> 0) & 0xFF);
-		}
-		else {
-			write((v >>> 0) & 0xFF);
-			write((v >>> 8) & 0xFF);
-			write((v >>> 16) & 0xFF);
-			write((v >>> 24) & 0xFF);
-		}
+		write(Bytes.fromInt(v, isLittleEndian()));
 	}
 
 	@Override
 	default void writeLong(final long v) throws IOException {
-		if (isBigEndian()) {
-			write((byte) (v >>> 56));
-			write((byte) (v >>> 48));
-			write((byte) (v >>> 40));
-			write((byte) (v >>> 32));
-			write((byte) (v >>> 24));
-			write((byte) (v >>> 16));
-			write((byte) (v >>> 8));
-			write((byte) (v >>> 0));
-		}
-		else {
-			write((byte) (v >>> 0));
-			write((byte) (v >>> 8));
-			write((byte) (v >>> 16));
-			write((byte) (v >>> 24));
-			write((byte) (v >>> 32));
-			write((byte) (v >>> 40));
-			write((byte) (v >>> 48));
-			write((byte) (v >>> 56));
-		}
+		write(Bytes.fromLong(v, isLittleEndian()));
 	}
 
 	@Override
 	default void writeFloat(final float v) throws IOException {
-		writeInt(Float.floatToIntBits(v));
+		write(Bytes.fromFloat(v, isLittleEndian()));
 	}
 
 	@Override
 	default void writeDouble(final double v) throws IOException {
-		writeLong(Double.doubleToLongBits(v));
+		write(Bytes.fromDouble(v, isLittleEndian()));
 	}
 
 	@Override
@@ -750,9 +651,7 @@ default void writeBytes(final String s) throws IOException {
 	default void writeChars(final String s) throws IOException {
 		final int len = s.length();
 		for (int i = 0; i < len; i++) {
-			final int v = s.charAt(i);
-			write((v >>> 8) & 0xFF);
-			write((v >>> 0) & 0xFF);
+			writeChar(s.charAt(i));
 		}
 	}
 

From 64f641988364162da9f634d3b93d4544e081b7c8 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 28 Sep 2018 10:41:42 +0200
Subject: [PATCH 0837/1208] DataHandle#readLine() use StringBuilder instead of
 StringBuffer

- StringBuilder is faster and recommended for most cases
---
 src/main/java/org/scijava/io/handle/DataHandle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 98812e55a..cf2e7d3ee 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -563,7 +563,7 @@ default double readDouble() throws IOException {
 	default String readLine() throws IOException {
 		// NB: Adapted from java.io.RandomAccessFile.readLine().
 
-		final StringBuffer input = new StringBuffer();
+		final StringBuilder input = new StringBuilder();
 		int c = -1;
 		boolean eol = false;
 

From 5835b942b59245d57b3de5d98c7329bb3f41ae12 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 28 Sep 2018 10:45:32 +0200
Subject: [PATCH 0838/1208] FileHandle: use DataHandle methods for all
 endianness affected IO

RandomAccessFile is always BigEndian, so we need to use the interface
methods for conversion.
---
 .../org/scijava/io/handle/FileHandle.java     | 65 -------------------
 1 file changed, 65 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 87fad4386..a42e05587 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -151,21 +151,6 @@ public byte readByte() throws IOException {
 		return reader().readByte();
 	}
 
-	@Override
-	public char readChar() throws IOException {
-		return reader().readChar();
-	}
-
-	@Override
-	public double readDouble() throws IOException {
-		return reader().readDouble();
-	}
-
-	@Override
-	public float readFloat() throws IOException {
-		return reader().readFloat();
-	}
-
 	@Override
 	public void readFully(final byte[] b) throws IOException {
 		reader().readFully(b);
@@ -178,36 +163,16 @@ public void readFully(final byte[] b, final int off, final int len)
 		reader().readFully(b, off, len);
 	}
 
-	@Override
-	public int readInt() throws IOException {
-		return reader().readInt();
-	}
-
 	@Override
 	public String readLine() throws IOException {
 		return reader().readLine();
 	}
 
-	@Override
-	public long readLong() throws IOException {
-		return reader().readLong();
-	}
-
-	@Override
-	public short readShort() throws IOException {
-		return reader().readShort();
-	}
-
 	@Override
 	public int readUnsignedByte() throws IOException {
 		return reader().readUnsignedByte();
 	}
 
-	@Override
-	public int readUnsignedShort() throws IOException {
-		return reader().readUnsignedShort();
-	}
-
 	@Override
 	public String readUTF() throws IOException {
 		return reader().readUTF();
@@ -252,41 +217,11 @@ public void writeBytes(final String s) throws IOException {
 		writer().writeBytes(s);
 	}
 
-	@Override
-	public void writeChar(final int v) throws IOException {
-		writer().writeChar(v);
-	}
-
 	@Override
 	public void writeChars(final String s) throws IOException {
 		writer().writeChars(s);
 	}
 
-	@Override
-	public void writeDouble(final double v) throws IOException {
-		writer().writeDouble(v);
-	}
-
-	@Override
-	public void writeFloat(final float v) throws IOException {
-		writer().writeFloat(v);
-	}
-
-	@Override
-	public void writeInt(final int v) throws IOException {
-		writer().writeInt(v);
-	}
-
-	@Override
-	public void writeLong(final long v) throws IOException {
-		writer().writeLong(v);
-	}
-
-	@Override
-	public void writeShort(final int v) throws IOException {
-		writer().writeShort(v);
-	}
-
 	@Override
 	public void writeUTF(final String str) throws IOException {
 		writer().writeUTF(str);

From e1290fa0d6d97e7e37324f47b163726d0c489699 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Fri, 28 Sep 2018 16:33:42 +0200
Subject: [PATCH 0839/1208] DataHandleTest: extend to cover all methods in
 DataHandle

The was not sufficient before which resulted in various problems
not being discovered.
---
 .../org/scijava/io/handle/DataHandleTest.java | 482 +++++++++++++++---
 .../io/handle/ReadBufferDataHandleTest.java   |  68 +--
 .../io/handle/WriteBufferDataHandleTest.java  | 100 ++--
 3 files changed, 502 insertions(+), 148 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index f15248c7c..7c38e3e1a 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -33,16 +33,19 @@
 package org.scijava.io.handle;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
+import java.util.function.Supplier;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.io.handle.DataHandle;
 import org.scijava.io.handle.DataHandle.ByteOrder;
-import org.scijava.io.handle.DataHandleService;
 import org.scijava.io.location.Location;
 import org.scijava.util.Bytes;
 
@@ -55,29 +58,78 @@ public abstract class DataHandleTest {
 
 	protected static final byte[] BYTES = { //
 		'H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '\n', //
-			9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, -128, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, //
-			125, 127, -127, -125, -3, -2, -1 };
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, -128, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, //
+		125, 127, -127, -125, -3, -2, -1 };
 
-	// -- Test methods --
+	protected DataHandleService dataHandleService;
 
-	@Test
-	public void testDataHandle() throws IOException {
+	@Before
+	public void init() {
 		final Context context = new Context(DataHandleService.class);
-		final DataHandleService dataHandleService =
-			context.service(DataHandleService.class);
+		dataHandleService = context.service(DataHandleService.class);
+	}
+
+	@Test
+	public void checkSkip() throws IOException {
+		try (DataHandle<? extends Location> handle = createHandle()) {
+			handle.seek(0);
+			handle.skip(10);
+			assertEquals(10, handle.offset());
+			handle.skipBytes(11);
+			assertEquals(21, handle.offset());
+		}
+	}
+
+	@Test
+	public void testEndianesSettings() throws IOException {
+
+		try (DataHandle<? extends Location> handle = createHandle()) {
+			final ByteOrder original = handle.getOrder();
 
-		final Location loc = createLocation();
-		try (final DataHandle<? extends Location> handle = //
-			dataHandleService.create(loc))
-		{
-			assertEquals(getExpectedHandleType(), handle.getClass());
+			handle.setOrder(ByteOrder.BIG_ENDIAN);
+			assertEquals(ByteOrder.BIG_ENDIAN, handle.getOrder());
+			assertTrue(handle.isBigEndian());
+			assertFalse(handle.isLittleEndian());
 
-			checkReads(handle);
-			checkWrites(handle);
+			handle.setOrder(ByteOrder.LITTLE_ENDIAN);
+			assertEquals(ByteOrder.LITTLE_ENDIAN, handle.getOrder());
+			assertFalse(handle.isBigEndian());
+			assertTrue(handle.isLittleEndian());
+
+			handle.setLittleEndian(false);
+			assertEquals(ByteOrder.BIG_ENDIAN, handle.getOrder());
+			assertTrue(handle.isBigEndian());
+			assertFalse(handle.isLittleEndian());
+
+			handle.setLittleEndian(true);
+			assertEquals(ByteOrder.LITTLE_ENDIAN, handle.getOrder());
+			assertFalse(handle.isBigEndian());
+			assertTrue(handle.isLittleEndian());
+
+			handle.setOrder(original);
+		}
+	}
+
+	@Test
+	public void testReading() throws IOException {
+		try (final DataHandle<? extends Location> handle = createHandle()) {
+			checkBasicReadMethods(handle);
+			checkEndiannessReading(handle);
 		}
 	}
 
-	// -- DataHandleTest methods --
+	@Test
+	public void testWriting() throws IOException {
+		try (DataHandle<? extends Location> handle = createHandle()) {
+			checkBasicWriteMethods(handle);
+			final Location loc = createLocation();
+			checkWriteEndianes(() -> dataHandleService.create(loc),
+				ByteOrder.LITTLE_ENDIAN);
+			checkWriteEndianes(() -> dataHandleService.create(loc),
+				ByteOrder.BIG_ENDIAN);
+			checkAdvancedStringWriting(() -> dataHandleService.create(loc));
+		}
+	}
 
 	public abstract Class<? extends DataHandle<?>> getExpectedHandleType();
 
@@ -85,19 +137,45 @@ public void testDataHandle() throws IOException {
 
 	// -- Internal methods --
 
-	protected void populateData(final OutputStream out) throws IOException {
+	/**
+	 * Creates a handle for testing
+	 */
+	public DataHandle<? extends Location> createHandle() {
+		Location loc;
+		try {
+			loc = createLocation();
+		}
+		catch (final IOException exc) {
+			throw new RuntimeException(exc);
+		}
+		final DataHandle<Location> handle = dataHandleService.create(loc);
+		assertEquals(getExpectedHandleType(), handle.getClass());
+		return handle;
+	}
+
+	/**
+	 * Populates the provided {@link OutputStream} with test data.
+	 *
+	 * @param out the {@link OutputStream} to fill
+	 * @throws IOException
+	 */
+	public void populateData(final OutputStream out) throws IOException {
 		out.write(BYTES);
 		out.close();
 	}
 
-	protected <L extends Location> void checkReads(final DataHandle<L> handle)
-		throws IOException
+	/**
+	 * Checks basic byte reading methods.
+	 *
+	 * @param handle the handle to test
+	 * @throws IOException
+	 */
+	public <L extends Location> void checkBasicReadMethods(
+		final DataHandle<L> handle) throws IOException
 	{
 		assertEquals(0, handle.offset());
 		assertEquals(BYTES.length, handle.length());
 		assertEquals("UTF-8", handle.getEncoding());
-		assertEquals(ByteOrder.BIG_ENDIAN, handle.getOrder());
-		assertEquals(false, handle.isLittleEndian());
 
 		// test read()
 		for (int i = 0; i < BYTES.length; i++) {
@@ -119,98 +197,362 @@ protected <L extends Location> void checkReads(final DataHandle<L> handle)
 			assertEquals(msg(i), BYTES[i], handle.readByte());
 		}
 
+		// test readUnsignedByte()
+		handle.seek(0);
+		for (int i = 0; i < BYTES.length; i++) {
+			assertEquals(msg(i), BYTES[i] & 0xff, handle.readUnsignedByte());
+		}
+
+		// test readFully(byte[])
+		Arrays.fill(buf, (byte) 0);
+		handle.seek(3);
+		handle.readFully(buf);
+		assertBytesMatch(3, buf.length, buf);
+
+		// test readCString() - _includes_ the null terminator!
+		handle.seek(16);
+		assertBytesMatch(16, 7, handle.readCString().getBytes());
+		handle.seek(42);
+		assertNull(handle.readCString());
+
+		// test readBoolean
+		handle.seek(21);
+		assertTrue(handle.readBoolean());
+		assertFalse(handle.readBoolean());
+
+		// test readLine() - _excludes_ the newline terminator!
+		handle.seek(7);
+		assertBytesMatch(7, 5, handle.readLine().getBytes());
+
+		// test readString(String) - _includes_ the matching terminator!
+		handle.seek(7);
+		assertBytesMatch(7, 5, handle.readString("abcdefg").getBytes());
+
+		// test readString()
+		handle.seek(7);
+		assertBytesMatch(7, 5, handle.readString("d").getBytes());
+
+		// test readString(int
+		handle.seek(7);
+		assertBytesMatch(7, 5, handle.readString(5).getBytes());
+
+		// test findString(String) - _includes_ the matching terminator!
+		handle.seek(1);
+		assertBytesMatch(1, 11, handle.findString("world").getBytes());
+
+		handle.seek(0);
+		handle.findString(false, "world");
+		assertEquals(12, handle.offset());
+
+		handle.seek(0);
+		handle.findString(false, "w");
+		assertEquals(8, handle.offset());
+	}
+
+	/**
+	 * Checks reading methods effected by endianness. Tests both
+	 * {@link ByteOrder#LITTLE_ENDIAN} and {@link ByteOrder#BIG_ENDIAN}.
+	 *
+	 * @param handle the handle to check
+	 * @throws IOException
+	 */
+	public void checkEndiannessReading(
+		final DataHandle<? extends Location> handle) throws IOException
+	{
+		checkEndiannessReading(handle, ByteOrder.LITTLE_ENDIAN);
+		checkEndiannessReading(handle, ByteOrder.BIG_ENDIAN);
+	}
+
+	/**
+	 * Checks reading methods effected by endianness.
+	 *
+	 * @param handle the handle to check
+	 * @param order the {@link ByteOrder} to check
+	 * @throws IOException
+	 */
+	public void checkEndiannessReading(
+		final DataHandle<? extends Location> handle, final ByteOrder order)
+		throws IOException
+	{
+		handle.setOrder(order);
+		handle.seek(0);
+		final boolean little = order == ByteOrder.LITTLE_ENDIAN;
+
+		// test readChar()
+
+		handle.seek(0);
+		for (int i = 0; i < BYTES.length / 2; i += 2) {
+			assertEquals(msg(i), (char) Bytes.toShort(BYTES, i, little), handle
+				.readChar());
+		}
+
 		// test readShort()
 		handle.seek(0);
 		for (int i = 0; i < BYTES.length / 2; i += 2) {
-			assertEquals(msg(i), Bytes.toShort(BYTES, i, false), handle.readShort());
+			assertEquals(msg(i), Bytes.toShort(BYTES, i, little), handle.readShort());
 		}
 
 		// test readInt()
 		handle.seek(0);
 		for (int i = 0; i < BYTES.length / 4; i += 4) {
-			assertEquals(msg(i), Bytes.toInt(BYTES, i, false), handle.readInt());
+			assertEquals(msg(i), Bytes.toInt(BYTES, i, little), handle.readInt());
 		}
 
 		// test readLong()
 		handle.seek(0);
 		for (int i = 0; i < BYTES.length / 8; i += 8) {
-			assertEquals(msg(i), Bytes.toLong(BYTES, i, false), handle.readLong());
+			assertEquals(msg(i), Bytes.toLong(BYTES, i, little), handle.readLong());
 		}
 
 		// test readFloat()
 		handle.seek(0);
 		for (int i = 0; i < BYTES.length / 4; i += 4) {
-			assertEquals(msg(i), Bytes.toFloat(BYTES, i, false), handle.readFloat(),
+			assertEquals(msg(i), Bytes.toFloat(BYTES, i, little), handle.readFloat(),
 				0);
 		}
 
 		// test readDouble()
 		handle.seek(0);
 		for (int i = 0; i < BYTES.length / 8; i += 8) {
-			assertEquals(msg(i), Bytes.toDouble(BYTES, i, false),
-				handle.readDouble(), 0);
-		}
-
-		// test readBoolean()
-		handle.seek(0);
-		for (int i = 0; i < BYTES.length; i++) {
-			assertEquals(msg(i), BYTES[i] == 0 ? false : true, handle.readBoolean());
+			assertEquals(msg(i), Bytes.toDouble(BYTES, i, little), handle
+				.readDouble(), 0);
 		}
+	}
 
-		// test readChar()
-		handle.seek(0);
-		for (int i = 0; i < BYTES.length / 2; i += 2) {
-			assertEquals(msg(i), (char) Bytes.toInt(BYTES, i, 2, false), handle
-				.readChar());
-		}
-
-		// test readFully(byte[])
-		Arrays.fill(buf, (byte) 0);
-		handle.seek(3);
-		handle.readFully(buf);
-		assertBytesMatch(3, buf.length, buf);
-
-		// test readCString() - _includes_ the null terminator!
-		handle.seek(16);
-		assertBytesMatch(16, 7, handle.readCString().getBytes());
-
-		// test readLine() - _excludes_ the newline terminator!
-		handle.seek(7);
-		assertBytesMatch(7, 5, handle.readLine().getBytes());
-
-		// test readString(String) - _includes_ the matching terminator!
-		handle.seek(7);
-		assertBytesMatch(7, 5, handle.readString("abcdefg").getBytes());
-
-		// test findString(String) - _includes_ the matching terminator!
-		handle.seek(1);
-		assertBytesMatch(1, 11, handle.findString("world").getBytes());
+	/**
+	 * Check basic write methods for bytes.
+	 *
+	 * @param handle the handle to write to and read from
+	 * @throws IOException
+	 */
+	public <L extends Location> void checkBasicWriteMethods(
+		final DataHandle<L> handle) throws IOException
+	{
+		checkBasicWrites(handle, handle);
 	}
 
-	protected <L extends Location> void checkWrites(final DataHandle<L> handle)
+	/**
+	 * Tests basic write methods for bytes, both provided handles must point to
+	 * the same location!
+	 *
+	 * @param readHandle the handle to read from
+	 * @param writeHandle the handle to write from
+	 * @throws IOException
+	 */
+	public <L extends Location> void checkBasicWrites(
+		final DataHandle<L> readHandle, final DataHandle<L> writeHandle)
 		throws IOException
 	{
 		final byte[] copy = BYTES.clone();
 
 		// change the data
-		handle.seek(7);
+		writeHandle.seek(7);
 		final String splice = "there";
 		for (int i = 0; i < splice.length(); i++) {
 			final char c = splice.charAt(i);
-			handle.write(c);
+			writeHandle.write(c);
 			copy[7 + i] = (byte) c;
 		}
 
+		writeHandle.writeBoolean(true);
+		copy[12] = 1;
+		writeHandle.writeBoolean(false);
+		copy[13] = 0;
+
+		writeHandle.writeByte(42);
+		copy[14] = 42;
+
+		if (writeHandle != readHandle) {
+			writeHandle.close(); // to ensure data is flushed
+		}
+
 		// verify the changes
-		handle.seek(0);
+		readHandle.seek(0);
 		for (int i = 0; i < copy.length; i++) {
-			assertEquals(msg(i), 0xff & copy[i], handle.read());
+			assertEquals(msg(i), 0xff & copy[i], readHandle.read());
+		}
+	}
+
+	/**
+	 * Checks advanced string writing methods.
+	 *
+	 * @param handleCreator a supplier that creates properly initialized handles
+	 *          for reading and writing, all created handles must point to the
+	 *          same location!
+	 * @throws IOException
+	 */
+	public <L extends Location> void checkAdvancedStringWriting(
+		final Supplier<DataHandle<L>> handleCreator) throws IOException
+	{
+		checkAdvancedStringWriting(handleCreator, handleCreator);
+	}
+
+	/**
+	 * Checks advanced string writing methods.
+	 *
+	 * @param readHandleCreator a supplier that creates properly initialized
+	 *          handles for reading, all created handles must point to the same
+	 *          location!
+	 * @param writeHandleCreator a supplier that creates properly initialized
+	 *          handles for reading, all created handles must point to the same
+	 *          location!
+	 * @throws IOException
+	 */
+	public <L extends Location> void checkAdvancedStringWriting(
+		final Supplier<DataHandle<L>> readHandleCreator,
+		final Supplier<DataHandle<L>> writeHandleCreator) throws IOException
+	{
+		// test writeUTF() / readUTF()
+		final String utfTestString = "abcäúöäéëåáðßø¶🤓🍕😋";
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.writeUTF(utfTestString);
+		}
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			assertEquals(utfTestString, readHandle.readUTF());
+		}
+
+		// test writeLine()
+		final String testString = "The quick brown fox jumps over the lazy dog.";
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.writeLine(testString);
+		}
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			assertEquals(testString, readHandle.readLine());
+		}
+
+		// test writeChars / findString
+		final String testString2 = "The five boxing wizards jump quickly.";
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.writeChars(testString2);
+		}
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			for (int i = 0; i < testString2.length(); i++) {
+				assertEquals(testString2.charAt(i), readHandle.readChar());
+			}
+		}
+	}
+
+	/**
+	 * Checks writing methods affected by endianness.
+	 *
+	 * @param readHandleCreator a supplier that creates properly initialized
+	 *          handles for reading, all created handles must point to the same
+	 *          location!
+	 * @param writeHandleCreator a supplier that creates properly initialized
+	 *          handles for reading, all created handles must point to the same
+	 *          location!
+	 * @throws IOException
+	 */
+	public <L extends Location> void checkWriteEndianes(
+		final Supplier<DataHandle<L>> handleCreator, final ByteOrder order)
+		throws IOException
+	{
+		checkWriteEndianes(handleCreator, handleCreator, order);
+	}
+
+	public <L extends Location> void checkWriteEndianes(
+		final Supplier<DataHandle<L>> readHandleCreator,
+		final Supplier<DataHandle<L>> writeHandleCreator, final ByteOrder order)
+		throws IOException
+	{
+		final boolean little = order == ByteOrder.LITTLE_ENDIAN;
+
+		// test writeChar()
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 2; i += 2) {
+				writeHandle.writeChar(Bytes.toInt(BYTES, i, 2, little));
+			}
+		}
+
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			readHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 2; i += 2) {
+				assertEquals(msg(i), Bytes.toShort(BYTES, i, little), readHandle
+					.readChar());
+			}
+		}
+
+		// test writeShort()
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 2; i += 2) {
+				writeHandle.writeShort(Bytes.toShort(BYTES, i, little));
+			}
+		}
+
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			readHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 2; i += 2) {
+				assertEquals(msg(i), Bytes.toShort(BYTES, i, little), readHandle
+					.readShort());
+			}
+		}
+
+		// test writeInt()
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 4; i += 4) {
+				writeHandle.writeInt(Bytes.toInt(BYTES, i, little));
+			}
+		}
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			readHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 4; i += 4) {
+				assertEquals(msg(i), Bytes.toInt(BYTES, i, little), readHandle
+					.readInt());
+			}
+		}
+
+		// test writeLong()
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 8; i += 8) {
+				writeHandle.writeLong(Bytes.toLong(BYTES, i, little));
+			}
+		}
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			readHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 8; i += 8) {
+				assertEquals(msg(i), Bytes.toLong(BYTES, i, little), readHandle
+					.readLong());
+			}
+		}
+
+		// test writeFloat()
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 4; i += 4) {
+				writeHandle.writeFloat(Bytes.toFloat(BYTES, i, little));
+			}
+		}
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			readHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 4; i += 4) {
+				assertEquals(msg(i), Bytes.toFloat(BYTES, i, little), readHandle
+					.readFloat(), 0);
+			}
+		}
+
+		// test writeDouble()
+		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+			writeHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 8; i += 8) {
+				writeHandle.writeDouble(Bytes.toDouble(BYTES, i, little));
+			}
+		}
+		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+			readHandle.setOrder(order);
+			for (int i = 0; i < BYTES.length / 8; i += 8) {
+				assertEquals(msg(i), Bytes.toDouble(BYTES, i, little), readHandle
+					.readDouble(), 0);
+			}
 		}
 	}
 
 	// -- Internal methods --
 
-	protected void assertBytesMatch(final int offset, final int length,
+	public void assertBytesMatch(final int offset, final int length,
 		final byte[] b)
 	{
 		assertEquals(length, b.length);
@@ -219,7 +561,9 @@ protected void assertBytesMatch(final int offset, final int length,
 		}
 	}
 
-	protected String msg(final int i) {
+	// -- Test methods --
+
+	public String msg(final int i) {
 		return "[" + i + "]:";
 	}
 
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index a2a987a5e..e7cb332f2 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -42,9 +42,8 @@
 import java.util.List;
 import java.util.Random;
 
-import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.scijava.Context;
 import org.scijava.io.location.BytesLocation;
 import org.scijava.io.location.Location;
 
@@ -55,35 +54,40 @@
  */
 public class ReadBufferDataHandleTest extends DataHandleTest {
 
-	private Context context;
-	private DataHandleService dataHandleService;
-
-	@Override
 	@Test
-	public void testDataHandle() throws IOException {
+	public void testSmallBuffer() throws IOException {
 
 		final Location loc = createLocation();
 		try (final DataHandle<Location> handle = //
 			dataHandleService.create(loc);
 				AbstractDataHandle<Location> bufferedHandle = //
-					new ReadBufferDataHandle(handle))
+					new ReadBufferDataHandle(handle, 5))
 		{
-			checkReads(bufferedHandle);
+			// check with small buffersize
+			checkBasicReadMethods(bufferedHandle);
+			checkEndiannessReading(bufferedHandle);
 		}
 	}
 
-	@Test
-	public void testSmallBuffer() throws IOException {
+	@Test(expected = IOException.class)
+	public void ensureNotWritable() throws IOException {
+		createHandle().write(1);
+	}
 
-		final Location loc = createLocation();
-		try (final DataHandle<Location> handle = //
-			dataHandleService.create(loc);
-				AbstractDataHandle<Location> bufferedHandle = //
-					new ReadBufferDataHandle(handle, 5))
-		{
-			// check with small buffersize
-			checkReads(bufferedHandle);
+	@Override
+	public DataHandle<? extends Location> createHandle() {
+		Location loc;
+		try {
+			loc = createLocation();
 		}
+		catch (final IOException exc) {
+			throw new RuntimeException(exc);
+		}
+		final DataHandle<Location> handle = //
+			dataHandleService.create(loc);
+		final AbstractDataHandle<Location> bufferedHandle = //
+			new ReadBufferDataHandle(handle, 5);
+		return bufferedHandle;
 	}
 
 	@Test
@@ -91,7 +95,7 @@ public void testLargeRead() throws Exception {
 
 		final int size = 10_00;
 		final byte[] bytes = new byte[size];
-		Random r = new Random(42);
+		final Random r = new Random(42);
 		r.nextBytes(bytes);
 
 		final Location loc = new BytesLocation(bytes);
@@ -104,34 +108,34 @@ public void testLargeRead() throws Exception {
 			final byte[] actual = new byte[size];
 
 			// create evenly sized slice ranges
-			int slices = 60;
-			int range = (size + slices - 1) / slices;
-			List<SimpleEntry<Integer, Integer>> ranges = new ArrayList<>();
+			final int slices = 60;
+			final int range = (size + slices - 1) / slices;
+			final List<SimpleEntry<Integer, Integer>> ranges = new ArrayList<>();
 			for (int i = 0; i < slices; i++) {
-				int start = range * i;
-				int end = range * (i + 1);
+				final int start = range * i;
+				final int end = range * (i + 1);
 				ranges.add(new SimpleEntry<>(start, end));
 			}
 			Collections.shuffle(ranges, r);
 
-			for (SimpleEntry<Integer, Integer> e : ranges) {
+			for (final SimpleEntry<Integer, Integer> e : ranges) {
 				bufferedHandle.seek(e.getKey());
 				bufferedHandle.read(actual, e.getKey(), e.getValue() - e.getKey());
 			}
-
 			assertArrayEquals(bytes, actual);
 		}
 	}
 
-	@Before
-	public void setup() {
-		context = new Context(DataHandleService.class);
-		dataHandleService = context.service(DataHandleService.class);
+	@Test
+	@Ignore
+	@Override
+	public void testWriting() throws IOException {
+		// nothing to do here
 	}
 
 	@Override
 	public Class<? extends DataHandle<?>> getExpectedHandleType() {
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index b17d4037a..40f035e3a 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -32,78 +32,84 @@
 
 package org.scijava.io.handle;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.function.Supplier;
 
+import org.junit.Ignore;
 import org.junit.Test;
-import org.scijava.Context;
+import org.scijava.io.handle.DataHandle.ByteOrder;
 import org.scijava.io.location.BytesLocation;
 import org.scijava.io.location.Location;
 
 public class WriteBufferDataHandleTest extends DataHandleTest {
 
-	private Location loc;
-
 	@Override
 	public Class<? extends DataHandle<?>> getExpectedHandleType() {
 		// not needed
-		return null;
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
-	@Test
-	public void testDataHandle() throws IOException {
-		final Context context = new Context(DataHandleService.class);
-		final DataHandleService dataHandleService = context.service(
-			DataHandleService.class);
+	public Location createLocation() throws IOException {
+		// not needed
+		throw new UnsupportedOperationException();
+	}
 
-		loc = createLocation();
-		try (final DataHandle<Location> handle = //
-			dataHandleService.create(loc);
-				final DataHandle<Location> buffer = //
-					new WriteBufferDataHandle(handle))
-		{
-			checkWrites(buffer);
-		}
+	@Override
+	public DataHandle<? extends Location> createHandle() {
+		final DataHandle<Location> handle = //
+			dataHandleService.create(new BytesLocation(new byte[42]));
+		return dataHandleService.writeBuffer(handle);
 	}
 
+	@Test
+	@Ignore
 	@Override
-	public Location createLocation() throws IOException {
+	public void testReading() throws IOException {
+		// nothing to do
+	}
+
+	@Test
+	@Ignore
+	@Override
+	public void checkSkip() throws IOException {
+		// nothing to do
+	}
 
-		final ByteArrayOutputStream out = new ByteArrayOutputStream();
-		populateData(out);
-		return new BytesLocation(out.toByteArray());
+	@Test(expected = IOException.class)
+	public void ensureNotReadable() throws IOException {
+		createHandle().read();
 	}
 
 	@Override
-	protected <L extends Location> void checkWrites(final DataHandle<L> handle)
-		throws IOException
-	{
-		final byte[] copy = BYTES.clone();
+	@Test
+	public void testWriting() throws IOException {
+		final ByteArrayOutputStream os = new ByteArrayOutputStream(42);
+		populateData(os);
+		final BytesLocation location = new BytesLocation(os.toByteArray());
+		final DataHandle<Location> handle = //
+			dataHandleService.create(location);
+		final DataHandle<Location> writeHandle = dataHandleService.writeBuffer(
+			handle);
 
-		// change the data
-		handle.seek(7);
-		final String splice = "there";
-		for (int i = 0; i < splice.length(); i++) {
-			final char c = splice.charAt(i);
-			handle.write(c);
-			copy[7 + i] = (byte) c;
-		}
-		handle.close();
+		checkBasicWrites(handle, writeHandle);
+	}
 
-		final Context context = new Context(DataHandleService.class);
-		final DataHandleService dataHandleService = context.service(
-			DataHandleService.class);
+	@Test
+	public void testEndiannessWriting() throws IOException {
+		final BytesLocation location = new BytesLocation(new byte[42]);
+		final Supplier<DataHandle<Location>> readHandleSupplier =
+			() -> dataHandleService.create(location);
+		final Supplier<DataHandle<Location>> writeHandleSupplier = () -> {
+			final DataHandle<Location> h = dataHandleService.create(location);
+			return dataHandleService.writeBuffer(h);
+		};
 
-		try (final DataHandle<? extends Location> readHandle = //
-			dataHandleService.create(loc))
-		{
-			readHandle.seek(0);
-			for (int i = 0; i < copy.length; i++) {
-				assertEquals(msg(i), 0xff & copy[i], readHandle.read());
-			}
-		}
+		checkWriteEndianes(readHandleSupplier, writeHandleSupplier,
+			ByteOrder.LITTLE_ENDIAN);
+		checkWriteEndianes(readHandleSupplier, writeHandleSupplier,
+			ByteOrder.LITTLE_ENDIAN);
+		checkAdvancedStringWriting(readHandleSupplier, writeHandleSupplier);
 	}
 }

From e9f820ae4b29f037b1ffb982364f2965b38fe722 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Thu, 4 Oct 2018 11:27:20 +0200
Subject: [PATCH 0840/1208] DataHandle: Use persistent buffer for conversions.

- this avoids allocating a new byte array for each read
---
 .../scijava/io/handle/AbstractDataHandle.java |  7 ++++
 .../org/scijava/io/handle/DataHandle.java     | 37 +++++++++++++------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index 2d2258ab2..f5e5f1c59 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -44,6 +44,13 @@ public abstract class AbstractDataHandle<L extends Location> extends
 	AbstractWrapperPlugin<L> implements DataHandle<L>
 {
 
+	private byte[] conversionBuffer = new byte[8];
+	
+	@Override
+	public byte[] conversionBuffer() {
+		return conversionBuffer;
+	}
+ 
 	// -- Fields --
 
 	private ByteOrder order = ByteOrder.BIG_ENDIAN;
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index cf2e7d3ee..ccb93d434 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -250,6 +250,11 @@ default void setLittleEndian(final boolean little) {
 	/** Sets the native encoding of the stream. */
 	void setEncoding(String encoding);
 
+	/**
+	 * @return a 8 byte long buffer array used for type conversions
+	 */
+	byte[] conversionBuffer();
+
 	/** Reads a string of arbitrary length, terminated by a null char. */
 	default String readCString() throws IOException {
 		final String line = findString("\0");
@@ -515,7 +520,7 @@ default int readUnsignedByte() throws IOException {
 
 	@Override
 	default short readShort() throws IOException {
-		final byte[] buf = new byte[2];
+		final byte[] buf = conversionBuffer();
 		final int read = read(buf, 0, 2);
 		if (read < 2) throw new EOFException();
 		return Bytes.toShort(buf, isLittleEndian());
@@ -533,7 +538,7 @@ default char readChar() throws IOException {
 
 	@Override
 	default int readInt() throws IOException {
-		final byte[] buf = new byte[4];
+		final byte[] buf = conversionBuffer();
 		final int read = read(buf, 0, 4);
 		if (read < 4) throw new EOFException();
 		return Bytes.toInt(buf, isLittleEndian());
@@ -541,9 +546,9 @@ default int readInt() throws IOException {
 
 	@Override
 	default long readLong() throws IOException {
-		byte[] buf = new byte[8];
-		int read = read(buf, 0, 8);
-		if (read < 0) {
+		final byte[] buf = conversionBuffer();
+		final int read = read(buf, 0, 8);
+		if (read < 8) {
 			throw new EOFException();
 		}
 		return Bytes.toLong(buf, isLittleEndian());
@@ -614,32 +619,42 @@ default void writeByte(final int v) throws IOException {
 
 	@Override
 	default void writeShort(final int v) throws IOException {
-		write(Bytes.fromShort((short) v, isLittleEndian()));
+		final byte[] buf = conversionBuffer();
+		Bytes.unpack(v, buf, 0, 2, isLittleEndian());
+		write(buf, 0, 2);
 	}
 
 	@Override
 	default void writeChar(final int v) throws IOException {
-		write(Bytes.fromShort((short) v, isLittleEndian()));
+		writeShort(v);
 	}
 
 	@Override
 	default void writeInt(final int v) throws IOException {
-		write(Bytes.fromInt(v, isLittleEndian()));
+		final byte[] buf = conversionBuffer();
+		Bytes.unpack(v, buf, 0, 4, isLittleEndian());
+		write(buf, 0, 4);
 	}
 
 	@Override
 	default void writeLong(final long v) throws IOException {
-		write(Bytes.fromLong(v, isLittleEndian()));
+		final byte[] buf = conversionBuffer();
+		Bytes.unpack(v, buf, 0, 8, isLittleEndian());
+		write(buf, 0, 8);
 	}
 
 	@Override
 	default void writeFloat(final float v) throws IOException {
-		write(Bytes.fromFloat(v, isLittleEndian()));
+		final byte[] buf = conversionBuffer();
+		Bytes.unpack(Float.floatToIntBits(v), buf, 0, 4, isLittleEndian());
+		write(buf, 0, 4);
 	}
 
 	@Override
 	default void writeDouble(final double v) throws IOException {
-		write(Bytes.fromDouble(v, isLittleEndian()));
+		final byte[] buf = conversionBuffer();
+		Bytes.unpack(Double.doubleToLongBits(v), buf, 0, 8, isLittleEndian());
+		write(buf, 0, 8);
 	}
 
 	@Override

From 6c094f759ae0b92388df48479a933c8a4f453f53 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 13 Oct 2018 10:43:49 -0500
Subject: [PATCH 0841/1208] POM: bump to next minor version

There is new API in the DataHandle interface.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2aded5aee..5a8bf4172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.75.2-SNAPSHOT</version>
+	<version>2.76.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 4a365aa64e36658a12de0a3148fec4d17349b5ab Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Mon, 15 Oct 2018 17:10:41 +0200
Subject: [PATCH 0842/1208] DataHandle: fix findString(..) and support handles
 with unknown length

The findString(..) method used to require the exact length of the
handle, this length can be unknown, e.g. for compressed handles.
This is	no longer the case.
---
 .../org/scijava/io/handle/DataHandle.java     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index ccb93d434..c7cbfb654 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -350,10 +350,7 @@ default String findString(final boolean saveString, final int blockSize,
 		final StringBuilder out = new StringBuilder();
 		final long startPos = offset();
 		long bytesDropped = 0;
-		final long inputLen = length();
-		long maxLen = inputLen - startPos;
-		final boolean tooLong = saveString && maxLen > MAX_SEARCH_SIZE;
-		if (tooLong) maxLen = MAX_SEARCH_SIZE;
+		final long maxLen = saveString ? MAX_SEARCH_SIZE : Long.MAX_VALUE;
 		boolean match = false;
 		int maxTermLen = 0;
 		for (final String term : terminators) {
@@ -366,7 +363,10 @@ default String findString(final boolean saveString, final int blockSize,
 			new DataHandleInputStream<>(this), getEncoding());
 		final char[] buf = new char[blockSize];
 		long loc = 0;
-		while (loc < maxLen && offset() < length() - 1) {
+		int r = 0;
+
+		// NB: we need at least 2 bytes to read a char
+		while (loc < maxLen && ((r = in.read(buf, 0, blockSize)) > 1)) {
 			// if we're not saving the string, drop any old, unnecessary output
 			if (!saveString) {
 				final int outLen = out.length();
@@ -378,16 +378,12 @@ default String findString(final boolean saveString, final int blockSize,
 					bytesDropped += dropIndex;
 				}
 			}
-
-			// read block from stream
-			final int r = in.read(buf, 0, blockSize);
-			if (r <= 0) throw new IOException("Cannot read from stream: " + r);
-
 			// append block to output
 			out.append(buf, 0, r);
 
 			// check output, returning smallest possible string
-			int min = Integer.MAX_VALUE, tagLen = 0;
+			int min = Integer.MAX_VALUE;
+			int tagLen = 0;
 			for (final String t : terminators) {
 				final int len = t.length();
 				final int start = (int) (loc - bytesDropped - len);
@@ -415,7 +411,9 @@ default String findString(final boolean saveString, final int blockSize,
 		}
 
 		// no match
-		if (tooLong) throw new IOException("Maximum search length reached.");
+		if (loc > MAX_SEARCH_SIZE) {
+			throw new IOException("Maximum search length reached.");
+		}
 		return saveString ? out.toString() : null;
 	}
 

From a922e158a31e3a0469cc090cdad5ea67ac7f5cc7 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 16 Oct 2018 10:59:55 +0200
Subject: [PATCH 0843/1208] Add test for edge cases in the DataHandle default
 methods

---
 .../io/handle/DataHandleEdgeCaseTests.java    | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java

diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
new file mode 100644
index 000000000..268faee59
--- /dev/null
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -0,0 +1,142 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2018 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.io.location.BytesLocation;
+import org.scijava.io.location.Location;
+
+/**
+ * Additional Tests for edge case behavior of {@link DataHandle}.
+ * 
+ * @author Gabriel Einsdorf
+ */
+public class DataHandleEdgeCaseTests {
+
+	private static final byte[] BYTES = { //
+		'H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '\n', //
+		9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, -128, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, //
+		125, 127, -127, -125, -3, 'h', 'e' };
+
+	/**
+	 * Test to ensure {@link DataHandle#findString(String...)} and
+	 * {@link DataHandle#readCString()} work with {@link DataHandle}
+	 * implementations that have unknown length.
+	 * 
+	 * @throws IOException
+	 */
+	@Test
+	public void testFindStringsOnUnknonwLengthHandle() throws IOException {
+		final Context ctx = new Context();
+		final DataHandleService dhs = ctx.getService(DataHandleService.class);
+		final DummyHandle dummy = new DummyHandle(dhs.create(new BytesLocation(
+			BYTES)));
+
+		assertEquals("Hello,", dummy.findString(","));
+		assertEquals(" world\n", dummy.findString("\n"));
+		
+		dummy.seek(41);
+		assertEquals("he", dummy.findString("\n"));
+
+		dummy.seek(16);
+		assertArrayEquals(Arrays.copyOfRange(BYTES, 16, 23), dummy.readCString()
+			.getBytes());
+		dummy.seek(42);
+		assertNull(dummy.readCString());
+	}
+
+	private class DummyHandle extends AbstractHigherOrderHandle<Location> {
+
+		public DummyHandle(final DataHandle<Location> handle) {
+			super(handle);
+		}
+
+		@Override
+		public long length() throws IOException {
+			return -1;
+		}
+
+		@Override
+		public long offset() throws IOException {
+			return handle().offset();
+		}
+
+		@Override
+		public void seek(final long pos) throws IOException {
+			handle().seek(pos);
+		}
+
+		@Override
+		public void setLength(final long length) throws IOException {
+			handle().setLength(length);
+		}
+
+		@Override
+		public int read(final byte[] b, final int off, final int len)
+			throws IOException
+		{
+			return handle().read(b, off, len);
+		}
+
+		@Override
+		public byte readByte() throws IOException {
+			return handle().readByte();
+		}
+
+		@Override
+		public void write(final int b) throws IOException {
+			handle().write(b);
+		}
+
+		@Override
+		public void write(final byte[] b, final int off, final int len)
+			throws IOException
+		{
+			handle().write(b, off, len);
+		}
+
+		@Override
+		protected void cleanup() throws IOException {
+			//
+		}
+	}
+
+}

From 54d93cddb68bbc47e9f5f7bcf1d22e4a4cb1d1e1 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 16:49:03 +0100
Subject: [PATCH 0844/1208] Add StreamHandle

This basic version does not fully support random access, which will be
provided by subclasses to be added in future commits.
---
 .../io/handle/AbstractStreamHandle.java       |  65 ++++++
 .../org/scijava/io/handle/StreamHandle.java   | 192 ++++++++++++++++++
 2 files changed, 257 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
 create mode 100644 src/main/java/org/scijava/io/handle/StreamHandle.java

diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
new file mode 100644
index 000000000..f06e9fbb6
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import org.scijava.io.location.Location;
+
+/**
+ * Abstract base class for {@link StreamHandle} implementations.
+ *
+ * @author Curtis Rueden
+ * @author Melissa Linkert
+ */
+public abstract class AbstractStreamHandle<L extends Location> extends
+	AbstractDataHandle<L> implements StreamHandle<L>
+{
+
+	// -- Fields --
+
+	/** Current position within the stream(s). */
+	private long offset;
+
+	// -- StreamHandle methods --
+
+	@Override
+	public void setOffset(final long offset) {
+		this.offset = offset;
+	}
+
+	// -- DataHandle methods --
+
+	@Override
+	public long offset() {
+		return offset;
+	}
+
+}
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
new file mode 100644
index 000000000..64902d404
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -0,0 +1,192 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.scijava.io.location.Location;
+
+/**
+ * A {@link DataHandle} backed by an {@link InputStream} and/or
+ * {@link OutputStream}.
+ *
+ * @author Curtis Rueden
+ * @author Melissa Linkert
+ * @author Gabriel Einsdorf
+ */
+public interface StreamHandle<L extends Location> extends DataHandle<L> {
+
+	// -- StreamHandle methods --
+
+	/**
+	 * Gets an input stream for reading data, positioned at the current offset.
+	 *
+	 * @return the appropriate input stream, or null if the handle is write-only.
+	 * @throws IOException
+	 */
+	InputStream in() throws IOException;
+
+	/**
+	 * Gets an output stream for writing data, positioned at the current offset.
+	 *
+	 * @return the appropriate output stream, or null if the handle is read-only.
+	 */
+	OutputStream out() throws IOException;
+
+	/**
+	 * Sets the offset of the handle to the given position.
+	 * <p>
+	 * This method is intended to be called only in conjunction with reading from
+	 * the input stream, or writing to the output stream. Otherwise, the contents
+	 * may get out of sync.
+	 * </p>
+	 */
+	void setOffset(long offset);
+
+	/**
+	 * Increments the handle's offset by the given amount.
+	 * <p>
+	 * This method is intended to be called only in conjunction with reading from
+	 * the input stream, or writing to the output stream. Otherwise, the contents
+	 * may get out of sync.
+	 * </p>
+	 */
+	default void advance(final long bytes) throws IOException {
+		setOffset(offset() + bytes);
+	}
+
+	// -- DataHandle methods --
+
+	@Override
+	default void seek(final long pos) throws IOException {
+		if (pos == offset()) return;
+		if (pos > offset()) {
+			jump(pos - offset());
+		}
+		else {
+			throw new UnsupportedOperationException(
+				"Can't seek backwards through this StreamHandle");
+		}
+	}
+
+	/**
+	 * Resets the stream to its start.
+	 *
+	 * @throws IOException If something goes wrong with the reset
+	 */
+	void resetStream() throws IOException;
+
+	default void jump(final long n) throws IOException, EOFException {
+		long remain = n;
+		while (remain > 0) {
+			final long r = in().skip(remain);
+			if (r < 0) throw new EOFException();
+			remain -= r;
+		}
+	}
+
+	@Override
+	default void ensureReadable(final long count) throws IOException {
+		if (in() == null) throw new IOException("This handle is write-only.");
+		DataHandle.super.ensureReadable(count);
+	}
+
+	@Override
+	default boolean ensureWritable(final long count) throws IOException {
+		if (out() == null) throw new IOException("This handle is read-only.");
+		return DataHandle.super.ensureWritable(count);
+	}
+
+	@Override
+	default int read() throws IOException {
+		ensureReadable(0);
+		final int v = in().read();
+		if (v >= 0) advance(1);
+		return v;
+	}
+
+	@Override
+	default byte readByte() throws IOException {
+		int ch = this.read();
+		if (ch < 0) throw new EOFException();
+		return (byte) (ch);
+	}
+
+	@Override
+	default int read(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		final int n = in().read(b, off, len);
+		if (n >= 0) advance(n);
+		return n;
+	}
+
+	// -- DataOutput methods --
+
+	@Override
+	default void write(final int v) throws IOException {
+		ensureWritable(1);
+		out().write(v);
+		advance(1);
+	}
+
+	@Override
+	default void writeByte(int v) throws IOException {
+		write(v);
+	}
+
+	@Override
+	default void write(final byte[] b, final int off, final int len)
+		throws IOException
+	{
+		ensureWritable(len);
+		out().write(b, off, len);
+		advance(len);
+	}
+
+	// -- Closeable methods --
+
+	@Override
+	default void close() throws IOException {
+		// TODO: Double check this logic.
+		try (final InputStream in = in()) {
+			if (in != null) in.close();
+		}
+		try (final OutputStream out = out()) {
+			if (out != null) out.close();
+		}
+	}
+
+}

From 2f54eed4f0516506dd521dabadee9304e17f5f58 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 14 Mar 2017 18:39:16 +0100
Subject: [PATCH 0845/1208] Add ResettableStreamHandle + SeekableStreamHandle

These subinterfaces of StreamHandle provide random access over the
contained streams.
---
 .../handle/AbstractSeekableStreamHandle.java  | 105 ++++++++++++++++++
 .../io/handle/ResettableStreamHandle.java     |  72 ++++++++++++
 .../io/handle/SeekableStreamHandle.java       |  53 +++++++++
 3 files changed, 230 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
 create mode 100644 src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
 create mode 100644 src/main/java/org/scijava/io/handle/SeekableStreamHandle.java

diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
new file mode 100644
index 000000000..4015deb68
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.IOException;
+
+import org.scijava.io.location.Location;
+
+public abstract class AbstractSeekableStreamHandle<L extends Location> extends
+	AbstractStreamHandle<L> implements SeekableStreamHandle<L>
+{
+
+	private long jumpCutoff = 10000;
+
+	@Override
+	public void seek(final long pos) throws IOException {
+
+		// how much and which direction we have to jump
+		final long delta = pos - offset();
+
+		if (delta == 0) {
+			return;
+			// nothing to do
+		}
+		else if (delta > 0) {
+			// offset position is "downstream"
+
+			// try to reconnect instead of linearly reading large chunks
+			if (recreatePossible() && delta > jumpCutoff) {
+				recreateStreamFromPos(pos);
+			}
+			else {
+				jump(delta);
+			}
+
+		}
+		else { // delta < 0
+			// need to recreate the stream
+			if (recreatePossible()) {
+				recreateStreamFromPos(pos);
+			}
+			else {
+				resetStream();
+				jump(pos);
+			}
+		}
+		setOffset(pos);
+	}
+
+	/**
+	 * Recreates the internal input stream available through {@link #in()}, so
+	 * that it starts from the specified position.
+	 * 
+	 * @param pos
+	 * @throws IOException
+	 */
+	protected abstract void recreateStreamFromPos(long pos) throws IOException;
+
+	/**
+	 * In some implementations of this class, the ability to recreate the stream
+	 * depends on external factors (e.g. server support). This influences a
+	 * 
+	 * @return if recreate is actually possible.
+	 * @throws IOException
+	 */
+	protected abstract boolean recreatePossible() throws IOException;
+
+	/**
+	 * Sets the maximum of bytes which are read from the stream when seeking
+	 * forward. Any larger number will result in a call to
+	 * {@link #recreateStreamFromPos(long)}.
+	 */
+	protected void setJumpCutoff(long jumpCutoff) {
+		this.jumpCutoff = jumpCutoff;
+	}
+}
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
new file mode 100644
index 000000000..b22f17c1a
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.scijava.io.location.Location;
+
+/**
+ * A {@link DataHandle} backed by an {@link InputStream} and/or
+ * {@link OutputStream}. Supports resetting the handle to the start of the
+ * internal stream(s).
+ */
+public interface ResettableStreamHandle<L extends Location> extends
+	StreamHandle<L>
+{
+
+	@Override
+	default void seek(final long pos) throws IOException {
+		final long off = offset();
+		if (pos == off) return; // nothing to do
+		if (pos > off) {
+			// jump from the current offset
+			jump(pos - off);
+		}
+		else {
+			// jump from the beginning of the stream
+			resetStream();
+			jump(pos);
+		}
+		setOffset(pos);
+	}
+
+	/**
+	 * Resets the stream to its start.
+	 *
+	 * @throws IOException If something goes wrong with the reset
+	 */
+	@Override
+	void resetStream() throws IOException;
+}
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
new file mode 100644
index 000000000..3ad97e581
--- /dev/null
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -0,0 +1,53 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io.handle;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.scijava.io.location.Location;
+
+/**
+ * A {@link DataHandle} backed by an {@link InputStream} and/or
+ * {@link OutputStream}. Supports seeking to an arbitrary position within the
+ * stream.
+ *
+ * @author Gabriel Einsdorf
+ */
+public interface SeekableStreamHandle<L extends Location> extends
+	ResettableStreamHandle<L>
+{
+
+	@Override
+	void seek(long pos) throws IOException;
+}

From c56df67d2a1b1a90104f7a5881cc6398b5c278c6 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 16 Oct 2018 16:56:10 +0200
Subject: [PATCH 0846/1208] DataHandleTest: allow for handles with unknown
 length

Some handles don't know their length and instead return -1, this commit
adds an option to the length check to assure this.
---
 src/test/java/org/scijava/io/handle/DataHandleTest.java    | 7 ++++---
 .../org/scijava/io/handle/ReadBufferDataHandleTest.java    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 7c38e3e1a..859456ebe 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -113,7 +113,7 @@ public void testEndianesSettings() throws IOException {
 	@Test
 	public void testReading() throws IOException {
 		try (final DataHandle<? extends Location> handle = createHandle()) {
-			checkBasicReadMethods(handle);
+			checkBasicReadMethods(handle, true);
 			checkEndiannessReading(handle);
 		}
 	}
@@ -168,13 +168,14 @@ public void populateData(final OutputStream out) throws IOException {
 	 * Checks basic byte reading methods.
 	 *
 	 * @param handle the handle to test
+	 * @param lengthKnown whether the length of the handle is know
 	 * @throws IOException
 	 */
 	public <L extends Location> void checkBasicReadMethods(
-		final DataHandle<L> handle) throws IOException
+		final DataHandle<L> handle, boolean lengthKnown) throws IOException
 	{
 		assertEquals(0, handle.offset());
-		assertEquals(BYTES.length, handle.length());
+		assertEquals(lengthKnown ? BYTES.length : -1, handle.length());
 		assertEquals("UTF-8", handle.getEncoding());
 
 		// test read()
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index e7cb332f2..99d04e3fb 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -64,7 +64,7 @@ public void testSmallBuffer() throws IOException {
 					new ReadBufferDataHandle(handle, 5))
 		{
 			// check with small buffersize
-			checkBasicReadMethods(bufferedHandle);
+			checkBasicReadMethods(bufferedHandle, true);
 			checkEndiannessReading(bufferedHandle);
 		}
 	}

From 183c2e4ba897f1c44405df5ac8c6349a69f294f9 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 16 Oct 2018 16:57:07 +0200
Subject: [PATCH 0847/1208] Remove @Ignore from empty tests

---
 .../java/org/scijava/io/handle/ReadBufferDataHandleTest.java    | 1 -
 .../java/org/scijava/io/handle/WriteBufferDataHandleTest.java   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index 99d04e3fb..9f05bd38b 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -127,7 +127,6 @@ public void testLargeRead() throws Exception {
 	}
 
 	@Test
-	@Ignore
 	@Override
 	public void testWriting() throws IOException {
 		// nothing to do here
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index 40f035e3a..6ea468872 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -64,14 +64,12 @@ public DataHandle<? extends Location> createHandle() {
 	}
 
 	@Test
-	@Ignore
 	@Override
 	public void testReading() throws IOException {
 		// nothing to do
 	}
 
 	@Test
-	@Ignore
 	@Override
 	public void checkSkip() throws IOException {
 		// nothing to do

From e69e27f78a2dbe4008f46cdc396dc074627b0283 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 16 Oct 2018 11:01:02 +0200
Subject: [PATCH 0848/1208] BytesHandle: return -1 on EOF

---
 src/main/java/org/scijava/io/handle/BytesHandle.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 7eb52dbd5..9ffa71431 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -87,9 +87,13 @@ public void setLength(final long length) throws IOException {
 
 	@Override
 	public int read(final byte[] b, final int off, int len) throws IOException {
+		if(len == 0) return 0;
 		if (offset + len > length()) {
 			len = (int) (length() - offset);
 		}
+		if(len == 0) { // EOF
+			return -1;
+		}
 		bytes().getBytes(offset, b, off, len);
 		offset += len;
 		return len;

From d75e1a36dd7646a677605312f87b02635131b85c Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Tue, 25 Sep 2018 18:06:42 +0200
Subject: [PATCH 0849/1208] DefaultLocationService#resolve(String) add
 fall-back to FileLocation

Before giving up on parsing a given string, we try interpreting it as a
local file. This allows us to parse local paths, without requiring
users to transform them to URIs first.
---
 .../scijava/io/location/LocationService.java  | 21 ++++++++++++-------
 .../io/location/LocationServiceTest.java      | 13 ++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 193e03929..1599ed58b 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -32,6 +32,7 @@
 
 package org.scijava.io.location;
 
+import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -50,25 +51,29 @@ public interface LocationService extends HandlerService<URI, LocationResolver>,
 
 	/**
 	 * Turns the given string into an {@link URI}, then resolves it to a
-	 * {@link Location}
-	 * 
-	 * @param uri the uri to resolve
+	 * {@link Location}.
+	 *
+	 * @param uriString the uri to resolve
 	 * @return the resolved {@link Location}
 	 * @throws URISyntaxException if the URI is malformed
 	 */
-	default Location resolve(final String uri) throws URISyntaxException {
-		return resolve(new URI(uri));
+	default Location resolve(final String uriString) throws URISyntaxException {
+		return resolve(new URI(uriString));
 	}
 
 	/**
-	 * Resolves the given {@link URI} to a location.
-	 * 
+	 * Resolves the given {@link URI} to a location. If the {@code scheme} part of
+	 * the URI is {@code null} the path component is resolved as a local file.
+	 *
 	 * @param uri the uri to resolve
 	 * @return the resolved {@link Location} or <code>null</code> if no resolver
 	 *         could be found.
 	 * @throws URISyntaxException if the URI is malformed
 	 */
-	default Location resolve(final URI uri) throws URISyntaxException {
+	default Location resolve(URI uri) throws URISyntaxException {
+		if (uri.getScheme() == null) { // Fallback for local files
+			uri = new  File(uri.getPath()).toURI();
+		}
 		final LocationResolver resolver = getResolver(uri);
 		return resolver != null ? resolver.resolve(uri) : null;
 	}
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index 5d6d5d9b7..d24035d28 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -63,4 +63,17 @@ public void testResolve() throws URISyntaxException {
 		assertEquals(uri, loc.resolve(uri.toString()).getURI());
 	}
 
+	@Test
+	public void testFallBack() throws URISyntaxException {
+		final Context ctx = new Context(LocationService.class);
+		final LocationService loc = ctx.getService(LocationService.class);
+
+		final String uri = new File(".").getAbsolutePath();
+		final Location res = loc.resolve(uri);
+
+		assertTrue(res instanceof FileLocation);
+		FileLocation resFile = (FileLocation) res;
+		assertEquals(uri, resFile.getFile().getAbsolutePath());
+	}
+
 }

From d9cf223007ee0377a52d3188dd8a34ad38b480b2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 16 Oct 2018 10:41:14 -0500
Subject: [PATCH 0850/1208] AbstractLocation: implement a sensible toString()

This will make it easier to understand Location objects when debugging.
---
 .../java/org/scijava/io/location/AbstractLocation.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index 3d614d162..e15f64ab1 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -32,6 +32,7 @@
 
 package org.scijava.io.location;
 
+import java.net.URI;
 import java.util.Objects;
 
 /**
@@ -58,4 +59,13 @@ public boolean equals(final Object obj) {
 		return Objects.equals(getURI(), other.getURI());
 	}
 
+	@Override
+	public String toString() {
+		final String prefix = getClass().getSimpleName() + ":";
+		final URI uri = getURI();
+		if (uri != null) return prefix + uri;
+		final String name = getName();
+		if (name != null) return prefix + name;
+		return prefix + defaultName();
+	}
 }

From d9eac4e57dd0a05dd15dcb9a8e07b66d6d6f9428 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@uni-konstanz.de>
Date: Wed, 21 Feb 2018 14:56:24 +0100
Subject: [PATCH 0851/1208] FileLocation: require non-Null arguments

---
 src/main/java/org/scijava/io/location/FileLocation.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 7790ae4ec..2f073e1cc 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -37,6 +37,7 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -52,6 +53,7 @@ public class FileLocation extends AbstractLocation implements
 	private final File file;
 
 	public FileLocation(final File file) {
+		Objects.requireNonNull(file);
 		this.file = file;
 	}
 

From b66e768412106056b996b6c6b2628f888476a1d1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 16 Oct 2018 10:44:46 -0500
Subject: [PATCH 0852/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5a8bf4172..28cbe5c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.76.0-SNAPSHOT</version>
+	<version>2.76.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 9de70b484b962fc766a89362999ac3dd575d14c3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 16 Oct 2018 15:42:56 -0500
Subject: [PATCH 0853/1208] DataHandleTest: add missing final keywords

---
 .../org/scijava/io/handle/DataHandleTest.java | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 859456ebe..cffcd9fe0 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -71,7 +71,7 @@ public void init() {
 
 	@Test
 	public void checkSkip() throws IOException {
-		try (DataHandle<? extends Location> handle = createHandle()) {
+		try (final DataHandle<? extends Location> handle = createHandle()) {
 			handle.seek(0);
 			handle.skip(10);
 			assertEquals(10, handle.offset());
@@ -83,7 +83,7 @@ public void checkSkip() throws IOException {
 	@Test
 	public void testEndianesSettings() throws IOException {
 
-		try (DataHandle<? extends Location> handle = createHandle()) {
+		try (final DataHandle<? extends Location> handle = createHandle()) {
 			final ByteOrder original = handle.getOrder();
 
 			handle.setOrder(ByteOrder.BIG_ENDIAN);
@@ -120,7 +120,7 @@ public void testReading() throws IOException {
 
 	@Test
 	public void testWriting() throws IOException {
-		try (DataHandle<? extends Location> handle = createHandle()) {
+		try (final DataHandle<? extends Location> handle = createHandle()) {
 			checkBasicWriteMethods(handle);
 			final Location loc = createLocation();
 			checkWriteEndianes(() -> dataHandleService.create(loc),
@@ -405,28 +405,28 @@ public <L extends Location> void checkAdvancedStringWriting(
 	{
 		// test writeUTF() / readUTF()
 		final String utfTestString = "abcäúöäéëåáðßø¶🤓🍕😋";
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.writeUTF(utfTestString);
 		}
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			assertEquals(utfTestString, readHandle.readUTF());
 		}
 
 		// test writeLine()
 		final String testString = "The quick brown fox jumps over the lazy dog.";
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.writeLine(testString);
 		}
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			assertEquals(testString, readHandle.readLine());
 		}
 
 		// test writeChars / findString
 		final String testString2 = "The five boxing wizards jump quickly.";
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.writeChars(testString2);
 		}
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			for (int i = 0; i < testString2.length(); i++) {
 				assertEquals(testString2.charAt(i), readHandle.readChar());
 			}
@@ -459,14 +459,14 @@ public <L extends Location> void checkWriteEndianes(
 		final boolean little = order == ByteOrder.LITTLE_ENDIAN;
 
 		// test writeChar()
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 2; i += 2) {
 				writeHandle.writeChar(Bytes.toInt(BYTES, i, 2, little));
 			}
 		}
 
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			readHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 2; i += 2) {
 				assertEquals(msg(i), Bytes.toShort(BYTES, i, little), readHandle
@@ -475,14 +475,14 @@ public <L extends Location> void checkWriteEndianes(
 		}
 
 		// test writeShort()
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 2; i += 2) {
 				writeHandle.writeShort(Bytes.toShort(BYTES, i, little));
 			}
 		}
 
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			readHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 2; i += 2) {
 				assertEquals(msg(i), Bytes.toShort(BYTES, i, little), readHandle
@@ -491,13 +491,13 @@ public <L extends Location> void checkWriteEndianes(
 		}
 
 		// test writeInt()
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 4; i += 4) {
 				writeHandle.writeInt(Bytes.toInt(BYTES, i, little));
 			}
 		}
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			readHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 4; i += 4) {
 				assertEquals(msg(i), Bytes.toInt(BYTES, i, little), readHandle
@@ -506,13 +506,13 @@ public <L extends Location> void checkWriteEndianes(
 		}
 
 		// test writeLong()
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 8; i += 8) {
 				writeHandle.writeLong(Bytes.toLong(BYTES, i, little));
 			}
 		}
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			readHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 8; i += 8) {
 				assertEquals(msg(i), Bytes.toLong(BYTES, i, little), readHandle
@@ -521,13 +521,13 @@ public <L extends Location> void checkWriteEndianes(
 		}
 
 		// test writeFloat()
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 4; i += 4) {
 				writeHandle.writeFloat(Bytes.toFloat(BYTES, i, little));
 			}
 		}
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			readHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 4; i += 4) {
 				assertEquals(msg(i), Bytes.toFloat(BYTES, i, little), readHandle
@@ -536,13 +536,13 @@ public <L extends Location> void checkWriteEndianes(
 		}
 
 		// test writeDouble()
-		try (DataHandle<L> writeHandle = writeHandleCreator.get()) {
+		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 8; i += 8) {
 				writeHandle.writeDouble(Bytes.toDouble(BYTES, i, little));
 			}
 		}
-		try (DataHandle<L> readHandle = readHandleCreator.get()) {
+		try (final DataHandle<L> readHandle = readHandleCreator.get()) {
 			readHandle.setOrder(order);
 			for (int i = 0; i < BYTES.length / 8; i += 8) {
 				assertEquals(msg(i), Bytes.toDouble(BYTES, i, little), readHandle

From 1d5a14c386b57c20edb0ca86dc2029a846c05f9c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 16 Oct 2018 15:43:04 -0500
Subject: [PATCH 0854/1208] DataHandleTest: purge non-ASCII characters

This makes the source code as accessible as possible,
by escaping the non-ASCII Unicode characters.
---
 src/test/java/org/scijava/io/handle/DataHandleTest.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index cffcd9fe0..af08a6eba 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -404,7 +404,9 @@ public <L extends Location> void checkAdvancedStringWriting(
 		final Supplier<DataHandle<L>> writeHandleCreator) throws IOException
 	{
 		// test writeUTF() / readUTF()
-		final String utfTestString = "abcäúöäéëåáðßø¶🤓🍕😋";
+		final String utfTestString = "abc\u00E4\u00FA\u00F6\u00E4" +
+			"\u00E9\u00EB\u00E5\u00E1\u00F0\u00DF\u00EF\u0153\u0153" +
+			"\u00F8\u00B6\uD83E\uDD13\uD83C\uDF55\uD83D\uDE0B";
 		try (final DataHandle<L> writeHandle = writeHandleCreator.get()) {
 			writeHandle.writeUTF(utfTestString);
 		}

From 746b74f34c468f2f3c585ac34d872526f673aea3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 16 Oct 2018 15:43:46 -0500
Subject: [PATCH 0855/1208] DataHandleTest: fix javadoc

---
 .../org/scijava/io/handle/DataHandleTest.java | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index af08a6eba..5fe7cf273 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -438,13 +438,10 @@ public <L extends Location> void checkAdvancedStringWriting(
 	/**
 	 * Checks writing methods affected by endianness.
 	 *
-	 * @param readHandleCreator a supplier that creates properly initialized
-	 *          handles for reading, all created handles must point to the same
-	 *          location!
-	 * @param writeHandleCreator a supplier that creates properly initialized
-	 *          handles for reading, all created handles must point to the same
+	 * @param handleCreator a supplier that creates properly initialized
+	 *          handles. All created handles must point to the same
 	 *          location!
-	 * @throws IOException
+	 * @param order Byte order to use when writing to the handles.
 	 */
 	public <L extends Location> void checkWriteEndianes(
 		final Supplier<DataHandle<L>> handleCreator, final ByteOrder order)
@@ -453,6 +450,18 @@ public <L extends Location> void checkWriteEndianes(
 		checkWriteEndianes(handleCreator, handleCreator, order);
 	}
 
+	/**
+	 * Checks writing methods affected by endianness.
+	 *
+	 * @param readHandleCreator a supplier that creates properly initialized
+	 *          handles for reading. All created handles must point to the same
+	 *          location!
+	 * @param writeHandleCreator a supplier that creates properly initialized
+	 *          handles for writing. All created handles must point to the same
+	 *          location!
+	 * @param order Byte order to use when writing to the handles.
+	 * @throws IOException
+	 */
 	public <L extends Location> void checkWriteEndianes(
 		final Supplier<DataHandle<L>> readHandleCreator,
 		final Supplier<DataHandle<L>> writeHandleCreator, final ByteOrder order)

From b633b831ac1b780d4acfc311616c2ffc6186a000 Mon Sep 17 00:00:00 2001
From: gselzer <gabeselzer@gmail.com>
Date: Thu, 1 Nov 2018 10:41:02 -0500
Subject: [PATCH 0856/1208] Support invalid filename string to URI conversion

Not all filenames on all systems are valid URIs, especially on Windows,
    whose filenames have backslashes. If an error is thrown trying to
    create a URI from such an invalid String we attempt to resolve the
    issue by explicitly making it into a File first.
---
 .../java/org/scijava/io/location/LocationService.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 1599ed58b..0e824832a 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -58,7 +58,15 @@ public interface LocationService extends HandlerService<URI, LocationResolver>,
 	 * @throws URISyntaxException if the URI is malformed
 	 */
 	default Location resolve(final String uriString) throws URISyntaxException {
-		return resolve(new URI(uriString));
+	    try {
+	        return resolve(new URI(uriString));
+	    }
+	    catch (final URISyntaxException exc) {
+	        // In general, filenames are not valid URI strings.
+	        // Particularly on Windows, there are backslashes, which are invalid in URIs.
+	        // So we explicitly turn this string into a file if an error happens above.
+	        return resolve(new File(uriString).toURI());
+	    }
 	}
 
 	/**

From 161fe9607e953dbd8bf4e66f7cae4a0b1cc431d2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 3 Dec 2018 14:53:01 -0600
Subject: [PATCH 0857/1208] POM: update pom-scijava parent to 23.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 28cbe5c77..9fdca3b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>19.2.0</version>
+		<version>23.2.0</version>
 		<relativePath />
 	</parent>
 

From 523d8e0d5092415530f4d3c1dceda03b48a16dcc Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 3 Dec 2018 15:06:03 -0600
Subject: [PATCH 0858/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9fdca3b43..a384c0c53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.76.1-SNAPSHOT</version>
+	<version>2.76.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 83496744c6301080df1b2b53fa1b6f321edf0287 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 6 Dec 2018 17:47:05 +0100
Subject: [PATCH 0859/1208] DefaultScriptService: remove unused import

---
 src/main/java/org/scijava/script/DefaultScriptService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 699c0986e..626893150 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -50,7 +50,6 @@
 import org.scijava.Gateway;
 import org.scijava.InstantiableException;
 import org.scijava.MenuPath;
-import org.scijava.Priority;
 import org.scijava.app.AppService;
 import org.scijava.command.CommandService;
 import org.scijava.log.LogService;

From 884641064f31d0563c3558cced57a47382380477 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 6 Dec 2018 17:47:25 +0100
Subject: [PATCH 0860/1208] ScriptService: add mechanism to retrieve aliases

---
 src/main/java/org/scijava/script/DefaultScriptService.java | 5 +++++
 src/main/java/org/scijava/script/ScriptService.java        | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 626893150..f677c555c 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -195,6 +195,11 @@ public void addAlias(final String alias, final Class<?> type) {
 		aliasMap().put(alias, type);
 	}
 
+	@Override
+	public Map<String, Class<?>> getAliases() {
+		return Collections.unmodifiableMap(aliasMap());
+	}
+
 	@Override
 	public synchronized Class<?> lookupClass(final String alias)
 		throws ScriptException
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index a8c4209c4..1bdbb8aaa 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -323,6 +323,9 @@ default void addAlias(final Class<?> type) {
 	/** TODO */
 	void addAlias(String alias, Class<?> type);
 
+	/** TODO */
+	Map<String, Class<?>> getAliases();
+
 	/** TODO */
 	Class<?> lookupClass(String typeName) throws ScriptException;
 

From 4e6e3c72b288102dc319ecbbd522d13f5996011e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 14 Dec 2018 16:42:47 +0100
Subject: [PATCH 0861/1208] LocationService: do not cache resolvers by scheme

We want the ability for multiple resolvers to handle the same scheme in
different scenarios. So we don't want to cache which resolver was used
based only on scheme. Therefore, the getResolver method becomes the same
as getHandler, doing the lookup every time. So we deprecate it.
---
 .../io/location/DefaultLocationService.java       | 10 +---------
 .../org/scijava/io/location/LocationService.java  | 15 +++++----------
 .../scijava/io/location/LocationServiceTest.java  |  2 +-
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index d8c3c037d..9e8805204 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -33,8 +33,6 @@
 package org.scijava.io.location;
 
 import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.scijava.plugin.AbstractHandlerService;
 import org.scijava.plugin.Plugin;
@@ -50,11 +48,5 @@ public class DefaultLocationService extends
 	AbstractHandlerService<URI, LocationResolver> implements
 	LocationService
 {
-
-	private final Map<String, LocationResolver> resolvers = new HashMap<>();
-
-	@Override
-	public LocationResolver getResolver(final URI uri) {
-		return resolvers.computeIfAbsent(uri.getScheme(), u -> getHandler(uri));
-	}
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 0e824832a..8b2e6a439 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -86,16 +86,11 @@ default Location resolve(URI uri) throws URISyntaxException {
 		return resolver != null ? resolver.resolve(uri) : null;
 	}
 
-	/**
-	 * Returns a {@link LocationResolver} capable of resolving URL like the one
-	 * provided to this method. Allows faster repeated resolving of similar URIs
-	 * without going through this service.
-	 * 
-	 * @param uri the uri
-	 * @return the {@link LocationResolver} for this uri type, or
-	 *         <code>null</code> if no resolver could be found.
-	 */
-	LocationResolver getResolver(URI uri);
+	/** @deprecated Use {@link #getHandler(URI)} instead. */
+	@Deprecated
+	default LocationResolver getResolver(URI uri) {
+		return getHandler(uri);
+	}
 
 	// -- PTService methods --
 
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index d24035d28..4736fd24b 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -55,7 +55,7 @@ public void testResolve() throws URISyntaxException {
 		final LocationService loc = ctx.getService(LocationService.class);
 
 		final URI uri = new File(new File(".").getAbsolutePath()).toURI();
-		final LocationResolver res = loc.getResolver(uri);
+		final LocationResolver res = loc.getHandler(uri);
 
 		assertTrue(res instanceof FileLocationResolver);
 		assertEquals(uri, res.resolve(uri).getURI());

From c47b4b5aab9a38a647f75d4ccfd76dbd6d200f6f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 14 Dec 2018 16:58:25 +0100
Subject: [PATCH 0862/1208] ScriptIOPlugin: deactivate incomplete plugin

It seems this plugin was never completed.
---
 src/main/java/org/scijava/script/io/ScriptIOPlugin.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index d85817af8..72e20f701 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -37,7 +37,6 @@
 import org.scijava.io.AbstractIOPlugin;
 import org.scijava.io.IOPlugin;
 import org.scijava.plugin.Parameter;
-import org.scijava.plugin.Plugin;
 import org.scijava.script.ScriptService;
 
 /**
@@ -46,7 +45,6 @@
  * @author Curtis Rueden
  * @see ScriptService
  */
-@Plugin(type = IOPlugin.class)
 public class ScriptIOPlugin extends AbstractIOPlugin<String> {
 
 	@Parameter(required = false)

From 6bfb4ff5e8700656e7e8382d182d9b2bad20e4a8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 14 Dec 2018 18:01:47 +0100
Subject: [PATCH 0863/1208] LocationService: fix javadoc error

---
 src/main/java/org/scijava/io/location/LocationService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 8b2e6a439..70eedefce 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -86,7 +86,7 @@ default Location resolve(URI uri) throws URISyntaxException {
 		return resolver != null ? resolver.resolve(uri) : null;
 	}
 
-	/** @deprecated Use {@link #getHandler(URI)} instead. */
+	/** @deprecated Use {@link #getHandler} instead. */
 	@Deprecated
 	default LocationResolver getResolver(URI uri) {
 		return getHandler(uri);

From 2b0c5bf9b561c61cc86e26e6eacc1a9f899b1490 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 15 Dec 2018 19:44:58 +0100
Subject: [PATCH 0864/1208] LocationService: small tweaks

---
 src/main/java/org/scijava/io/location/LocationService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 70eedefce..fbced738a 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -50,7 +50,7 @@ public interface LocationService extends HandlerService<URI, LocationResolver>,
 {
 
 	/**
-	 * Turns the given string into an {@link URI}, then resolves it to a
+	 * Turns the given string into a {@link URI}, then resolves it to a
 	 * {@link Location}.
 	 *
 	 * @param uriString the uri to resolve
@@ -80,7 +80,7 @@ default Location resolve(final String uriString) throws URISyntaxException {
 	 */
 	default Location resolve(URI uri) throws URISyntaxException {
 		if (uri.getScheme() == null) { // Fallback for local files
-			uri = new  File(uri.getPath()).toURI();
+			uri = new File(uri.getPath()).toURI();
 		}
 		final LocationResolver resolver = getResolver(uri);
 		return resolver != null ? resolver.resolve(uri) : null;

From d5861f83a074df181bc64f8fcd6240db00438114 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Dec 2018 08:14:10 -0600
Subject: [PATCH 0865/1208] Make POM.getPOM work when G/A is unknown

We can scan for hits beneath META-INF/maven.
---
 src/main/java/org/scijava/util/POM.java | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index a6420398f..5edc679d8 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -232,11 +232,24 @@ public static POM getPOM(final Class<?> c, final String groupId,
 				location.toString().endsWith(".jar"))
 			{
 				// look for pom.xml in JAR's META-INF/maven subdirectory
-				final String pomPath =
-					"META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml";
-				final URL pomURL =
-					new URL("jar:" + location.toString() + "!/" + pomPath);
-				return new POM(pomURL);
+				if (groupId == null || artifactId == null) {
+					// groupId and/or artifactId is unknown; scan for the POM
+					final URL pomBase = new URL("jar:" + //
+						location.toString() + "!/META-INF/maven");
+					for (final URL url : FileUtils.listContents(pomBase, true, true)) {
+						if (url.toExternalForm().endsWith("/pom.xml")) {
+							return new POM(url);
+						}
+					}
+				}
+				else {
+					// known groupId and artifactId; grab it directly
+					final String pomPath =
+						"META-INF/maven/" + groupId + "/" + artifactId + "/pom.xml";
+					final URL pomURL =
+						new URL("jar:" + location.toString() + "!/" + pomPath);
+					return new POM(pomURL);
+				}
 			}
 			// look for the POM in the class's base directory
 			final File file = FileUtils.urlToFile(location);

From 636e5f44166582252d98cb876886f96a3720a539 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Dec 2018 08:14:45 -0600
Subject: [PATCH 0866/1208] Use try/multi-catch in POM.getPOM

---
 src/main/java/org/scijava/util/POM.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 5edc679d8..aff40e7ac 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -257,13 +257,7 @@ public static POM getPOM(final Class<?> c, final String groupId,
 			final File pomFile = new File(baseDir, "pom.xml");
 			return new POM(pomFile);
 		}
-		catch (final IOException e) {
-			return null;
-		}
-		catch (final ParserConfigurationException e) {
-			return null;
-		}
-		catch (final SAXException e) {
+		catch (final IOException | ParserConfigurationException | SAXException e) {
 			return null;
 		}
 	}

From b7ffa9b0f31a549952e3c7cf75bb561f186dc1f0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Dec 2018 08:16:51 -0600
Subject: [PATCH 0867/1208] Improve javadoc of POM.getPOM

---
 src/main/java/org/scijava/util/POM.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index aff40e7ac..32b6d7412 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -222,6 +222,8 @@ public String getVersion() {
 	 * @param c The class to use as a base when searching for a pom.xml.
 	 * @param groupId The Maven groupId of the desired POM.
 	 * @param artifactId The Maven artifactId of the desired POM.
+	 * @return {@link POM} object representing the discovered POM, or null if no
+	 *         POM could be found.
 	 */
 	public static POM getPOM(final Class<?> c, final String groupId,
 		final String artifactId)

From 6e97ae070510771997975e4a2fe0ee293396b503 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Dec 2018 08:19:09 -0600
Subject: [PATCH 0868/1208] Add POM.getPOM(Class) without G/A arguments

---
 src/main/java/org/scijava/util/POM.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 32b6d7412..f9b1bdd14 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -216,6 +216,17 @@ public String getVersion() {
 
 	// -- Utility methods --
 
+	/**
+	 * Gets the Maven POM associated with the given class.
+	 * 
+	 * @param c The class to use as a base when searching for a pom.xml.
+	 * @return {@link POM} object representing the discovered POM, or null if no
+	 *         POM could be found.
+	 */
+	public static POM getPOM(final Class<?> c) {
+		return getPOM(c, null, null);
+	}
+
 	/**
 	 * Gets the Maven POM associated with the given class.
 	 * 

From ae05d6b4115349d5e83aa244e839049a1e5c6831 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Dec 2018 08:20:04 -0600
Subject: [PATCH 0869/1208] POM: bump minor version

New API was added in 884641064f31d0563c3558cced57a47382380477.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a384c0c53..f8b70137a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.76.2-SNAPSHOT</version>
+	<version>2.77.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 4a20b44bbbd2d4876dd8fc18596d920ed90e1d86 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@knime.com>
Date: Fri, 14 Dec 2018 12:36:05 +0100
Subject: [PATCH 0870/1208] ReadBufferDataHandle: ensure pages are fully read

Reading bytes with `DataHandle#read(bytes[], off, len)` results in *up
to* `len` bytes being read into the provided array.
In ReadBufferHandleDataHandle the number of read bytes was not checked,
this lead to partially filled pages resulting in read errors. Now the
reading is repeated until the page is either full or EOF is reached.

And adapt to changes in ReadBufferDataHandle.
---
 .../io/handle/ReadBufferDataHandle.java       | 12 +++++-
 .../handle/ReadBufferDataHandleMockTest.java  | 40 ++++++++++++-------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index b54ebe950..6f092f759 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -167,7 +167,17 @@ private byte[] readPage(final int pageID, final int slotID) throws IOException {
 		if (handle().offset() != startOfPage) {
 			handle().seek(startOfPage);
 		}
-		handle().read(page);
+
+		// NB: we read repeatedly until the page is full or EOF is reached
+		// handle().read(..) might read less bytes than requested
+		int off = 0;
+		while (off < pageSize) {
+			final int read = handle().read(page, off, pageSize - off);
+			if (read == -1) { // EOF
+				break;
+			}
+			off += read;
+		}
 		return page;
 	}
 
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index cc1b992d2..38fabfe06 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -1,21 +1,25 @@
 
 package org.scijava.io.handle;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.mockito.AdditionalMatchers.aryEq;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.Test;
 import org.scijava.io.location.DummyLocation;
 import org.scijava.io.location.Location;
 
-import static org.mockito.Mockito.*;
-
-import java.io.IOException;
-
 public class ReadBufferDataHandleMockTest {
 
 	private DataHandle<Location> mock;
@@ -59,34 +63,40 @@ public void testBufferingSequence() throws IOException {
 
 		// set length of stubbed handle
 		when(mock.length()).thenReturn(30l);
+		byte[] value = new byte[10];
+		when(mock.read(aryEq(value), eq(0), eq(10))).thenReturn(10);
+		when(mock.read(aryEq(value), anyInt(), anyInt())).thenReturn(10);
 
 		// read the first byte
 		buf.read();
 		verify(mock, times(0)).seek(0);
 		// buffer should read a whole page
-		verify(mock).read(aryEq(byteArrayLen10));
+		verify(mock).read(aryEq(byteArrayLen10), eq(0), eq(10));
 
 		buf.seek(0);
 		// ensure seek was not called again
 		verify(mock, times(0)).seek(0);
 
+		when(mock.offset()).thenReturn(10l);
+
 		// read over the edge of the current page
 		buf.read(new byte[12]);
 		verify(mock, times(0)).seek(anyLong());
-		verify(mock, times(2)).read(aryEq(byteArrayLen10));
+		verify(mock, times(2)).read(aryEq(byteArrayLen10), eq(0), eq(10));
 
 		assertEquals(12, buf.offset());
 
 		// read the last page
+		when(mock.offset()).thenReturn(20l);
 		buf.read(new byte[12]);
 		verify(mock, times(0)).seek(anyLong());
-		verify(mock, times(3)).read(aryEq(byteArrayLen10));
+		verify(mock, times(3)).read(aryEq(byteArrayLen10), eq(0), eq(10));
 
 		// first page should no longer be buffered, must be reread in
 		buf.seek(0);
 		buf.read();
 		verify(mock).seek(0);
-		verify(mock, times(4)).read(aryEq(byteArrayLen10));
+		verify(mock, times(4)).read(aryEq(byteArrayLen10), eq(0), eq(10));
 	}
 
 	/**
@@ -99,11 +109,12 @@ public void testSkipForward() throws IOException {
 
 		// set length of stubbed handle
 		when(mock.length()).thenReturn(40l);
+		when(mock.read(any(), anyInt(), anyInt())).thenReturn(10);
 
 		// read the first byte
 		buf.read();
 		verify(mock, times(0)).seek(anyLong());
-		verify(mock).read(aryEq(byteArrayLen10));
+		verify(mock, times(1)).read(aryEq(byteArrayLen10), eq(0), eq(10));
 
 		// skip the second page
 		buf.seek(30l);
@@ -111,7 +122,8 @@ public void testSkipForward() throws IOException {
 
 		// read the third page
 		verify(mock).seek(30l);
-		verify(mock, times(2)).read(aryEq(byteArrayLen10));
+		verify(mock, times(2)).read(aryEq(byteArrayLen10), eq(0), eq(10));
+		when(mock.offset()).thenReturn(40l);
 
 		// go back to already buffered page
 		buf.seek(0l);
@@ -123,6 +135,6 @@ public void testSkipForward() throws IOException {
 		buf.seek(35);
 		buf.read();
 		verify(mock, times(1)).seek(anyLong());
-		verify(mock, times(2)).read(any());
+		verify(mock, times(2)).read(any(), anyInt(), anyInt());
 	}
 }

From 821f89fc53bd2f3ffe75c14cd35eb74d5b4e545e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 22 Dec 2018 14:42:23 -0600
Subject: [PATCH 0871/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f8b70137a..2016c2adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.77.0-SNAPSHOT</version>
+	<version>2.77.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From daf4ae2b24ed6aa55334cbe3e991de7bdbd253c0 Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@knime.com>
Date: Thu, 24 Jan 2019 13:26:39 +0100
Subject: [PATCH 0872/1208] BytesLocation: Add method to set the name for the
 Location

In some instances libarary users want to create a BytesLocation that has
a specific name, e.g. so that it is correctly detected by a Service that
performs a name based lookup.
---
 .../scijava/io/location/BytesLocation.java    | 72 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 43c08e659..41980b0fd 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -34,7 +34,6 @@
 
 import org.scijava.io.ByteArrayByteBank;
 import org.scijava.io.ByteBank;
-import org.scijava.io.handle.DataHandle;
 import org.scijava.util.ByteArray;
 
 /**
@@ -47,6 +46,8 @@ public class BytesLocation extends AbstractLocation {
 
 	private final ByteBank bytes;
 
+	private final String name;
+
 	/**
 	 * Creates a {@link BytesLocation} backed by the specified
 	 * {@link ByteBank}.
@@ -54,7 +55,18 @@ public class BytesLocation extends AbstractLocation {
 	 * @param bytes the {@link ByteBank} that will back this {@link Location}
 	 */
 	public BytesLocation(final ByteBank bytes) {
+		this(bytes, null);
+	}
+
+	/**
+	 * Creates a {@link BytesLocation} backed by the specified {@link ByteBank}.
+	 *
+	 * @param bytes the {@link ByteBank} that will back this {@link Location}
+	 * @param name the name of this {@link Location}
+	 */
+	public BytesLocation(final ByteBank bytes, final String name) {
 		this.bytes = bytes;
+		this.name = name;
 	}
 
 	/**
@@ -63,7 +75,19 @@ public BytesLocation(final ByteBank bytes) {
 	 * can be used to avoid needing to grow the underlying {@link ByteBank}.
 	 */
 	public BytesLocation(final int initialCapacity) {
+		this(initialCapacity, null);
+	}
+
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank} with
+	 * the specified initial capacity, but with a reported size of 0. This method
+	 * can be used to avoid needing to grow the underlying {@link ByteBank}.
+	 *
+	 * @param name the name of this {@link Location}
+	 */
+	public BytesLocation(final int initialCapacity, final String name) {
 		this.bytes = new ByteArrayByteBank(initialCapacity);
+		this.name = name;
 	}
 
 	/**
@@ -71,7 +95,18 @@ public BytesLocation(final int initialCapacity) {
 	 * that wraps the specified {@link ByteArray}.
 	 */
 	public BytesLocation(final ByteArray bytes) {
+		this(bytes, null);
+	}
+
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank} that
+	 * wraps the specified {@link ByteArray}.
+	 *
+	 * @param name the name of this Location.
+	 */
+	public BytesLocation(final ByteArray bytes, final String name) {
 		this.bytes = new ByteArrayByteBank(bytes);
+		this.name = name;
 	}
 
 	/**
@@ -81,7 +116,19 @@ public BytesLocation(final ByteArray bytes) {
 	 * @param bytes the array to wrap
 	 */
 	public BytesLocation(final byte[] bytes) {
+		this(bytes, null);
+	}
+
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank} which
+	 * wraps the specified array.
+	 *
+	 * @param bytes the array to wrap
+	 * @param name the name of this Location.
+	 */
+	public BytesLocation(final byte[] bytes, final String name) {
 		this.bytes = new ByteArrayByteBank(bytes);
+		this.name = name;
 	}
 
 	/**
@@ -92,11 +139,25 @@ public BytesLocation(final byte[] bytes) {
 	 * @param offset the offset in the bytes array to start copying from
 	 * @param length the number of bytes to copy, starting from the offset
 	 */
-	public BytesLocation(final byte[] bytes, final int offset,
-		final int length)
+	public BytesLocation(final byte[] bytes, final int offset, final int length) {
+		this(bytes, offset, length, null);
+	}
+
+	/**
+	 * Creates a {@link BytesLocation} backed by a {@link ByteArrayByteBank} with
+	 * the specified initial capacity and the provided data.
+	 *
+	 * @param bytes the bytes to copy into the new {@link BytesLocation}
+	 * @param offset the offset in the bytes array to start copying from
+	 * @param length the number of bytes to copy, starting from the offset
+	 * @param name the name of this Location.
+	 */
+	public BytesLocation(final byte[] bytes, final int offset, final int length,
+		final String name)
 	{
 		this.bytes = new ByteArrayByteBank(length);
 		this.bytes.setBytes(0l, bytes, offset, length);
+		this.name = name;
 	}
 
 	// -- BytesLocation methods --
@@ -106,6 +167,11 @@ public ByteBank getByteBank() {
 		return bytes;
 	}
 
+	@Override
+	public String getName() {
+		return name != null ? name : defaultName();
+	}
+
 	// -- Object methods --
 
 	@Override

From 80f96e74b2b6cbcf02662ba8c1b94e189fb37baf Mon Sep 17 00:00:00 2001
From: Gabriel Einsdorf <gabriel.einsdorf@knime.com>
Date: Wed, 23 Jan 2019 15:44:53 +0100
Subject: [PATCH 0873/1208] BytesLocation: add test for setName()

---
 .../io/location/BytesLocationTest.java        | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index f95144ca3..addac1dbb 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -9,13 +9,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
@@ -36,10 +36,12 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.scijava.io.ByteArrayByteBank;
+import org.scijava.util.ByteArray;
 
 /**
  * Tests {@link BytesLocation}.
- * 
+ *
  * @author Curtis Rueden
  */
 public class BytesLocationTest {
@@ -72,4 +74,31 @@ public void testBytesOffsetLength() {
 		assertArrayEquals(expectedDigits, testDigits);
 	}
 
+	/**
+	 * Tests getName()
+	 */
+	@Test
+	public void getNameTest() {
+
+		final BytesLocation loc1 = new BytesLocation(0);
+		assertEquals(loc1.defaultName(), loc1.getName());
+		assertEquals("Location.defaultName", loc1.defaultName());
+
+		final String expectedName = "test.name";
+		BytesLocation loc2 = new BytesLocation(0, expectedName);
+		assertEquals(expectedName, loc2.getName());
+
+		loc2 = new BytesLocation(new byte[0], expectedName);
+		assertEquals(expectedName, loc2.getName());
+
+		loc2 = new BytesLocation(new ByteArray(), expectedName);
+		assertEquals(expectedName, loc2.getName());
+
+		loc2 = new BytesLocation(new ByteArrayByteBank(), expectedName);
+		assertEquals(expectedName, loc2.getName());
+
+		loc2 = new BytesLocation(new byte[0], 0, 0, expectedName);
+		assertEquals(expectedName, loc2.getName());
+	}
+
 }

From 9a1b86a4fc1afd3604041c3614ace9d57d5e0207 Mon Sep 17 00:00:00 2001
From: Ulrik Guenther <hello@ulrik.is>
Date: Fri, 25 Jan 2019 19:32:46 +0100
Subject: [PATCH 0874/1208] DefaultIOService: Log warning in case Opener
 IOPlugin returns null data, and log error in case no IOPlugin is found for
 loading or saving data

---
 src/main/java/org/scijava/io/DefaultIOService.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 70ac00020..1f74ec075 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -64,10 +64,16 @@ public final class DefaultIOService
 	@Override
 	public Object open(final String source) throws IOException {
 		final IOPlugin<?> opener = getOpener(source);
-		if (opener == null) return null; // no appropriate IOPlugin
+		if (opener == null) {
+			log.error("No opener IOPlugin found for " + source + ".");
+			return null;
+		}
 
 		final Object data = opener.open(source);
-		if (data == null) return null; // IOPlugin returned no data; canceled?
+		if (data == null) {
+			log.warn("Opener IOPlugin " + opener + " returned no data. Canceled?");
+			return null; // IOPlugin returned no data; canceled?
+		}
 
 		eventService.publish(new DataOpenedEvent(source, data));
 		return data;
@@ -81,6 +87,8 @@ public void save(final Object data, final String destination)
 		if (saver != null) {
 			saver.save(data, destination);
 			eventService.publish(new DataSavedEvent(destination, data));
+		} else {
+			log.error("No Saver IOPlugin found for " + data.toString() + ".");
 		}
 	}
 }

From 079d80e01a6ec651f1d0bb43725e21ec32c97e43 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 23 Feb 2019 14:21:16 -0600
Subject: [PATCH 0875/1208] POM: use HTTPS where feasible

---
 pom.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2016c2adf..19f06aee4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 	<inceptionYear>2009</inceptionYear>
 	<organization>
 		<name>SciJava</name>
-		<url>http://www.scijava.org/</url>
+		<url>https://scijava.org/</url>
 	</organization>
 	<licenses>
 		<license>
@@ -31,7 +31,7 @@
 		<developer>
 			<id>ctrueden</id>
 			<name>Curtis Rueden</name>
-			<url>http://imagej.net/User:Rueden</url>
+			<url>https://imagej.net/User:Rueden</url>
 			<roles>
 				<role>founder</role>
 				<role>lead</role>
@@ -46,13 +46,13 @@
 	<contributors>
 		<contributor>
 			<name>Mark Hiner</name>
-			<url>http://imagej.net/User:Hinerm</url>
+			<url>https://imagej.net/User:Hinerm</url>
 			<roles><role>founder</role></roles>
 			<properties><id>hinerm</id></properties>
 		</contributor>
 		<contributor>
 			<name>Johannes Schindelin</name>
-			<url>http://imagej.net/User:Schindelin</url>
+			<url>https://imagej.net/User:Schindelin</url>
 			<properties><id>dscho</id></properties>
 		</contributor>
 		<contributor>
@@ -61,27 +61,27 @@
 		</contributor>
 		<contributor>
 			<name>Barry DeZonia</name>
-			<url>http://imagej.net/User:Bdezonia</url>
+			<url>https://imagej.net/User:Bdezonia</url>
 			<properties><id>bdezonia</id></properties>
 		</contributor>
 		<contributor>
 			<name>Christian Dietz</name>
-			<url>http://imagej.net/User:Dietzc</url>
+			<url>https://imagej.net/User:Dietzc</url>
 			<properties><id>dietzc</id></properties>
 		</contributor>
 		<contributor>
 			<name>Richard Domander</name>
-			<url>http://imagej.net/User:Rdom</url>
+			<url>https://imagej.net/User:Rdom</url>
 			<properties><id>rimadoma</id></properties>
 		</contributor>
 		<contributor>
 			<name>Gabriel Einsdorf</name>
-			<url>http://imagej.net/User:Gab1one</url>
+			<url>https://imagej.net/User:Gab1one</url>
 			<properties><id>gab1one</id></properties>
 		</contributor>
 		<contributor>
 			<name>Aivar Grislis</name>
-			<url>http://imagej.net/User:Grislis</url>
+			<url>https://imagej.net/User:Grislis</url>
 			<properties><id>grislis</id></properties>
 		</contributor>
 		<contributor>
@@ -90,36 +90,36 @@
 		</contributor>
 		<contributor>
 			<name>Grant Harris</name>
-			<url>http://imagej.net/User:Harris</url>
+			<url>https://imagej.net/User:Harris</url>
 			<properties><id>tnargsirrah</id></properties>
 		</contributor>
 		<contributor>
 			<name>Lee Kamentsky</name>
-			<url>http://imagej.net/User:Leek</url>
+			<url>https://imagej.net/User:Leek</url>
 			<properties><id>LeeKamentsky</id></properties>
 		</contributor>
 		<contributor>
 			<name>Rick Lentz</name>
-			<url>http://imagej.net/User:Lentz</url>
+			<url>https://imagej.net/User:Lentz</url>
 		</contributor>
 		<contributor>
 			<name>Melissa Linkert</name>
-			<url>http://imagej.net/User:Linkert</url>
+			<url>https://imagej.net/User:Linkert</url>
 			<properties><id>melissalinkert</id></properties>
 		</contributor>
 		<contributor>
 			<name>Kevin Mader</name>
-			<url>http://imagej.net/User:Ksmader</url>
+			<url>https://imagej.net/User:Ksmader</url>
 			<properties><id>kmader</id></properties>
 		</contributor>
 		<contributor>
 			<name>Hadrien Mary</name>
-			<url>http://imagej.net/User:Hadim</url>
+			<url>https://imagej.net/User:Hadim</url>
 			<properties><id>hadim</id></properties>
 		</contributor>
 		<contributor>
 			<name>Alison Walter</name>
-			<url>http://imagej.net/User:Awalter2</url>
+			<url>https://imagej.net/User:Awalter2</url>
 			<properties><id>awalter17</id></properties>
 		</contributor>
 		<contributor>

From 0acdc141103ee3a151f2b8bb31bea94845d3fcc4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 25 Feb 2019 13:33:23 -0600
Subject: [PATCH 0876/1208] Update test to reflect POM change

---
 src/test/java/org/scijava/util/POMTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 5ad61707e..c445c110d 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -104,7 +104,7 @@ public void testAccessors() throws ParserConfigurationException,
 		assertEquals("https://github.com/scijava/scijava-common/issues",
 			issueManagementURL);
 		assertEquals("SciJava", pom.getOrganizationName());
-		assertEquals("http://www.scijava.org/", pom.getOrganizationURL());
+		assertEquals("https://scijava.org/", pom.getOrganizationURL());
 		assertTrue(pom.getPath().endsWith("pom.xml"));
 		assertTrue(pom.getProjectDescription().startsWith(
 			"SciJava Common is a shared library for SciJava software."));

From eb8e5700b2c8630adefb514543cf2613439e25ae Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 24 Nov 2017 20:53:52 -0600
Subject: [PATCH 0877/1208] Types: fix NPE in isAssignable method

---
 src/main/java/org/scijava/util/Types.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index f0c1683b6..89bfa88a3 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -1416,7 +1416,7 @@ private static boolean isAssignable(final Type type,
 				// parameters must either be absent from the subject type, within
 				// the bounds of the wildcard type, or be an exact match to the
 				// parameters of the target type.
-				if (fromTypeArg != null && !toTypeArg.equals(fromTypeArg) &&
+				if (fromTypeArg != null && !fromTypeArg.equals(toTypeArg) &&
 					!(toTypeArg instanceof WildcardType && isAssignable(fromTypeArg,
 						toTypeArg, typeVarAssigns)))
 				{

From fbf4248c1dd49043d89aaf75f728113f6ccd5635 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 24 Nov 2017 20:57:03 -0600
Subject: [PATCH 0878/1208] TypesTest: add more isAssignable tests

---
 src/test/java/org/scijava/util/TypesTest.java | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 597037454..01ca45532 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -510,6 +510,31 @@ public void testIsAssignableClassToNull() {
 		Types.isAssignable(Object.class, null);
 	}
 
+	/** Tests {@link Types#isAssignable(Type, Type)} with type variable. */
+	@Test
+	public <T extends Number> void testIsAssignableT() {
+		final Type t = genericTestType("t");
+		final Type listT = genericTestType("listT");
+		final Type listNumber = genericTestType("listNumber");
+		final Type listInteger = genericTestType("listInteger");
+		final Type listExtendsNumber = genericTestType("listExtendsNumber");
+
+		assertTrue(Types.isAssignable(t, t));
+		assertTrue(Types.isAssignable(listT, listT));
+		assertTrue(Types.isAssignable(listNumber, listNumber));
+		assertTrue(Types.isAssignable(listInteger, listInteger));
+		assertTrue(Types.isAssignable(listExtendsNumber, listExtendsNumber));
+
+		assertTrue(Types.isAssignable(listT, listExtendsNumber));
+		assertTrue(Types.isAssignable(listNumber, listExtendsNumber));
+		assertTrue(Types.isAssignable(listInteger, listExtendsNumber));
+
+		assertFalse(Types.isAssignable(listNumber, listT));
+		assertFalse(Types.isAssignable(listInteger, listT));
+		assertFalse(Types.isAssignable(listExtendsNumber, listT));
+		assertFalse(Types.isAssignable(listExtendsNumber, listNumber));
+	}
+
 	/** Tests {@link Types#isInstance(Object, Class)}. */
 	@Test
 	public void testIsInstance() {
@@ -598,6 +623,14 @@ public static enum Words {
 		FOO, BAR, FUBAR
 	}
 
+	private interface TestTypes<T extends Number> {
+		T t();
+		List<T> listT();
+		List<Number> listNumber();
+		List<Integer> listInteger();
+		List<? extends Number> listExtendsNumber();
+	}
+
 	// -- Helper methods --
 
 	/**
@@ -671,4 +704,7 @@ private void assertAllTheSame(final List<?> list, final Object... values) {
 		}
 	}
 
+	private Type genericTestType(final String name) {
+		return Types.method(TestTypes.class, name).getGenericReturnType();
+	}
 }

From d99dcad94412b88de4acf1ad6a260f60a34354b7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 12 Apr 2019 16:22:27 -0500
Subject: [PATCH 0879/1208] POM: update parent to pom-scijava 25.0.0

This fixes an error about the default-jar goal in newer Eclipses.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 19f06aee4..d92265830 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>23.2.0</version>
+		<version>25.0.0</version>
 		<relativePath />
 	</parent>
 

From 30a3246e1f2cdba039c0647fe23481bb9db5dcd3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 5 Jun 2018 12:36:35 -0500
Subject: [PATCH 0880/1208] Types: Refactor parameterizeWithOwner params

This breaks backwards compatibility. But there was a type argument
clash with the other methods called parameterize, so it's better to
rename this one to something unique, to avoid confusion.

We'll call it "new API". ;-)

Co-authored-by: Gabriel Selzer <gselzer@wisc.edu>
---
 pom.xml                                   |  2 +-
 src/main/java/org/scijava/util/Types.java | 26 +++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index d92265830..523c1421a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.77.1-SNAPSHOT</version>
+	<version>2.78.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 89bfa88a3..85ab6f84f 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -70,8 +70,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.scijava.util.FileUtils;
-
 /**
  * Utility class for working with generic types, fields and methods.
  * <p>
@@ -86,6 +84,7 @@
  * </ul>
  *
  * @author Curtis Rueden
+ * @author Gabe Selzer
  */
 public final class Types {
 
@@ -791,22 +790,22 @@ public static <T> T enumValue(final String name, final Class<T> dest) {
 	public static ParameterizedType parameterize(final Class<?> rawType,
 		final Type... typeArgs)
 	{
-		return parameterize(rawType, rawType.getDeclaringClass(), typeArgs);
+		return parameterizeWithOwner(null, rawType, typeArgs);
 	}
 
 	/**
 	 * Creates a new {@link ParameterizedType} of the given class together with
 	 * the specified type arguments.
 	 *
-	 * @param rawType The class of the {@link ParameterizedType}.
 	 * @param ownerType The owner type of the parameterized class.
+	 * @param rawType The class of the {@link ParameterizedType}.
 	 * @param typeArgs The type arguments to use in parameterizing it.
 	 * @return The newly created {@link ParameterizedType}.
 	 */
-	public static ParameterizedType parameterize(final Class<?> rawType,
-		final Type ownerType, final Type... typeArgs)
+	public static ParameterizedType parameterizeWithOwner(final Type ownerType,
+		final Class<?> rawType, final Type... typeArgs)
 	{
-		return new TypeUtils.ParameterizedTypeImpl(rawType, ownerType, typeArgs);
+		return TypeUtils.parameterizeWithOwner(ownerType, rawType, typeArgs);
 	}
 
 	/**
@@ -3206,7 +3205,7 @@ else if (isMissingTypeParameters(clazz)) {
 				Arrays.fill(arguments, UNBOUND_WILDCARD);
 				final Type owner = clazz.getDeclaringClass() == null ? null
 					: addWildcardParameters(clazz.getDeclaringClass());
-				return parameterize(clazz, owner, arguments);
+				return parameterizeWithOwner(owner, clazz, arguments);
 			}
 			else {
 				return clazz;
@@ -3584,9 +3583,9 @@ public static Type capture(final Type type) {
 				for (final CaptureTypeImpl captured : toInit) {
 					captured.init(varMap);
 				}
-				final Type ownerType = (pType.getOwnerType() == null) ? null : capture(
+				final Type ownerType = pType.getOwnerType() == null ? null : capture(
 					pType.getOwnerType());
-				return parameterize(clazz, ownerType, capturedArguments);
+				return parameterizeWithOwner(ownerType, clazz, capturedArguments);
 			}
 			return type;
 		}
@@ -3764,9 +3763,10 @@ else if (type instanceof TypeVariable) {
 			}
 			else if (type instanceof ParameterizedType) {
 				final ParameterizedType pType = (ParameterizedType) type;
-				return parameterize((Class<?>) pType.getRawType(), pType
-					.getOwnerType() == null ? pType.getOwnerType() : map(pType
-						.getOwnerType()), map(pType.getActualTypeArguments()));
+				final Type ownerType = pType.getOwnerType() == null ? //
+					pType.getOwnerType() : map(pType.getOwnerType());
+				return parameterizeWithOwner(ownerType, (Class<?>) pType.getRawType(),
+					map(pType.getActualTypeArguments()));
 			}
 			else if (type instanceof WildcardType) {
 				final WildcardType wType = (WildcardType) type;

From 8c05cc8100c9a84fd0dd2d56f779d223510bfc18 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 12 Apr 2019 16:03:10 -0500
Subject: [PATCH 0881/1208] Types: fix location of third party attribution

---
 src/main/java/org/scijava/util/Types.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 85ab6f84f..7f0c9ee21 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -29,10 +29,6 @@
  * #L%
  */
 
-package org.scijava.util;
-
-import java.io.File;
-
 // Portions of this class were adapted from the
 // org.apache.commons.lang3.reflect.TypeUtils and
 // org.apache.commons.lang3.Validate classes of
@@ -46,6 +42,9 @@
 //
 // See NOTICE.txt for further details on third-party licenses.
 
+package org.scijava.util;
+
+import java.io.File;
 import java.io.Serializable;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;

From 2f6e7ae68631666dbd97c5d063710057c9a41645 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gabeselzer@gmail.com>
Date: Tue, 5 Jun 2018 10:35:28 -0500
Subject: [PATCH 0882/1208] ClassUtils: TODO finish migrating to Types

---
 src/main/java/org/scijava/util/ClassUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index ea0d8fef7..ceae7c44a 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -352,6 +352,7 @@ public static void setValue(final Field field, final Object instance,
 
 	// -- Comparison --
 
+	// START HERE: Migrate remaining methods to Types, then deprecate this class.
 	/**
 	 * Compares two {@link Class} objects using their fully qualified names.
 	 * <p>

From 93682f0b9db2928cc64a69c7ed3a1441c8131cd8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 5 Jun 2018 12:45:03 -0500
Subject: [PATCH 0883/1208] TypeTests: add parameterize and unbox test TODOs

Co-authored-by: Gabriel Selzer <gselzer@wisc.edu>
---
 src/test/java/org/scijava/util/TypesTest.java | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 01ca45532..6dcbcc393 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -310,6 +310,12 @@ public void testBox() {
 		}
 	}
 
+	/** Tests {@link Types#unbox(Class)}. */
+	@Test
+	public void testUnbox() {
+		// TODO
+	}
+
 	/** Tests {@link Types#nullValue(Class)}. */
 	@Test
 	public void testNullValue() {
@@ -597,9 +603,28 @@ public void testEnumValueNonEnum() {
 		Types.enumValue("HOOYAH", String.class);
 	}
 
+	/** Tests {@link Types#parameterize(Class, Map)}. */
+	@Test
+	public void testParameterizeMap() {
+		// TODO
+	}
+
+	/** Tests {@link Types#parameterize(Class, Type...)}. */
+	@Test
+	public void testParameterizeTypes() {
+		// TODO
+	}
+
+	/** Tests {@link Types#parameterizeWithOwner(Type, Class, Type...)}. */
+	@Test
+	public void testParameterizeWithOwner() {
+		// TODO
+	}
+
 	// -- Helper classes --
 
 	private static class Thing<T> {
+
 		@SuppressWarnings("unused")
 		private T thing;
 	}

From 79369f9e1567a697ed64684cbddae65d14d58b5b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Apr 2019 14:34:31 -0500
Subject: [PATCH 0884/1208] Types: flesh out the javadoc

---
 src/main/java/org/scijava/util/Types.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 7f0c9ee21..8bcbabae5 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -81,6 +81,24 @@
  * <li><a href="https://github.com/coekarts/gentyref">GenTyRef</a> (Generic Type
  * Reflector), a library for runtime generic type introspection.</li>
  * </ul>
+ * <p>
+ * All three of these libraries contain fantastic generics-related logic, but
+ * none of the three contained everything that SciJava needed for all its use
+ * cases. Hence, we have drawn from sources as needed to create a unified
+ * generics API for use from SciJava applications. See in particular the
+ * <a href="https://github.com/scijava/scijava-ops">SciJava Ops</a> project,
+ * which utilizes these functions heavily.
+ * </p>
+ * <p>
+ * NB: The <a href=
+ * "https://javadoc.scijava.org/Apache-Commons-Lang/org/apache/commons/lang3/reflect/TypeUtils.html">
+ * <code>org.apache.commons.reflect.TypeUtils</code></a> class of
+ * <a href="https://commons.apache.org/proper/commons-lang/">Apache Commons
+ * Lang</a> version 3.4 is forked internally within this class. We did this for
+ * two reasons: 1) to avoid bringing in the whole of Apache Commons Lang as a
+ * dependency; and 2) to fix an infinite recursion bug in the
+ * {@code TypeUtils.toString(Type)} method.
+ * </p>
  *
  * @author Curtis Rueden
  * @author Gabe Selzer

From d1ee15c584ea60f05ab3057fe1d5552a5a7de6a2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Apr 2019 15:10:46 -0500
Subject: [PATCH 0885/1208] Update the mailmap

---
 .mailmap | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index e5a0e733c..5157cbbe1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,7 +1,16 @@
 Barry DeZonia <bdezonia@wisc.edu> <bdezonia@users.noreply.github.com>
-Christian Dietz <christian.dietz@uni-konstanz.de>
+Christian Dietz <dietzc85@googlemail.com>
+Christian Dietz <dietzc85@googlemail.com> <christian.dietz@uni-konstanz.de>
+Gabriel Einsdorf <gabriel.einsdorf@knime.com> <gabriel.einsdorf@uni-konstanz.de>
+Gabriel Einsdorf <gabriel.einsdorf@knime.com> <gabriel.einsdorf@uni.kn>
+Gabriel Selzer <gabeselzer@gmail.com>
+Gabriel Selzer <gabeselzer@gmail.com> <gselzer@wisc.edu>
 ImageJ Jenkins <jenkins@imagej.net> <jenkins@dev.loci.wisc.edu>
+Jan Eglinger <jan.eglinger@fmi.ch> <jan.eglinger@gmail.com>
 Johannes Schindelin <johannes.schindelin@gmx.de>
 Johannes Schindelin <johannes.schindelin@gmx.de> <dscho@users.noreply.github.com>
 Jonathan Hale <Squareys@googlemail.com>
+Leon Yang <leon.gh.yang@gmail.com>
+Leon Yang <leon.gh.yang@gmail.com> <leonyang1994@gmail.com>
 Mark Hiner <hiner@wisc.edu> <hinerm@gmail.com>
+Richard Domander <rdomander@rvc.ac.uk>

From e2e5af69ba0f90dfc131c7815721780075fb6eaa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 30 Apr 2019 17:04:46 -0500
Subject: [PATCH 0886/1208] POM: update parent to pom-scijava 26.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 523c1421a..2ab222832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>25.0.0</version>
+		<version>26.0.0</version>
 		<relativePath />
 	</parent>
 

From 421ea3e2540655dc093b94bfaeb0b7c713384c97 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 30 Apr 2019 17:04:46 -0500
Subject: [PATCH 0887/1208] Travis: build using openjdk8

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b3fcda211..3bc57c558 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: java
-jdk: oraclejdk8
+jdk: openjdk8
 branches:
   only:
   - master

From 2201d402b0892c4b6828203b29e6e9694003cfc6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 May 2019 17:13:29 -0500
Subject: [PATCH 0888/1208] POM: be defensive if metadata is missing

When comparing POMs, apparently it is possible for groupId,
artifactId and/or version to be missing/null. See:

https://forum.image.sc/t/special-characters-no-longer-allowed-in-script-parameter-declaration/25244/3

Fortunately, Java 8 has a nice functional syntax to help with this.
---
 src/main/java/org/scijava/util/POM.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index f9b1bdd14..ac7eedcd1 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -184,18 +184,19 @@ public String getCIManagementURL() {
 
 	// -- Comparable methods --
 
-	@Override
-	public int compareTo(final POM pom) {
+	private static final Comparator<String> STRING_COMPARATOR = //
+		Comparator.nullsFirst(String::compareTo);
+	private static final Comparator<POM> POM_COMPARATOR = Comparator//
 		// sort by groupId first
-		final int gid = getGroupId().compareTo(pom.getGroupId());
-		if (gid != 0) return gid;
-
+		.comparing(POM::getGroupId, STRING_COMPARATOR)
 		// sort by artifactId second
-		final int aid = getArtifactId().compareTo(pom.getArtifactId());
-		if (aid != 0) return aid;
-
+		.thenComparing(POM::getArtifactId, STRING_COMPARATOR)//
 		// finally, sort by version
-		return compareVersions(getVersion(), pom.getVersion());
+		.thenComparing(POM::getVersion, POM::compareVersions);
+
+	@Override
+	public int compareTo(final POM pom) {
+		return POM_COMPARATOR.compare(this, pom);
 	}
 
 	// -- Versioned methods --

From e6e1fe9f50397b3697712676d79d812fedd96aef Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Mon, 13 May 2019 16:30:46 +0200
Subject: [PATCH 0889/1208] Safeguard against null style arg in
 UserInterface#chooseFile

This fixes the issue reported by @kephale on the forum, where the absence of a style attribute
on a File parameter leads to a NullPointerException:

https://forum.image.sc/t/error-for-file-type-imagej2-parameter/25585

This commit is a quick fix, it should probably be rewritten when addressing issue #333
---
 src/main/java/org/scijava/ui/UserInterface.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 385df24d8..6449960b7 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -162,9 +162,12 @@ DialogPrompt dialogPrompt(String message, String title,
 	 */
 	default File chooseFile(final File file, final String style) {
 		final String title;
-		if (style.equals(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
-		else if (style.equals(FileWidget.OPEN_STYLE)) title = "Open";
-		else if (style.equals(FileWidget.SAVE_STYLE)) title = "Save";
+		// style can be a string with multiple comma-separated keywords
+		// TODO use a utility class for style handling, e.g. StyleUtils.isStyle(style, ...)
+		if (style == null) title = "Choose a file";
+		else if (style.toLowerCase().contains(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
+		else if (style.toLowerCase().contains(FileWidget.OPEN_STYLE)) title = "Open";
+		else if (style.toLowerCase().contains(FileWidget.SAVE_STYLE)) title = "Save";
 		else title = "Choose a file";
 
 		return chooseFile(title, file, style);

From f105c736a540e17b5d81bd6dd4f16a5db17fa5ab Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Mon, 13 May 2019 16:47:28 +0200
Subject: [PATCH 0890/1208] DefaultTextService: use try-with-resources

---
 src/main/java/org/scijava/text/DefaultTextService.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index 34ef2479a..dd1ecc2d3 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -63,16 +63,12 @@ public final class DefaultTextService extends
 	@Override
 	public String open(final File file) throws IOException {
 		// This routine is from: http://stackoverflow.com/a/326440
-		final FileInputStream stream = new FileInputStream(file);
-		try {
+		try (final FileInputStream stream = new FileInputStream(file)) {
 			final FileChannel fc = stream.getChannel();
 			final MappedByteBuffer bb =
 				fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
 			return Charset.defaultCharset().decode(bb).toString();
 		}
-		finally {
-			stream.close();
-		}
 	}
 
 	@Override

From 72ce14a2e04407c5bb4f0b1510ca977839b944c9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 23 May 2019 16:38:00 -0500
Subject: [PATCH 0891/1208] DefaultParseService: update javadoc link

---
 src/main/java/org/scijava/parse/DefaultParseService.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 3e5f5384e..db48d5ac1 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -62,9 +62,8 @@ public Items parse(final String arg, final boolean strict) {
 	// -- Helper classes --
 
 	/**
-	 * {@link Items} implementation backed by the
-	 * <a href="https://github.com/scijava/scijava-expression-parser">SciJava
-	 * Expression Parser</a>.
+	 * {@link Items} implementation backed by
+	 * <a href="https://github.com/scijava/parsington">Parsington</a>.
 	 */
 	private static class ItemsList extends ObjectArray<Item> implements Items {
 

From 7d03b51ea8737e700d203b76ab64798bb78e1528 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 17 Jun 2019 12:02:50 -0500
Subject: [PATCH 0892/1208] DynamicCommand: add method to persist input values

See:
https://forum.image.sc/t/how-to-save-interactivecommand-parameter-values/26645/5
---
 .../org/scijava/command/DynamicCommand.java   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index b56a0bac6..b963c655e 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -39,7 +39,11 @@
 import org.scijava.Contextual;
 import org.scijava.NullContextException;
 import org.scijava.module.DefaultMutableModule;
+import org.scijava.module.process.PreprocessorPlugin;
+import org.scijava.module.process.SaveInputsPreprocessor;
 import org.scijava.plugin.Parameter;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.PluginService;
 import org.scijava.util.ClassUtils;
 
 /**
@@ -60,6 +64,9 @@ public abstract class DynamicCommand extends DefaultMutableModule implements
 	@Parameter
 	private CommandService commandService;
 
+	@Parameter
+	private PluginService pluginService;
+
 	private DynamicCommandInfo info;
 
 	/** Reason for cancelation, or null if not canceled. */
@@ -144,4 +151,21 @@ public String getCancelReason() {
 	public void uncancel() {
 		cancelReason = null;
 	}
+
+	// -- Internal methods --
+
+	/**
+	 * Persists current input values. Use e.g. for {@link InteractiveCommand}s
+	 * that want to persist values as they change, since interactive commands do
+	 * not complete the module execution lifecycle normally.
+	 */
+	protected void saveInputs() {
+		// https://forum.image.sc/t/how-to-save-interactivecommand-parameter-values/26645/5
+		final PluginInfo<PreprocessorPlugin> saveInputsPreprocessorInfo =
+			pluginService.getPlugin(SaveInputsPreprocessor.class,
+				PreprocessorPlugin.class);
+		final PreprocessorPlugin saveInputsPreprocessor = //
+			pluginService.createInstance(saveInputsPreprocessorInfo);
+		saveInputsPreprocessor.process(this);
+	}
 }

From 5f4e0787d10e3ccba9bc3231dc1cf86e64a4ede1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 17 Jun 2019 12:04:09 -0500
Subject: [PATCH 0893/1208] InteractiveCommand: save inputs when they change

With this change, individual InteractiveCommands benefit from automatic
input parameter persistence without needing to code it by hand.

See:
https://forum.image.sc/t/how-to-save-interactivecommand-parameter-values/26645/5
---
 src/main/java/org/scijava/command/InteractiveCommand.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index 117485838..d02e0d7d9 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -96,6 +96,7 @@ public InteractiveCommand(final String... listenerNames) {
 	public void preview() {
 		// NB: Interactive commands call run upon any parameter change.
 		run();
+		saveInputs();
 	}
 
 	@Override

From f624acd27c62d26d4c8f4c4c0605ba4d25085d01 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 27 Jun 2019 09:13:10 +0200
Subject: [PATCH 0894/1208] POM: update parent to pom-scijava 27.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2ab222832..50f2c30a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>26.0.0</version>
+		<version>27.0.1</version>
 		<relativePath />
 	</parent>
 

From 0e2ff6f83814ff3d40d88f2b165a8c855b59e969 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 27 Jun 2019 09:15:54 +0200
Subject: [PATCH 0895/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 50f2c30a3..29301765c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.78.0-SNAPSHOT</version>
+	<version>2.78.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 482c170eefe58078a1affc0e8da5665012501ac1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 29 Jun 2019 14:56:09 +0200
Subject: [PATCH 0896/1208] Migrate module input persistence to ModuleService

This makes the LoadInputsPreprocessor and SaveInputsPreprocessor much
simpler, since they can now simply lean on the ModuleService directly.

This also makes the DynamicCommand's internal saveInputs() method no
longer need to instantiate and run a SaveInputsPreprocessor, but
rather instead it can call that same service method in ModuleService.
---
 pom.xml                                       |  2 +-
 .../org/scijava/command/DynamicCommand.java   | 15 +++-----
 .../scijava/module/DefaultModuleService.java  | 38 +++++++++++++++++++
 .../org/scijava/module/ModuleService.java     |  5 +++
 .../process/LoadInputsPreprocessor.java       | 38 +------------------
 .../process/SaveInputsPreprocessor.java       | 17 +--------
 6 files changed, 51 insertions(+), 64 deletions(-)

diff --git a/pom.xml b/pom.xml
index 29301765c..b8ebce4c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.78.1-SNAPSHOT</version>
+	<version>2.79.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index b963c655e..4e1bc5531 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -39,10 +39,8 @@
 import org.scijava.Contextual;
 import org.scijava.NullContextException;
 import org.scijava.module.DefaultMutableModule;
-import org.scijava.module.process.PreprocessorPlugin;
-import org.scijava.module.process.SaveInputsPreprocessor;
+import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
-import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
 import org.scijava.util.ClassUtils;
 
@@ -67,6 +65,9 @@ public abstract class DynamicCommand extends DefaultMutableModule implements
 	@Parameter
 	private PluginService pluginService;
 
+	@Parameter
+	private ModuleService moduleService;
+
 	private DynamicCommandInfo info;
 
 	/** Reason for cancelation, or null if not canceled. */
@@ -160,12 +161,6 @@ public void uncancel() {
 	 * not complete the module execution lifecycle normally.
 	 */
 	protected void saveInputs() {
-		// https://forum.image.sc/t/how-to-save-interactivecommand-parameter-values/26645/5
-		final PluginInfo<PreprocessorPlugin> saveInputsPreprocessorInfo =
-			pluginService.getPlugin(SaveInputsPreprocessor.class,
-				PreprocessorPlugin.class);
-		final PreprocessorPlugin saveInputsPreprocessor = //
-			pluginService.createInstance(saveInputsPreprocessorInfo);
-		saveInputsPreprocessor.process(this);
+		moduleService.saveInputs(this);
 	}
 }
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 4cd4da238..6aaa731b2 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -339,6 +339,16 @@ public <T> T getDefaultValue(final ModuleItem<T> item) {
 		return null;
 	}
 
+	@Override
+	public void saveInputs(final Module module) {
+		module.getInfo().inputs().forEach(item -> saveInput(module, item));
+	}
+
+	@Override
+	public void loadInputs(final Module module) {
+		module.getInfo().inputs().forEach(item -> loadInput(module, item));
+	}
+
 	// -- Service methods --
 
 	@Override
@@ -523,4 +533,32 @@ private String prefKey(final ModuleItem<?> item) {
 		return persistKey == null || persistKey.isEmpty() ? //
 			item.getName() : persistKey;
 	}
+
+	/** Saves the value of the given module item to persistent storage. */
+	private <T> void saveInput(final Module module, final ModuleItem<T> item) {
+		final T value = item.getValue(module);
+		save(item, value);
+	}
+
+	/** Loads the value of the given module item from persistent storage. */
+	private <T> void loadInput(final Module module, final ModuleItem<T> item) {
+		// skip input that has already been resolved
+		if (module.isInputResolved(item.getName())) return;
+
+		final T prefValue = load(item);
+		final Class<T> type = item.getType();
+		final T defaultValue = item.getValue(module);
+		final T value = getBestValue(prefValue, defaultValue, type);
+		item.setValue(module, value);
+	}
+
+	private <T> T getBestValue(final Object prefValue,
+		final Object defaultValue, final Class<T> type)
+	{
+		if (prefValue != null) return convertService.convert(prefValue, type);
+		if (defaultValue != null) {
+			return convertService.convert(defaultValue, type);
+		}
+		return Types.nullValue(type);
+	}
 }
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 9267c0070..5c6e86809 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -311,4 +311,9 @@ <M extends Module> Future<M> run(M module,
 	/** Gets the default value of the given {@link ModuleItem}. */
 	<T> T getDefaultValue(final ModuleItem<T> item);
 
+	/** Saves values to persistent storage from the given {@link Module}. */
+	void saveInputs(final Module module);
+
+	/** Loads values from persistent storage into the given {@link Module}. */
+	void loadInputs(final Module module);
 }
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index d44d96133..c9c84505b 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -32,13 +32,10 @@
 
 package org.scijava.module.process;
 
-import org.scijava.convert.ConvertService;
 import org.scijava.module.Module;
-import org.scijava.module.ModuleItem;
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
-import org.scijava.util.Types;
 import org.scijava.widget.InputHarvester;
 
 /**
@@ -59,41 +56,8 @@ public class LoadInputsPreprocessor extends AbstractPreprocessorPlugin {
 	@Parameter
 	private ModuleService moduleService;
 
-	@Parameter
-	private ConvertService conversionService;
-
-	// -- ModuleProcessor methods --
-
 	@Override
 	public void process(final Module module) {
-		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
-		for (final ModuleItem<?> item : inputs) {
-			loadValue(module, item);
-		}
-	}
-
-	// -- Helper methods --
-
-	/** Loads the value of the given module item from persistent storage. */
-	private <T> void loadValue(final Module module, final ModuleItem<T> item) {
-		// skip input that has already been resolved
-		if (module.isInputResolved(item.getName())) return;
-
-		final T prefValue = moduleService.load(item);
-		final Class<T> type = item.getType();
-		final T defaultValue = item.getValue(module);
-		final T value = getBestValue(prefValue, defaultValue, type);
-		item.setValue(module, value);
+		moduleService.loadInputs(module);
 	}
-
-	private <T> T getBestValue(final Object prefValue,
-		final Object defaultValue, final Class<T> type)
-	{
-		if (prefValue != null) return conversionService.convert(prefValue, type);
-		if (defaultValue != null) {
-			return conversionService.convert(defaultValue, type);
-		}
-		return Types.nullValue(type);
-	}
-
 }
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 30f23a49f..c8fde59d8 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -34,7 +34,6 @@
 
 import org.scijava.Priority;
 import org.scijava.module.Module;
-import org.scijava.module.ModuleItem;
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -59,22 +58,8 @@ public class SaveInputsPreprocessor extends AbstractPreprocessorPlugin {
 	@Parameter
 	private ModuleService moduleService;
 
-	// -- ModuleProcessor methods --
-
 	@Override
 	public void process(final Module module) {
-		final Iterable<ModuleItem<?>> inputs = module.getInfo().inputs();
-		for (final ModuleItem<?> item : inputs) {
-			saveValue(module, item);
-		}
+		moduleService.saveInputs(module);
 	}
-
-	// -- Helper methods --
-
-	/** Saves the value of the given module item to persistent storage. */
-	private <T> void saveValue(final Module module, final ModuleItem<T> item) {
-		final T value = item.getValue(module);
-		moduleService.save(item, value);
-	}
-
 }

From 32c4098ab3c6aab7efc0a2d09464adbda95d8489 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 4 Sep 2019 15:07:00 -0500
Subject: [PATCH 0897/1208] FileUtils: recognize more native classifiers

Any time we see "-native-..." or "-natives-..."
it should be assumed to be a native classifier.
---
 src/main/java/org/scijava/util/FileUtils.java     | 2 +-
 src/test/java/org/scijava/util/FileUtilsTest.java | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index bd42f055b..b928118e6 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -729,7 +729,7 @@ private static String classifiers() {
 			"shaded",
 			"sources",
 			"javadoc",
-			"native",
+			"natives?-?\\w*",
 			"(natives-)?(android|linux|macosx|solaris|windows)-" +
 				"(aarch64|amd64|arm|armv6|armv6hf|i586|universal|x86|x86_64)",
 		};
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index e241854fb..b464a580e 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -312,6 +312,12 @@ public void testStripVersionFromFilename() {
 		assertEquals("jars/jogl-all-natives-solaris-i586.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-solaris-i586.jar"));
 		assertEquals("jars/jogl-all-natives-windows-amd64.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-windows-amd64.jar"));
 		assertEquals("jars/jogl-all-natives-windows-i586.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-windows-i586.jar"));
+
+		// Test jinput style of native binary .jars
+		assertEquals("jars/jinput-natives-all.jar", FileUtils.stripFilenameVersion("jars/jinput-2.0.9-natives-all.jar"));
+
+		// Test that native-lib-loader is not misrecognized as a native classifier
+		assertEquals("jars/native-lib-loader.jar", FileUtils.stripFilenameVersion("jars/native-lib-loader-2.3.2.jar"));
 	}
 
 	@Test

From ade6894e29a4400be2fb54ce5e02a6ce9d792fd7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 4 Sep 2019 15:14:48 -0500
Subject: [PATCH 0898/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b8ebce4c0..7bc888093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.79.0-SNAPSHOT</version>
+	<version>2.79.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 423fa179e2f072b64f9ef920695181872f9c949f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Sep 2019 15:38:58 +0200
Subject: [PATCH 0899/1208] VersionUtils.compare: fix bug with suffixes

When comparing e.g. "1" versus "a", the logic was stripping the "1" as
leading and ultimately comparing "" with "a". This comparison happened
to give the same result, because both "" and "1" compare less than "a",
but for other strings like "%" which comes before the digits, the
behavior differs.
---
 src/main/java/org/scijava/util/VersionUtils.java     | 7 +++++--
 src/test/java/org/scijava/util/VersionUtilsTest.java | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index 8e0e74b5c..87fe7e676 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -146,15 +146,18 @@ private static String[] splitDots(final String s) {
 	/** Compares one token of a multi-token version string. */
 	private static int compareToken(final String t1, final String t2) {
 		final int i1 = digitIndex(t1), i2 = digitIndex(t2);
+		String suffix1 = t1, suffix2 = t2;
 		if (i1 > 0 && i2 > 0) {
 			// Versions start with digits; compare them numerically.
 			final long d1 = Long.parseLong(t1.substring(0, i1));
 			final long d2 = Long.parseLong(t2.substring(0, i2));
 			if (d1 < d2) return -1;
 			if (d1 > d2) return 1;
+			suffix1 = t1.substring(i1);
+			suffix2 = t2.substring(i2);
 		}
-		// Compare remaining characters lexicographically.
-		return t1.substring(i1).compareTo(t2.substring(i2));
+		// Compare lexicographically.
+		return suffix1.compareTo(suffix2);
 	}
 
 	/** Gets the subsequent index to all the given string's leading digits. */
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index e452ca1f1..d1c62e546 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -88,6 +88,7 @@ public void testCompare() {
 
 		// Check weird stuff.
 		assertTrue(VersionUtils.compare("1", "a") < 0);
+		assertTrue(VersionUtils.compare("1", "%") > 0);
 		assertTrue(VersionUtils.compare("", "1") < 0);
 		assertTrue(VersionUtils.compare("1", "1.") < 0);
 		assertTrue(VersionUtils.compare("", ".") < 0);

From 097cbb4b4248b84f3ad475b5a844fe3cc8b1ca97 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Sep 2019 15:41:52 +0200
Subject: [PATCH 0900/1208] VersionUtils.compare: handle SemVer suffixes

With SemVer, 2.0.0 is newer than 2.0.0-beta-1.
We were behaving in the opposite way.

In other words: we want empty post-numeric suffixes to sort _after_
non-empty ones. So we need a special test for empty string here.
---
 src/main/java/org/scijava/util/VersionUtils.java     | 7 +++++++
 src/test/java/org/scijava/util/VersionUtilsTest.java | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index 87fe7e676..bf1be77ff 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -156,6 +156,13 @@ private static int compareToken(final String t1, final String t2) {
 			suffix1 = t1.substring(i1);
 			suffix2 = t2.substring(i2);
 		}
+
+		// Final version (empty string) is larger than non-final (non-empty).
+		// For example: 2.0.0 > 2.0.0-beta-1.
+		if (suffix1.isEmpty() && suffix2.isEmpty()) return 0;
+		if (suffix1.isEmpty()) return 1;
+		if (suffix2.isEmpty()) return -1;
+
 		// Compare lexicographically.
 		return suffix1.compareTo(suffix2);
 	}
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index d1c62e546..902006367 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -60,7 +60,7 @@ public void testCompare() {
 		assertTrue(VersionUtils.compare("2.7.3", "1.7.3") > 0);
 
 		// Suffix indicates version is older than final release.
-		assertTrue(VersionUtils.compare("1.5.2", "1.5.2-beta-1") < 0);
+		assertTrue(VersionUtils.compare("1.5.2", "1.5.2-beta-1") > 0);
 
 		// Check when number of version tokens does not match.
 		assertTrue(VersionUtils.compare("1.5", "1.5.1") < 0);

From a2b4582e8c3d3719f76d927179e361484bd622e8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 8 Oct 2019 13:20:19 -0500
Subject: [PATCH 0901/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7bc888093..afc4af758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.79.1-SNAPSHOT</version>
+	<version>2.79.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From fd9078ec8026a8c230dea96551d1d15559b3b5ad Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Mon, 14 Oct 2019 22:44:45 +0200
Subject: [PATCH 0902/1208] LogMessage: Do not print null message

* Prevent printing of log message if message is null
---
 src/main/java/org/scijava/log/LogMessage.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 6eee6e8cf..dadf6b395 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -132,7 +132,7 @@ public String toString() {
 		final StringWriter sw = new StringWriter();
 		final PrintWriter printer = new PrintWriter(sw);
 		printer.print("[" + LogLevel.prefix(level()) + "] ");
-		printer.println(text());
+		if(text() != null) printer.println(text());
 		if (throwable() != null) {
 			throwable().printStackTrace(printer);
 		}

From c2bfbe647009dc52bd3fba9068a04a2066682b42 Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Mon, 14 Oct 2019 23:16:42 +0200
Subject: [PATCH 0903/1208] Gateway: implements Disposable

* make Gateway implement Disposable
* delegate dispose to context by default
---
 src/main/java/org/scijava/Gateway.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 37a5b6403..9e06d2398 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -120,7 +120,7 @@
  * @author Mark Hiner
  * @author Curtis Rueden
  */
-public interface Gateway extends RichPlugin {
+public interface Gateway extends RichPlugin, Disposable {
 
 	/**
 	 * Perform launch operations associated with this gateway.
@@ -372,4 +372,8 @@ public interface Gateway extends RichPlugin {
 	/** @see org.scijava.app.App#getInfo(boolean) */
 	String getInfo(boolean mem);
 
+	@Override
+	default void dispose() {
+		context().dispose();
+	}
 }

From a07d014a4701d23f354afc08c97793185e0054a6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 21 Oct 2019 11:03:07 -0500
Subject: [PATCH 0904/1208] ThreadService: use lambdas

---
 .../scijava/thread/DefaultThreadService.java  | 49 +++++++------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 34dac1f10..e24ac8e40 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -190,14 +190,9 @@ private synchronized ExecutorService executor(final String id) {
 		if (disposed) return null;
 		if (queues == null) queues = new HashMap<>();
 		if (!queues.containsKey(id)) {
-			final ThreadFactory factory = new ThreadFactory() {
-
-				@Override
-				public Thread newThread(final Runnable r) {
-					final String threadName = contextThreadPrefix() + id;
-					return new Thread(r, threadName);
-				}
-
+			final ThreadFactory factory = r -> {
+				final String threadName = contextThreadPrefix() + id;
+				return new Thread(r, threadName);
 			};
 			final ExecutorService queue = Executors.newSingleThreadExecutor(factory);
 			queues.put(id, queue);
@@ -212,34 +207,28 @@ private synchronized void initExecutor() {
 
 	private Runnable wrap(final Runnable r) {
 		final Thread parent = Thread.currentThread();
-		return new Runnable() {
-			@Override
-			public void run() {
-				final Thread thread = Thread.currentThread();
-				try {
-					if (parent != thread) parents.put(thread, parent);
-					r.run();
-				}
-				finally {
-					if (parent != thread) parents.remove(thread);
-				}
+		return () -> {
+			final Thread thread = Thread.currentThread();
+			try {
+				if (parent != thread) parents.put(thread, parent);
+				r.run();
+			}
+			finally {
+				if (parent != thread) parents.remove(thread);
 			}
 		};
 	}
 
 	private <V> Callable<V> wrap(final Callable<V> c) {
 		final Thread parent = Thread.currentThread();
-		return new Callable<V>() {
-			@Override
-			public V call() throws Exception {
-				final Thread thread = Thread.currentThread();
-				try {
-					if (parent != thread) parents.put(thread, parent);
-					return c.call();
-				}
-				finally {
-					if (parent != thread) parents.remove(thread);
-				}
+		return () -> {
+			final Thread thread = Thread.currentThread();
+			try {
+				if (parent != thread) parents.put(thread, parent);
+				return c.call();
+			}
+			finally {
+				if (parent != thread) parents.remove(thread);
 			}
 		};
 	}

From 9fcb52c5abdd07ea9a760f9e5ad652bc3d9c3521 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 22 Oct 2019 19:46:21 -0500
Subject: [PATCH 0905/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index afc4af758..0a1b16e63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.79.2-SNAPSHOT</version>
+	<version>2.80.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 00a3cf7b8ffaf5f844fbb77dfe99925113ef9f6c Mon Sep 17 00:00:00 2001
From: Dasong Gao <dgao24@wisc.edu>
Date: Fri, 1 Nov 2019 13:58:15 -0500
Subject: [PATCH 0906/1208] Be defensive checking menu path

---
 src/main/java/org/scijava/menu/ShadowMenu.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 4a067692e..f2ca6f04b 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -493,7 +493,7 @@ public <T> T[] toArray(final T[] a) {
 	// -- Helper methods --
 
 	private ShadowMenu addInternal(final ModuleInfo o) {
-		if (o.getMenuPath().isEmpty()) return null; // no menu
+		if (o.getMenuPath() == null || o.getMenuPath().isEmpty()) return null; // no menu
 		return addChild(o, 0);
 	}
 

From 089606b2f20f003e4fa22eeff573edb3ddbeaa1b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Nov 2019 14:30:31 -0500
Subject: [PATCH 0907/1208] Fix duplicate moduleService parameter

See:
https://forum.image.sc/t/error-with-search-options-dialog/30948
---
 src/main/java/org/scijava/command/DynamicCommand.java | 2 +-
 src/main/java/org/scijava/options/OptionsPlugin.java  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index 4e1bc5531..a8bf63220 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -66,7 +66,7 @@ public abstract class DynamicCommand extends DefaultMutableModule implements
 	private PluginService pluginService;
 
 	@Parameter
-	private ModuleService moduleService;
+	protected ModuleService moduleService;
 
 	private DynamicCommandInfo info;
 
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 6d9c75825..ceeb6f0f2 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -35,7 +35,6 @@
 import org.scijava.command.DynamicCommand;
 import org.scijava.event.EventService;
 import org.scijava.module.ModuleItem;
-import org.scijava.module.ModuleService;
 import org.scijava.options.event.OptionsEvent;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.SingletonPlugin;
@@ -84,9 +83,6 @@ public abstract class OptionsPlugin extends DynamicCommand implements
 	@Parameter
 	private PrefService prefService;
 
-	@Parameter
-	private ModuleService moduleService;
-
 	// -- OptionsPlugin methods --
 
 	/** Loads option values from persistent storage. */

From f7eea88e16aa92fd18484b7c357e255144316092 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 1 Nov 2019 14:34:08 -0500
Subject: [PATCH 0908/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0a1b16e63..bdc512316 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.80.1-SNAPSHOT</version>
+	<version>2.80.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 31d0d727f89e8645217c0cab68e4a15e4e462415 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Thu, 7 Nov 2019 16:43:25 +0100
Subject: [PATCH 0909/1208] Add abstract delegate converter class

---
 .../convert/AbstractDelegateConverter.java    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/main/java/org/scijava/convert/AbstractDelegateConverter.java

diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
new file mode 100644
index 000000000..11c6e3173
--- /dev/null
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -0,0 +1,29 @@
+
+package org.scijava.convert;
+
+import org.scijava.plugin.Parameter;
+
+/**
+ * Abstract superclass for {@link Converter} plugins that delegate to other
+ * converters to chain two conversion steps together.
+ * 
+ * @author Jan Eglinger
+ * @param <I> the input type
+ * @param <D> the delegate type
+ * @param <O> the output type
+ */
+public abstract class AbstractDelegateConverter<I, D, O> extends
+	AbstractConverter<I, O>
+{
+
+	@Parameter
+	private ConvertService convertService;
+
+	@Override
+	public <T> T convert(Object src, Class<T> dest) {
+		D delegate = convertService.convert(src, getDelegateType());
+		return convertService.convert(delegate, dest);
+	}
+
+	protected abstract Class<D> getDelegateType();
+}

From d0268f91efd9386cd18cca7c5f8f542c63cf1c17 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Thu, 7 Nov 2019 17:11:57 +0100
Subject: [PATCH 0910/1208] Add test for AbstractDelegateConverter

---
 .../convert/DelegateConverterTest.java        | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 src/test/java/org/scijava/convert/DelegateConverterTest.java

diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
new file mode 100644
index 000000000..6126750c0
--- /dev/null
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -0,0 +1,118 @@
+package org.scijava.convert;
+
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.plugin.Plugin;
+
+
+public class DelegateConverterTest {
+	private Context context;
+
+	@Before
+	public void setUp() {
+		context = new Context();
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+		context = null;
+	}
+
+	@Test
+	public void testDelegateConverters() {
+		ConvertService convertService = context.getService(ConvertService.class);
+		
+		// Test conversion from AType to BType
+		AType a = new AType();
+		assertTrue(convertService.supports(a, BType.class));
+		BType b = convertService.convert(a, BType.class);
+		assertSame(BType.class, b.getClass());
+		
+		// Test conversion from BType to CType
+		assertTrue(convertService.supports(b, CType.class));
+		CType c = convertService.convert(b, CType.class);
+		assertSame(CType.class, c.getClass());
+
+		// Test chained conversion
+		assertTrue(convertService.supports(a, CType.class));
+		CType converted = convertService.convert(a, CType.class);
+		assertSame(c.getClass(), converted.getClass());
+	}
+
+	public static class AType {
+		// empty class
+	}
+
+	public static class BType {
+		// empty class
+	}
+
+	public static class CType {
+		// empty class
+	}
+
+	@Plugin(type=Converter.class)
+	public static class ABConverter extends AbstractConverter<AType, BType> {
+
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T convert(Object src, Class<T> dest) {
+			return (T) new BType();
+		}
+
+		@Override
+		public Class<BType> getOutputType() {
+			return BType.class;
+		}
+
+		@Override
+		public Class<AType> getInputType() {
+			return AType.class;
+		}		
+	}
+
+	@Plugin(type=Converter.class)
+	public static class BCConverter extends AbstractConverter<BType, CType> {
+
+		@SuppressWarnings("unchecked")
+		@Override
+		public <T> T convert(Object src, Class<T> dest) {
+			return (T) new CType();
+		}
+
+		@Override
+		public Class<CType> getOutputType() {
+			return CType.class;
+		}
+
+		@Override
+		public Class<BType> getInputType() {
+			return BType.class;
+		}		
+	}
+
+	@Plugin(type=Converter.class)
+	public static class DelegateConverter extends AbstractDelegateConverter<AType, BType, CType> {
+
+		@Override
+		public Class<CType> getOutputType() {
+			return CType.class;
+		}
+
+		@Override
+		public Class<AType> getInputType() {
+			return AType.class;
+		}
+
+		@Override
+		protected Class<BType> getDelegateType() {
+			return BType.class;
+		}
+	}
+}

From cbd0ec558f52ac3726b63d3d749eb415b4ef5301 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 09:45:42 -0600
Subject: [PATCH 0911/1208] ServiceHelper: assign PluginInfo to Services

Normally, plugin are instantiated using PluginInfo#createInstance(),
which injects the matching PluginInfo metadata for plugins implementing
HasPluginInfo, and assigns the expected priority for plugins
implementing Prioritized.

But Service creation is special, because we want to instantiate Service
dependencies recursively -- which makes the ServiceHelper more complex.

The ServiceHelper code was injecting priority via service.setPriority,
but not injecting plugin metadata via service.setInfo. Now it does both.
---
 .../java/org/scijava/service/ServiceHelper.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 22e9503a7..728e07e5a 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -65,7 +65,7 @@ public class ServiceHelper extends AbstractContextual {
 	 * Classes to scan when searching for dependencies. Data structure is a map
 	 * with keys being relevant classes, and values being associated priorities.
 	 */
-	private final Map<Class<? extends Service>, Double> classPoolMap;
+	private final Map<Class<? extends Service>, PluginInfo<?>> classPoolMap;
 
 	/** Classes to scan when searching for dependencies, sorted by priority. */
 	private final List<Class<? extends Service>> classPoolList;
@@ -303,9 +303,10 @@ private <S extends Service> S createServiceRecursively(final Class<S> c)
 		final S service = c.newInstance();
 		service.setContext(getContext());
 
-		// propagate priority if known
-		final Double priority = classPoolMap.get(c);
-		if (priority != null) service.setPriority(priority);
+		// propagate plugin metadata and priority if known
+		final PluginInfo<?> info = classPoolMap.get(c);
+		service.setInfo(info);
+		if (info != null) service.setPriority(info.getPriority());
 
 		// NB: If there are any @EventHandler annotated methods, we treat the
 		// EventService as a required dependency, _unless_ there is also an
@@ -358,7 +359,7 @@ private <S extends Service> S createServiceRecursively(final Class<S> c)
 
 	/** Asks the plugin index for all available service implementations. */
 	private void findServiceClasses(
-		final Map<Class<? extends Service>, Double> serviceMap,
+		final Map<Class<? extends Service>, PluginInfo<?>> serviceMap,
 		final List<Class<? extends Service>> serviceList)
 	{
 		// ask the plugin index for the (sorted) list of available services
@@ -368,8 +369,7 @@ private void findServiceClasses(
 		for (final PluginInfo<Service> info : services) {
 			try {
 				final Class<? extends Service> c = info.loadClass();
-				final double priority = info.getPriority();
-				serviceMap.put(c, priority);
+				serviceMap.put(c, info);
 				serviceList.add(c);
 			}
 			catch (final Throwable e) {

From ed9f724489c3bfdccac4b0a7dcabc15578d8bdd2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 09:58:32 -0600
Subject: [PATCH 0912/1208] Gateway: default to plugin name for getShortName()

And name the SciJava gateway "sj" and stop overriding getShortName().
---
 src/main/java/org/scijava/AbstractGateway.java |  2 ++
 src/main/java/org/scijava/SciJava.java         | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 4f8362194..9edfd6edc 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -114,6 +114,8 @@ public void launch(final String... args) {
 
 	@Override
 	public String getShortName() {
+		final String pluginName = getInfo() == null ? null : getInfo().getName();
+		if (pluginName != null && !pluginName.isEmpty()) return pluginName;
 		return getClass().getSimpleName().toLowerCase();
 	}
 
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index ebf387171..befdc46d3 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -45,7 +45,7 @@
  * 
  * @author Curtis Rueden
  */
-@Plugin(type = Gateway.class)
+@Plugin(type = Gateway.class, name = "sj")
 public class SciJava extends AbstractGateway {
 
 	// -- Constructors --
@@ -113,12 +113,4 @@ public SciJava(final Collection<Class<? extends Service>> serviceClasses) {
 	public SciJava(final Context context) {
 		super(SciJavaApp.NAME, context);
 	}
-
-	// -- Gateway methods --
-
-	@Override
-	public String getShortName() {
-		return "sj";
-	}
-
 }

From 3f0db7838b3d705b45ef07596aafead4e2a31378 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 11:36:01 -0600
Subject: [PATCH 0913/1208] PluginInfo: remove unused import

---
 src/main/java/org/scijava/plugin/PluginInfo.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 420323dbf..69c41849f 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -45,7 +45,6 @@
 import org.scijava.UIDetails;
 import org.scijava.Versioned;
 import org.scijava.input.Accelerator;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.StringMaker;
 import org.scijava.util.Types;
 import org.scijava.util.VersionUtils;

From f31a468bc3c17cf133ce1545fbe1b4da872facfb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 11:38:18 -0600
Subject: [PATCH 0914/1208] PluginInfo: add utility methods to get PluginInfos

---
 .../java/org/scijava/plugin/PluginInfo.java   | 158 ++++++++++++++++++
 .../org/scijava/plugin/PluginInfoTest.java    |  90 +++++++++-
 2 files changed, 245 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 69c41849f..259e1a2a3 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -33,6 +33,8 @@
 package org.scijava.plugin;
 
 import java.net.URL;
+import java.util.Collection;
+import java.util.Optional;
 
 import org.scijava.AbstractUIDetails;
 import org.scijava.Identifiable;
@@ -351,6 +353,143 @@ public String getVersion() {
 		}
 	}
 
+	// -- Utility methods --
+
+	/**
+	 * Finds a {@link PluginInfo} of the given plugin class in the specified
+	 * {@link PluginIndex}. <em>Note that to avoid loading plugin classes, class
+	 * identity is determined by class name equality only.</em>
+	 * 
+	 * @param pluginClass The concrete class of the plugin whose
+	 *          {@link PluginInfo} is desired.
+	 * @param pluginIndex The {@link PluginIndex} to search for a matching
+	 *          {@link PluginInfo}.
+	 * @return The matching {@link PluginInfo}, or null if none found.
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static <P extends SciJavaPlugin> PluginInfo<?> get(
+		final Class<P> pluginClass, final PluginIndex pluginIndex)
+	{
+		return get(pluginClass, (Collection) pluginIndex.getAll());
+	}
+
+	/**
+	 * Finds a {@link PluginInfo} of the given plugin class and plugin type in the
+	 * specified {@link PluginIndex}. <em>Note that to avoid loading plugin
+	 * classes, class identity is determined by class name equality only.</em>
+	 * 
+	 * @param pluginClass The concrete class of the plugin whose
+	 *          {@link PluginInfo} is desired.
+	 * @param pluginType The type of the plugin; see {@link #getPluginType()}.
+	 * @param pluginIndex The {@link PluginIndex} to search for a matching
+	 *          {@link PluginInfo}.
+	 * @return The matching {@link PluginInfo}, or null if none found.
+	 */
+	public static <P extends PT, PT extends SciJavaPlugin> PluginInfo<PT> get(
+		final Class<P> pluginClass, final Class<PT> pluginType,
+		final PluginIndex pluginIndex)
+	{
+		return get(pluginClass, pluginIndex.getPlugins(pluginType));
+	}
+
+	/**
+	 * Finds a {@link PluginInfo} of the given plugin class in the specified list
+	 * of plugins. <em>Note that to avoid loading plugin classes, class identity
+	 * is determined by class name equality only.</em>
+	 * 
+	 * @param pluginClass The concrete class of the plugin whose
+	 *          {@link PluginInfo} is desired.
+	 * @param plugins The list of plugins to search for a match.
+	 * @return The matching {@link PluginInfo}, or null if none found.
+	 */
+	public static <P extends PT, PT extends SciJavaPlugin> PluginInfo<PT> get(
+		final Class<P> pluginClass,
+		final Collection<? extends PluginInfo<PT>> plugins)
+	{
+		final String className = pluginClass.getName();
+		final Optional<? extends PluginInfo<PT>> result = plugins.stream() //
+			.filter(info -> info.getClassName().equals(className)) //
+			.findFirst();
+		return result.isPresent() ? result.get() : null;
+	}
+
+	/**
+	 * Creates a {@link PluginInfo} for the given plugin class. The class must be
+	 * a concrete class annotated with the @{@link Plugin} annotation, from which
+	 * the plugin type will be inferred.
+	 * 
+	 * @param pluginClass The concrete class of the plugin for which a new
+	 *          {@link PluginInfo} is desired.
+	 * @return A newly created {@link PluginInfo} for the given plugin class.
+	 * @throws IllegalArgumentException if the given class is not annotated
+	 *           with @{@link Plugin}, or its annotated {@link Plugin#type()
+	 *           type()} is not a supertype of the plugin class.
+	 */
+	public static PluginInfo<?> create(
+		final Class<? extends SciJavaPlugin> pluginClass)
+	{
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		final PluginInfo<?> info = new PluginInfo(pluginClass, //
+			pluginType(pluginClass));
+		return info;
+	}
+
+	/**
+	 * Creates a {@link PluginInfo} for the given plugin class of the specified
+	 * plugin type.
+	 * 
+	 * @param pluginClass The concrete class of the plugin for which a new
+	 *          {@link PluginInfo} is desired.
+	 * @param pluginType The type of the plugin; see {@link #getPluginType()}.
+	 * @return A newly created {@link PluginInfo} for the given plugin class.
+	 */
+	public static <P extends PT, PT extends SciJavaPlugin> PluginInfo<PT> create(
+		final Class<P> pluginClass, final Class<PT> pluginType)
+	{
+		return new PluginInfo<>(pluginClass, pluginType);
+	}
+
+	/**
+	 * Obtains a {@link PluginInfo} for the given plugin class. If one already
+	 * exists in the specified {@link PluginIndex}, it is retrieved (see
+	 * {@link #get(Class, PluginIndex)}); otherwise, a new one is created (see
+	 * {@link #create(Class)}) but not added to the index.
+	 * 
+	 * @param pluginClass The concrete class of the plugin whose
+	 *          {@link PluginInfo} is desired.
+	 * @param pluginIndex The {@link PluginIndex} to search for a matching
+	 *          {@link PluginInfo}.
+	 * @throws IllegalArgumentException when creating a new {@link PluginInfo} if
+	 *           the associated plugin type cannot be inferred; see
+	 *           {@link #create(Class)}.
+	 */
+	public static <P extends SciJavaPlugin> PluginInfo<?> getOrCreate(
+		final Class<P> pluginClass, final PluginIndex pluginIndex)
+	{
+		final PluginInfo<?> existing = get(pluginClass, pluginIndex);
+		return existing == null ? create(pluginClass) : existing;
+	}
+
+	/**
+	 * Obtains a {@link PluginInfo} for the given plugin class. If one already
+	 * exists in the specified {@link PluginIndex}, it is retrieved (see
+	 * {@link #get(Class, PluginIndex)}); otherwise, a new one is created (see
+	 * {@link #create(Class)}) but not added to the index.
+	 * 
+	 * @param pluginClass The concrete class of the plugin whose
+	 *          {@link PluginInfo} is desired.
+	 * @param pluginType The type of the plugin; see {@link #getPluginType()}.
+	 * @param pluginIndex The {@link PluginIndex} to search for a matching
+	 *          {@link PluginInfo}.
+	 */
+	public static <P extends PT, PT extends SciJavaPlugin> PluginInfo<PT>
+		getOrCreate(final Class<P> pluginClass, final Class<PT> pluginType,
+			final PluginIndex pluginIndex)
+	{
+		final PluginInfo<PT> existing = get(pluginClass, pluginType, pluginIndex);
+		return existing == null ? create(pluginClass, pluginType) : existing;
+	}
+
 	// -- Helper methods --
 
 	/** Populates the entry to match the associated @{@link Plugin} annotation. */
@@ -412,4 +551,23 @@ private MenuPath parseMenuPath(final Menu[] menu) {
 		return menuPath;
 	}
 
+	/** Extracts the plugin type from a class's @{@link Plugin} annotation. */
+	private static <P extends SciJavaPlugin> Class<? super P> pluginType(
+		final Class<P> pluginClass)
+	{
+		final Plugin annotation = pluginClass.getAnnotation(Plugin.class);
+		if (annotation == null) {
+			throw new IllegalArgumentException(
+				"Cannot infer plugin type from class '" + pluginClass.getName() +
+					"' with no @Plugin annotation.");
+		}
+		final Class<?> type = annotation.type();
+		if (!type.isAssignableFrom(pluginClass)) {
+			throw new IllegalArgumentException("Invalid plugin type '" + //
+				type.getName() + "' for class '" + pluginClass.getName() + "'");
+		}
+		@SuppressWarnings("unchecked")
+		final Class<? super P> pluginType = (Class<? super P>) type;
+		return pluginType;
+	}
 }
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 20c0b5ebb..ae504aec7 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -33,10 +33,16 @@
 package org.scijava.plugin;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
 import java.util.List;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.InstantiableException;
@@ -49,11 +55,24 @@
  */
 public class PluginInfoTest {
 
+	private Context context;
+	private PluginIndex pluginIndex;
+
+	@Before
+	public void setUp() {
+		context = new Context(true);
+		pluginIndex = context.getPluginIndex();
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+		context = null;
+		pluginIndex = null;
+	}
+
 	@Test
 	public void testNames() throws InstantiableException {
-		final Context context = new Context(true);
-		final PluginIndex pluginIndex = context.getPluginIndex();
-
 		final List<PluginInfo<?>> infos = pluginIndex.get(IceCream.class);
 		assertEquals(3, infos.size());
 
@@ -62,9 +81,74 @@ public void testNames() throws InstantiableException {
 		assertPlugin(Flavorless.class, IceCream.class, "", infos.get(2));
 	}
 
+	@Test
+	public void testGet() throws InstantiableException {
+		final PluginInfo<?> chocolateInfo = //
+			PluginInfo.get(Chocolate.class, pluginIndex);
+		assertPlugin(Chocolate.class, IceCream.class, "chocolate", chocolateInfo);
+
+		final PluginInfo<IceCream> chocolateInfoWithType = //
+			PluginInfo.get(Chocolate.class, IceCream.class, pluginIndex);
+		assertSame(chocolateInfo, chocolateInfoWithType);
+
+		class Sherbet implements IceCream {}
+		assertNull(PluginInfo.get(Sherbet.class, pluginIndex));
+	}
+
+	@Test
+	public void testCreate() throws InstantiableException {
+		final PluginInfo<?> chocolateInfo = PluginInfo.create(Chocolate.class);
+		assertPlugin(Chocolate.class, IceCream.class, "chocolate", chocolateInfo);
+
+		final PluginInfo<IceCream> chocolateInfoWithType = //
+			PluginInfo.create(Chocolate.class, IceCream.class);
+		assertPlugin(Chocolate.class, IceCream.class, "chocolate",
+			chocolateInfoWithType);
+		assertNotSame(chocolateInfo, chocolateInfoWithType);
+
+		class Sherbet implements IceCream {}
+		final PluginInfo<IceCream> sherbetInfoWithType = //
+			PluginInfo.create(Sherbet.class, IceCream.class);
+		assertPlugin(Sherbet.class, IceCream.class, null, sherbetInfoWithType);
+
+		try {
+			final PluginInfo<?> result = PluginInfo.create(Sherbet.class);
+			fail("Expected IllegalArgumentException but got: " + result);
+		}
+		catch (final IllegalArgumentException exc) {
+			// NB: Expected.
+		}
+	}
+
+	@Test
+	public void testGetOrCreate() throws InstantiableException {
+		final PluginInfo<?> chocolateInfo = //
+			PluginInfo.getOrCreate(Chocolate.class, pluginIndex);
+		assertPlugin(Chocolate.class, IceCream.class, "chocolate", chocolateInfo);
+
+		final PluginInfo<IceCream> chocolateInfoWithType = //
+			PluginInfo.getOrCreate(Chocolate.class, IceCream.class, pluginIndex);
+		assertSame(chocolateInfo, chocolateInfoWithType);
+
+		class Sherbet implements IceCream {}
+		final PluginInfo<IceCream> sherbetInfoWithType = //
+			PluginInfo.getOrCreate(Sherbet.class, IceCream.class, pluginIndex);
+		assertPlugin(Sherbet.class, IceCream.class, null, sherbetInfoWithType);
+
+		try {
+			final PluginInfo<?> result = //
+				PluginInfo.getOrCreate(Sherbet.class, pluginIndex);
+			fail("Expected IllegalArgumentException but got: " + result);
+		}
+		catch (final IllegalArgumentException exc) {
+			// NB: Expected.
+		}
+	}
+
 	private void assertPlugin(Class<?> pluginClass, Class<?> pluginType,
 		String name, PluginInfo<?> info) throws InstantiableException
 	{
+		assertNotNull(info);
 		assertSame(pluginClass, info.loadClass());
 		assertSame(pluginType, info.getPluginType());
 		assertEquals(name, info.getName());

From f44d764605850b2eb6bdba466072ba438e518896 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 11:44:13 -0600
Subject: [PATCH 0915/1208] Gateway: make an effort to inject plugin metadata

People like to create gateways by calling the constructors directly.
Let's make sure that when they are created in this fashion, methods
of RichPlugin like getInfo() and getPriority() still work correctly.
---
 src/main/java/org/scijava/AbstractGateway.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 9edfd6edc..4a4e89332 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -54,6 +54,7 @@
 import org.scijava.platform.AppEventService;
 import org.scijava.platform.PlatformService;
 import org.scijava.plugin.AbstractRichPlugin;
+import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
 import org.scijava.prefs.PrefService;
 import org.scijava.script.ScriptService;
@@ -86,7 +87,15 @@ public AbstractGateway() {
 
 	public AbstractGateway(final String appName, final Context context) {
 		this.appName = appName;
-		if (context != null) setContext(context);
+		if (context != null) {
+			setContext(context);
+
+			// NB: Make a best effort to inject plugin metadata.
+			final PluginInfo<?> info = PluginInfo.getOrCreate(getClass(),
+				Gateway.class, context.getPluginIndex());
+			info.inject(this);
+			Priority.inject(this, info.getPriority());
+		}
 	}
 
 	// -- Gateway methods --

From 8e3b4018c2eea42637feeedcd98cd366c480c7de Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 12:09:19 -0600
Subject: [PATCH 0916/1208] Add some simple tests for the SciJava gateway

These tests fail before the previous commit's improvements.
---
 src/test/java/org/scijava/SciJavaTest.java | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 src/test/java/org/scijava/SciJavaTest.java

diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
new file mode 100644
index 000000000..b8b91ecf8
--- /dev/null
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -0,0 +1,68 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+import org.scijava.plugin.PluginInfo;
+
+/**
+ * Tests {@link SciJava}.
+ * 
+ * @author Curtis Rueden
+ */
+public class SciJavaTest {
+
+	@Test
+	public void testInfo() {
+		final SciJava sj = new SciJava();
+
+		final PluginInfo<?> infoFromObject = sj.getInfo();
+		final PluginInfo<?> infoFromServiceNoType = //
+			sj.plugin().getPlugin(SciJava.class);
+		final PluginInfo<Gateway> infoFromServiceWithType = //
+			sj.plugin().getPlugin(SciJava.class, Gateway.class);
+		assertSame(infoFromServiceNoType, infoFromObject);
+		assertSame(infoFromServiceWithType, infoFromObject);
+
+		assertNotNull(infoFromObject);
+		assertSame(Gateway.class, infoFromObject.getPluginType());
+
+		assertEquals(Priority.NORMAL, sj.getPriority(), 0);
+
+		sj.dispose();
+	}
+}

From e1d4caae4007cba9a9186a6390e7e36696a45187 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 09:52:14 -0600
Subject: [PATCH 0917/1208] ScriptREPL: use service name from @Plugin metadata

And fall back to the old behavior of synthesizing a name from the
class name when no name is specified in the @Plugin annotation.

Related discussion at:
https://gitter.im/scijava/scijava-common?at=5dcc215f92a84f79fe5da435

This commit is dedicated to Kyle Harrington.
---
 src/main/java/org/scijava/script/ScriptREPL.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 71dc6eea0..d28558f8b 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -386,6 +386,11 @@ private List<Gateway> gateways() {
 	}
 
 	private String serviceName(final Service service) {
+		final PluginInfo<?> info = service.getInfo();
+		final String pluginName = info == null ? null : info.getName();
+		// Name was explicitly given in the @Plugin annotation.
+		if (pluginName != null && !pluginName.isEmpty()) return pluginName;
+		// No name was given; synthesize one from the class name.
 		final String serviceName = service.getClass().getSimpleName();
 		final String shortName = lowerCamelCase(
 			serviceName.replaceAll("^(Default)?(.*)Service$", "$2"));

From 466d0aa8affcd666a6c342b7faa7cad66ac22f86 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 13 Nov 2019 15:05:54 -0600
Subject: [PATCH 0918/1208] POM: bump to next minor version

There is new API: org.scijava.convert.AbstractDelegateConverter.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bdc512316..f3a87fac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.80.2-SNAPSHOT</version>
+	<version>2.81.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 4235519a1e6cfe2f8521bebd3b7d66ab676bf116 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 14 Nov 2019 14:19:34 -0600
Subject: [PATCH 0919/1208] GatewayPreprocessor: use try/multi-catch

---
 .../module/process/GatewayPreprocessor.java   | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 59c3169cb..a581f91ca 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -87,22 +87,10 @@ private <G extends Gateway> void setGatewayValue(final Context context,
 		try {
 			gateway = type.getConstructor(Context.class).newInstance(context);
 		}
-		catch (final IllegalArgumentException exc) {
-			exception = exc;
-		}
-		catch (final SecurityException exc) {
-			exception = exc;
-		}
-		catch (final InstantiationException exc) {
-			exception = exc;
-		}
-		catch (final IllegalAccessException exc) {
-			exception = exc;
-		}
-		catch (final InvocationTargetException exc) {
-			exception = exc;
-		}
-		catch (final NoSuchMethodException exc) {
+		catch (final IllegalArgumentException | SecurityException
+				| InstantiationException | IllegalAccessException
+				| InvocationTargetException | NoSuchMethodException exc)
+		{
 			exception = exc;
 		}
 		if (exception != null) {

From 7756d049a1b89ee8e335b7c8b6c6e44bb95c12f5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 14 Nov 2019 14:20:15 -0600
Subject: [PATCH 0920/1208] Fix some instances of bogus parameter filling

* If an input has been resolved already, do not overwrite.
* If the input type is super general -- e.g. an Object when the
  preprocessor fills in Context or UserInterface -- do not fill.
---
 src/main/java/org/scijava/module/DefaultModuleService.java | 3 +--
 .../org/scijava/module/process/GatewayPreprocessor.java    | 3 ++-
 .../org/scijava/module/process/ServicePreprocessor.java    | 7 +++++--
 src/main/java/org/scijava/ui/UIPreprocessor.java           | 7 +++++--
 src/test/java/org/scijava/script/ScriptServiceTest.java    | 1 -
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 6aaa731b2..ea20a6ffa 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -497,9 +497,8 @@ private ModuleItem<?> getSingleItem(final Module module,
 
 		for (final ModuleItem<?> item : items) {
 			final String name = item.getName();
-			final boolean resolved = module.isInputResolved(name);
-			if (resolved) continue; // skip resolved inputs
 			if (!item.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(name)) continue; // skip resolved inputs
 			final Class<?> itemType = item.getType();
 			for (final Class<?> type : types) {
 				if (type.isAssignableFrom(itemType)) {
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index a581f91ca..a2f751546 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -64,7 +64,8 @@ public class GatewayPreprocessor extends AbstractPreprocessorPlugin {
 	@Override
 	public void process(final Module module) {
 		for (final ModuleItem<?> input : module.getInfo().inputs()) {
-			if (!input.isAutoFill()) continue; // cannot auto-fill this input
+			if (!input.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(input.getName())) continue; // skip resolved inputs
 			final Class<?> type = input.getType();
 			if (Gateway.class.isAssignableFrom(type)) {
 				// input is a gateway
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 8993cdd46..287c2159f 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -70,7 +70,8 @@ public class ServicePreprocessor extends AbstractPreprocessorPlugin {
 	@Override
 	public void process(final Module module) {
 		for (final ModuleItem<?> input : module.getInfo().inputs()) {
-			if (!input.isAutoFill()) continue; // cannot auto-fill this input
+			if (!input.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(input.getName())) continue; // skip resolved inputs
 			final Class<?> type = input.getType();
 			if (Service.class.isAssignableFrom(type)) {
 				// input is a service
@@ -79,7 +80,9 @@ public void process(final Module module) {
 					(ModuleItem<? extends Service>) input;
 				setServiceValue(getContext(), module, serviceInput);
 			}
-			if (type.isAssignableFrom(getContext().getClass())) {
+			if (Context.class.isAssignableFrom(type) && //
+				type.isAssignableFrom(getContext().getClass()))
+			{
 				// input is a compatible context
 				final String name = input.getName();
 				module.setInput(name, getContext());
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index b55dffbb2..c1e11ccab 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -62,9 +62,12 @@ public void process(final Module module) {
 		if (ui == null) return; // no default UI
 
 		for (final ModuleItem<?> input : module.getInfo().inputs()) {
-			if (!input.isAutoFill()) continue; // cannot auto-fill this input
+			if (!input.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(input.getName())) continue; // skip resolved inputs
 			final Class<?> type = input.getType();
-			if (type.isAssignableFrom(ui.getClass())) {
+			if (UserInterface.class.isAssignableFrom(type) && //
+				type.isAssignableFrom(ui.getClass()))
+			{
 				// input is a compatible UI
 				final String name = input.getName();
 				module.setInput(name, ui);
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index 01782d057..642767104 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -129,5 +129,4 @@ public void testArrayAliases() throws ScriptException {
 
 		ctx.dispose();
 	}
-
 }

From 3f13d99ed847f98e902d3fdbf0ca26b26391f16c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Dec 2019 14:29:13 +0100
Subject: [PATCH 0921/1208] UIService: quit more gracefully

If the UIService never initialized, and then an AppQuitEvent fires,
there is no need to proactively discover the UIs and save their
locations, since clearly nothing changed with the UI.
---
 src/main/java/org/scijava/ui/DefaultUIService.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 49368efc8..1640b3206 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -436,7 +436,10 @@ public void run() {
 	}
 
 	@EventHandler
-	protected void onEvent(@SuppressWarnings("unused") final AppQuitEvent event) {
+	protected synchronized void onEvent(
+		@SuppressWarnings("unused") final AppQuitEvent event)
+	{
+		if (!initialized) return;
 		for (final UserInterface ui : getVisibleUIs()) {
 			ui.saveLocation();
 		}

From 1f93f6449baeea7f11b474369277e6d1703e72b6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Dec 2019 15:05:47 +0100
Subject: [PATCH 0922/1208] PluginService: be less verbose if injection fails

If a plugin depends on an unavailable service, the context injection
will fail. When a plugin fails to instantiate for whatever reason, we
don't need to see the whole huge stack trace, normally. Let's reserve
that for when debug mode is enabled. But still log the failure.
---
 src/main/java/org/scijava/plugin/DefaultPluginService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index dc61d9ab7..45fcdf656 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -239,7 +239,9 @@ public <PT extends SciJavaPlugin> List<PT> createInstances(
 			return p;
 		}
 		catch (final Throwable t) {
-			log.error("Cannot create plugin: " + info, t);
+			final String errorMessage = "Cannot create plugin: " + info;
+			if (log.isDebug()) log.debug(errorMessage, t);
+			else log.error(errorMessage);
 		}
 		return null;
 	}

From 9de270cc0bac352fab4246a62fa2dd57cbb1bc54 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Dec 2019 15:19:26 +0100
Subject: [PATCH 0923/1208] UIService: make isVisible methods more permissive

If the requested UI does not exist in the context,
no need to throw an exception -- it's not visible. :-)

If _no_ UI exists in the context, no worries -- not visible.
---
 .../java/org/scijava/ui/DefaultUIService.java | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 1640b3206..d7d915eea 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -138,7 +138,11 @@ public void addUI(final String name, final UserInterface ui) {
 	public void showUI() {
 		if (disposed) return;
 		final UserInterface ui = getDefaultUI();
-		if (ui == null) throw noUIsAvailableException();
+		if (ui == null) {
+			throw new IllegalStateException("No UIs available. " +
+				"Please add a component containing a UIPlugin " +
+				"(e.g., scijava-ui-swing) to your class-path.");
+		}
 		showUI(ui);
 	}
 
@@ -165,17 +169,14 @@ public void showUI(final UserInterface ui) {
 	@Override
 	public boolean isVisible() {
 		final UserInterface ui = getDefaultUI();
-		if (ui == null) throw noUIsAvailableException();
+		if (ui == null) return false;
 		return ui.isVisible();
 	}
 
 	@Override
 	public boolean isVisible(final String name) {
 		final UserInterface ui = uiMap().get(name);
-		if (ui == null) {
-			throw new IllegalArgumentException("No such user interface: " + name);
-		}
-		return ui.isVisible();
+		return ui != null && ui.isVisible();
 	}
 
 	@Override
@@ -533,10 +534,4 @@ private void addUserInterface(final String name, final UserInterface ui) {
 	private String getTitle() {
 		return appService.getApp().getTitle();
 	}
-
-	private IllegalStateException noUIsAvailableException() {
-		return new IllegalStateException("No UIs available. " +
-			"Please add a component containing a UIPlugin " +
-			"(e.g., scijava-ui-swing) to your class-path.");
-	}
 }

From 952a4c843994bfeebb4038d4208f8a7985ac27ef Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 14 Dec 2019 15:10:31 +0100
Subject: [PATCH 0924/1208] Make DynamicCommand work when not in plugin index

This enables some new use cases: e.g. it becomes possible to make a
DynamicCommand anonymous subclass as a local variable in a method,
for the purpose of using it once, without registering it in the context.
---
 src/main/java/org/scijava/command/DynamicCommand.java     | 3 ++-
 src/main/java/org/scijava/command/DynamicCommandInfo.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index a8bf63220..c4601f35f 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -79,7 +79,8 @@ public abstract class DynamicCommand extends DefaultMutableModule implements
 	public DynamicCommandInfo getInfo() {
 		if (info == null) {
 			// NB: Create dynamic metadata lazily.
-			final CommandInfo commandInfo = commandService.getCommand(getClass());
+			CommandInfo commandInfo = commandService.getCommand(getClass());
+			if (commandInfo == null) commandInfo = new CommandInfo(getClass());
 			info = new DynamicCommandInfo(commandInfo, getClass());
 		}
 		return info;
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index a45f4b1ac..790f7064a 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -51,9 +51,9 @@
  * Helper class for maintaining a {@link DynamicCommand}'s associated
  * {@link ModuleInfo}.
  * <p>
- * The {@link CommandService} has a plain {@link CommandInfo} object in its
- * index, populated from the {@link DynamicCommand}'s @{@link Plugin}
- * annotation. So this class adapts that object, delegating to it for the
+ * This class wraps a plain {@link CommandInfo} object (e.g. from the
+ * {@link CommandService}'s index, present due to an @{@link Plugin} annotation
+ * on the {@link DynamicCommand} class), delegating to it for the
  * {@link UIDetails} methods. The plain {@link CommandInfo} cannot be used
  * as-is, however, because we need to override the {@link ModuleInfo} methods as
  * well as provide metadata manipulation functionality such as

From 7146669092a7436744622204b0cb49057128369b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 14 Dec 2019 15:21:03 +0100
Subject: [PATCH 0925/1208] Add convenient way to build input-only commands

The idea is to build up the inputs with code dynamically in Java, run
the command (which does nothing when executed) to exploit the module
preprocessing chain, and then harvest the final input values.

In this way, the user can be prompted for inputs dynamically from Java
code, roughly similar to the ij.gui.GenericDialog class of ImageJ 1.x.
---
 .../org/scijava/command/DynamicCommand.java   |   2 +-
 src/main/java/org/scijava/command/Inputs.java | 105 ++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/command/Inputs.java

diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index c4601f35f..ce2848139 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -63,7 +63,7 @@ public abstract class DynamicCommand extends DefaultMutableModule implements
 	private CommandService commandService;
 
 	@Parameter
-	private PluginService pluginService;
+	protected PluginService pluginService;
 
 	@Parameter
 	protected ModuleService moduleService;
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
new file mode 100644
index 000000000..f34f00aed
--- /dev/null
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -0,0 +1,105 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.command;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import org.scijava.Context;
+import org.scijava.module.process.PreprocessorPlugin;
+
+/**
+ * A way to build a dynamic set of inputs, whose values are then harvested by
+ * the preprocessing framework.
+ * <p>
+ * The {@link #run()} method of this command does nothing. If you want something
+ * custom to happen during execution, use a normal {@link Command} instead:
+ * either implement {@link Command directly}, or extend {@link ContextCommand}
+ * or {@link DynamicCommand}.
+ * </p>
+ * <p>
+ * Here is are some examples of usage:
+ * </p>
+ *
+ * <pre>
+ * {@code
+ * // Single input, no configuration.
+ * Inputs inputs = new Inputs(context);
+ * inputs.addInput("sigma", Double.class);
+ * Double sigma = (Double) inputs.harvest().get("sigma");
+ *
+ * // Two inputs, no configuration.
+ * Inputs inputs = new Inputs(context);
+ * inputs.addInput("name", String.class);
+ * inputs.addInput("age", Integer.class);
+ * Map<String, Object> values = inputs.harvest();
+ * String name = (String) values.get("name");
+ * Integer age = (Integer) values.get("age");
+ *
+ * // Inputs with configuration.
+ * Inputs inputs = new Inputs(context);
+ * MutableModuleItem<String> wordInput = inputs.addInput("word", String.class);
+ * wordInput.setLabel("Favorite word");
+ * wordInput.setChoices(Arrays.asList("quick", "brown", "fox"));
+ * wordInput.setDefaultValue("fox");
+ * MutableModuleItem<Double> opacityInput = inputs.addInput("opacity", Double.class);
+ * opacityInput.setMinimumValue(0.0);
+ * opacityInput.setMaximumValue(1.0);
+ * opacityInput.setDefaultValue(0.5);
+ * opacityInput.setWidgetStyle(NumberWidget.SCROLL_BAR_STYLE);
+ * inputs.harvest();
+ * String word = wordInput.getValue(inputs);
+ * Double opacity = opacityInput.getValue(inputs);
+ * }
+ * </pre>
+ *
+ * @author Curtis Rueden
+ */
+public final class Inputs extends DynamicCommand {
+
+	public Inputs(final Context context) {
+		context.inject(this);
+	}
+
+	public Map<String, Object> harvest() {
+		try {
+			final List<PreprocessorPlugin> pre = //
+				pluginService.createInstancesOfType(PreprocessorPlugin.class);
+			return moduleService.run(this, true, pre, null).get().getInputs();
+		}
+		catch (final InterruptedException | ExecutionException exc) {
+			throw new RuntimeException(exc);
+		}
+	}
+}

From cd67323c13678c931cb5e1e798149c45ef5b21a9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 Dec 2019 19:19:52 +0100
Subject: [PATCH 0926/1208] Encapsulate intelligent class loader access

According to the javadoc, Thread#getContextClassLoader() can return
null. In that case, we want to fall back to the system class loader.
---
 src/main/java/org/scijava/Context.java           | 16 +++++++++++++---
 .../scijava/annotations/AnnotationCombiner.java  |  5 +++--
 .../org/scijava/annotations/EclipseHelper.java   |  3 ++-
 .../org/scijava/plugin/DefaultPluginFinder.java  |  5 +++--
 src/main/java/org/scijava/util/FileUtils.java    |  4 +++-
 src/main/java/org/scijava/util/POM.java          |  4 ++--
 .../java/org/scijava/util/ServiceCombiner.java   |  5 +++--
 src/main/java/org/scijava/util/Types.java        |  6 ++++--
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index c3b928c2d..b53749e0d 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -440,6 +440,18 @@ public static List<Class<? extends Service>> serviceClassList(
 			Arrays.asList(serviceClasses) : Arrays.asList(Service.class);
 	}
 
+	/**
+	 * Gets the class loader to use. This will be the current thread's context
+	 * class loader if non-null; otherwise it will be the system class loader.
+	 * 
+	 * @see Thread#getContextClassLoader()
+	 * @see ClassLoader#getSystemClassLoader()
+	 */
+	public static ClassLoader getClassLoader() {
+		final ClassLoader contextCL = Thread.currentThread().getContextClassLoader();
+		return contextCL != null ? contextCL : ClassLoader.getSystemClassLoader();
+	}
+
 	// -- Helper methods --
 
 	private List<Field> getParameterFields(final Object o) {
@@ -530,8 +542,7 @@ private String createMissingServiceMessage(
 		final Class<? extends Service> serviceType)
 	{
 		final String nl = System.getProperty("line.separator");
-		final ClassLoader classLoader = //
-			Thread.currentThread().getContextClassLoader();
+		final ClassLoader classLoader = getClassLoader();
 		final StringBuilder msg = new StringBuilder(
 			"Required service is missing: " + serviceType.getName() + nl);
 		msg.append("Context: " + this + nl);
@@ -569,5 +580,4 @@ private static List<Class<? extends Service>> services(final boolean empty) {
 	private static boolean strict() {
 		return !"false".equals(System.getProperty(STRICT_PROPERTY));
 	}
-
 }
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 4d399d8ea..8e4ae8a34 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -43,6 +43,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.scijava.Context;
 import org.scijava.util.Combiner;
 import org.scijava.util.FileUtils;
 
@@ -65,7 +66,7 @@ public void combine(File outputDirectory) throws Exception {
 		}
 		final Set<String> annotationFiles = getAnnotationFiles();
 
-		final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+		final ClassLoader loader = Context.getClassLoader();
 
 		log("");
 		log("Writing annotations to " + outputDirectory.getAbsolutePath());
@@ -92,7 +93,7 @@ public Set<String> getAnnotationFiles() throws IOException {
 
 		for (final String prefix : new String[] { PREFIX, LEGACY_PREFIX }) {
 			final Enumeration<URL> directories =
-				Thread.currentThread().getContextClassLoader().getResources(prefix);
+				Context.getClassLoader().getResources(prefix);
 			while (directories.hasMoreElements()) {
 				final URL url = directories.nextElement();
 				for (final URL annotationIndexURL : FileUtils.listContents(url)) {
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 053103e8c..31584568a 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -43,6 +43,7 @@
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
+import org.scijava.Context;
 import org.scijava.util.FileUtils;
 
 /**
@@ -297,7 +298,7 @@ else if (file.isDirectory()) {
 	 */
 	public static void main(final String... args) {
 		System.setProperty(FORCE_ANNOTATION_INDEX_PROPERTY, "true");
-		updateAnnotationIndex(Thread.currentThread().getContextClassLoader());
+		updateAnnotationIndex(Context.getClassLoader());
 	}
 
 }
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 3081cd34e..21242fcf6 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -38,6 +38,7 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import org.scijava.Context;
 import org.scijava.annotations.Index;
 import org.scijava.annotations.IndexItem;
 
@@ -113,8 +114,8 @@ private PluginInfo<SciJavaPlugin> createInfo(
 	}
 
 	private ClassLoader getClassLoader() {
-		if (customClassLoader != null) return customClassLoader;
-		return Thread.currentThread().getContextClassLoader();
+		return customClassLoader != null ? //
+			customClassLoader : Context.getClassLoader();
 	}
 
 	// -- Helper classes --
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index b928118e6..5b2c109c6 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -58,6 +58,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.scijava.Context;
+
 /**
  * Useful methods for working with file paths.
  * 
@@ -664,7 +666,7 @@ public static Map<String, URL> findResources(final String regex,
 		final String pathPrefix, final File baseDirectory)
 	{
 		// scan URL resource paths first
-		final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+		final ClassLoader loader = Context.getClassLoader();
 		final ArrayList<URL> urls = new ArrayList<>();
 		try {
 			urls.addAll(Collections.list(loader.getResources(pathPrefix + "/")));
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index ac7eedcd1..53d2a0559 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -43,6 +43,7 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.scijava.Context;
 import org.scijava.Versioned;
 import org.xml.sax.SAXException;
 
@@ -280,8 +281,7 @@ public static POM getPOM(final Class<?> c, final String groupId,
 	public static List<POM> getAllPOMs() {
 		// find all META-INF/maven/ folders on the classpath
 		final String pomPrefix = "META-INF/maven/";
-		final ClassLoader classLoader =
-			Thread.currentThread().getContextClassLoader();
+		final ClassLoader classLoader = Context.getClassLoader();
 		final Enumeration<URL> resources;
 		try {
 			resources = classLoader.getResources(pomPrefix);
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index 5efa456d6..f5577b9f9 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -45,6 +45,8 @@
 
 import javax.xml.ws.Service;
 
+import org.scijava.Context;
+
 /**
  * Combines {@link Service} information from all JAR files on the classpath.
  * 
@@ -61,8 +63,7 @@ public void combine(final File outputDirectory) throws IOException {
 		final Map<String, StringBuilder> files =
 			new HashMap<>();
 		final Enumeration<URL> directories =
-			Thread.currentThread().getContextClassLoader().getResources(
-				SERVICES_PREFIX);
+			Context.getClassLoader().getResources(SERVICES_PREFIX);
 
 		// Iterate over all the service files
 		while (directories.hasMoreElements()) {
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 8bcbabae5..25995ea0e 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -69,6 +69,8 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.scijava.Context;
+
 /**
  * Utility class for working with generic types, fields and methods.
  * <p>
@@ -221,8 +223,8 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 
 		// load the class!
 		try {
-			final ClassLoader cl = classLoader == null ? //
-				Thread.currentThread().getContextClassLoader() : classLoader;
+			final ClassLoader cl = //
+				classLoader != null ? classLoader : Context.getClassLoader();
 			return cl.loadClass(className);
 		}
 		catch (final Throwable t) {

From 06aa06d7d5e7f6eec8f2f23a27cba7e686a5b8c6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 16 Dec 2019 19:41:24 +0100
Subject: [PATCH 0927/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f3a87fac5..3d766bab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.81.0-SNAPSHOT</version>
+	<version>2.81.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 100351f89642907297575deae006bdacd4050223 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 17 Dec 2019 10:57:24 -0600
Subject: [PATCH 0928/1208] ClassUtils: simplify getList method code

---
 src/main/java/org/scijava/util/ClassUtils.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index ceae7c44a..3f7202dd8 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -699,12 +699,8 @@ private static class CacheMap<T extends AnnotatedElement> extends
 		public List<T> getList(final Class<?> c,
 			final Class<? extends Annotation> annotationClass)
 		{
-			List<T> annotatedFields = null;
 			final Map<Class<? extends Annotation>, List<T>> annotationTypes = get(c);
-			if (annotationTypes != null) {
-				annotatedFields = annotationTypes.get(annotationClass);
-			}
-			return annotatedFields;
+			return annotationTypes == null ? null : annotationTypes.get(annotationClass);
 		}
 
 		/**

From fee2644203c68d2f17301ec72d089bedece14a9a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 30 Dec 2019 11:07:02 -0600
Subject: [PATCH 0929/1208] PluginInfo.getIdentifier: do not load the class

Fixes scifio/scifio#410.
---
 src/main/java/org/scijava/plugin/PluginInfo.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 259e1a2a3..90cf7dac5 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -321,12 +321,7 @@ public PT createInstance() throws InstantiableException {
 
 	@Override
 	public String getIdentifier() {
-		try {
-			return "plugin:" + loadClass();
-		}
-		catch (final InstantiableException exc) {
-			return null;
-		}
+		return "plugin:" + getClassName();
 	}
 
 	// -- Locatable methods --

From a5d0fc09550e275646361ec860129aa99af04318 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Tue, 17 Dec 2019 18:05:25 +0100
Subject: [PATCH 0930/1208] Add named object index and improve ObjectService

---
 .../scijava/object/DefaultObjectService.java  | 25 ++++++-
 .../org/scijava/object/NamedObjectIndex.java  | 29 +++++++
 .../org/scijava/object/ObjectService.java     | 13 ++++
 .../scijava/widget/DefaultWidgetModel.java    |  6 +-
 .../scijava/object/NamedObjectIndexTest.java  | 43 +++++++++++
 .../org/scijava/object/ObjectServiceTest.java | 75 +++++++++++++++++++
 6 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/org/scijava/object/NamedObjectIndex.java
 create mode 100644 src/test/java/org/scijava/object/NamedObjectIndexTest.java
 create mode 100644 src/test/java/org/scijava/object/ObjectServiceTest.java

diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 46f162ab0..4c1855214 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -34,6 +34,7 @@
 
 import java.util.List;
 
+import org.scijava.Named;
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.object.event.ObjectCreatedEvent;
@@ -68,7 +69,7 @@ public final class DefaultObjectService extends AbstractService implements
 	private EventService eventService;
 
 	/** Index of registered objects. */
-	private ObjectIndex<Object> objectIndex;
+	private NamedObjectIndex<Object> objectIndex;
 
 	// -- ObjectService methods --
 
@@ -92,7 +93,12 @@ public <T> List<T> getObjects(final Class<T> type) {
 
 	@Override
 	public void addObject(final Object obj) {
-		objectIndex.add(obj);
+		addObject(obj, null);
+	}
+
+	@Override
+	public void addObject(Object obj, String name) {
+		objectIndex.add(obj, name);		
 		eventService.publish(new ObjectsAddedEvent(obj));
 	}
 
@@ -102,11 +108,23 @@ public void removeObject(final Object obj) {
 		eventService.publish(new ObjectsRemovedEvent(obj));
 	}
 
+	@Override
+	public String getName(Object obj) {
+		String name = objectIndex.getName(obj);
+		if (name != null) {
+			return name;
+		}
+		if (obj instanceof Named) {
+			return ((Named) obj).getName();
+		}
+		return obj.toString();
+	}
+
 	// -- Service methods --
 
 	@Override
 	public void initialize() {
-		objectIndex = new ObjectIndex<>(Object.class);
+		objectIndex = new NamedObjectIndex<>(Object.class);
 	}
 
 	// -- Event handlers --
@@ -120,5 +138,4 @@ protected void onEvent(final ObjectCreatedEvent event) {
 	protected void onEvent(final ObjectDeletedEvent event) {
 		removeObject(event.getObject());
 	}
-
 }
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
new file mode 100644
index 000000000..3db8f9d51
--- /dev/null
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -0,0 +1,29 @@
+package org.scijava.object;
+
+import java.util.WeakHashMap;
+
+public class NamedObjectIndex<E> extends ObjectIndex<E> {
+	
+	private WeakHashMap<Object, String> nameMap;
+
+	public NamedObjectIndex(final Class<E> baseClass) {
+		super(baseClass);
+		nameMap = new WeakHashMap<>();
+	}
+
+	public boolean add(E object, String name) {
+		if (name != null)
+			nameMap.put(object, name);
+		return add(object);
+	}
+
+	public boolean add(E object, Class<?> type, String name, boolean batch) {
+		if (name != null)
+			nameMap.put(object, name);
+		return add(object, type, batch);
+	}
+
+	public String getName(E object) {
+		return nameMap.get(object);
+	}
+}
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index e24922b21..584c4b335 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -34,6 +34,7 @@
 
 import java.util.List;
 
+import org.scijava.Named;
 import org.scijava.event.EventService;
 import org.scijava.service.SciJavaService;
 
@@ -54,9 +55,21 @@ default EventService eventService() {
 	/** Gets a list of all registered objects compatible with the given type. */
 	<T> List<T> getObjects(Class<T> type);
 
+	/**
+	 * Gets the name belonging to a given object.
+	 * 
+	 * If no explicit name was provided at registration time, the name will be
+	 * derived from {@link Named#getName()} if the object implements {@link Named},
+	 * or from the {@link Object#toString()} otherwise
+	 **/
+	String getName(Object obj);
+
 	/** Registers an object with the object service. */
 	void addObject(Object obj);
 
+	/** Registers a named object with the object service. */
+	void addObject(Object obj, String name);
+
 	/** Deregisters an object with the object service. */
 	void removeObject(Object obj);
 
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index aaece9fcc..46e960fd8 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -47,6 +47,7 @@
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
 import org.scijava.module.ModuleService;
+import org.scijava.object.ObjectService;
 import org.scijava.plugin.Parameter;
 import org.scijava.thread.ThreadService;
 import org.scijava.util.NumberUtils;
@@ -74,6 +75,9 @@ public class DefaultWidgetModel extends AbstractContextual implements WidgetMode
 	@Parameter
 	private ModuleService moduleService;
 
+	@Parameter
+	private ObjectService objectService;
+
 	@Parameter(required = false)
 	private LogService log;
 
@@ -227,7 +231,7 @@ public String[] getChoices() {
 		final List<?> choicesList = item.getChoices();
 		final String[] choices = new String[choicesList.size()];
 		for (int i = 0; i < choices.length; i++) {
-			choices[i] = choicesList.get(i).toString();
+			choices[i] = objectService.getName(choicesList.get(i));
 		}
 		return choices;
 	}
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
new file mode 100644
index 000000000..3e4783247
--- /dev/null
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -0,0 +1,43 @@
+package org.scijava.object;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
+public class NamedObjectIndexTest {
+
+	@Test
+	public void testNamedObjects() {
+		NamedObjectIndex<String> index = new NamedObjectIndex<>(String.class);
+		String obj1 = "obj1";
+		String name1 = "name1";
+		String obj2 = "obj1";
+		String name2 = "name1";
+		assertTrue(index.add(obj1, name1));
+		assertTrue(index.add(obj2, String.class, name2, false));
+		assertTrue(index.contains(obj1));
+		assertTrue(index.contains(obj2));
+		assertEquals(name1, index.getName(obj1));
+		assertEquals(name2, index.getName(obj2));
+		assertTrue(index.remove(obj1));
+		assertTrue(index.remove(obj2));
+		assertFalse(index.contains(obj1));
+		assertFalse(index.contains(obj2));
+	}
+
+	@Test
+	public void testNullNames() {
+		NamedObjectIndex<String> index = new NamedObjectIndex<>(String.class);
+		String obj1 = "object1";
+		String name1 = null;
+		String obj2 = "object2";
+		String name2 = "";
+		assertTrue(index.add(obj1, name1));
+		assertTrue(index.add(obj2, name2));
+		assertEquals(name1, index.getName(obj1));
+		assertEquals(name2, index.getName(obj2));
+	}
+}
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
new file mode 100644
index 000000000..4d58a97fe
--- /dev/null
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -0,0 +1,75 @@
+package org.scijava.object;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.SciJavaPlugin;
+
+public class ObjectServiceTest {
+
+	private Context context;
+	private ObjectService objectService;
+
+	@Before
+	public void setUp() {
+		context = new Context(ObjectService.class);
+		objectService = context.getService(ObjectService.class);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	@Test
+	public void testAddRemoveObjects() {
+		Object obj1 = new Object();
+		String name1 = "Object 1";
+		Object obj2 = "";
+		Object obj3 = new Double(0.3);
+		PluginInfo<SciJavaPlugin> obj4 = PluginInfo.create(TestPlugin.class, SciJavaPlugin.class);
+		obj4.setName("TestPlugin name");
+
+		objectService.addObject(obj1, name1);
+		assertEquals("Name of object 1", name1, objectService.getName(obj1));
+		objectService.addObject(obj2);
+		assertEquals("Name of object 2", obj2.toString(), objectService.getName(obj2));
+		objectService.addObject(obj3, null);
+		assertEquals("Name of object 3", obj3.toString(), objectService.getName(obj3));
+		objectService.addObject(obj4);
+		assertNotNull(objectService.getName(obj4));
+		assertEquals("Name of object 4", obj4.getName(), objectService.getName(obj4));
+
+		assertTrue("Object 1 registered", objectService.getObjects(Object.class).contains(obj1));
+		assertTrue("Object 2 registered", objectService.getObjects(Object.class).contains(obj2));
+		assertTrue("Object 3 registered", objectService.getObjects(Object.class).contains(obj3));
+		assertTrue("Object 4 registered", objectService.getObjects(Object.class).contains(obj4));
+
+		objectService.removeObject(obj1);
+		objectService.removeObject(obj2);
+		objectService.removeObject(obj3);
+		objectService.removeObject(obj4);
+
+		assertFalse("Object 1 removed", objectService.getObjects(Object.class).contains(obj1));
+		assertFalse("Object 2 removed", objectService.getObjects(Object.class).contains(obj2));
+		assertFalse("Object 3 removed", objectService.getObjects(Object.class).contains(obj3));
+		assertFalse("Object 4 removed", objectService.getObjects(Object.class).contains(obj4));
+	}
+
+	@Test
+	public void testNamedObjectIndex() {
+		ObjectIndex<Object> index = objectService.getIndex();
+		assertTrue(index instanceof NamedObjectIndex);
+	}
+
+	private class TestPlugin implements SciJavaPlugin {
+
+	}
+}

From 6eeef9aed4f7abd4d4e260696974b63e5c2c3ffb Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Thu, 9 Jan 2020 11:30:08 +0100
Subject: [PATCH 0931/1208] Respect autoFill parameter in script parameters

This adds a new method setAutoFill(boolean) to MutableModuleItem and fixes ParameterScriptProcessor to set the autoFill value according to the parameter attribute.

ScriptInfoTest is updated with a parameter testing autoFill=false that fails without the changes in this commit.
---
 .../module/DefaultMutableModuleItem.java       | 13 +++++++++++++
 .../org/scijava/module/MutableModuleItem.java  |  2 ++
 .../process/ParameterScriptProcessor.java      |  1 +
 .../org/scijava/script/ScriptInfoTest.java     | 18 +++++++++++-------
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 7a2d3ec23..1feffbcc6 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -54,6 +54,7 @@ public class DefaultMutableModuleItem<T> extends AbstractModuleItem<T>
 	private final Type genericType;
 	private ItemIO ioType;
 	private ItemVisibility visibility;
+	private boolean autoFill;
 	private boolean required;
 	private boolean persisted;
 	private String persistKey;
@@ -88,6 +89,7 @@ public DefaultMutableModuleItem(final ModuleInfo info, final String name,
 		genericType = type;
 		ioType = super.getIOType();
 		visibility = super.getVisibility();
+		autoFill = super.isAutoFill();
 		required = super.isRequired();
 		persisted = super.isPersisted();
 		persistKey = super.getPersistKey();
@@ -115,6 +117,7 @@ public DefaultMutableModuleItem(final ModuleInfo info,
 		genericType = item.getGenericType();
 		ioType = item.getIOType();
 		visibility = item.getVisibility();
+		autoFill = item.isAutoFill();
 		required = item.isRequired();
 		persisted = item.isPersisted();
 		persistKey = item.getPersistKey();
@@ -146,6 +149,11 @@ public void setVisibility(final ItemVisibility visibility) {
 		this.visibility = visibility;
 	}
 
+	@Override
+	public void setAutoFill(final boolean autoFill) {
+		this.autoFill = autoFill;
+	}
+
 	@Override
 	public void setRequired(final boolean required) {
 		this.required = required;
@@ -244,6 +252,11 @@ public ItemVisibility getVisibility() {
 		return visibility;
 	}
 
+	@Override
+	public boolean isAutoFill() {
+		return autoFill;
+	}
+
 	@Override
 	public boolean isRequired() {
 		return required;
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 4c2f132fd..01af92e0d 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -49,6 +49,8 @@ public interface MutableModuleItem<T> extends ModuleItem<T> {
 
 	void setVisibility(ItemVisibility visibility);
 
+	void setAutoFill(boolean autoFill);
+
 	void setRequired(boolean required);
 
 	void setPersisted(boolean persisted);
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index c1a3170e8..1473ddf33 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -270,6 +270,7 @@ private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
 		else if (is(k, "max")) item.setMaximumValue(as(v, item.getType()));
 		else if (is(k, "min")) item.setMinimumValue(as(v, item.getType()));
 		else if (is(k, "name")) item.setName(as(v, String.class));
+		else if (is(k, "autoFill")) item.setAutoFill(as(v, boolean.class));
 		else if (is(k, "persist")) item.setPersisted(as(v, boolean.class));
 		else if (is(k, "persistKey")) item.setPersistKey(as(v, String.class));
 		else if (is(k, "required")) item.setRequired(as(v, boolean.class));
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 521327ccf..b6214c1cb 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -252,13 +252,14 @@ public void testVersion() throws IOException {
 	@Test
 	public void testParameters() {
 		final String script = "" + //
-			"% @LogService(required = false) log\n" + //
-			"% @int(label=\"Slider Value\", softMin=5, softMax=15, " + //
+			"#@ LogService (required = false) log\n" + //
+			"#@ int (label=\"Slider Value\", softMin=5, softMax=15, " + //
 			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
-			"% @String(persist = false, family='Carnivora', " + //
+			"#@ String (persist = false, family='Carnivora', " + //
 			"choices={'quick brown fox', 'lazy dog'}) animal\n" + //
-			"% @String(visibility=MESSAGE) msg\n" + //
-			"% @BOTH java.lang.StringBuilder buffer";
+			"#@ Double (autoFill = false) notAutoFilled\n" + //
+			"#@ String (visibility=MESSAGE) msg\n" + //
+			"#@BOTH java.lang.StringBuilder buffer";
 
 		final ScriptInfo info =
 			new ScriptInfo(context, "params.bsizes", new StringReader(script));
@@ -280,6 +281,9 @@ public void testParameters() {
 			null, null, null, null, null, null, null, null, animalChoices, animal);
 		assertEquals(animal.get("family"), "Carnivora"); // test custom attribute
 
+		final ModuleItem<?> notAutoFilled = info.getInput("notAutoFilled");
+		assertFalse(notAutoFilled.isAutoFill());
+
 		final ModuleItem<?> msg = info.getInput("msg");
 		assertSame(ItemVisibility.MESSAGE, msg.getVisibility());
 
@@ -288,7 +292,7 @@ public void testParameters() {
 			null, null, null, null, null, null, null, null, noChoices, buffer);
 
 		int inputCount = 0;
-		final ModuleItem<?>[] inputs = { log, sliderValue, animal, msg, buffer };
+		final ModuleItem<?>[] inputs = { log, sliderValue, animal, notAutoFilled, msg, buffer };
 		for (final ModuleItem<?> inItem : info.inputs()) {
 			assertSame(inputs[inputCount++], inItem);
 		}
@@ -404,7 +408,7 @@ public List<String> getExtensions() {
 		}
 	}
 
-	// -- Test script langauge --
+	// -- Test script language --
 
 	private static class BindingSizesEngine extends AbstractScriptEngine {
 

From 765d6ef1506a3daf9af9c7bd18824b2946015beb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 13 Jan 2020 13:57:27 -0600
Subject: [PATCH 0932/1208] ObjectService: ensure getName() returns non-null

---
 .../org/scijava/object/DefaultObjectService.java   | 14 ++++++++------
 .../java/org/scijava/object/ObjectService.java     | 10 ++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 4c1855214..c2cffb8bc 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -110,14 +110,16 @@ public void removeObject(final Object obj) {
 
 	@Override
 	public String getName(Object obj) {
-		String name = objectIndex.getName(obj);
-		if (name != null) {
-			return name;
-		}
+		if (obj == null) throw new NullPointerException();
+		final String name = objectIndex.getName(obj);
+		if (name != null) return name;
 		if (obj instanceof Named) {
-			return ((Named) obj).getName();
+			final String n = ((Named) obj).getName();
+			if (n != null) return n;
 		}
-		return obj.toString();
+		final String s = obj.toString();
+		if (s != null) return s;
+		return obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode());
 	}
 
 	// -- Service methods --
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 584c4b335..286e1da68 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -57,11 +57,13 @@ default EventService eventService() {
 
 	/**
 	 * Gets the name belonging to a given object.
-	 * 
+	 * <p>
 	 * If no explicit name was provided at registration time, the name will be
-	 * derived from {@link Named#getName()} if the object implements {@link Named},
-	 * or from the {@link Object#toString()} otherwise
-	 **/
+	 * derived from {@link Named#getName()} if the object implements
+	 * {@link Named}, or from the {@link Object#toString()} otherwise. It is
+	 * guaranteed that this method will not return {@code null}.
+	 * </p>
+	 */
 	String getName(Object obj);
 
 	/** Registers an object with the object service. */

From ce965b93d729569c83f4f94d100c8f262b6c1730 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 13 Jan 2020 13:58:26 -0600
Subject: [PATCH 0933/1208] NamedObjectIndex: add missing javadoc

---
 src/main/java/org/scijava/object/NamedObjectIndex.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index 3db8f9d51..2b314fa1d 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -2,6 +2,11 @@
 
 import java.util.WeakHashMap;
 
+/**
+ * An {@link ObjectIndex} where each object can have an associated name.
+ *
+ * @author Jan Eglinger
+ */
 public class NamedObjectIndex<E> extends ObjectIndex<E> {
 	
 	private WeakHashMap<Object, String> nameMap;

From d5dfb5d7c6e4425c2c0511c3b77cda37c2b01aca Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 13 Jan 2020 13:59:00 -0600
Subject: [PATCH 0934/1208] ObjectService: push default impls to interface

---
 .../scijava/object/DefaultObjectService.java  | 46 +------------------
 .../org/scijava/object/ObjectService.java     | 40 +++++++++++++---
 2 files changed, 34 insertions(+), 52 deletions(-)

diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index c2cffb8bc..2b150a997 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -32,15 +32,10 @@
 
 package org.scijava.object;
 
-import java.util.List;
-
-import org.scijava.Named;
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.object.event.ObjectCreatedEvent;
 import org.scijava.object.event.ObjectDeletedEvent;
-import org.scijava.object.event.ObjectsAddedEvent;
-import org.scijava.object.event.ObjectsRemovedEvent;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
@@ -79,49 +74,10 @@ public EventService eventService() {
 	}
 
 	@Override
-	public ObjectIndex<Object> getIndex() {
+	public NamedObjectIndex<Object> getIndex() {
 		return objectIndex;
 	}
 
-	@Override
-	public <T> List<T> getObjects(final Class<T> type) {
-		final List<Object> list = objectIndex.get(type);
-		@SuppressWarnings("unchecked")
-		final List<T> result = (List<T>) list;
-		return result;
-	}
-
-	@Override
-	public void addObject(final Object obj) {
-		addObject(obj, null);
-	}
-
-	@Override
-	public void addObject(Object obj, String name) {
-		objectIndex.add(obj, name);		
-		eventService.publish(new ObjectsAddedEvent(obj));
-	}
-
-	@Override
-	public void removeObject(final Object obj) {
-		objectIndex.remove(obj);
-		eventService.publish(new ObjectsRemovedEvent(obj));
-	}
-
-	@Override
-	public String getName(Object obj) {
-		if (obj == null) throw new NullPointerException();
-		final String name = objectIndex.getName(obj);
-		if (name != null) return name;
-		if (obj instanceof Named) {
-			final String n = ((Named) obj).getName();
-			if (n != null) return n;
-		}
-		final String s = obj.toString();
-		if (s != null) return s;
-		return obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode());
-	}
-
 	// -- Service methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 286e1da68..24e71299e 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -36,6 +36,8 @@
 
 import org.scijava.Named;
 import org.scijava.event.EventService;
+import org.scijava.object.event.ObjectsAddedEvent;
+import org.scijava.object.event.ObjectsRemovedEvent;
 import org.scijava.service.SciJavaService;
 
 /**
@@ -50,10 +52,15 @@ default EventService eventService() {
 	}
 
 	/** Gets the index of available objects. */
-	ObjectIndex<Object> getIndex();
+	NamedObjectIndex<Object> getIndex();
 
 	/** Gets a list of all registered objects compatible with the given type. */
-	<T> List<T> getObjects(Class<T> type);
+	default <T> List<T> getObjects(final Class<T> type) {
+		final List<Object> list = getIndex().get(type);
+		@SuppressWarnings("unchecked")
+		final List<T> result = (List<T>) list;
+		return result;
+	}
 
 	/**
 	 * Gets the name belonging to a given object.
@@ -63,17 +70,36 @@ default EventService eventService() {
 	 * {@link Named}, or from the {@link Object#toString()} otherwise. It is
 	 * guaranteed that this method will not return {@code null}.
 	 * </p>
-	 */
-	String getName(Object obj);
+	 **/
+	default String getName(final Object obj) {
+		if (obj == null) throw new NullPointerException();
+		final String name = getIndex().getName(obj);
+		if (name != null) return name;
+		if (obj instanceof Named) {
+			final String n = ((Named) obj).getName();
+			if (n != null) return n;
+		}
+		final String s = obj.toString();
+		if (s != null) return s;
+		return obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode());
+	}
 
 	/** Registers an object with the object service. */
-	void addObject(Object obj);
+	default void addObject(Object obj) {
+		addObject(obj, null);
+	}
 
 	/** Registers a named object with the object service. */
-	void addObject(Object obj, String name);
+	default void addObject(final Object obj, final String name) {
+		getIndex().add(obj, name);
+		eventService().publish(new ObjectsAddedEvent(obj));
+	}
 
 	/** Deregisters an object with the object service. */
-	void removeObject(Object obj);
+	default void removeObject(final Object obj) {
+		getIndex().remove(obj);
+		eventService().publish(new ObjectsRemovedEvent(obj));
+	}
 
 	// -- Deprecated methods --
 

From 04b2b499f69c3dab739795a34679cc30534c15f2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 14 Feb 2020 11:50:31 -0600
Subject: [PATCH 0935/1208] POM: bump to next minor version

The NamedObjectIndex functionality is new API.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3d766bab7..e1a4bb670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.81.1-SNAPSHOT</version>
+	<version>2.82.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From d304cea59964eef032ed5c5762e46f2fa25b235f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 14 Feb 2020 11:52:11 -0600
Subject: [PATCH 0936/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e1a4bb670..29eaaafc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.82.0-SNAPSHOT</version>
+	<version>2.82.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 3dae7a46d5e86e3e33dc62035442143c766bc1e6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 6 Mar 2020 15:31:11 -0600
Subject: [PATCH 0937/1208] POM: bump minor version

The MutableModuleItem interface gained new API.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 29eaaafc2..466c03ea4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.82.1-SNAPSHOT</version>
+	<version>2.83.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 0a17bf8d4ec67b81fe495019ded79f84229bc34b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 6 Mar 2020 15:32:14 -0600
Subject: [PATCH 0938/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 466c03ea4..01653f333 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.83.0-SNAPSHOT</version>
+	<version>2.83.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 656521b61b715e06ad22729420dd37f8eeb361db Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 May 2020 12:19:15 -0500
Subject: [PATCH 0939/1208] Update to parsington 2.0.0

This is a breaking package rename on the parsington side, to avoid
split packages. It facilitates use from JPMS-modularized projects.
---
 pom.xml                                                  | 2 ++
 src/main/java/org/scijava/parse/DefaultParseService.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 01653f333..a5d58ddbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,6 +162,8 @@
 Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
 Institute of Molecular Cell Biology and Genetics, University of
 Konstanz, and KNIME GmbH.</license.copyrightOwners>
+
+		<parsington.version>2.0.0</parsington.version>
 	</properties>
 
 	<dependencies>
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index db48d5ac1..3d4d1d9b4 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -37,7 +37,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.scijava.parse.eval.DefaultEvaluator;
+import org.scijava.parsington.Variable;
+import org.scijava.parsington.eval.DefaultEvaluator;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;

From 24b03bc8ba17dc813153f4529a54a50be9db6cc4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 15 May 2020 12:21:57 -0500
Subject: [PATCH 0940/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a5d58ddbe..41ac08e5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.83.1-SNAPSHOT</version>
+	<version>2.83.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 75a1ca67c7e366cf48f06f0d6d9a89d122764d22 Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Mon, 25 May 2020 12:34:44 +0200
Subject: [PATCH 0941/1208] DefaultRecentFileService: add dispose method

---
 src/main/java/org/scijava/io/DefaultRecentFileService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 8bda3c537..9d00f1144 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -175,6 +175,11 @@ public void initialize() {
 		moduleService.addModules(recentModules.values());
 	}
 
+	@Override
+	public void dispose() {
+		clear();
+	}
+
 	// -- Event handlers --
 
 	@EventHandler

From 7542428f3d6c0ee0132a2186894ab46612f9ae14 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 25 May 2020 13:36:52 -0500
Subject: [PATCH 0942/1208] POM: update parent to pom-scijava 28.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 41ac08e5b..af5be4f60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>27.0.1</version>
+		<version>28.0.0</version>
 		<relativePath />
 	</parent>
 

From 87b1cc82ad9e68d4ff7b21217b540d9fdb1b7361 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 25 May 2020 13:37:23 -0500
Subject: [PATCH 0943/1208] Happy New Year 2020

---
 LICENSE.txt                                   |  5 +---
 pom.xml                                       |  5 +---
 src/it/apt-test/pom.xml                       |  5 +---
 src/it/apt-test/setup.bsh                     |  5 +---
 .../org/scijava/annotation/its/Annotated.java |  5 +---
 .../annotation/its/CustomAnnotation.java      |  5 +---
 src/it/apt-test/verify.bsh                    |  5 +---
 src/it/settings.xml                           |  5 +---
 .../org/scijava/AbstractBasicDetails.java     |  5 +---
 .../java/org/scijava/AbstractContextual.java  |  5 +---
 .../java/org/scijava/AbstractGateway.java     |  5 +---
 .../java/org/scijava/AbstractUIDetails.java   |  5 +---
 src/main/java/org/scijava/BasicDetails.java   |  5 +---
 src/main/java/org/scijava/Cancelable.java     |  5 +---
 src/main/java/org/scijava/Context.java        |  5 +---
 src/main/java/org/scijava/Contextual.java     |  5 +---
 src/main/java/org/scijava/Disposable.java     |  5 +---
 src/main/java/org/scijava/Gateway.java        |  5 +---
 src/main/java/org/scijava/Identifiable.java   |  5 +---
 src/main/java/org/scijava/Initializable.java  |  5 +---
 src/main/java/org/scijava/Instantiable.java   |  5 +---
 .../org/scijava/InstantiableException.java    |  5 +---
 src/main/java/org/scijava/ItemIO.java         |  5 +---
 src/main/java/org/scijava/ItemVisibility.java |  5 +---
 src/main/java/org/scijava/Locatable.java      |  5 +---
 src/main/java/org/scijava/MenuEntry.java      |  5 +---
 src/main/java/org/scijava/MenuPath.java       |  5 +---
 src/main/java/org/scijava/Named.java          |  5 +---
 .../org/scijava/NoSuchServiceException.java   |  5 +---
 .../org/scijava/NullContextException.java     |  5 +---
 src/main/java/org/scijava/Optional.java       |  5 +---
 src/main/java/org/scijava/Prioritized.java    |  5 +---
 src/main/java/org/scijava/Priority.java       |  5 +---
 src/main/java/org/scijava/SciJava.java        |  5 +---
 src/main/java/org/scijava/Typed.java          |  5 +---
 src/main/java/org/scijava/UIDetails.java      |  5 +---
 src/main/java/org/scijava/Validated.java      |  5 +---
 .../java/org/scijava/ValidityProblem.java     |  5 +---
 src/main/java/org/scijava/Versioned.java      |  5 +---
 .../annotations/AbstractIndexWriter.java      |  5 +---
 .../annotations/AnnotationCombiner.java       |  5 +---
 .../annotations/AnnotationProcessor.java      |  5 +---
 .../scijava/annotations/ByteCodeAnalyzer.java |  5 +---
 .../scijava/annotations/DirectoryIndexer.java |  5 +---
 .../scijava/annotations/EclipseHelper.java    |  5 +---
 .../java/org/scijava/annotations/Index.java   |  5 +---
 .../org/scijava/annotations/IndexItem.java    |  5 +---
 .../org/scijava/annotations/IndexReader.java  |  5 +---
 .../org/scijava/annotations/Indexable.java    |  5 +---
 .../annotations/legacy/LegacyReader.java      |  5 +---
 .../java/org/scijava/app/AbstractApp.java     |  5 +---
 src/main/java/org/scijava/app/App.java        |  5 +---
 src/main/java/org/scijava/app/AppService.java |  5 +---
 .../org/scijava/app/DefaultAppService.java    |  5 +---
 .../org/scijava/app/DefaultStatusService.java |  5 +---
 src/main/java/org/scijava/app/SciJavaApp.java |  5 +---
 .../java/org/scijava/app/StatusService.java   |  5 +---
 .../org/scijava/app/event/StatusEvent.java    |  5 +---
 .../java/org/scijava/cache/CacheService.java  |  5 +---
 .../scijava/cache/DefaultCacheService.java    |  5 +---
 .../java/org/scijava/command/Command.java     |  5 +---
 .../java/org/scijava/command/CommandInfo.java |  5 +---
 .../org/scijava/command/CommandModule.java    |  5 +---
 .../scijava/command/CommandModuleItem.java    |  5 +---
 .../org/scijava/command/CommandService.java   |  5 +---
 .../org/scijava/command/ContextCommand.java   |  5 +---
 .../command/DefaultCommandService.java        |  5 +---
 .../org/scijava/command/DynamicCommand.java   |  5 +---
 .../scijava/command/DynamicCommandInfo.java   |  5 +---
 .../java/org/scijava/command/Interactive.java |  5 +---
 .../scijava/command/InteractiveCommand.java   |  5 +---
 .../org/scijava/command/ModuleCommand.java    |  5 +---
 .../java/org/scijava/command/Previewable.java |  5 +---
 .../scijava/command/UnimplementedCommand.java |  5 +---
 .../scijava/command/console/RunArgument.java  |  5 +---
 .../command/run/CommandCodeRunner.java        |  5 +---
 .../console/AbstractConsoleArgument.java      |  5 +---
 .../org/scijava/console/ConsoleArgument.java  |  5 +---
 .../org/scijava/console/ConsoleService.java   |  5 +---
 .../org/scijava/console/ConsoleUtils.java     |  5 +---
 .../console/DefaultConsoleService.java        |  5 +---
 .../scijava/console/MultiOutputStream.java    |  5 +---
 .../org/scijava/console/MultiPrintStream.java |  5 +---
 .../java/org/scijava/console/OutputEvent.java |  5 +---
 .../org/scijava/console/OutputListener.java   |  5 +---
 .../console/SystemPropertyArgument.java       |  5 +---
 .../convert/AbstractConvertService.java       |  5 +---
 .../scijava/convert/AbstractConverter.java    |  5 +---
 .../convert/AbstractDelegateConverter.java    | 28 +++++++++++++++++++
 .../org/scijava/convert/ArrayConverters.java  |  5 +---
 .../org/scijava/convert/CastingConverter.java |  5 +---
 .../scijava/convert/ConversionRequest.java    |  5 +---
 .../org/scijava/convert/ConvertService.java   |  5 +---
 .../java/org/scijava/convert/Converter.java   |  5 +---
 .../convert/DefaultConvertService.java        |  5 +---
 .../org/scijava/convert/DefaultConverter.java |  5 +---
 .../scijava/convert/FileListConverters.java   |  9 ++----
 .../org/scijava/convert/NullConverter.java    |  5 +---
 .../org/scijava/convert/NumberConverters.java |  5 +---
 .../convert/NumberToBigDecimalConverter.java  |  5 +---
 .../convert/NumberToBigIntegerConverter.java  |  5 +---
 .../convert/NumberToDoubleConverter.java      |  5 +---
 .../convert/NumberToFloatConverter.java       |  5 +---
 .../convert/NumberToIntegerConverter.java     |  5 +---
 .../convert/NumberToLongConverter.java        |  5 +---
 .../convert/NumberToNumberConverter.java      |  5 +---
 .../convert/NumberToShortConverter.java       |  5 +---
 .../convert/PrimitiveArrayUnwrapper.java      |  5 +---
 .../convert/PrimitiveArrayWrapper.java        |  5 +---
 .../org/scijava/display/AbstractDisplay.java  |  5 +---
 .../display/ActiveDisplayPreprocessor.java    |  5 +---
 .../org/scijava/display/DefaultDisplay.java   |  5 +---
 .../display/DefaultDisplayService.java        |  5 +---
 .../scijava/display/DefaultTextDisplay.java   |  5 +---
 .../java/org/scijava/display/Display.java     |  5 +---
 .../scijava/display/DisplayPostprocessor.java |  5 +---
 .../org/scijava/display/DisplayService.java   |  5 +---
 .../java/org/scijava/display/Displayable.java |  5 +---
 .../java/org/scijava/display/TextDisplay.java |  5 +---
 .../display/event/DisplayActivatedEvent.java  |  5 +---
 .../display/event/DisplayCreatedEvent.java    |  5 +---
 .../display/event/DisplayDeletedEvent.java    |  5 +---
 .../scijava/display/event/DisplayEvent.java   |  5 +---
 .../display/event/DisplayUpdatedEvent.java    |  5 +---
 .../display/event/input/InputEvent.java       |  5 +---
 .../scijava/display/event/input/KyEvent.java  |  5 +---
 .../display/event/input/KyPressedEvent.java   |  5 +---
 .../display/event/input/KyReleasedEvent.java  |  5 +---
 .../display/event/input/KyTypedEvent.java     |  5 +---
 .../display/event/input/MsButtonEvent.java    |  5 +---
 .../display/event/input/MsClickedEvent.java   |  5 +---
 .../display/event/input/MsDraggedEvent.java   |  5 +---
 .../display/event/input/MsEnteredEvent.java   |  5 +---
 .../scijava/display/event/input/MsEvent.java  |  5 +---
 .../display/event/input/MsExitedEvent.java    |  5 +---
 .../display/event/input/MsMovedEvent.java     |  5 +---
 .../display/event/input/MsPressedEvent.java   |  5 +---
 .../display/event/input/MsReleasedEvent.java  |  5 +---
 .../display/event/input/MsWheelEvent.java     |  5 +---
 .../event/window/WinActivatedEvent.java       |  5 +---
 .../display/event/window/WinClosedEvent.java  |  5 +---
 .../display/event/window/WinClosingEvent.java |  5 +---
 .../event/window/WinDeactivatedEvent.java     |  5 +---
 .../event/window/WinDeiconifiedEvent.java     |  5 +---
 .../display/event/window/WinEvent.java        |  5 +---
 .../event/window/WinIconifiedEvent.java       |  5 +---
 .../display/event/window/WinOpenedEvent.java  |  5 +---
 .../download/DefaultDownloadService.java      |  5 +---
 .../scijava/download/DiskLocationCache.java   |  5 +---
 .../java/org/scijava/download/Download.java   |  5 +---
 .../org/scijava/download/DownloadService.java |  5 +---
 .../org/scijava/download/LocationCache.java   |  5 +---
 .../scijava/download/MultiWriteHandle.java    |  5 +---
 .../scijava/event/ContextDisposingEvent.java  |  5 +---
 .../org/scijava/event/DefaultEventBus.java    |  5 +---
 .../scijava/event/DefaultEventHistory.java    |  5 +---
 .../scijava/event/DefaultEventService.java    |  5 +---
 .../java/org/scijava/event/EventDetails.java  |  5 +---
 .../java/org/scijava/event/EventHandler.java  |  5 +---
 .../java/org/scijava/event/EventHistory.java  |  5 +---
 .../scijava/event/EventHistoryListener.java   |  5 +---
 .../java/org/scijava/event/EventService.java  |  5 +---
 .../org/scijava/event/EventSubscriber.java    |  5 +---
 .../java/org/scijava/event/SciJavaEvent.java  |  5 +---
 .../java/org/scijava/input/Accelerator.java   |  5 +---
 .../scijava/input/DefaultInputService.java    |  5 +---
 .../org/scijava/input/InputModifiers.java     |  5 +---
 .../java/org/scijava/input/InputService.java  |  5 +---
 src/main/java/org/scijava/input/KeyCode.java  |  5 +---
 .../java/org/scijava/input/MouseCursor.java   |  5 +---
 .../java/org/scijava/io/AbstractIOPlugin.java |  5 +---
 .../org/scijava/io/ByteArrayByteBank.java     |  5 +---
 src/main/java/org/scijava/io/ByteBank.java    |  5 +---
 .../java/org/scijava/io/DefaultIOService.java |  5 +---
 .../scijava/io/DefaultRecentFileService.java  |  5 +---
 src/main/java/org/scijava/io/IOPlugin.java    |  5 +---
 src/main/java/org/scijava/io/IOService.java   |  5 +---
 .../org/scijava/io/RecentFileService.java     |  5 +---
 .../org/scijava/io/console/OpenArgument.java  |  5 +---
 .../org/scijava/io/event/DataOpenedEvent.java |  5 +---
 .../org/scijava/io/event/DataSavedEvent.java  |  5 +---
 .../java/org/scijava/io/event/IOEvent.java    |  5 +---
 .../scijava/io/handle/AbstractDataHandle.java |  5 +---
 .../io/handle/AbstractHigherOrderHandle.java  |  9 ++----
 .../handle/AbstractSeekableStreamHandle.java  |  4 +--
 .../io/handle/AbstractStreamHandle.java       |  8 ++----
 .../org/scijava/io/handle/BytesHandle.java    |  5 +---
 .../org/scijava/io/handle/DataHandle.java     |  5 +---
 .../io/handle/DataHandleInputStream.java      |  5 +---
 .../io/handle/DataHandleOutputStream.java     |  5 +---
 .../scijava/io/handle/DataHandleService.java  |  5 +---
 .../org/scijava/io/handle/DataHandles.java    |  9 ++----
 .../io/handle/DefaultDataHandleService.java   |  5 +---
 .../org/scijava/io/handle/DummyHandle.java    |  5 +---
 .../org/scijava/io/handle/FileHandle.java     |  5 +---
 .../io/handle/ReadBufferDataHandle.java       |  9 ++----
 .../io/handle/ResettableStreamHandle.java     |  4 +--
 .../io/handle/SeekableStreamHandle.java       |  4 +--
 .../org/scijava/io/handle/StreamHandle.java   |  8 ++----
 .../io/handle/WriteBufferDataHandle.java      |  9 ++----
 .../scijava/io/location/AbstractLocation.java |  5 +---
 .../io/location/AbstractLocationResolver.java |  5 +---
 .../io/location/AbstractRemoteLocation.java   |  5 +---
 .../io/location/BrowsableLocation.java        |  5 +---
 .../scijava/io/location/BytesLocation.java    |  5 +---
 .../io/location/DefaultLocationService.java   |  5 +---
 .../scijava/io/location/DummyLocation.java    |  5 +---
 .../org/scijava/io/location/FileLocation.java |  5 +---
 .../io/location/FileLocationResolver.java     |  5 +---
 .../org/scijava/io/location/Location.java     |  5 +---
 .../scijava/io/location/LocationResolver.java |  5 +---
 .../scijava/io/location/LocationService.java  |  5 +---
 .../scijava/io/location/RemoteLocation.java   |  5 +---
 .../org/scijava/io/location/URILocation.java  |  5 +---
 .../org/scijava/io/location/URLLocation.java  |  5 +---
 .../scijava/io/nio/ByteBufferByteBank.java    |  5 +---
 .../org/scijava/io/nio/DefaultNIOService.java |  5 +---
 .../java/org/scijava/io/nio/NIOService.java   |  5 +---
 .../org/scijava/log/AbstractLogService.java   |  5 +---
 .../org/scijava/log/CallingClassUtils.java    |  8 ++----
 .../java/org/scijava/log/DefaultLogger.java   |  8 ++----
 .../log/DefaultUncaughtExceptionHandler.java  |  5 +---
 .../org/scijava/log/IgnoreAsCallingClass.java |  8 ++----
 src/main/java/org/scijava/log/LogLevel.java   |  4 +--
 .../java/org/scijava/log/LogListener.java     |  8 ++----
 src/main/java/org/scijava/log/LogMessage.java |  8 ++----
 src/main/java/org/scijava/log/LogService.java |  5 +---
 src/main/java/org/scijava/log/LogSource.java  |  8 ++----
 src/main/java/org/scijava/log/Logged.java     |  5 +---
 src/main/java/org/scijava/log/Logger.java     |  4 +--
 .../org/scijava/log/StderrLogService.java     |  5 +---
 .../org/scijava/main/DefaultMainService.java  |  5 +---
 .../java/org/scijava/main/MainService.java    |  5 +---
 .../scijava/main/console/MainArgument.java    |  5 +---
 .../org/scijava/main/run/MainCodeRunner.java  |  5 +---
 .../org/scijava/menu/AbstractMenuCreator.java |  5 +---
 .../org/scijava/menu/DefaultMenuService.java  |  5 +---
 .../java/org/scijava/menu/MenuConstants.java  |  5 +---
 .../java/org/scijava/menu/MenuCreator.java    |  5 +---
 .../java/org/scijava/menu/MenuService.java    |  5 +---
 .../java/org/scijava/menu/ShadowMenu.java     |  5 +---
 .../org/scijava/menu/ShadowMenuIterator.java  |  5 +---
 .../org/scijava/menu/event/MenuEvent.java     |  5 +---
 .../scijava/menu/event/MenusAddedEvent.java   |  5 +---
 .../scijava/menu/event/MenusRemovedEvent.java |  5 +---
 .../scijava/menu/event/MenusUpdatedEvent.java |  5 +---
 .../org/scijava/module/AbstractModule.java    |  5 +---
 .../scijava/module/AbstractModuleInfo.java    |  5 +---
 .../scijava/module/AbstractModuleItem.java    |  5 +---
 .../scijava/module/DefaultModuleService.java  |  5 +---
 .../scijava/module/DefaultMutableModule.java  |  5 +---
 .../module/DefaultMutableModuleInfo.java      |  5 +---
 .../module/DefaultMutableModuleItem.java      |  5 +---
 .../scijava/module/MethodCallException.java   |  5 +---
 .../java/org/scijava/module/MethodRef.java    |  5 +---
 src/main/java/org/scijava/module/Module.java  |  5 +---
 .../module/ModuleCanceledException.java       |  5 +---
 .../org/scijava/module/ModuleException.java   |  5 +---
 .../java/org/scijava/module/ModuleIndex.java  |  5 +---
 .../java/org/scijava/module/ModuleInfo.java   |  5 +---
 .../java/org/scijava/module/ModuleItem.java   |  5 +---
 .../java/org/scijava/module/ModuleRunner.java |  5 +---
 .../org/scijava/module/ModuleService.java     |  5 +---
 .../org/scijava/module/MutableModule.java     |  5 +---
 .../org/scijava/module/MutableModuleInfo.java |  5 +---
 .../org/scijava/module/MutableModuleItem.java |  5 +---
 .../module/event/ModuleCanceledEvent.java     |  5 +---
 .../org/scijava/module/event/ModuleEvent.java |  5 +---
 .../module/event/ModuleExecutedEvent.java     |  5 +---
 .../module/event/ModuleExecutingEvent.java    |  5 +---
 .../module/event/ModuleExecutionEvent.java    |  5 +---
 .../module/event/ModuleFinishedEvent.java     |  5 +---
 .../module/event/ModulePostprocessEvent.java  |  5 +---
 .../module/event/ModulePreprocessEvent.java   |  5 +---
 .../module/event/ModuleProcessEvent.java      |  5 +---
 .../module/event/ModuleStartedEvent.java      |  5 +---
 .../module/event/ModulesAddedEvent.java       |  5 +---
 .../module/event/ModulesListEvent.java        |  5 +---
 .../module/event/ModulesRemovedEvent.java     |  5 +---
 .../module/event/ModulesUpdatedEvent.java     |  5 +---
 .../process/AbstractPostprocessorPlugin.java  |  5 +---
 .../process/AbstractPreprocessorPlugin.java   |  5 +---
 .../AbstractSingleInputPreprocessor.java      |  5 +---
 .../process/CheckInputsPreprocessor.java      |  5 +---
 .../module/process/DebugPostprocessor.java    |  5 +---
 .../module/process/DebugPreprocessor.java     |  5 +---
 .../process/DefaultValuePreprocessor.java     |  5 +---
 .../module/process/GatewayPreprocessor.java   |  5 +---
 .../module/process/InitPreprocessor.java      |  5 +---
 .../process/LoadInputsPreprocessor.java       |  5 +---
 .../module/process/LoggerPreprocessor.java    |  8 ++----
 .../module/process/ModulePostprocessor.java   |  5 +---
 .../module/process/ModulePreprocessor.java    |  5 +---
 .../module/process/ModuleProcessor.java       |  5 +---
 .../module/process/PostprocessorPlugin.java   |  5 +---
 .../module/process/PreprocessorPlugin.java    |  5 +---
 .../process/SaveInputsPreprocessor.java       |  5 +---
 .../module/process/ServicePreprocessor.java   |  5 +---
 .../module/process/ValidityPreprocessor.java  |  5 +---
 .../scijava/module/run/ModuleCodeRunner.java  |  5 +---
 .../scijava/object/DefaultObjectService.java  |  5 +---
 .../java/org/scijava/object/LazyObjects.java  |  5 +---
 .../org/scijava/object/NamedObjectIndex.java  | 28 +++++++++++++++++++
 .../java/org/scijava/object/ObjectIndex.java  |  5 +---
 .../org/scijava/object/ObjectService.java     |  5 +---
 .../org/scijava/object/SortedObjectIndex.java |  5 +---
 .../org/scijava/object/event/ListEvent.java   |  5 +---
 .../object/event/ObjectCreatedEvent.java      |  5 +---
 .../object/event/ObjectDeletedEvent.java      |  5 +---
 .../org/scijava/object/event/ObjectEvent.java |  5 +---
 .../object/event/ObjectModifiedEvent.java     |  5 +---
 .../object/event/ObjectsAddedEvent.java       |  5 +---
 .../object/event/ObjectsListEvent.java        |  5 +---
 .../object/event/ObjectsRemovedEvent.java     |  5 +---
 .../options/DefaultOptionsService.java        |  5 +---
 .../org/scijava/options/OptionsPlugin.java    |  5 +---
 .../org/scijava/options/OptionsService.java   |  5 +---
 .../scijava/options/event/OptionsEvent.java   |  5 +---
 .../scijava/parse/DefaultParseService.java    |  5 +---
 src/main/java/org/scijava/parse/Item.java     |  5 +---
 src/main/java/org/scijava/parse/Items.java    |  5 +---
 .../java/org/scijava/parse/ParseService.java  |  5 +---
 .../scijava/platform/AbstractPlatform.java    |  5 +---
 .../org/scijava/platform/AppEventService.java |  5 +---
 .../platform/DefaultAppEventService.java      |  5 +---
 .../org/scijava/platform/DefaultPlatform.java |  5 +---
 .../platform/DefaultPlatformService.java      |  5 +---
 .../java/org/scijava/platform/Platform.java   |  5 +---
 .../org/scijava/platform/PlatformService.java |  5 +---
 .../scijava/platform/event/AppAboutEvent.java |  5 +---
 .../scijava/platform/event/AppFocusEvent.java |  5 +---
 .../platform/event/AppMenusCreatedEvent.java  |  5 +---
 .../platform/event/AppOpenFilesEvent.java     |  5 +---
 .../platform/event/AppPreferencesEvent.java   |  5 +---
 .../scijava/platform/event/AppPrintEvent.java |  5 +---
 .../scijava/platform/event/AppQuitEvent.java  |  5 +---
 .../platform/event/AppReOpenEvent.java        |  5 +---
 .../platform/event/AppScreenSleepEvent.java   |  5 +---
 .../scijava/platform/event/AppSleepEvent.java |  5 +---
 .../platform/event/AppSystemSleepEvent.java   |  5 +---
 .../platform/event/AppUserSessionEvent.java   |  5 +---
 .../platform/event/AppVisibleEvent.java       |  5 +---
 .../platform/event/ApplicationEvent.java      |  5 +---
 .../scijava/plugin/AbstractHandlerPlugin.java |  5 +---
 .../plugin/AbstractHandlerService.java        |  5 +---
 .../org/scijava/plugin/AbstractPTService.java |  5 +---
 .../scijava/plugin/AbstractRichPlugin.java    |  5 +---
 .../plugin/AbstractSingletonService.java      |  5 +---
 .../scijava/plugin/AbstractTypedPlugin.java   |  5 +---
 .../scijava/plugin/AbstractTypedService.java  |  5 +---
 .../scijava/plugin/AbstractWrapperPlugin.java |  5 +---
 .../plugin/AbstractWrapperService.java        |  5 +---
 src/main/java/org/scijava/plugin/Attr.java    |  5 +---
 .../scijava/plugin/DefaultPluginFinder.java   |  5 +---
 .../scijava/plugin/DefaultPluginService.java  |  5 +---
 .../org/scijava/plugin/HandlerPlugin.java     |  5 +---
 .../org/scijava/plugin/HandlerService.java    |  5 +---
 .../org/scijava/plugin/HasPluginInfo.java     |  5 +---
 src/main/java/org/scijava/plugin/Menu.java    |  5 +---
 .../java/org/scijava/plugin/PTService.java    |  5 +---
 .../java/org/scijava/plugin/Parameter.java    |  5 +---
 src/main/java/org/scijava/plugin/Plugin.java  |  5 +---
 .../java/org/scijava/plugin/PluginFinder.java |  5 +---
 .../java/org/scijava/plugin/PluginIndex.java  |  5 +---
 .../java/org/scijava/plugin/PluginInfo.java   |  5 +---
 .../org/scijava/plugin/PluginService.java     |  5 +---
 .../java/org/scijava/plugin/RichPlugin.java   |  5 +---
 .../org/scijava/plugin/SciJavaPlugin.java     |  5 +---
 .../org/scijava/plugin/SingletonPlugin.java   |  5 +---
 .../org/scijava/plugin/SingletonService.java  |  5 +---
 .../org/scijava/plugin/SortablePlugin.java    |  5 +---
 .../java/org/scijava/plugin/TypedPlugin.java  |  5 +---
 .../java/org/scijava/plugin/TypedService.java |  5 +---
 .../org/scijava/plugin/WrapperPlugin.java     |  5 +---
 .../org/scijava/plugin/WrapperService.java    |  5 +---
 .../plugin/event/PluginsAddedEvent.java       |  5 +---
 .../plugin/event/PluginsListEvent.java        |  5 +---
 .../plugin/event/PluginsRemovedEvent.java     |  5 +---
 .../scijava/prefs/AbstractPrefService.java    |  5 +---
 .../org/scijava/prefs/DefaultPrefService.java |  5 +---
 .../java/org/scijava/prefs/PrefService.java   |  5 +---
 .../org/scijava/run/AbstractCodeRunner.java   |  5 +---
 src/main/java/org/scijava/run/CodeRunner.java |  5 +---
 .../org/scijava/run/DefaultRunService.java    |  5 +---
 src/main/java/org/scijava/run/RunService.java |  5 +---
 .../org/scijava/run/console/RunArgument.java  |  5 +---
 .../scijava/script/AbstractAutoCompleter.java |  5 +---
 .../scijava/script/AbstractScriptContext.java |  5 +---
 .../scijava/script/AbstractScriptEngine.java  |  5 +---
 .../scijava/script/AbstractScriptHeader.java  |  5 +---
 .../script/AbstractScriptLanguage.java        |  5 +---
 .../scijava/script/AdaptedScriptEngine.java   |  5 +---
 .../scijava/script/AdaptedScriptLanguage.java |  5 +---
 .../org/scijava/script/AutoCompleter.java     |  5 +---
 .../scijava/script/AutoCompletionResult.java  |  5 +---
 .../org/scijava/script/CodeGenerator.java     |  5 +---
 .../org/scijava/script/CodeGeneratorJava.java |  5 +---
 .../scijava/script/DefaultAutoCompleter.java  |  5 +---
 .../script/DefaultScriptHeaderService.java    |  5 +---
 .../script/DefaultScriptInterpreter.java      |  5 +---
 .../scijava/script/DefaultScriptService.java  |  5 +---
 .../org/scijava/script/InvocationObject.java  |  5 +---
 .../org/scijava/script/ParameterObject.java   |  5 +---
 .../java/org/scijava/script/ScriptFinder.java |  5 +---
 .../java/org/scijava/script/ScriptHeader.java |  5 +---
 .../scijava/script/ScriptHeaderService.java   |  5 +---
 .../java/org/scijava/script/ScriptInfo.java   |  5 +---
 .../org/scijava/script/ScriptInterpreter.java |  5 +---
 .../org/scijava/script/ScriptLanguage.java    |  5 +---
 .../scijava/script/ScriptLanguageIndex.java   |  5 +---
 .../java/org/scijava/script/ScriptModule.java |  5 +---
 .../java/org/scijava/script/ScriptREPL.java   |  5 +---
 .../org/scijava/script/ScriptService.java     |  5 +---
 .../script/console/RunScriptArgument.java     |  5 +---
 .../org/scijava/script/io/ScriptIOPlugin.java |  5 +---
 .../DefaultScriptProcessorService.java        |  5 +---
 .../process/DirectiveScriptProcessor.java     |  5 +---
 .../process/ParameterScriptProcessor.java     |  5 +---
 .../script/process/ScriptCallback.java        |  5 +---
 .../ScriptDirectiveScriptProcessor.java       |  5 +---
 .../script/process/ScriptProcessor.java       |  5 +---
 .../process/ScriptProcessorService.java       |  5 +---
 .../process/ShebangScriptProcessor.java       |  5 +---
 .../scijava/script/run/ScriptCodeRunner.java  |  5 +---
 .../org/scijava/service/AbstractService.java  |  5 +---
 .../org/scijava/service/SciJavaService.java   |  5 +---
 .../java/org/scijava/service/Service.java     |  5 +---
 .../org/scijava/service/ServiceHelper.java    |  5 +---
 .../org/scijava/service/ServiceIndex.java     |  5 +---
 .../service/event/ServicesLoadedEvent.java    |  5 +---
 .../startup/DefaultStartupService.java        |  5 +---
 .../org/scijava/startup/StartupService.java   |  5 +---
 .../java/org/scijava/task/DefaultTask.java    |  5 +---
 .../org/scijava/task/DefaultTaskService.java  |  5 +---
 src/main/java/org/scijava/task/Task.java      |  5 +---
 .../java/org/scijava/task/TaskService.java    |  5 +---
 .../org/scijava/task/event/TaskEvent.java     |  5 +---
 src/main/java/org/scijava/test/TestUtils.java |  5 +---
 .../org/scijava/text/AbstractTextFormat.java  |  5 +---
 .../org/scijava/text/DefaultTextService.java  |  5 +---
 .../java/org/scijava/text/TextFormat.java     |  5 +---
 .../java/org/scijava/text/TextService.java    |  5 +---
 .../org/scijava/text/io/TextIOPlugin.java     |  5 +---
 .../scijava/thread/DefaultThreadService.java  |  5 +---
 .../org/scijava/thread/ThreadService.java     |  5 +---
 .../java/org/scijava/tool/AbstractTool.java   |  5 +---
 .../org/scijava/tool/CustomDrawnTool.java     |  5 +---
 .../org/scijava/tool/DefaultToolService.java  |  5 +---
 src/main/java/org/scijava/tool/DummyTool.java |  5 +---
 .../java/org/scijava/tool/IconDrawer.java     |  5 +---
 .../java/org/scijava/tool/IconService.java    |  5 +---
 src/main/java/org/scijava/tool/Tool.java      |  5 +---
 .../java/org/scijava/tool/ToolService.java    |  5 +---
 .../tool/event/ToolActivatedEvent.java        |  5 +---
 .../tool/event/ToolDeactivatedEvent.java      |  5 +---
 .../org/scijava/tool/event/ToolEvent.java     |  5 +---
 src/main/java/org/scijava/ui/ARGBPlane.java   |  5 +---
 .../ui/AbstractInputHarvesterPlugin.java      |  5 +---
 .../org/scijava/ui/AbstractUIInputWidget.java |  5 +---
 .../org/scijava/ui/AbstractUserInterface.java |  5 +---
 .../java/org/scijava/ui/ApplicationFrame.java |  5 +---
 src/main/java/org/scijava/ui/Arrangeable.java |  5 +---
 .../java/org/scijava/ui/CloseConfirmable.java |  5 +---
 .../java/org/scijava/ui/DefaultUIService.java |  5 +---
 src/main/java/org/scijava/ui/Desktop.java     |  5 +---
 .../java/org/scijava/ui/DialogPrompt.java     |  5 +---
 .../org/scijava/ui/FileListPreprocessor.java  |  5 +---
 .../java/org/scijava/ui/FilePreprocessor.java |  5 +---
 src/main/java/org/scijava/ui/StatusBar.java   |  5 +---
 .../java/org/scijava/ui/SystemClipboard.java  |  5 +---
 src/main/java/org/scijava/ui/ToolBar.java     |  5 +---
 .../java/org/scijava/ui/UIPreprocessor.java   |  5 +---
 src/main/java/org/scijava/ui/UIService.java   |  5 +---
 .../java/org/scijava/ui/UserInterface.java    |  5 +---
 .../ui/console/AbstractConsolePane.java       |  5 +---
 .../org/scijava/ui/console/ConsolePane.java   |  5 +---
 .../scijava/ui/console/HeadlessArgument.java  |  5 +---
 .../scijava/ui/console/ShowUIArgument.java    |  5 +---
 .../org/scijava/ui/console/UIArgument.java    |  5 +---
 .../ui/dnd/AbstractDragAndDropData.java       |  5 +---
 .../ui/dnd/AbstractDragAndDropHandler.java    |  5 +---
 .../ui/dnd/DefaultDragAndDropData.java        |  5 +---
 .../ui/dnd/DefaultDragAndDropService.java     |  5 +---
 .../org/scijava/ui/dnd/DragAndDropData.java   |  5 +---
 .../scijava/ui/dnd/DragAndDropHandler.java    |  5 +---
 .../scijava/ui/dnd/DragAndDropService.java    |  5 +---
 .../ui/dnd/FileDragAndDropHandler.java        |  5 +---
 .../ui/dnd/ListDragAndDropHandler.java        |  5 +---
 .../java/org/scijava/ui/dnd/MIMEType.java     |  5 +---
 .../ui/dnd/ScriptFileDragAndDropHandler.java  |  5 +---
 .../ui/dnd/event/DragAndDropEvent.java        |  5 +---
 .../scijava/ui/dnd/event/DragEnterEvent.java  |  5 +---
 .../scijava/ui/dnd/event/DragExitEvent.java   |  5 +---
 .../scijava/ui/dnd/event/DragOverEvent.java   |  5 +---
 .../org/scijava/ui/dnd/event/DropEvent.java   |  5 +---
 .../java/org/scijava/ui/event/UIEvent.java    |  5 +---
 .../org/scijava/ui/event/UIShownEvent.java    |  5 +---
 .../ui/headless/HeadlessDisplayViewer.java    |  5 +---
 .../org/scijava/ui/headless/HeadlessUI.java   |  5 +---
 .../org/scijava/ui/headlessUI/HeadlessUI.java |  5 +---
 .../ui/viewer/AbstractDisplayViewer.java      |  5 +---
 .../org/scijava/ui/viewer/DisplayPanel.java   |  5 +---
 .../org/scijava/ui/viewer/DisplayViewer.java  |  5 +---
 .../org/scijava/ui/viewer/DisplayWindow.java  |  5 +---
 .../text/AbstractTextDisplayViewer.java       |  5 +---
 .../ui/viewer/text/TextDisplayPanel.java      |  5 +---
 .../ui/viewer/text/TextDisplayViewer.java     |  5 +---
 .../scijava/util/AbstractPrimitiveArray.java  |  5 +---
 src/main/java/org/scijava/util/AppUtils.java  |  5 +---
 .../java/org/scijava/util/ArrayUtils.java     |  5 +---
 src/main/java/org/scijava/util/BoolArray.java |  5 +---
 src/main/java/org/scijava/util/ByteArray.java |  5 +---
 src/main/java/org/scijava/util/Bytes.java     |  5 +---
 src/main/java/org/scijava/util/CharArray.java |  5 +---
 .../java/org/scijava/util/CheckSezpoz.java    |  5 +---
 .../java/org/scijava/util/ClassUtils.java     |  5 +---
 src/main/java/org/scijava/util/ColorRGB.java  |  5 +---
 src/main/java/org/scijava/util/ColorRGBA.java |  5 +---
 src/main/java/org/scijava/util/Colors.java    |  5 +---
 .../org/scijava/util/CombineAnnotations.java  |  5 +---
 src/main/java/org/scijava/util/Combiner.java  |  5 +---
 .../org/scijava/util/ConversionUtils.java     |  5 +---
 .../java/org/scijava/util/DebugUtils.java     |  5 +---
 .../org/scijava/util/DefaultTreeNode.java     |  5 +---
 .../java/org/scijava/util/DigestUtils.java    |  5 +---
 .../java/org/scijava/util/DoubleArray.java    |  5 +---
 src/main/java/org/scijava/util/FileUtils.java |  5 +---
 .../java/org/scijava/util/FloatArray.java     |  5 +---
 .../java/org/scijava/util/GenericUtils.java   |  5 +---
 src/main/java/org/scijava/util/IntArray.java  |  5 +---
 src/main/java/org/scijava/util/IntCoords.java |  5 +---
 src/main/java/org/scijava/util/IntRect.java   |  5 +---
 .../java/org/scijava/util/IteratorPlus.java   |  5 +---
 .../org/scijava/util/LastRecentlyUsed.java    |  5 +---
 .../org/scijava/util/LineOutputStream.java    |  5 +---
 src/main/java/org/scijava/util/ListUtils.java |  5 +---
 src/main/java/org/scijava/util/LongArray.java |  5 +---
 src/main/java/org/scijava/util/Manifest.java  |  5 +---
 .../org/scijava/util/MersenneTwisterFast.java |  5 +---
 .../org/scijava/util/MetaInfCombiner.java     |  5 +---
 .../java/org/scijava/util/MirrorWebsite.java  |  5 +---
 src/main/java/org/scijava/util/MiscUtils.java |  5 +---
 .../java/org/scijava/util/NumberUtils.java    |  5 +---
 .../java/org/scijava/util/ObjectArray.java    |  5 +---
 src/main/java/org/scijava/util/POM.java       |  5 +---
 .../java/org/scijava/util/PlatformUtils.java  |  5 +---
 src/main/java/org/scijava/util/Prefs.java     |  5 +---
 .../java/org/scijava/util/PrimitiveArray.java |  5 +---
 .../java/org/scijava/util/ProcessUtils.java   |  5 +---
 src/main/java/org/scijava/util/Query.java     |  5 +---
 src/main/java/org/scijava/util/ReadInto.java  |  5 +---
 .../java/org/scijava/util/RealCoords.java     |  5 +---
 src/main/java/org/scijava/util/RealRect.java  |  5 +---
 .../org/scijava/util/ReflectException.java    |  5 +---
 .../org/scijava/util/ReflectedUniverse.java   |  5 +---
 .../org/scijava/util/ServiceCombiner.java     |  5 +---
 .../java/org/scijava/util/ShortArray.java     |  5 +---
 src/main/java/org/scijava/util/Sizable.java   |  5 +---
 .../org/scijava/util/SizableArrayList.java    |  5 +---
 .../java/org/scijava/util/StringMaker.java    |  5 +---
 .../java/org/scijava/util/StringUtils.java    |  5 +---
 src/main/java/org/scijava/util/Timing.java    |  5 +---
 src/main/java/org/scijava/util/TreeNode.java  |  5 +---
 .../java/org/scijava/util/TunePlayer.java     |  5 +---
 src/main/java/org/scijava/util/Types.java     |  8 ++----
 src/main/java/org/scijava/util/UnitUtils.java |  5 +---
 .../java/org/scijava/util/VersionUtils.java   |  5 +---
 src/main/java/org/scijava/util/XML.java       |  5 +---
 .../welcome/DefaultWelcomeService.java        |  5 +---
 .../org/scijava/welcome/WelcomeService.java   |  5 +---
 .../scijava/welcome/event/WelcomeEvent.java   |  5 +---
 .../widget/AbstractInputHarvester.java        |  5 +---
 .../scijava/widget/AbstractInputPanel.java    |  5 +---
 .../scijava/widget/AbstractInputWidget.java   |  5 +---
 src/main/java/org/scijava/widget/Button.java  |  5 +---
 .../java/org/scijava/widget/ButtonWidget.java |  5 +---
 .../java/org/scijava/widget/ChoiceWidget.java |  5 +---
 .../java/org/scijava/widget/ColorWidget.java  |  5 +---
 .../java/org/scijava/widget/DateWidget.java   |  5 +---
 .../scijava/widget/DefaultWidgetModel.java    |  5 +---
 .../scijava/widget/DefaultWidgetService.java  |  5 +---
 .../org/scijava/widget/FileListWidget.java    |  5 +---
 .../java/org/scijava/widget/FileWidget.java   |  5 +---
 .../org/scijava/widget/InputHarvester.java    |  5 +---
 .../java/org/scijava/widget/InputPanel.java   |  5 +---
 .../java/org/scijava/widget/InputWidget.java  |  5 +---
 .../org/scijava/widget/MessageWidget.java     |  5 +---
 .../java/org/scijava/widget/NumberWidget.java |  5 +---
 .../java/org/scijava/widget/ObjectWidget.java |  5 +---
 .../java/org/scijava/widget/TextWidget.java   |  5 +---
 .../java/org/scijava/widget/ToggleWidget.java |  5 +---
 .../java/org/scijava/widget/UIComponent.java  |  5 +---
 .../java/org/scijava/widget/WidgetModel.java  |  5 +---
 .../org/scijava/widget/WidgetService.java     |  5 +---
 .../java/org/scijava/ContextCreationTest.java |  5 +---
 .../org/scijava/ContextInjectionTest.java     |  5 +---
 src/test/java/org/scijava/SciJavaTest.java    |  5 +---
 .../org/scijava/annotations/AnnotatedA.java   |  5 +---
 .../org/scijava/annotations/AnnotatedB.java   |  5 +---
 .../org/scijava/annotations/AnnotatedC.java   |  5 +---
 .../org/scijava/annotations/AnnotatedD.java   |  5 +---
 .../annotations/AnnotatedInnerClass.java      |  5 +---
 .../java/org/scijava/annotations/Complex.java |  5 +---
 .../annotations/DirectoryIndexerTest.java     |  5 +---
 .../annotations/EclipseHelperTest.java        |  5 +---
 .../java/org/scijava/annotations/Fruit.java   |  5 +---
 .../org/scijava/annotations/LegacyTest.java   |  5 +---
 .../java/org/scijava/annotations/Simple.java  |  5 +---
 .../org/scijava/app/StatusServiceTest.java    |  5 +---
 .../org/scijava/command/CommandInfoTest.java  |  5 +---
 .../scijava/command/CommandModuleTest.java    |  5 +---
 .../scijava/command/CommandServiceTest.java   |  5 +---
 .../scijava/command/InvalidCommandTest.java   |  5 +---
 .../command/run/CommandCodeRunnerTest.java    |  5 +---
 .../scijava/console/ConsoleServiceTest.java   |  5 +---
 .../console/SystemPropertyArgumentTest.java   |  5 +---
 .../convert/AbstractNumberConverterTests.java |  5 +---
 .../BigIntegerToBigDecimalConverterTest.java  |  5 +---
 .../ByteToBigDecimalConverterTest.java        |  5 +---
 .../ByteToBigIntegerConverterTest.java        |  5 +---
 .../convert/ByteToDoubleConverterTest.java    |  5 +---
 .../convert/ByteToFloatConverterTest.java     |  5 +---
 .../convert/ByteToIntegerConverterTest.java   |  5 +---
 .../convert/ByteToLongConverterTest.java      |  5 +---
 .../convert/ByteToShortConverterTest.java     |  5 +---
 .../scijava/convert/ConvertServiceTest.java   |  5 +---
 .../org/scijava/convert/ConverterTest.java    |  5 +---
 .../convert/DelegateConverterTest.java        | 28 +++++++++++++++++++
 .../DoubleToBigDecimalConverterTest.java      |  5 +---
 .../convert/FileListConverterTest.java        |  9 ++----
 .../FloatToBigDecimalConverterTest.java       |  5 +---
 .../convert/FloatToDoubleConverterTest.java   |  5 +---
 .../IntegerToBigDecimalConverterTest.java     |  5 +---
 .../IntegerToBigIntegerConverterTest.java     |  5 +---
 .../convert/IntegerToDoubleConverterTest.java |  5 +---
 .../convert/IntegerToLongConverterTest.java   |  5 +---
 .../LongToBigDecimalConverterTest.java        |  5 +---
 .../LongToBigIntegerConverterTest.java        |  5 +---
 .../ShortToBigDecimalConverterTest.java       |  5 +---
 .../ShortToBigIntegerConverterTest.java       |  5 +---
 .../convert/ShortToDoubleConverterTest.java   |  5 +---
 .../convert/ShortToFloatConverterTest.java    |  5 +---
 .../convert/ShortToIntegerConverterTest.java  |  5 +---
 .../convert/ShortToLongConverterTest.java     |  5 +---
 .../java/org/scijava/display/DisplayTest.java |  5 +---
 .../scijava/download/DownloadServiceTest.java |  5 +---
 .../org/scijava/event/EventServiceTest.java   |  5 +---
 .../org/scijava/io/ByteArrayByteBankTest.java |  5 +---
 .../java/org/scijava/io/ByteBankTest.java     |  9 ++----
 .../scijava/io/handle/BytesHandleTest.java    |  5 +---
 .../io/handle/DataHandleEdgeCaseTests.java    |  5 +---
 .../org/scijava/io/handle/DataHandleTest.java |  5 +---
 .../scijava/io/handle/DataHandlesTest.java    |  5 +---
 .../org/scijava/io/handle/FileHandleTest.java |  5 +---
 .../handle/ReadBufferDataHandleMockTest.java  | 28 +++++++++++++++++++
 .../io/handle/ReadBufferDataHandleTest.java   |  9 ++----
 .../io/handle/WriteBufferDataHandleTest.java  |  9 ++----
 .../io/location/BytesLocationTest.java        |  9 ++----
 .../io/location/FileLocationResolverTest.java |  9 ++----
 .../scijava/io/location/FileLocationTest.java |  5 +---
 .../io/location/LocationServiceTest.java      |  9 ++----
 .../scijava/io/location/URILocationTest.java  |  5 +---
 .../scijava/io/location/URLLocationTest.java  |  5 +---
 .../io/nio/ByteBufferByteBankTest.java        |  5 +---
 .../scijava/log/CallingClassUtilsTest.java    |  8 ++----
 .../org/scijava/log/DefaultLoggerTest.java    |  8 ++----
 .../java/org/scijava/log/LogMessageTest.java  |  8 ++----
 .../java/org/scijava/log/LogServiceTest.java  | 28 +++++++++++++++++++
 .../java/org/scijava/log/LogSourceTest.java   | 10 +++----
 .../org/scijava/log/StderrLogServiceTest.java |  5 +---
 .../java/org/scijava/log/TestLogListener.java |  8 ++----
 .../org/scijava/main/MainServiceTest.java     |  5 +---
 .../scijava/main/run/MainCodeRunnerTest.java  |  5 +---
 .../org/scijava/menu/MenuServiceTest.java     |  5 +---
 .../java/org/scijava/menu/ShadowMenuTest.java |  5 +---
 .../org/scijava/module/ModuleServiceTest.java |  5 +---
 .../process/LoggerPreprocessorTest.java       |  8 ++----
 .../module/run/ModuleCodeRunnerTest.java      |  5 +---
 .../scijava/object/NamedObjectIndexTest.java  | 28 +++++++++++++++++++
 .../org/scijava/object/ObjectIndexTest.java   |  5 +---
 .../org/scijava/object/ObjectServiceTest.java | 28 +++++++++++++++++++
 .../scijava/object/SortedObjectIndexTest.java |  5 +---
 .../java/org/scijava/options/OptionsTest.java |  5 +---
 .../org/scijava/parse/ParseServiceTest.java   |  5 +---
 .../org/scijava/plugin/PluginFinderTest.java  |  5 +---
 .../org/scijava/plugin/PluginIndexTest.java   |  5 +---
 .../org/scijava/plugin/PluginInfoTest.java    |  5 +---
 .../scijava/plugin/SingletonServiceTest.java  |  9 ++----
 .../org/scijava/prefs/PrefServiceTest.java    |  5 +---
 .../java/org/scijava/run/RunServiceTest.java  |  5 +---
 .../script/AbstractScriptLanguageTest.java    |  5 +---
 .../org/scijava/script/ScriptEngineTest.java  |  5 +---
 .../org/scijava/script/ScriptFinderTest.java  |  5 +---
 .../org/scijava/script/ScriptInfoTest.java    |  5 +---
 .../org/scijava/script/ScriptServiceTest.java |  5 +---
 .../org/scijava/service/ServiceIndexTest.java |  5 +---
 .../org/scijava/task/TaskServiceTest.java     |  5 +---
 .../org/scijava/test/AbstractSciJavaTest.java |  5 +---
 .../java/org/scijava/test/TestUtilsTest.java  |  5 +---
 .../org/scijava/thread/ThreadServiceTest.java |  5 +---
 .../java/org/scijava/ui/UIServiceTest.java    |  5 +---
 .../java/org/scijava/util/AppUtilsTest.java   |  5 +---
 .../java/org/scijava/util/ArrayUtilsTest.java |  5 +---
 .../java/org/scijava/util/BoolArrayTest.java  |  5 +---
 .../java/org/scijava/util/ByteArrayTest.java  |  5 +---
 .../java/org/scijava/util/CharArrayTest.java  |  5 +---
 .../java/org/scijava/util/ClassUtilsTest.java |  5 +---
 .../java/org/scijava/util/ColorRGBTest.java   |  5 +---
 .../org/scijava/util/ConversionUtilsTest.java |  5 +---
 .../org/scijava/util/DigestUtilsTest.java     |  5 +---
 .../org/scijava/util/DoubleArrayTest.java     |  5 +---
 .../java/org/scijava/util/FileUtilsTest.java  |  5 +---
 .../java/org/scijava/util/FloatArrayTest.java |  5 +---
 .../java/org/scijava/util/IntArrayTest.java   |  5 +---
 .../scijava/util/LastRecentlyUsedTest.java    |  5 +---
 .../java/org/scijava/util/LongArrayTest.java  |  5 +---
 .../org/scijava/util/ObjectArrayTest.java     |  5 +---
 src/test/java/org/scijava/util/POMTest.java   |  5 +---
 .../org/scijava/util/PrimitiveArrayTest.java  |  5 +---
 .../org/scijava/util/ProcessUtilsTest.java    |  5 +---
 .../java/org/scijava/util/ShortArrayTest.java |  5 +---
 .../org/scijava/util/StringUtilsTest.java     |  5 +---
 src/test/java/org/scijava/util/TypesTest.java |  5 +---
 .../java/org/scijava/util/UnitUtilsTest.java  |  5 +---
 .../org/scijava/util/VersionUtilsTest.java    |  5 +---
 725 files changed, 973 insertions(+), 2910 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 82d98ebc1..7d75d811c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,4 @@
-Copyright (c) 2009 - 2017, Board of Regents of the University of
-Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-Institute of Molecular Cell Biology and Genetics, University of
-Konstanz, and KNIME GmbH.
+Copyright (c) 2009 - 2020, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/pom.xml b/pom.xml
index af5be4f60..649edcae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,10 +158,7 @@
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>
-		<license.copyrightOwners>Board of Regents of the University of
-Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-Institute of Molecular Cell Biology and Genetics, University of
-Konstanz, and KNIME GmbH.</license.copyrightOwners>
+		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
 
 		<parsington.version>2.0.0</parsington.version>
 	</properties>
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 1647ef3ed..f250325d7 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,10 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2017 Board of Regents of the University of
-  Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-  Institute of Molecular Cell Biology and Genetics, University of
-  Konstanz, and KNIME GmbH.
+  Copyright (C) 2009 - 2020 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 563bf2b67..a2a1dab92 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index aeb8b9cd5..d7322e748 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index 1ef8c4510..bf204259b 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index 84696a531..66d036d7b 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index f7dc233e8..d5b5c19c7 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,10 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2017 Board of Regents of the University of
-  Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
-  Institute of Molecular Cell Biology and Genetics, University of
-  Konstanz, and KNIME GmbH.
+  Copyright (C) 2009 - 2020 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index a956f0b48..e8f52a049 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index d11fb2c6f..647ea1d97 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 4a4e89332..5c3dbd446 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 6627efa85..3d86efba7 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index 98884ff15..454929e6b 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index fd8aae923..968b66586 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index b53749e0d..638230db1 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 682abfefe..416f03ff9 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index 9ec7aeec2..df22b8ec8 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 9e06d2398..59fe12810 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index 0d88f23a4..512d69b11 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index c29b5fb0b..efa9854ab 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index d67cf1298..85480ad34 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index 7b1f55900..c3904f7b4 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index febcc8629..eacc23958 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index da4e594d4..749e91ae3 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index c9b0e7039..e855158ab 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index e29db087b..d8ca1961a 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 26b732e17..d18d5045f 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index f97542944..b30c410a1 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index bf2bc79f6..e19a58270 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index c0509c937..e3eb1c731 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index c96fc8892..570991bb8 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 13f6f600c..a3b9b7223 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 628904e36..61776fff4 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index befdc46d3..f41be8bbe 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index a5e28f0df..26d2ef9e2 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 998742226..49b508347 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index efa4acf93..cd2c8c04e 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index 10e8bf159..9c31dd435 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index 36aabaea6..e14786fd2 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index c87d1da55..5d3749e9d 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 8e4ae8a34..3855ed454 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 8982527e0..5e8c1febc 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 7ef216860..88e4229be 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 145252203..8b5650e48 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 31584568a..72c521ead 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index 23348cd80..6507152be 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index b047e8075..34956a4f6 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index d716978ae..32ac714e5 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 2916d0a78..2c72f011c 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 11d0929aa..44aa9dd49 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 14003cc24..f4d5f9d8e 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index 641c12778..c4d2515af 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 34c3dc4b9..cdf4bbdf0 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 918501003..40f7816fa 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index a58987ed2..0fab08453 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 6cb97fb8b..32bf3f5e2 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index c0f20dd08..2748361e1 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index 1866e18a6..e94ad4eb1 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index 24c592a0f..2cae0d038 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 4111a45a6..0b4242720 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 1843cf1be..66c9decca 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 4acc3f163..8d843d457 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index b675c59a5..3cff108b9 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 862bc3643..7be4d3e9f 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 589da8fe8..9caa8a956 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index 2754d4f7f..a804b41a5 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index ca8c412d1..86abd98c9 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index a8bf63220..695969c7d 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index a45f4b1ac..4296ec7e1 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index 74ad4cfee..864d9ba5e 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index d02e0d7d9..ed52be5df 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index 4abc0fee1..e51acee46 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 8ee57832d..211ad5033 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 74530bcec..1b9e0cb49 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index a6673e243..770ba3366 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index 25024e0da..863c404ef 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index cde13bf0d..21cb3883c 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index 4e645ced5..06834e22c 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index f5bd055a8..1a9fdc3d9 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 6b366a860..eab050323 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 8783e1eb9..b30bdd2e7 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index d1f380f20..84c3e9a82 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 659f52b9f..80224eb76 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index 663d51de7..5255a41be 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index f3657c1ca..895ba73a5 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index c174d5aec..725fbe44c 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index c9a79dc53..5bc2d5d3b 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 2c6b4165c..08699df4f 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index 11c6e3173..047c9070e 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.convert;
 
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 70b0d927c..0ed8136e8 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 77f5479eb..71a5b3d87 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 409af735f..173733bc6 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 49bf952ee..2ae80eb74 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 195fa4b07..687f1f80f 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index 2176e0398..023f3f2a3 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index f065627cf..b7a30e12d 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index 386279774..87ef0b625 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index cc3977d8a..fee7fd868 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index e7827463f..f5b290f7a 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index 74f4fecb1..d478b3a52 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index daf688867..8f9809beb 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 49bd310aa..4476c7c39 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index dacd8496c..46e2ebdbc 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index 5d43e22a1..0bd5fd940 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index e22864ed6..9cf6119cf 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index 31e3358e6..185a05cc5 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 1714eeae0..28685a49e 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index d407fcb99..98d2968bb 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index 46a07a4ed..b7e2bffbb 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index f4eff12aa..53d48f526 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 58d41b983..acb44807c 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index 542a88f5b..03ecfdf8e 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index a8e0e6ade..9875f381a 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index 35d9285ec..9b1344f1e 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index e51c819bf..aea51db20 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 0bfdfd77b..71dd23651 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 204b72608..df6402848 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index c57d69244..2a3d401ab 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 46be07e94..133dbe33c 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 4edf3e210..b2fdcdc3e 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index 56202566b..cc31035d2 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index 30a461d51..e9c2d2591 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index a604634fd..8623bef2e 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index dbac42c23..aac425b78 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index 8ef95d6a1..cb965f47d 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index 93f8741f6..72240dd43 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index d86783a0c..5114179df 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 81f003f47..7dd73548e 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index 52354fc5a..357c325aa 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index 737edb758..9f06970c6 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 206cdea81..1303ed7bc 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index a1d73920f..f82342037 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index c68ca8fce..4f9633cc7 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index ffc1cd08c..c31d00fec 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index b0ea0b037..89e22cc84 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index e0d7045a8..71b0f9de8 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index 4c3e3fd99..ac91255cd 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 7fdbc15f8..7b0d29a11 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index c0da07dc4..550ff39d4 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index e070b45a4..151c7a075 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 11bb065a3..599cd2f2e 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index 51b9e6402..c1cbb600f 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index d3f994aef..5087352c1 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 68a182f04..7a6bf981c 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index 6eda6b191..2f5a5628a 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 910acbadc..197640421 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index 1b4bd8b09..d3a24080f 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index b665645c1..41fd8d36c 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index 5ee047fa8..1cb2b2cf4 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index ef2e0b0e1..499e3ffd7 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index de74162f0..1471ce490 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index 4f6b72471..aa93b5b96 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index 0f810c9c6..f47928ce2 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 26b9b7bcf..2a7533c30 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 7d262054c..09110c29b 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 7835f5087..b5e9678ec 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 07530827d..76530d7af 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index 94db61dcd..77cbe8ec6 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 386713bc6..adb6e6f72 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index 6d0dbc100..a74eb57b2 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index b74804836..a860eacda 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 4d046e5a7..63565cf64 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index 1233b0913..ce8d38274 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index 7d50772f3..92fa10abe 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index 5ac542926..c5fefc304 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 32317193e..5901b3fbe 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index b6a8567e6..6df1198cb 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index a3541422d..d402ebd85 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 430f97f0c..5a0ae0139 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index 833298a89..3c0521552 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 6053405d8..6ccd92f2c 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index b0b759955..699d9ed59 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index 397b22133..e5462f035 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 1f74ec075..c71896453 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 9d00f1144..28a3804ef 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 42781e9a6..86bcee5b2 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 3858229a9..f31ffdf64 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index e7ab47cae..a2f98459c 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index fa05f8afc..7ca6363de 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 08ac7c0ef..7af006c5a 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index 45691849f..cd6d22439 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 2c21cd076..1a62e6fca 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index f5e5f1c59..6242fff7e 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index ae2a73451..9953eb226 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
index 4015deb68..bdc345e5b 100644
--- a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -2,9 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
index f06e9fbb6..80619f38b 100644
--- a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 9ffa71431..8d58024ee 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index c7cbfb654..c20b043ee 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index d96cfed49..f0d15852c 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index 8291985ba..c702f9bf9 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index 8bc55a2b6..ecd96333e 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index 9bed1a516..91522eb9b 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index b2bf44b98..af7c931cf 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 2244c4692..45b9b5571 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index a42e05587..3bcbfe6dd 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index 6f092f759..26670f5ed 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
index b22f17c1a..98bc48e62 100644
--- a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -2,9 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
index 3ad97e581..8b5f767b6 100644
--- a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -2,9 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
index 64902d404..3483932dc 100644
--- a/src/main/java/org/scijava/io/handle/StreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
index 41c1603a8..86e63ec81 100644
--- a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index e15f64ab1..6b493a391 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
index 3ab3c8e75..dc6f613d4 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index 5a5873ed3..2a31dcfe6 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
index cd3daaccd..52356fbc1 100644
--- a/src/main/java/org/scijava/io/location/BrowsableLocation.java
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 41980b0fd..a4d870b6f 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index 9e8805204..f84ddb1e5 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index 564305b0b..f393a381a 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 2f073e1cc..618f8a3b0 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
index b40f0f13e..5873b5285 100644
--- a/src/main/java/org/scijava/io/location/FileLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index bec21e813..6b87ab2ec 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
index 6e71f617c..3f9c84048 100644
--- a/src/main/java/org/scijava/io/location/LocationResolver.java
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index fbced738a..8cfb3cda1 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index 94cc2155b..da2b59f3c 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 8ea6531cc..5413e8bb6 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index 7311dc874..ac9a7a34e 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index a159185a8..10fc18e42 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 29785ec49..29218ea6e 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index 1d67b0a66..6ebf4d618 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 09038ea6b..e813e10e3 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index c885a7ac8..5bcf98460 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 7e5fb7a00..506b02447 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index 526b27331..0c313435f 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index de7c2f974..d6ff175f1 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index e38b85e80..dab6e9583 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -2,9 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index 88a1a63d4..918895891 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index dadf6b395..a9755e034 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index ef79590bc..d8dd1c2b0 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index ad7bbacf3..16fdd6c6b 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index fab36ba9f..3f31f51c5 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index bc0f3203e..492203115 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -2,9 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index e59a85a06..39f09ac2d 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index f706fbefb..17ef070f6 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index c4a4ac2d0..7ecc9ff67 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 793fdce2c..b01f55636 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 2e86b3b5c..5b6a17acf 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index b88dd28db..acda55b48 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 4145342a3..dc43dd7d5 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index 680b52f86..eb80cbc89 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index ebda18708..a9d510f9c 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index 02747467d..f7fc4a7e7 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index f2ca6f04b..7872caaa3 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index e4ae4883c..42e0d1970 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index 220a8389f..3dbeca85c 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index 7474e77a1..f824c3ad6 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index c8fb8c1df..70926115c 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index 75ac1d5a0..df5b30223 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index ca13bf3db..04ad15e3a 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 7020f24ed..334f9f37e 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index 3f881b944..da260b12a 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index ea20a6ffa..26fac0d84 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index c1cc84d16..011c9336a 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index 6654c616d..af331696e 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 1feffbcc6..4c8354d14 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index 970958312..d17923d9b 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index acfa908b4..a3399c35e 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 567602335..70a45398b 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index 82ae29ef9..08dd0ef3f 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 2355db95b..6c07451f4 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index 83da593d6..431924783 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index b442b4300..2e1dbb476 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 5b6b43fdb..4abd391ea 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index d95e123f0..d514afa54 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 5c6e86809..0767fb2f4 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 83d746362..302b321e4 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index aec08d912..6436b0d42 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 01af92e0d..58c146a81 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index 80bf49ba9..d40bf6a9f 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index 4303c40d4..cd618e566 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index 58dc9e41c..5771a16ee 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index 9589e788a..b9e8231d3 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 5c5ed02ef..6b674ad84 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index 5ab4b856f..8a6d748b9 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 98a0b2a27..5f5c3a7bf 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index ab8ef93ea..468d5ef66 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 4f42cc3d3..57482a65a 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index 52647be4e..28933c8ad 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index 8fa1c18de..98f9f3b39 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 140ee62c0..467ac137b 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index f37774673..fabc602a0 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index 067cad90f..00a3ef6cb 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index 7f6231b28..73f5a2dcf 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index b1c049a80..861e00f33 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index 91abbb0a9..864d780a8 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index c07a0644c..58d6fc890 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 2cc1e89e5..4cff4eb06 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index aeede855e..bd3e2826d 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index cc0d1f7d5..431d80f52 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index a2f751546..c71fe444a 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index b71b961d8..5e1dad59f 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index c9c84505b..3e9b01ca5 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 2e62faaf1..19306d59c 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index 9f3d29ae4..8293fd796 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index e40a7b21c..e2c48d3b0 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 01daf5446..4cb204c62 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index e8f346b8b..ada646e05 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index b7081968d..af68aeffc 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index c8fde59d8..ce19bfd45 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 287c2159f..85e8aec4f 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index 012d14fe7..bf33a6d7c 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index e34b1b800..d94a04a80 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 2b150a997..c72dcf434 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index e1d0d660e..c0b5ab00c 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index 2b314fa1d..2fe990d15 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.object;
 
 import java.util.WeakHashMap;
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index 04c174cb5..47f1efd25 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 24e71299e..e68eaf1c4 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 690ff025d..c89921129 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index ee97f715a..c863add41 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index 6d7ea3c52..0b92de092 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index 1cda244d8..e5857e7f7 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index 5b4d8e68a..e9b649635 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 44b289518..51b2bf3fb 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index a924dcf5c..7030ec9f9 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index 699cc48b0..3790576c7 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 20b505c6a..8dda4a1b5 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 706eb0579..3067f7c4d 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index ceeb6f0f2..40e07da97 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index 199478d05..2c0bc2e7b 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index 6e2712b02..71970cd2d 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 3d4d1d9b4..05262097b 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index c08d40764..1a7217d02 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index a1a47320c..dd7a0a8a1 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 870893e6f..6a4b7bf80 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index e0437cd04..f97e4b6d4 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index 12dad7a43..8591a610b 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index 450710084..b3957baec 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 06124c883..fb6e44fab 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index b0ded7629..7bcc67b26 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 840e03c46..99c801f66 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 53f56d85d..f0825da3b 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 7bc964bdb..1abf52932 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index a4364de88..48d8a1dc9 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 72b90558b..871321496 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index bc6e98bc4..38f6d114d 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index 494372e96..67e214539 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index b89404a7d..1e7ca07da 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index 6f8f3ff08..445bb83c0 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index db1fe918b..6fce38f6e 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index 4396d87d7..7d6626e11 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index a8545571b..7ff2d58f9 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index 81c23b321..56347c8cf 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index 8adcbb90d..a35cde8d9 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 88d6d71fb..8e63de1a8 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 0114a3231..f9ae6a778 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 358baa2f5..5242b040f 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index a0bd36719..4d5dfe5ec 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 03145e616..5c5cef87e 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 30b46b66d..179dcf60a 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index ee5dc7cef..81fe6d810 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 52b82ef2c..088516aa4 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 7c71dfd51..15f2b2f50 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index ca7cfafad..86834e247 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 4795a5810..44319cb0a 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index 08aac65da..dbff0e208 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 21242fcf6..d703119a8 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 45fcdf656..aa11fb7d5 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index 9dfe36a7a..9a70628d9 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index dd4cc1b7c..cf72138fa 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 4e359bd91..ffd2326c5 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index 9b031c836..33bda0f4a 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 990535a43..9d45d2ebb 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index 3d0f14077..ac24dd5e6 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index 3a084f7ef..f71c9d0b8 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 59310b635..3437229c1 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 78866bbe8..ac783ec41 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 90cf7dac5..55b6034a8 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index 36adb07a7..afe785048 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index 33ab3e9f4..528e378dc 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index cfcda7d6a..3c4014149 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 8be6a7b9a..64c52b840 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 4099afbdc..71a1f09d1 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index e031af5bb..596f536d9 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index 2e451c992..ff5866890 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index b1c8263f9..052a00aca 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index 06ad76eaa..b2391b7de 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index 6e4483e02..08fb27213 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index ed19ddcf5..4f9e4cb72 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index 3fd7a5d32..9a65c9fb0 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index d4636239a..98eca3ac8 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 350fe27b1..21ea5976f 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 92ae62f8f..229c8deed 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index b039d970b..ba4f40876 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 8bacf6a95..3f10ada1a 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index 56fe2954b..c3dd29465 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index b8aee1b27..fd481f213 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index ab6ca65be..d0f293b92 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 0ee722664..3f5d01fb4 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index 981653d9c..f06224bfd 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index 7b8409a03..452a7b212 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index cdbb2252d..13b9d56d3 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 819d79c8d..f2cd2549a 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index cd29ceb33..c3b0934c8 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index e69de8bf3..506da8b54 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index 8ab47cfb4..804fa7e80 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index 220e78589..37c2960e4 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index e3f777d36..90e1000db 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index b8a0e9266..461b2cd1c 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 8c2db2675..a6911a839 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index f20e3ee25..0f9878e88 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index 4d2ac2050..39b718050 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index f6610d7f9..58fb7e4b0 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index f677c555c..974b4e517 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 85886a494..d90d3b4d6 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 8f6f68af5..7142501d8 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 0422b2aca..ef358a778 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index 3872e1e3f..631183696 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index 25d8b08c5..54fb2e316 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index ef8802b5a..ce199cbe8 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index 782bb0d71..bea31b1bd 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 779ca7897..da77e84a3 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 68fe4d6db..66035b130 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 3766c56c6..7e398fb55 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index d28558f8b..d6c10adfd 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 1bdbb8aaa..b295fdadd 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index f8b99c3b9..db593af9e 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index 72e20f701..56d201770 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index 1978295b4..b3486a274 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
index a7cdbba47..047b09986 100644
--- a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index 1473ddf33..fb73cdc16 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index 5d060704f..d3c21ac86 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index 212495c1d..3521add73 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index 11bb9645a..28ef60b73 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 66a482476..cbf37f84c 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index 1d93df16b..f0acd3f06 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index 02df88c75..007f7eb5e 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index 0a5e7c631..3aaef93d9 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index 5887eec55..a1dad4f9d 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index 3260f6205..31b5c5137 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 728e07e5a..f4222cd09 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index e512c2a0f..4507986b0 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index 8c06ba6d0..aa43d1d6f 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index 2a4d8ab4c..e37f3684c 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
index 8f1e56f47..8f886e34a 100644
--- a/src/main/java/org/scijava/startup/StartupService.java
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 8042f511e..fae38bd39 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
index e99edfa3a..67f5c60c8 100644
--- a/src/main/java/org/scijava/task/DefaultTaskService.java
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index 958ec8d07..f2ea69aef 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
index 774f2ae98..82d015847 100644
--- a/src/main/java/org/scijava/task/TaskService.java
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
index a8f3a02dd..9b88b2642 100644
--- a/src/main/java/org/scijava/task/event/TaskEvent.java
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 3244499c7..3a71c3fa0 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index c02394f10..ce1a419dc 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index dd1ecc2d3..82d09cf40 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 6e483d3b1..aeb62d315 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 16b18d1c6..03209c58c 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 03b090046..3d2c64172 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index e24ac8e40..626fb7a24 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index e33011885..69a6c13bf 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index f233701ba..b1bbfbff9 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 3b9c6cd32..48af501ac 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index cb714e30f..f907ce6fc 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index 508c35b16..0da513789 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index 6e2c26d27..782c1eda3 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index 48b5b2ae8..e293a5a79 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index 8e32d696b..118e54529 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 29065b2f7..175fc01d3 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 70df3662f..33665f794 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 9eab6bd6c..5099ed283 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 1ea60d802..c6bf80824 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index 0b6681e37..1601a2b07 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index 6b078bdb5..920b4e6a0 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index 3aa8d4214..ca37e8503 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 0e429808e..1efa8139b 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index ddbde1e27..30a63ca2d 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index 49f2b6d64..bdcbaafa7 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index fb81cb57d..c0f410b6b 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index d7d915eea..96fc2ea6d 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index 710d440c4..f8407428e 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index d0e0ec607..82401f183 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index 6a8971898..fbb5cea5b 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index 2bb916e29..02b8d1a04 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index ea09442f9..8d11e6ddb 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index 4bbd7e490..42e2bd1cd 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index f4ef6f875..91555eb7f 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index c1e11ccab..abf939667 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 9b711bd05..efd1cbccf 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 6449960b7..ca5c86cee 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index bc029ea35..d8e66b589 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index 7f373bf10..28336c6d6 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index 97551d667..ff1079f3f 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index 206899067..aabaa1c0f 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index adb428492..39053f14e 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 643bcbfba..6f26986bd 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index 15f675082..512f01035 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index 8a0012b07..f89136087 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index 0c7355dd7..bf7230819 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index cbad90cde..2d59d4af9 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 6f65c0a73..140f61ada 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index c52b28565..5dfbaa90c 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index e6116de21..2076c6a20 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index 7e92f190e..ba24d62b9 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 2600b161d..eb3b860af 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index c3e49ee08..ae911864b 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index 429f6903a..3be4929f6 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index d89ef6ef9..76b2eb9d2 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 57a93a2bb..7fd8845af 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index c2a3ff8b2..286ddbe03 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index f91dada1b..8fe5364b5 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index 2a03183dd..3c974ac4d 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index 1cd8b54d5..1a57865a4 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index 62576cc9a..b265c389b 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 8b70fd54e..b315b377f 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 90e4105f6..928168d90 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index d949a3312..aa75ca0fc 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index 5edabe84f..ba7f324ff 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index d7ac3f89b..cfe9570e7 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index d170758fe..825510501 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index c9d9cea64..ba48ce527 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 26702b2bb..38513d1f8 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 2a8c44b51..b052d4f58 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index 0c91b9454..e745e5ba2 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index f4836730d..ea93137b1 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 52d1c3378..6d396fd36 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 8a02aed89..e2f69e924 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index 69617306a..3f56a3089 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index edfeff177..ea7415fe5 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index 3c2914f25..a3e661f26 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index f394a860e..c5d535281 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 3f7202dd8..9bc2000ea 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 3151f7f62..39d15a21f 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index 7b9b1d038..d9abbd395 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index f9f3fe292..db2db000f 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index 4e2a95057..fd8804f96 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index 062182c15..064d32bb3 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index e2e5428da..d12ad5281 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 8d705a985..dc08f1085 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
index c4f722ab3..9e9351a2d 100644
--- a/src/main/java/org/scijava/util/DefaultTreeNode.java
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 725a7628d..08d4fe587 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index 2108fb609..00dd0dec6 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 5b2c109c6..69a658896 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index 26464d35e..61d7102d7 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index 75b52c44f..ff45ab5ce 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 3c6014ded..21592e25d 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index 0501616a3..e368dbab7 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index a96c98e39..2ed65bbb2 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index 56a4319dd..5827b173b 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 731bd74a0..4f23438ce 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index 1ef4e99e4..de517f696 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index 1c169f351..09981d20f 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index c0ac04d1f..fce832a0b 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index aad982446..e0dae6e79 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index a3a8707b3..d7e178c59 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 6f274e50e..c34b3a236 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index e59621e4e..d6f5ff1c6 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 428b4e819..0a6286d19 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index d7b51272f..f3b8d84c6 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index f1af6eb58..6b6ce4e60 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 53d2a0559..0811cdb21 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index acd9459ba..c6412303a 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index f9d13609f..9e1bc9191 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 192498e89..7fc4935df 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index 8dee1e5c8..233fca0c3 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index d0cba28ba..431176950 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 297465013..3ef783c28 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index 32bf04be0..781b38910 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index bb5c9e6f4..b2fabab85 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index 241f50373..f3841cbc6 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 2a2fe9554..e3bb179fe 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index f5577b9f9..92ab6595e 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 444ed8e21..e6552acb4 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index 863a08c06..69826743e 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index 925b90ce1..a4882d018 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 6b6a389ae..84a4b1338 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index c2155e277..ba1f57305 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 3b6eaa1e9..56c71c050 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
index 5f2063349..9402f1db7 100644
--- a/src/main/java/org/scijava/util/TreeNode.java
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index 4a4d54db2..7460c8bcf 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 25995ea0e..adfbc3fcb 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2016 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 9fa762fc7..315c69149 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index bf1be77ff..0dac9702f 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index ab904e876..aee47bf36 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 72731ae3b..763fe8a08 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index d3e97197f..dfdc1ace1 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index 9d3f656fe..09e67f6ab 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index fefc9bb47..c17f3f6b7 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index 24006c63e..d0483f911 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 2557f9714..379521c9a 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index 99d62816e..ef8c22460 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index 56129404e..f06772fa4 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index b956c764f..d7b5449c5 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 22b1f6d6d..77363a9f3 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index fc60b932d..1bed7f3bd 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 46e960fd8..ffb19061f 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index f80fc641b..5487289d1 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index b7f2203a5..a47cc89c9 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index f31c2ac28..2e3b5fac1 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 6d4933790..80640cd83 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 1087924f7..78ee87076 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 3f3b2ad43..5107eb2aa 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 9d8bc2234..c1245b479 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index a48567eac..1e6f85a30 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index fd7ce5ce2..d13a56261 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index a89b49446..4f5dab5f5 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index 04c00a6f9..af9e18369 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index ab06587a9..c03d375be 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 2bb202e46..80f033de0 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index 85c73afbe..fd0eee169 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 0be58b788..4fd266e4b 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index 53aa7ab40..f05706dfa 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
index b8b91ecf8..b66a0587f 100644
--- a/src/test/java/org/scijava/SciJavaTest.java
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 27c4f1db9..b30632b66 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index a8644a6c9..c6a2af6b1 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index b4d0bb2de..098b4597a 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index ac122ff03..9baa28c3d 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index f5133e5be..8a7be9293 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index b7881c1b3..cf767f6b3 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 249511a57..06ce50b5b 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index d2f663f35..e47ee1d4d 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index 75efc3e7a..657d3ecb5 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index eeb2f5503..7e7290c52 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index 709593d4b..5b713e1d9 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index f5abb4730..02b074e38 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index ded76ecd8..63a698b23 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 834962d1c..8f32e59bd 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index 95ae9aa22..ca89f8084 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 2c4109a1e..8ab7b7c53 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index 7a226ed43..d9a47c566 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index c87eadcb8..45f3af9c5 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index b9ebff3d7..a1b0b5992 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 99505256c..c28ff6247 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index b08cfeb84..966ca3501 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index bac9855af..c988e252e 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index 2356d46c4..db0ce1531 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index fec333605..153986d8f 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 8044c7f00..d5fe939ff 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 506a11fe9..b5eeddebb 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 79f58a1a0..dc76b0314 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index 284c485d7..ac4169511 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 50debdabe..1634f8e57 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 3a89f4785..9473e4a16 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
index 6126750c0..ab3941050 100644
--- a/src/test/java/org/scijava/convert/DelegateConverterTest.java
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.convert;
 
 import static org.junit.Assert.assertSame;
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index d18d7b19a..c903e33eb 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index ed3610e11..e690f926e 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index 31085d0c6..b67714c14 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index 2d836e667..fe2c586b4 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 44e85680f..ac3d1d222 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index 9779a0a29..980fdee94 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 0f2c38533..be4045cd4 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index fa242dd9b..d3c174f2f 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index a5f7e7402..684c6480f 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index c04794cb9..67a3aa196 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index 436f2098f..b70c66c99 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index 35be86ac7..5770c77a9 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index 9b5f91830..b02e438f2 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index b6b16a4f2..29592cd6c 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 407df7e84..83079e693 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index 361438faf..9e7dcac9d 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index 8b9081d6c..45d667eb9 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index d7ca11eb8..3a4f3abfb 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index a90e6adb0..b8b5c1c32 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index acf5ec911..8466a16e0 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index 60eaa7c1e..b6350fb83 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index 03c536d55..991d2663b 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
index 268faee59..6e0398aa8 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2018 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 5fe7cf273..99ce93e35 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
index 4d2a9a8c6..6bc45b329 100644
--- a/src/test/java/org/scijava/io/handle/DataHandlesTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index df43ef347..687161d90 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index 38fabfe06..ee964d265 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.io.handle;
 
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index 9f05bd38b..52d1436b0 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index 6ea468872..efa3c70d7 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index addac1dbb..583861392 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
index 9e94b0281..9b58fe467 100644
--- a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index 43bc8b0f7..aa12f5df7 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index 4736fd24b..c298896da 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index 5298b1d6a..a8314552a 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index 1f74e1cb3..5a802b5f9 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index a1c571107..61e4a6c46 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index b9be5999b..a23f8fee0 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index 5abf54683..f19707bec 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 0f19c0b65..8ad7252e3 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index a3c510d3a..79d2b5362 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.log;
 
 import org.junit.Test;
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index b83c7d9ab..2348731ef 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
@@ -115,4 +113,4 @@ public void testSetLogLevel() {
 		assertTrue(source.hasLogLevel());
 		assertEquals(LogLevel.INFO, source.logLevel());
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index bf740226e..72c1de930 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
index fbc31946c..a07dc82e1 100644
--- a/src/test/java/org/scijava/log/TestLogListener.java
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index 76d1fd854..1280da8ee 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index c361345df..8dc7b9449 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index f228f7d79..a5df5b5fa 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index e0f06e0c3..e1056e81e 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index 08604b4e3..90c9107b7 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index b3cbc60ca..f39cbccb8 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -2,19 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
- * Institute of Molecular Cell Biology and Genetics.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index 8ad866534..03f5b059c 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
index 3e4783247..29544816a 100644
--- a/src/test/java/org/scijava/object/NamedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.object;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 6e662eef4..e31d2b54d 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
index 4d58a97fe..0a473a3ba 100644
--- a/src/test/java/org/scijava/object/ObjectServiceTest.java
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.object;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 255780dc6..a1922ad25 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 7ac1e4dd9..c4de55bbd 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index fd24e86ac..69ab7c3f9 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index cf3984c85..89170b5bc 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 59e881152..2fb4e4f59 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index ae504aec7..3e46bf072 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index 1f91581f0..f2cf3075e 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2018 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index b768d960b..9f9733037 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index 17a38ab2d..304bce5cb 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index b9117d27c..e99d850e0 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index 8c72c5f8f..a45d9b66e 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index d47d2d858..92bcfd1cb 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index b6214c1cb..38c0ffa2f 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index 642767104..b9c5d14da 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 4712282c0..972697a01 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index e9eb0e068..1dce2952a 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index 3bf06dde2..9064f9f92 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 181e3246b..b47d94f79 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 576c5a9a5..1bde42216 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index b54dfa540..f4c43008d 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index 2b2da010a..11ac49cb5 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index 7521d018c..7e98f5bf0 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index f94955de0..f481aab12 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index 266bf2e01..b0c22be5e 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 4983e6461..deb2b2a66 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 283ff45cd..e48c59dde 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 423a6d281..5302f04d8 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 69e08bc91..84ee67931 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 4d0a837ff..792bac870 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index e90c6d053..42d9dbeb9 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index b464a580e..64c3a0024 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index 356df3e18..d68961a92 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index 4f22647b5..e55154002 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index fd80647e2..55e7157cb 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index d1063a581..43d742da3 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index 40dc5bd61..9b9ff1eab 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index c445c110d..b398d98f8 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index f4a5bfa72..7b64063fd 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index e8882c123..300cd5b01 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index 5cd7b6cb2..1a3211c03 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 9559fd83c..168ef614b 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 6dcbcc393..f5eef7b01 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index e0f060eca..e5ecb806b 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index 902006367..57bf77718 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -2,10 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From dcb568dcb9c3c215a508813e899ffc4f1bfff056 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 25 May 2020 13:39:24 -0500
Subject: [PATCH 0944/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 649edcae2..b6f190a7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.83.2-SNAPSHOT</version>
+	<version>2.83.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From ca7bf72c17260f18f597775d2041b991189015f0 Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Thu, 28 May 2020 10:40:03 +0200
Subject: [PATCH 0945/1208] AbstractInputHarvester: make getObjects() not
 return duplicates

* both the convertService and the objectService attach objects of a
given type to the result list of AbstractInputHarvester:getObjects
* this results into the same objects being in the list twice
* using a set avoids duplicates in the list
---
 .../java/org/scijava/widget/AbstractInputHarvester.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index c17f3f6b7..582b72b77 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -30,7 +30,9 @@
 package org.scijava.widget;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.scijava.AbstractContextual;
 import org.scijava.convert.ConvertService;
@@ -129,10 +131,10 @@ private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,
 	@SuppressWarnings("unchecked")
 	private List<?> getObjects(final Class<?> type) {
 		@SuppressWarnings("rawtypes")
-		List compatibleInputs =
-			new ArrayList(convertService.getCompatibleInputs(type));
+		Set compatibleInputs =
+				new HashSet(convertService.getCompatibleInputs(type));
 		compatibleInputs.addAll(objectService.getObjects(type));
-		return compatibleInputs;
+		return new ArrayList<>(compatibleInputs);
 	}
 
 }

From 92339087fe885e55d2cb913eea8322483cf96e0f Mon Sep 17 00:00:00 2001
From: tpietzsch <tobias.pietzsch@gmail.com>
Date: Thu, 28 May 2020 17:02:13 +0200
Subject: [PATCH 0946/1208] Fix ReadBufferDataHandle.globalToLocalOffset()

Missing parantheses broke it for off > Integer.MAX_VALUE
---
 src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index 26670f5ed..05e442405 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -182,7 +182,7 @@ private byte[] readPage(final int pageID, final int slotID) throws IOException {
 	 * Calculates the offset in the current page for the given global offset
 	 */
 	private int globalToLocalOffset(final long off) {
-		return (int) off % pageSize;
+		return (int) (off % pageSize);
 	}
 
 	@Override

From dc8ea6d88071d02740ec8e707c9e2cd2cc1ce53c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 28 May 2020 10:11:25 -0500
Subject: [PATCH 0947/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b6f190a7b..ed7bd2a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.83.3-SNAPSHOT</version>
+	<version>2.83.4-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 9d3a6e647e1b7991a120f0a2b87052bda9a93ceb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 14 Dec 2019 17:56:54 +0100
Subject: [PATCH 0948/1208] Add unit tests for Inputs class

Co-authored-by: Deborah Schmidt <mail@frauzufall.de>
---
 src/main/java/org/scijava/command/Inputs.java |   2 +-
 .../scijava/plugin/DefaultPluginService.java  |   3 +-
 .../java/org/scijava/command/InputsTest.java  | 170 ++++++++++++++++++
 3 files changed, 173 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/scijava/command/InputsTest.java

diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index f34f00aed..ad7ba18f4 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -96,7 +96,7 @@ public Map<String, Object> harvest() {
 		try {
 			final List<PreprocessorPlugin> pre = //
 				pluginService.createInstancesOfType(PreprocessorPlugin.class);
-			return moduleService.run(this, true, pre, null).get().getInputs();
+			return moduleService.run(this, pre, null).get().getInputs();
 		}
 		catch (final InterruptedException | ExecutionException exc) {
 			throw new RuntimeException(exc);
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 45fcdf656..24612e3d4 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -239,7 +239,8 @@ public <PT extends SciJavaPlugin> List<PT> createInstances(
 			return p;
 		}
 		catch (final Throwable t) {
-			final String errorMessage = "Cannot create plugin: " + info;
+			final String errorMessage = //
+				"Cannot create plugin: " + info.getClassName();
 			if (log.isDebug()) log.debug(errorMessage, t);
 			else log.error(errorMessage);
 		}
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
new file mode 100644
index 000000000..8c06e0bbe
--- /dev/null
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -0,0 +1,170 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2017 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
+ * Institute of Molecular Cell Biology and Genetics, University of
+ * Konstanz, and KNIME GmbH.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.command;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.InstantiableException;
+import org.scijava.log.LogLevel;
+import org.scijava.log.LogService;
+import org.scijava.module.Module;
+import org.scijava.module.ModuleItem;
+import org.scijava.module.MutableModuleItem;
+import org.scijava.module.process.AbstractPreprocessorPlugin;
+import org.scijava.module.process.PreprocessorPlugin;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.PluginService;
+import org.scijava.widget.InputHarvester;
+import org.scijava.widget.NumberWidget;
+
+/**
+ * Tests {@link Inputs}.
+ *
+ * @author Curtis Rueden
+ * @author Deborah Schmidt
+ */
+public class InputsTest {
+
+	private Context context;
+
+	@Before
+	public void setUp() {
+		context = new Context();
+		context.service(PluginService.class);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	/** Tests single input, no configuration. */
+	@Test
+	public void testSingleInput() {
+		setExpected(new HashMap<String, Object>() {{
+			put("sigma", 3.9f);
+		}});
+		Inputs inputs = new Inputs(context);
+		inputs.getInfo().setName("testSingleInput");//TEMP
+		inputs.addInput("sigma", Float.class);
+		float sigma = (Float) inputs.harvest().get("sigma");
+		assertEquals(3.9f, sigma, 0);
+	}
+
+	/** Tests two inputs, no configuration. */
+	@Test
+	public void testTwoInputs() {
+		setExpected(new HashMap<String, Object>() {{
+			put("name", "Chuckles");
+			put("age", 37);
+		}});
+		Inputs inputs = new Inputs(context);
+		inputs.getInfo().setName("testTwoInputs");//TEMP
+		inputs.addInput("name", String.class);
+		inputs.addInput("age", Integer.class);
+		Map<String, Object> values = inputs.harvest();
+		String name = (String) values.get("name");
+		int age = (Integer) values.get("age");
+		assertEquals("Chuckles", name);
+		assertEquals(37, age);
+	}
+
+	/** Tests inputs with configuration. */
+	@Test
+	public void testWithConfiguration() {
+		setExpected(new HashMap<String, Object>() {{
+			put("word", "brown");
+			put("opacity", 0.8);
+		}});
+		Inputs inputs = new Inputs(context);
+		inputs.getInfo().setName("testWithConfiguration");//TEMP
+		MutableModuleItem<String> wordInput = inputs.addInput("word", String.class);
+		wordInput.setLabel("Favorite word");
+		wordInput.setChoices(Arrays.asList("quick", "brown", "fox"));
+		wordInput.setDefaultValue("fox");
+		MutableModuleItem<Double> opacityInput = inputs.addInput("opacity", Double.class);
+		opacityInput.setMinimumValue(0.0);
+		opacityInput.setMaximumValue(1.0);
+		opacityInput.setDefaultValue(0.5);
+		opacityInput.setWidgetStyle(NumberWidget.SCROLL_BAR_STYLE);
+		inputs.harvest();
+		String word = wordInput.getValue(inputs);
+		double opacity = opacityInput.getValue(inputs);
+		assertEquals("brown", word);
+		assertEquals(0.8, opacity, 0);
+	}
+
+	public void setExpected(final Map<String, Object> expected) {
+		final PluginInfo<PreprocessorPlugin> info =
+			new PluginInfo<PreprocessorPlugin>(MockInputHarvester.class,
+				PreprocessorPlugin.class)
+		{
+			@Override
+			public PreprocessorPlugin createInstance() throws InstantiableException {
+				final PreprocessorPlugin pp = super.createInstance();
+				((MockInputHarvester) pp).setExpected(expected);
+				return pp;
+			}
+		};
+		info.setPriority(InputHarvester.PRIORITY);
+		context.service(PluginService.class).addPlugin(info);
+	}
+
+	public static class MockInputHarvester extends AbstractPreprocessorPlugin {
+		private Map<String, Object> expected;
+		public void setExpected(final Map<String, Object> expected) {
+			this.expected = expected;
+		}
+
+		@Override
+		public void process(final Module module) {
+			for (final ModuleItem<?> input : module.getInfo().inputs()) {
+				if (module.isInputResolved(input.getName())) continue;
+				final String name = input.getName();
+				if (!expected.containsKey(name)) {
+					throw new AssertionError("No value for input: " + input.getName());
+				}
+				final Object value = expected.get(name);
+				module.setInput(name, value);
+			}
+		}
+	}
+}

From 950c3f3b5a4437015baf5455514db8c5a84df4df Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 3 Jul 2020 11:30:39 -0500
Subject: [PATCH 0949/1208] Rename blacklist to blocklist

See e.g. https://twitter.com/leahculver/status/1269109776983547904
---
 .../scijava/plugin/DefaultPluginFinder.java    | 18 +++++++++---------
 .../org/scijava/plugin/PluginFinderTest.java   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index d703119a8..3cb59909e 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -53,7 +53,7 @@ public class DefaultPluginFinder implements PluginFinder {
 	/** Class loader to use when querying the annotation indexes. */
 	private final ClassLoader customClassLoader;
 
-	private final PluginBlacklist blacklist;
+	private final PluginBlocklist blocklist;
 
 	// -- Constructors --
 
@@ -63,7 +63,7 @@ public DefaultPluginFinder() {
 
 	public DefaultPluginFinder(final ClassLoader classLoader) {
 		customClassLoader = classLoader;
-		blacklist = new SysPropBlacklist();
+		blocklist = new SysPropBlocklist();
 	}
 
 	// -- PluginFinder methods --
@@ -82,7 +82,7 @@ public HashMap<String, Throwable> findPlugins(
 
 		// create a PluginInfo object for each item in the index
 		for (final IndexItem<Plugin> item : annotationIndex) {
-			if (blacklist.contains(item.className())) continue;
+			if (blocklist.contains(item.className())) continue;
 			try {
 				final PluginInfo<?> info = createInfo(item, classLoader);
 				plugins.add(info);
@@ -117,23 +117,23 @@ private ClassLoader getClassLoader() {
 
 	// -- Helper classes --
 
-	private interface PluginBlacklist {
+	private interface PluginBlocklist {
 		boolean contains(String className);
 	}
 
 	/**
-	 * A blacklist defined by the {@code scijava.plugin.blacklist} system
+	 * A blocklist defined by the {@code scijava.plugin.blocklist} system
 	 * property, formatted as a colon-separated list of regexes.
 	 * <p>
 	 * If a plugin class matches any of the regexes, it is excluded from the
 	 * plugin index.
 	 * </p>
 	 */
-	private class SysPropBlacklist implements PluginBlacklist {
+	private class SysPropBlocklist implements PluginBlocklist {
 		private final List<Pattern> patterns;
 
-		public SysPropBlacklist() {
-			final String sysProp = System.getProperty("scijava.plugin.blacklist");
+		public SysPropBlocklist() {
+			final String sysProp = System.getProperty("scijava.plugin.blocklist");
 			final String[] regexes = //
 				sysProp == null ? new String[0] : sysProp.split(":");
 			patterns = new ArrayList<>(regexes.length);
@@ -147,7 +147,7 @@ public SysPropBlacklist() {
 			}
 		}
 
-		// -- PluginBlacklist methods --
+		// -- PluginBlocklist methods --
 
 		@Override
 		public boolean contains(final String className) {
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index 89170b5bc..6df16a8d7 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -43,33 +43,33 @@
 public class PluginFinderTest {
 
 	/**
-	 * Tests that the {@code scijava.plugin.blacklist} system property works to
+	 * Tests that the {@code scijava.plugin.blocklist} system property works to
 	 * exclude plugins from the index, even when they are on the classpath.
 	 */
 	@Test
-	public void testPluginBlacklistSystemProperty() {
+	public void testPluginBlocklistSystemProperty() {
 		// check that the plugin is there, normally
 		Context context = new Context(PluginService.class);
 		PluginService pluginService = context.service(PluginService.class);
 		PluginInfo<SciJavaPlugin> plugin = //
-			pluginService.getPlugin(BlacklistedPlugin.class);
-		assertSame(BlacklistedPlugin.class.getName(), plugin.getClassName());
+			pluginService.getPlugin(BlocklistedPlugin.class);
+		assertSame(BlocklistedPlugin.class.getName(), plugin.getClassName());
 		context.dispose();
 
-		// blacklist the plugin, then check that it is absent
-		System.setProperty("scijava.plugin.blacklist", ".*BlacklistedPlugin");
+		// blocklist the plugin, then check that it is absent
+		System.setProperty("scijava.plugin.blocklist", ".*BlocklistedPlugin");
 		context = new Context(PluginService.class);
 		pluginService = context.service(PluginService.class);
-		plugin = pluginService.getPlugin(BlacklistedPlugin.class);
+		plugin = pluginService.getPlugin(BlocklistedPlugin.class);
 		assertNull(plugin);
 		context.dispose();
 
 		// reset the system
-		System.getProperties().remove("scijava.plugin.blacklist");
+		System.getProperties().remove("scijava.plugin.blocklist");
 	}
 
 	@Plugin(type = SciJavaPlugin.class)
-	public static class BlacklistedPlugin implements SciJavaPlugin {
+	public static class BlocklistedPlugin implements SciJavaPlugin {
 		// NB: No implementation needed.
 	}
 

From 460927a3c946eb7c2cb7fd9c01b3a359bd2306ef Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 3 Jul 2020 11:37:16 -0500
Subject: [PATCH 0950/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed7bd2a5f..43d085481 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.83.4-SNAPSHOT</version>
+	<version>2.83.5-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From d200f608e601a5cb70865fea27c3844bcef1b8c4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 16 Jul 2020 13:50:27 -0500
Subject: [PATCH 0951/1208] POM: bump minor version

The Inputs class is new API.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 43d085481..92757258f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.83.5-SNAPSHOT</version>
+	<version>2.84.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From b42b473d5943c0b64df49eb3cb13de53da9c30d5 Mon Sep 17 00:00:00 2001
From: Emil Melnikov <emilmelnikov@users.noreply.github.com>
Date: Fri, 31 Jul 2020 15:19:30 +0200
Subject: [PATCH 0952/1208] Fix DynamicCommand.getOutput

---
 src/main/java/org/scijava/command/DynamicCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index e8146faca..c9919ef33 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -93,7 +93,7 @@ public Object getInput(final String name) {
 	@Override
 	public Object getOutput(final String name) {
 		final Field field = getInfo().getOutputField(name);
-		if (field == null) return super.getInput(name);
+		if (field == null) return super.getOutput(name);
 		return ClassUtils.getValue(field, this);
 	}
 

From a5993b3a9cd9c634881b4c30c47ac95884ff451d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 5 Aug 2020 11:38:16 -0500
Subject: [PATCH 0953/1208] ModuleRunner: do not rethrow caught exceptions

Apparently this is a bad practice. Better to use chaining.
---
 src/main/java/org/scijava/module/ModuleRunner.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index d514afa54..b8ec3a20a 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -124,12 +124,10 @@ public Module call() {
 			run();
 		}
 		catch (final RuntimeException exc) {
-			if (log != null) log.error("Module threw exception", exc);
-			throw exc;
+			throw new RuntimeException("Module threw exception", exc);
 		}
 		catch (final Error err) {
-			if (log != null) log.error("Module threw error", err);
-			throw err;
+			throw new RuntimeException("Module threw error", err);
 		}
 		return module;
 	}

From b7285c5f807891097b5405b270952fcd32f2253c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 7 Jun 2014 13:19:45 -0500
Subject: [PATCH 0954/1208] Use Location, not String, in the I/O API

This is much more elegant. It is also a very breaking change.

Co-authored-by: Deborah Schmidt <mail@frauzufall.de>
---
 .../java/org/scijava/io/AbstractIOPlugin.java | 41 ++++++++++++-
 .../java/org/scijava/io/DefaultIOService.java | 30 +++++++++-
 .../scijava/io/DefaultRecentFileService.java  |  7 ++-
 src/main/java/org/scijava/io/IOPlugin.java    | 34 +++++++++--
 src/main/java/org/scijava/io/IOService.java   | 59 ++++++++++++++++---
 .../org/scijava/io/event/DataOpenedEvent.java | 16 ++---
 .../org/scijava/io/event/DataSavedEvent.java  | 12 ++--
 .../java/org/scijava/io/event/IOEvent.java    | 18 +++---
 .../org/scijava/script/io/ScriptIOPlugin.java | 11 +++-
 .../org/scijava/text/io/TextIOPlugin.java     | 15 +++--
 .../ui/dnd/FileDragAndDropHandler.java        |  9 +--
 .../java/org/scijava/io/DummyTextFormat.java  | 22 +++++++
 .../java/org/scijava/io/IOServiceTest.java    | 38 ++++++++++++
 src/test/resources/org/scijava/io/test.txt    |  1 +
 14 files changed, 256 insertions(+), 57 deletions(-)
 create mode 100644 src/test/java/org/scijava/io/DummyTextFormat.java
 create mode 100644 src/test/java/org/scijava/io/IOServiceTest.java
 create mode 100644 src/test/resources/org/scijava/io/test.txt

diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 6ccd92f2c..9d314f8a3 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -29,15 +29,50 @@
 
 package org.scijava.io;
 
+import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 import org.scijava.plugin.AbstractHandlerPlugin;
+import org.scijava.plugin.Parameter;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
 
 /**
  * Abstract base class for {@link IOPlugin}s.
  * 
  * @author Curtis Rueden
  */
-public abstract class AbstractIOPlugin<D> extends AbstractHandlerPlugin<String>
-	implements IOPlugin<D>
+public abstract class AbstractIOPlugin<D> extends
+	AbstractHandlerPlugin<Location> implements IOPlugin<D>
 {
-	// NB: No implementation needed.
+
+	@Parameter
+	private LocationService locationService;
+
+	@Override
+	public boolean supportsOpen(final String source) {
+		try {
+			return supportsOpen(locationService.resolve(source));
+		} catch (URISyntaxException e) {
+			return false;
+		}
+	}
+
+	@Override
+	public boolean supportsSave(final String destination) {
+		try {
+			return supportsSave(locationService.resolve(destination));
+		} catch (URISyntaxException e) {
+			return false;
+		}
+	}
+
+	@Override
+	public void save(final D data, final String destination) throws IOException {
+		try {
+			save(data, locationService.resolve(destination));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
 }
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index c71896453..bfdaf35a2 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -30,10 +30,13 @@
 package org.scijava.io;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import org.scijava.event.EventService;
 import org.scijava.io.event.DataOpenedEvent;
 import org.scijava.io.event.DataSavedEvent;
+import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractHandlerService;
 import org.scijava.plugin.Parameter;
@@ -47,7 +50,7 @@
  */
 @Plugin(type = Service.class)
 public final class DefaultIOService
-	extends AbstractHandlerService<String, IOPlugin<?>> implements IOService
+	extends AbstractHandlerService<Location, IOPlugin<?>> implements IOService
 {
 
 	@Parameter
@@ -56,10 +59,31 @@ public final class DefaultIOService
 	@Parameter
 	private EventService eventService;
 
-	// -- IOService methods --
+	@Parameter
+	private LocationService locationService;
 
 	@Override
 	public Object open(final String source) throws IOException {
+		try {
+			return open(locationService.resolve(source));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
+
+	@Override
+	public void save(final Object data, final String destination)
+			throws IOException
+	{
+		try {
+			save(data, locationService.resolve(destination));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
+
+	@Override
+	public Object open(final Location source) throws IOException {
 		final IOPlugin<?> opener = getOpener(source);
 		if (opener == null) {
 			log.error("No opener IOPlugin found for " + source + ".");
@@ -77,7 +101,7 @@ public Object open(final String source) throws IOException {
 	}
 
 	@Override
-	public void save(final Object data, final String destination)
+	public void save(final Object data, final Location destination)
 		throws IOException
 	{
 		final IOPlugin<Object> saver = getSaver(data, destination);
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 28a3804ef..a15b172b5 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -41,6 +41,8 @@
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
 import org.scijava.io.event.IOEvent;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.menu.MenuConstants;
 import org.scijava.module.ModuleInfo;
 import org.scijava.module.ModuleService;
@@ -181,7 +183,10 @@ public void dispose() {
 
 	@EventHandler
 	protected void onEvent(final IOEvent event) {
-		add(event.getDescriptor());
+		final Location loc = event.getLocation();
+		if (!(loc instanceof FileLocation)) return;
+		final FileLocation fileLoc = (FileLocation) loc;
+		add(fileLoc.getFile().getPath());
 	}
 
 	// -- Helper methods --
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 86bcee5b2..298cf6252 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -31,6 +31,8 @@
 
 import java.io.IOException;
 
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
 
@@ -48,7 +50,7 @@
  * @see Plugin
  * @see IOService
  */
-public interface IOPlugin<D> extends HandlerPlugin<String> {
+public interface IOPlugin<D> extends HandlerPlugin<Location> {
 
 	/** The type of data opened and/or saved by the plugin. */
 	Class<D> getDataType();
@@ -56,44 +58,66 @@ public interface IOPlugin<D> extends HandlerPlugin<String> {
 	/** Checks whether the I/O plugin can open data from the given source. */
 	@SuppressWarnings("unused")
 	default boolean supportsOpen(final String source) {
+		return supportsOpen(new FileLocation(source));
+	}
+
+	/** Checks whether the I/O plugin can open data from the given location. */
+	default boolean supportsOpen(Location source) {
 		return false;
 	}
 
 	/** Checks whether the I/O plugin can save data to the given destination. */
 	@SuppressWarnings("unused")
 	default boolean supportsSave(final String destination) {
+		return supportsSave(new FileLocation(destination));
+	}
+
+	/** Checks whether the I/O plugin can save data to the given location. */
+	default boolean supportsSave(Location destination) {
 		return false;
 	}
 
 	/**
 	 * Checks whether the I/O plugin can save the given data to the specified
-	 * destination.
+	 * location.
 	 */
 	default boolean supportsSave(final Object data, final String destination) {
 		return supportsSave(destination) && getDataType().isInstance(data);
 	}
 
+	default boolean supportsSave(Object data, Location destination) {
+		return supportsSave(destination) && getDataType().isInstance(data);
+	}
+
 	/** Opens data from the given source. */
 	@SuppressWarnings("unused")
 	default D open(final String source) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 
+	/** Opens data from the given location. */
+	default D open(Location source) throws IOException {
+		throw new UnsupportedOperationException();
+	}
 	/** Saves the given data to the specified destination. */
 	@SuppressWarnings("unused")
 	default void save(final D data, final String destination) throws IOException {
+		save(data, new FileLocation(destination));
+	}
+
+	/** Saves the given data to the specified location. */
+	default void save(D data, Location destination) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 
 	// -- Typed methods --
 
-	@Override
 	default boolean supports(final String descriptor) {
 		return supportsOpen(descriptor) || supportsSave(descriptor);
 	}
 
 	@Override
-	default Class<String> getType() {
-		return String.class;
+	default Class<Location> getType() {
+		return Location.class;
 	}
 }
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index f31ffdf64..4e49f4aee 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -31,6 +31,8 @@
 
 import java.io.IOException;
 
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
 
@@ -39,15 +41,23 @@
  * 
  * @author Curtis Rueden
  */
-public interface IOService extends HandlerService<String, IOPlugin<?>>,
+public interface IOService extends HandlerService<Location, IOPlugin<?>>,
 	SciJavaService
 {
 
 	/**
 	 * Gets the most appropriate {@link IOPlugin} for opening data from the given
-	 * source.
+	 * location.
 	 */
 	default IOPlugin<?> getOpener(final String source) {
+		return getOpener(new FileLocation(source));
+	}
+
+	/**
+	 * Gets the most appropriate {@link IOPlugin} for opening data from the given
+	 * location.
+	 */
+	default IOPlugin<?> getOpener(Location source) {
 		for (final IOPlugin<?> handler : getInstances()) {
 			if (handler.supportsOpen(source)) return handler;
 		}
@@ -56,9 +66,17 @@ default IOPlugin<?> getOpener(final String source) {
 
 	/**
 	 * Gets the most appropriate {@link IOPlugin} for saving data to the given
-	 * destination.
+	 * location.
 	 */
 	default <D> IOPlugin<D> getSaver(final D data, final String destination) {
+		return getSaver(data, new FileLocation(destination));
+	}
+
+	/**
+	 * Gets the most appropriate {@link IOPlugin} for saving data to the given
+	 * location.
+	 */
+	default <D> IOPlugin<D> getSaver(D data, Location destination) {
 		for (final IOPlugin<?> handler : getInstances()) {
 			if (handler.supportsSave(data, destination)) {
 				@SuppressWarnings("unchecked")
@@ -77,7 +95,7 @@ default <D> IOPlugin<D> getSaver(final D data, final String destination) {
 	 * The opener to use is automatically determined based on available
 	 * {@link IOPlugin}s; see {@link #getOpener(String)}.
 	 * </p>
-	 * 
+	 *
 	 * @param source The source (e.g., file path) from which to data should be
 	 *          loaded.
 	 * @return An object representing the loaded data, or null if the source is
@@ -86,6 +104,20 @@ default <D> IOPlugin<D> getSaver(final D data, final String destination) {
 	 */
 	Object open(String source) throws IOException;
 
+	/**
+	 * Loads data from the given location.
+	 * <p>
+	 * The opener to use is automatically determined based on available
+	 * {@link IOPlugin}s; see {@link #getOpener(Location)}.
+	 * </p>
+	 *
+	 * @param source The location from which to data should be loaded.
+	 * @return An object representing the loaded data, or null if the source is
+	 *         not supported.
+	 * @throws IOException if something goes wrong loading the data.
+	 */
+	Object open(Location source) throws IOException;
+
 	/**
 	 * Saves data to the given destination. The nature of the destination is left
 	 * intentionally general, but the most common example is a file path.
@@ -93,7 +125,7 @@ default <D> IOPlugin<D> getSaver(final D data, final String destination) {
 	 * The saver to use is automatically determined based on available
 	 * {@link IOPlugin}s; see {@link #getSaver(Object, String)}.
 	 * </p>
-	 * 
+	 *
 	 * @param data The data to be saved to the destination.
 	 * @param destination The destination (e.g., file path) to which data should
 	 *          be saved.
@@ -101,6 +133,19 @@ default <D> IOPlugin<D> getSaver(final D data, final String destination) {
 	 */
 	void save(Object data, String destination) throws IOException;
 
+	/**
+	 * Saves data to the given location.
+	 * <p>
+	 * The saver to use is automatically determined based on available
+	 * {@link IOPlugin}s; see {@link #getSaver(Object, Location)}.
+	 * </p>
+	 * 
+	 * @param data The data to be saved to the destination.
+	 * @param destination The destination location to which data should be saved.
+	 * @throws IOException if something goes wrong saving the data.
+	 */
+	void save(Object data, Location destination) throws IOException;
+
 	// -- HandlerService methods --
 
 	@Override
@@ -110,7 +155,7 @@ default Class<IOPlugin<?>> getPluginType() {
 	}
 
 	@Override
-	default Class<String> getType() {
-		return String.class;
+	default Class<Location> getType() {
+		return Location.class;
 	}
 }
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 7af006c5a..4cf613856 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -29,22 +29,18 @@
 
 package org.scijava.io.event;
 
+
+import org.scijava.io.location.Location;
+
 /**
- * An event indicating that data has been opened from a source.
+ * An event indicating that data has been opened from a location.
  * 
  * @author Curtis Rueden
  */
 public class DataOpenedEvent extends IOEvent {
 
-	public DataOpenedEvent(final String source, final Object data) {
-		super(source, data);
-	}
-
-	// -- DataOpenedEvent methods --
-
-	/** Gets the source from which data was opened. */
-	public String getSource() {
-		return getDescriptor();
+	public DataOpenedEvent(final Location location, final Object data) {
+		super(location, data);
 	}
 
 }
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index cd6d22439..fe4b7abc3 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -29,6 +29,9 @@
 
 package org.scijava.io.event;
 
+
+import org.scijava.io.location.Location;
+
 /**
  * An event indicating that data has been saved to a destination.
  * 
@@ -36,15 +39,8 @@
  */
 public class DataSavedEvent extends IOEvent {
 
-	public DataSavedEvent(final String destination, final Object data) {
+	public DataSavedEvent(final Location destination, final Object data) {
 		super(destination, data);
 	}
 
-	// -- DataSavedEvent methods --
-
-	/** Gets the destination to which data was saved. */
-	public String getDestination() {
-		return getDescriptor();
-	}
-
 }
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 1a62e6fca..9228c94a4 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -30,6 +30,7 @@
 package org.scijava.io.event;
 
 import org.scijava.event.SciJavaEvent;
+import org.scijava.io.location.Location;
 
 /**
  * An event indicating that I/O (e.g., opening or saving) has occurred.
@@ -38,20 +39,20 @@
  */
 public abstract class IOEvent extends SciJavaEvent {
 
-	/** The data descriptor (source or destination). */
-	private final String descriptor;
+	/** The data location (source or destination). */
+	private final Location location;
 
 	/** The data for which I/O took place. */
 	private final Object data;
 
-	public IOEvent(final String descriptor, final Object data) {
-		this.descriptor = descriptor;
+	public IOEvent(final Location location, final Object data) {
+		this.location = location;
 		this.data = data;
 	}
 
-	/** Gets the data descriptor (source or destination). */
-	public String getDescriptor() {
-		return descriptor;
+	/** Gets the data location (source or destination). */
+	public Location getLocation() {
+		return location;
 	}
 
 	/** Gets the data for which I/O took place. */
@@ -63,7 +64,8 @@ public Object getData() {
 
 	@Override
 	public String toString() {
-		return super.toString() + "\n\tdescriptor = " + data + "\n\tdata = " + data;
+		return super.toString() + "\n\tlocation = " + location + "\n\tdata = " +
+			data;
 	}
 
 }
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index 56d201770..f881dc429 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -33,6 +33,8 @@
 
 import org.scijava.io.AbstractIOPlugin;
 import org.scijava.io.IOPlugin;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.plugin.Parameter;
 import org.scijava.script.ScriptService;
 
@@ -55,13 +57,16 @@ public Class<String> getDataType() {
 	}
 
 	@Override
-	public boolean supportsOpen(final String source) {
+	public boolean supportsOpen(final Location source) {
 		if (scriptService == null) return false; // no service for opening scripts
-		return scriptService.canHandleFile(source);
+		// TODO: Update ScriptService to use Location instead of File.
+		if (!(source instanceof FileLocation)) return false;
+		final FileLocation loc = (FileLocation) source;
+		return scriptService.canHandleFile(loc.getFile());
 	}
 
 	@Override
-	public String open(final String source) throws IOException {
+	public String open(final Location source) throws IOException {
 		if (scriptService == null) return null; // no service for opening scripts
 		// TODO: Use the script service to open the file in the script editor.
 		return null;
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 3d2c64172..523ff2c34 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -29,12 +29,13 @@
 
 package org.scijava.text.io;
 
-import java.io.File;
 import java.io.IOException;
 
 import org.scijava.Priority;
 import org.scijava.io.AbstractIOPlugin;
 import org.scijava.io.IOPlugin;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.text.TextService;
@@ -59,15 +60,19 @@ public Class<String> getDataType() {
 	}
 
 	@Override
-	public boolean supportsOpen(final String source) {
+	public boolean supportsOpen(final Location source) {
 		if (textService == null) return false; // no service for opening text files
-		return textService.supports(new File(source));
+		if (!(source instanceof FileLocation)) return false;
+		final FileLocation loc = (FileLocation) source;
+		return textService.supports(loc.getFile());
 	}
 
 	@Override
-	public String open(final String source) throws IOException {
+	public String open(final Location source) throws IOException {
 		if (textService == null) return null; // no service for opening text files
-		return textService.asHTML(new File(source));
+		if (!(source instanceof FileLocation)) throw new IllegalArgumentException();
+		final FileLocation loc = (FileLocation) source;
+		return textService.asHTML(loc.getFile());
 	}
 
 }
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 2076c6a20..02289b6e4 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -36,6 +36,7 @@
 import org.scijava.display.Display;
 import org.scijava.display.DisplayService;
 import org.scijava.io.IOService;
+import org.scijava.io.location.FileLocation;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -68,7 +69,8 @@ public boolean supports(final File file) {
 		if (!super.supports(file)) return false;
 
 		// verify that the file can be opened somehow
-		return ioService.getOpener(file.getAbsolutePath()) != null;
+		final FileLocation loc = new FileLocation(file);
+		return ioService.getOpener(loc) != null;
 	}
 
 	@Override
@@ -78,13 +80,12 @@ public boolean drop(final File file, final Display<?> display) {
 		if (file == null) return true; // trivial case
 
 		// load the data
-		final String filename = file.getAbsolutePath();
 		final Object data;
 		try {
-			data = ioService.open(filename);
+			data = ioService.open(new FileLocation(file));
 		}
 		catch (final IOException exc) {
-			if (log != null) log.error("Error opening file: " + filename, exc);
+			if (log != null) log.error("Error opening file: " + file, exc);
 			return false;
 		}
 
diff --git a/src/test/java/org/scijava/io/DummyTextFormat.java b/src/test/java/org/scijava/io/DummyTextFormat.java
new file mode 100644
index 000000000..21729843f
--- /dev/null
+++ b/src/test/java/org/scijava/io/DummyTextFormat.java
@@ -0,0 +1,22 @@
+package org.scijava.io;
+
+import org.scijava.plugin.Plugin;
+import org.scijava.text.AbstractTextFormat;
+import org.scijava.text.TextFormat;
+
+import java.util.Collections;
+import java.util.List;
+
+@Plugin(type = TextFormat.class)
+public class DummyTextFormat  extends AbstractTextFormat {
+
+	@Override
+	public List<String> getExtensions() {
+		return Collections.singletonList("txt");
+	}
+
+	@Override
+	public String asHTML(String text) {
+		return text;
+	}
+}
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
new file mode 100644
index 000000000..55ebcf774
--- /dev/null
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -0,0 +1,38 @@
+package org.scijava.io;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.io.location.FileLocation;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.text.TextFormat;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class IOServiceTest {
+
+	@Test
+	public void testTextFile() throws IOException {
+		// create context, add dummy text format
+		final Context ctx = new Context();
+		ctx.getPluginIndex().add(new PluginInfo<>(DummyTextFormat.class, TextFormat.class));
+		final IOService io = ctx.getService(IOService.class);
+
+		// open text file from resources as String
+		String localFile = getClass().getResource("test.txt").getPath();
+		Object obj = io.open(localFile);
+		assertNotNull(obj);
+		String content = obj.toString();
+		assertTrue(content.contains("content"));
+
+		// open text file from resources as FileLocation
+		obj = io.open(new FileLocation(localFile));
+		assertNotNull(obj);
+		assertEquals(content, obj.toString());
+	}
+}
diff --git a/src/test/resources/org/scijava/io/test.txt b/src/test/resources/org/scijava/io/test.txt
new file mode 100644
index 000000000..d95f3ad14
--- /dev/null
+++ b/src/test/resources/org/scijava/io/test.txt
@@ -0,0 +1 @@
+content

From 0bcbce32adee756dee8d2e77fee29371b2451e48 Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Wed, 12 Aug 2020 13:45:10 +0200
Subject: [PATCH 0955/1208] POM: update to pom-scijava 29.2.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 92757258f..df8282af0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>28.0.0</version>
+		<version>29.2.1</version>
 		<relativePath />
 	</parent>
 

From acbb65dd5b2a285ad01aa7cedf69854f20458290 Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Wed, 12 Aug 2020 13:45:40 +0200
Subject: [PATCH 0956/1208] AbstractIOPlugin: add open(String destination)
 method

---
 src/main/java/org/scijava/io/AbstractIOPlugin.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 9d314f8a3..98dd6fef7 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -75,4 +75,14 @@ public void save(final D data, final String destination) throws IOException {
 			throw new IOException(e);
 		}
 	}
+
+	@Override
+	public D open(final String destination) throws IOException {
+		try {
+			return open(locationService.resolve(destination));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
+
 }

From 59061954cde14ac20d20beefa4f4b66416352d57 Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Wed, 12 Aug 2020 13:54:30 +0200
Subject: [PATCH 0957/1208] Make test class for IOServiceTest inline class

---
 .../java/org/scijava/io/DummyTextFormat.java  | 22 -------------------
 .../java/org/scijava/io/IOServiceTest.java    | 19 ++++++++++++++--
 2 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 src/test/java/org/scijava/io/DummyTextFormat.java

diff --git a/src/test/java/org/scijava/io/DummyTextFormat.java b/src/test/java/org/scijava/io/DummyTextFormat.java
deleted file mode 100644
index 21729843f..000000000
--- a/src/test/java/org/scijava/io/DummyTextFormat.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.scijava.io;
-
-import org.scijava.plugin.Plugin;
-import org.scijava.text.AbstractTextFormat;
-import org.scijava.text.TextFormat;
-
-import java.util.Collections;
-import java.util.List;
-
-@Plugin(type = TextFormat.class)
-public class DummyTextFormat  extends AbstractTextFormat {
-
-	@Override
-	public List<String> getExtensions() {
-		return Collections.singletonList("txt");
-	}
-
-	@Override
-	public String asHTML(String text) {
-		return text;
-	}
-}
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index 55ebcf774..bd3f7a3af 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -4,11 +4,12 @@
 import org.scijava.Context;
 import org.scijava.io.location.FileLocation;
 import org.scijava.plugin.PluginInfo;
+import org.scijava.text.AbstractTextFormat;
 import org.scijava.text.TextFormat;
-import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -35,4 +36,18 @@ public void testTextFile() throws IOException {
 		assertNotNull(obj);
 		assertEquals(content, obj.toString());
 	}
+
+
+	public static class DummyTextFormat  extends AbstractTextFormat {
+
+		@Override
+		public List<String> getExtensions() {
+			return Collections.singletonList("txt");
+		}
+
+		@Override
+		public String asHTML(String text) {
+			return text;
+		}
+	}
 }

From 7d4a580b8ed7456e52b3aa4bf4d7aebd69a996cd Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Wed, 12 Aug 2020 21:55:09 +0200
Subject: [PATCH 0958/1208] Re-add reprecated methods

* they were removed in favor of using Location instead of String for IO
handling
* they are re-added to restore backwards compatibility
---
 .../org/scijava/io/event/DataOpenedEvent.java | 22 ++++++++++++++++
 .../org/scijava/io/event/DataSavedEvent.java  | 21 ++++++++++++++++
 .../java/org/scijava/io/event/IOEvent.java    | 22 ++++++++++++++++
 .../org/scijava/io/event/DataEventTest.java   | 25 +++++++++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 src/test/java/org/scijava/io/event/DataEventTest.java

diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 4cf613856..2d9c50929 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -30,6 +30,7 @@
 package org.scijava.io.event;
 
 
+import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
 
 /**
@@ -43,4 +44,25 @@ public DataOpenedEvent(final Location location, final Object data) {
 		super(location, data);
 	}
 
+	/**
+	 * @deprecated use {@link #DataOpenedEvent(Location, Object)} instead
+	 */
+	@Deprecated
+	public DataOpenedEvent(final String source, final Object data) {
+		this(new FileLocation(source), data);
+	}
+
+	/**
+	 * @deprecated use {@link #getLocation} instead
+	 */
+	@Deprecated
+	public String getSource() {
+		try {
+			FileLocation fileLocation = (FileLocation) getLocation();
+			return fileLocation.getFile().getAbsolutePath();
+		} catch(ClassCastException e) {
+			return getLocation().getURI().toString();
+		}
+	}
+
 }
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index fe4b7abc3..600eccafc 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -30,6 +30,7 @@
 package org.scijava.io.event;
 
 
+import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
 
 /**
@@ -43,4 +44,24 @@ public DataSavedEvent(final Location destination, final Object data) {
 		super(destination, data);
 	}
 
+	/**
+	 * @deprecated use {@link #DataSavedEvent(Location, Object)} instead
+	 */
+	@Deprecated
+	public DataSavedEvent(final String destination, final Object data) {
+		this(new FileLocation(destination), data);
+	}
+
+	/**
+	 * @deprecated use {@link #getLocation} instead
+	 */
+	@Deprecated
+	public String getDestination() {
+		try {
+			FileLocation fileLocation = (FileLocation) getLocation();
+			return fileLocation.getFile().getAbsolutePath();
+		} catch(ClassCastException e) {
+			return getLocation().getURI().toString();
+		}
+	}
 }
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 9228c94a4..89bfe0f27 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -30,6 +30,7 @@
 package org.scijava.io.event;
 
 import org.scijava.event.SciJavaEvent;
+import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
 
 /**
@@ -45,6 +46,14 @@ public abstract class IOEvent extends SciJavaEvent {
 	/** The data for which I/O took place. */
 	private final Object data;
 
+	/**
+	 * @deprecated use {@link #IOEvent(Location, Object)} instead
+	 */
+	@Deprecated
+	public IOEvent(final String descriptor, final Object data) {
+		this(new FileLocation(descriptor), data);
+	}
+
 	public IOEvent(final Location location, final Object data) {
 		this.location = location;
 		this.data = data;
@@ -68,4 +77,17 @@ public String toString() {
 			data;
 	}
 
+	/**
+	 * @deprecated use {@link #getLocation()} instead
+	 */
+	@Deprecated
+	public String getDescriptor() {
+		try {
+			FileLocation fileLocation = (FileLocation) getLocation();
+			return fileLocation.getFile().getAbsolutePath();
+		} catch(ClassCastException e) {
+			return getLocation().getURI().toString();
+		}
+	}
+
 }
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
new file mode 100644
index 000000000..8e2ce0aa0
--- /dev/null
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -0,0 +1,25 @@
+package org.scijava.io.event;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DataEventTest {
+
+	@Test
+	public void testDeprecatedMethods() {
+		String localPath = "/local/absolute/path.txt";
+		Object obj = null;
+		DataOpenedEvent openedEvent = new DataOpenedEvent(localPath, obj);
+		DataSavedEvent savedEvent = new DataSavedEvent(localPath, obj);
+		assertEquals(localPath, openedEvent.getSource());
+		assertEquals(localPath, savedEvent.getDestination());
+
+//		String remotepath = "https://remote.org/path.txt";
+//		openedEvent = new DataOpenedEvent(remotepath, obj);
+//		savedEvent = new DataSavedEvent(remotepath, obj);
+//		assertEquals(remotepath, openedEvent.getSource());
+//		assertEquals(remotepath, savedEvent.getDestination());
+	}
+
+}

From d255cdd1df501c5a2afcd37ec9569e307737d32b Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Wed, 12 Aug 2020 22:11:16 +0200
Subject: [PATCH 0959/1208] IOService: add default body to open(Location) and
 save(Object, Location)

- this restores backwards-compatibility
---
 src/main/java/org/scijava/io/IOService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 4e49f4aee..0d6ad9340 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -116,7 +116,9 @@ default <D> IOPlugin<D> getSaver(D data, Location destination) {
 	 *         not supported.
 	 * @throws IOException if something goes wrong loading the data.
 	 */
-	Object open(Location source) throws IOException;
+	default Object open(Location source) throws IOException {
+		throw new UnsupportedOperationException();
+	}
 
 	/**
 	 * Saves data to the given destination. The nature of the destination is left
@@ -144,7 +146,9 @@ default <D> IOPlugin<D> getSaver(D data, Location destination) {
 	 * @param destination The destination location to which data should be saved.
 	 * @throws IOException if something goes wrong saving the data.
 	 */
-	void save(Object data, Location destination) throws IOException;
+	default void save(Object data, Location destination) throws IOException {
+		throw new UnsupportedOperationException();
+	}
 
 	// -- HandlerService methods --
 

From 5a83bcdbba7ab0d77fa552f1555c2b3b1ab5c66e Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Wed, 12 Aug 2020 16:32:20 +0200
Subject: [PATCH 0960/1208] Add TypedIOService

This is an interface which can be used to write IOServices opening and
saving a specific type. The TypedIOServiceTest class demonstrates how to
do that with an exemplary TextIOService.

So far, IO services like DatasetIOService or TableIOServcie don't share
a common IOService interface.
---
 .../scijava/io/AbstractTypedIOService.java    | 140 +++++++++++++++
 .../java/org/scijava/io/TypedIOService.java   | 168 ++++++++++++++++++
 .../org/scijava/io/TypedIOServiceTest.java    |  61 +++++++
 3 files changed, 369 insertions(+)
 create mode 100644 src/main/java/org/scijava/io/AbstractTypedIOService.java
 create mode 100644 src/main/java/org/scijava/io/TypedIOService.java
 create mode 100644 src/test/java/org/scijava/io/TypedIOServiceTest.java

diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
new file mode 100644
index 000000000..45403af49
--- /dev/null
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io;
+
+import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
+import org.scijava.plugin.AbstractHandlerService;
+import org.scijava.plugin.Parameter;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+/**
+ * Abstract base class for typed {@link IOPlugin}s.
+ * 
+ * @author Curtis Rueden
+ * @author Deborah Schmidt
+ */
+public abstract class AbstractTypedIOService<D> extends AbstractHandlerService<Location, IOPlugin<D>> implements TypedIOService<D>
+{
+
+	@Parameter
+	private LocationService locationService;
+
+	@Parameter
+	private IOService ioService;
+
+	@Override
+	public D open(String source) throws IOException {
+		try {
+			return open(locationService.resolve(source));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
+
+	@Override
+	public D open(Location source) throws IOException {
+		IOPlugin<?> opener = ioService().getOpener(source);
+		try {
+			Class<D> ignored = (Class<D>) opener.getDataType();
+			return (D) opener.open(source);
+		}
+		catch(ClassCastException e) {
+			throw new UnsupportedOperationException("No compatible opener found.");
+		}
+	}
+
+	@Override
+	public void save(D data, String destination) throws IOException {
+		try {
+			save(data, locationService.resolve(destination));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
+
+	@Override
+	public void save(D data, Location destination) throws IOException {
+		IOPlugin<D> saver = ioService().getSaver(data, destination);
+		if (saver != null) {
+			saver.save(data, destination);
+		}
+		else {
+			throw new UnsupportedOperationException("No compatible saver found.");
+		}
+	}
+
+	@Override
+	public boolean canOpen(String source) {
+		try {
+			return canOpen(locationService.resolve(source));
+		} catch (URISyntaxException e) {
+			return false;
+		}
+	}
+
+	@Override
+	public boolean canOpen(Location source) {
+		IOPlugin<?> opener = ioService().getOpener(source);
+		if (opener == null) return false;
+		try {
+			Class<D> ignored = (Class<D>) (opener.getDataType());
+			return true;
+		} catch(ClassCastException e) {
+			return false;
+		}
+	}
+
+	@Override
+	public boolean canSave(D data, String source) {
+		try {
+			return canSave(data, locationService.resolve(source));
+		} catch (URISyntaxException e) {
+			return false;
+		}
+	}
+
+	@Override
+	public boolean canSave(D data, Location destination) {
+		IOPlugin<D> saver = ioService.getSaver(data, destination);
+		if (saver == null) return false;
+		return saver.supportsSave(destination);
+	}
+
+	protected LocationService locationService() {
+		return locationService;
+	}
+
+	protected IOService ioService() {
+		return ioService;
+	}
+}
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
new file mode 100644
index 000000000..550edd67a
--- /dev/null
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -0,0 +1,168 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.io;
+
+import java.io.IOException;
+
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
+import org.scijava.plugin.HandlerService;
+import org.scijava.service.SciJavaService;
+
+/**
+ * Interface for high-level data I/O: opening and saving data of a specific type.
+ *
+ * @author Curtis Rueden
+ * @author Deborah Schmidt
+ */
+public interface TypedIOService<D> extends HandlerService<Location, IOPlugin<D>>,
+		SciJavaService
+{
+
+	/**
+	 * Gets the most appropriate {@link IOPlugin} for opening data from the given
+	 * location.
+	 */
+	default IOPlugin<D> getOpener(final String source) {
+		return getOpener(new FileLocation(source));
+	}
+
+	/**
+	 * Gets the most appropriate {@link IOPlugin} for opening data from the given
+	 * location.
+	 */
+	default IOPlugin<D> getOpener(Location source) {
+		for (final IOPlugin<D> handler : getInstances()) {
+			if (handler.supportsOpen(source)) return handler;
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the most appropriate {@link IOPlugin} for saving data to the given
+	 * location.
+	 */
+	default IOPlugin<D> getSaver(final D data, final String destination) {
+		return getSaver(data, new FileLocation(destination));
+	}
+
+	/**
+	 * Gets the most appropriate {@link IOPlugin} for saving data to the given
+	 * location.
+	 */
+	default IOPlugin<D> getSaver(D data, Location destination) {
+		for (final IOPlugin<?> handler : getInstances()) {
+			if (handler.supportsSave(data, destination)) {
+				return (IOPlugin<D>) handler;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Loads data from the given source. For extensibility, the nature of the
+	 * source is left intentionally general, but two common examples include file
+	 * paths and URLs.
+	 * <p>
+	 * The opener to use is automatically determined based on available
+	 * {@link IOPlugin}s; see {@link #getOpener(String)}.
+	 * </p>
+	 *
+	 * @param source The source (e.g., file path) from which to data should be
+	 *          loaded.
+	 * @return An object representing the loaded data, or null if the source is
+	 *         not supported.
+	 * @throws IOException if something goes wrong loading the data.
+	 */
+	D open(String source) throws IOException;
+
+	/**
+	 * Loads data from the given location.
+	 * <p>
+	 * The opener to use is automatically determined based on available
+	 * {@link IOPlugin}s; see {@link #getOpener(Location)}.
+	 * </p>
+	 *
+	 * @param source The location from which to data should be loaded.
+	 * @return An object representing the loaded data, or null if the source is
+	 *         not supported.
+	 * @throws IOException if something goes wrong loading the data.
+	 */
+	D open(Location source) throws IOException;
+
+	/**
+	 * Saves data to the given destination. The nature of the destination is left
+	 * intentionally general, but the most common example is a file path.
+	 * <p>
+	 * The saver to use is automatically determined based on available
+	 * {@link IOPlugin}s; see {@link #getSaver(Object, String)}.
+	 * </p>
+	 *
+	 * @param data The data to be saved to the destination.
+	 * @param destination The destination (e.g., file path) to which data should
+	 *          be saved.
+	 * @throws IOException if something goes wrong saving the data.
+	 */
+	void save(D data, String destination) throws IOException;
+
+	/**
+	 * Saves data to the given location.
+	 * <p>
+	 * The saver to use is automatically determined based on available
+	 * {@link IOPlugin}s; see {@link #getSaver(Object, Location)}.
+	 * </p>
+	 *
+	 * @param data The data to be saved to the destination.
+	 * @param destination The destination location to which data should be saved.
+	 * @throws IOException if something goes wrong saving the data.
+	 */
+	void save(D data, Location destination) throws IOException;
+
+	boolean canOpen(String source);
+
+	boolean canOpen(Location source);
+
+	boolean canSave(D data, String destination);
+
+	boolean canSave(D data, Location destination);
+
+	// -- HandlerService methods --
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	default Class<IOPlugin<D>> getPluginType() {
+		return (Class) IOPlugin.class;
+	}
+
+	@Override
+	default Class<Location> getType() {
+		return Location.class;
+	}
+}
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
new file mode 100644
index 000000000..e72324c60
--- /dev/null
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -0,0 +1,61 @@
+package org.scijava.io;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.plugin.PluginInfo;
+import org.scijava.plugin.PluginService;
+import org.scijava.plugin.SciJavaPlugin;
+import org.scijava.service.SciJavaService;
+import org.scijava.text.AbstractTextFormat;
+import org.scijava.text.TextFormat;
+import org.scijava.text.TextService;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class TypedIOServiceTest {
+
+	@Test
+	public void testTextFile() throws IOException {
+		// create context, add dummy text format
+		final Context ctx = new Context();
+		ctx.getPluginIndex().add(new PluginInfo<>(DummyTextFormat.class, TextFormat.class));
+		ctx.getPluginIndex().add(new PluginInfo<>(DefaultTextIOService.class, TextIOService.class));
+		TextIOService instance = (TextIOService) ctx.getService(PluginService.class).createInstance(ctx.getPluginIndex().get(TextIOService.class).get(0));
+		ctx.getServiceIndex().add(instance);
+
+		// try to get the TextIOService
+		final TextIOService io = ctx.service(TextIOService.class);
+		assertNotNull(io);
+
+		// open text file from resources as String
+		String localFile = getClass().getResource("test.txt").getPath();
+		String obj = io.open(localFile);
+		assertNotNull(obj);
+		assertTrue(obj.contains("content"));
+	}
+
+	interface TextIOService extends TypedIOService<String> {
+	}
+
+	public static class DefaultTextIOService extends AbstractTypedIOService<String> implements TextIOService {
+	}
+
+	public static class DummyTextFormat  extends AbstractTextFormat {
+
+		@Override
+		public List<String> getExtensions() {
+			return Collections.singletonList("txt");
+		}
+
+		@Override
+		public String asHTML(String text) {
+			return text;
+		}
+
+	}
+}

From bba50af44bc437670fb482d4e7959c32c3e14565 Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Wed, 12 Aug 2020 17:24:32 +0200
Subject: [PATCH 0961/1208] Adding TextIOService with default implementation

* .. which was originally implemented in the TypedIOServiceTest for
testing the TypedIOService architecture
---
 .../scijava/text/io/DefaultTextIOService.java | 43 +++++++++++++++++++
 .../org/scijava/text/io/TextIOService.java    | 40 +++++++++++++++++
 .../java/org/scijava/ContextCreationTest.java |  1 +
 .../org/scijava/io/TypedIOServiceTest.java    | 14 +-----
 4 files changed, 85 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/org/scijava/text/io/DefaultTextIOService.java
 create mode 100644 src/main/java/org/scijava/text/io/TextIOService.java

diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
new file mode 100644
index 000000000..509216a3c
--- /dev/null
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.text.io;
+
+import org.scijava.io.AbstractTypedIOService;
+import org.scijava.plugin.Plugin;
+import org.scijava.service.Service;
+
+/**
+ * Default {@link TextIOService} implementation for opening and saving text data
+ *
+ * @author Deborah Schmidt
+ */
+@Plugin(type = Service.class)
+public class DefaultTextIOService extends AbstractTypedIOService<String> implements TextIOService {
+}
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
new file mode 100644
index 000000000..c87d2847a
--- /dev/null
+++ b/src/main/java/org/scijava/text/io/TextIOService.java
@@ -0,0 +1,40 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.text.io;
+
+import org.scijava.io.TypedIOService;
+
+/**
+ * {@link TypedIOService} for opening and saving text data
+ *
+ * @author Deborah Schmidt
+ */
+public interface TextIOService extends TypedIOService<String> {
+}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 4fd266e4b..ccf76e426 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -114,6 +114,7 @@ public void testFull() {
 				org.scijava.startup.DefaultStartupService.class,
 				org.scijava.task.DefaultTaskService.class,
 				org.scijava.text.DefaultTextService.class,
+				org.scijava.text.io.DefaultTextIOService.class,
 				org.scijava.thread.DefaultThreadService.class,
 				org.scijava.tool.DefaultToolService.class,
 				org.scijava.ui.DefaultUIService.class,
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index e72324c60..de64730e2 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -3,12 +3,9 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.plugin.PluginInfo;
-import org.scijava.plugin.PluginService;
-import org.scijava.plugin.SciJavaPlugin;
-import org.scijava.service.SciJavaService;
 import org.scijava.text.AbstractTextFormat;
 import org.scijava.text.TextFormat;
-import org.scijava.text.TextService;
+import org.scijava.text.io.TextIOService;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -24,9 +21,6 @@ public void testTextFile() throws IOException {
 		// create context, add dummy text format
 		final Context ctx = new Context();
 		ctx.getPluginIndex().add(new PluginInfo<>(DummyTextFormat.class, TextFormat.class));
-		ctx.getPluginIndex().add(new PluginInfo<>(DefaultTextIOService.class, TextIOService.class));
-		TextIOService instance = (TextIOService) ctx.getService(PluginService.class).createInstance(ctx.getPluginIndex().get(TextIOService.class).get(0));
-		ctx.getServiceIndex().add(instance);
 
 		// try to get the TextIOService
 		final TextIOService io = ctx.service(TextIOService.class);
@@ -39,12 +33,6 @@ public void testTextFile() throws IOException {
 		assertTrue(obj.contains("content"));
 	}
 
-	interface TextIOService extends TypedIOService<String> {
-	}
-
-	public static class DefaultTextIOService extends AbstractTypedIOService<String> implements TextIOService {
-	}
-
 	public static class DummyTextFormat  extends AbstractTextFormat {
 
 		@Override

From 1b38b35f5050147570c5e2d33161ebfd3dbedcae Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Aug 2020 12:45:25 -0500
Subject: [PATCH 0962/1208] Fix out-of-sync license headers

---
 src/main/java/org/scijava/command/Inputs.java |  9 ++----
 .../java/org/scijava/io/TypedIOService.java   |  4 +--
 .../scijava/text/io/DefaultTextIOService.java |  4 +--
 .../org/scijava/text/io/TextIOService.java    |  4 +--
 .../java/org/scijava/command/InputsTest.java  |  9 ++----
 .../java/org/scijava/io/IOServiceTest.java    | 28 +++++++++++++++++++
 .../org/scijava/io/TypedIOServiceTest.java    | 28 +++++++++++++++++++
 .../org/scijava/io/event/DataEventTest.java   | 28 +++++++++++++++++++
 8 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index ad7ba18f4..a686bf4ff 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index 550edd67a..ca27e9bf7 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.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
diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
index 509216a3c..e29a1c796 100644
--- a/src/main/java/org/scijava/text/io/DefaultTextIOService.java
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.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
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
index c87d2847a..d196c893a 100644
--- a/src/main/java/org/scijava/text/io/TextIOService.java
+++ b/src/main/java/org/scijava/text/io/TextIOService.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
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index 8c06e0bbe..f53146d26 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -2,20 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2017 Board of Regents of the University of
- * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck
- * Institute of Molecular Cell Biology and Genetics, University of
- * Konstanz, and KNIME GmbH.
+ * Copyright (C) 2009 - 2020 SciJava developers.
  * %%
  * 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
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index bd3f7a3af..5e39835ea 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.io;
 
 import org.junit.Test;
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index de64730e2..affbbf66d 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.io;
 
 import org.junit.Test;
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index 8e2ce0aa0..45568b12e 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.io.event;
 
 import org.junit.Test;

From 6d6eec59b8a147a996dbdcd9568de7ac845e8a73 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 13 Aug 2020 12:48:15 -0500
Subject: [PATCH 0963/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index df8282af0..8b8fef07a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.84.0-SNAPSHOT</version>
+	<version>2.84.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 9970cef348faa343e6870981d1c1702604419b1e Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 14 Aug 2020 13:18:20 -0500
Subject: [PATCH 0964/1208] Context: code formatting

Using the ImageJ style preferences
---
 src/main/java/org/scijava/Context.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 638230db1..e4d2bda14 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -445,7 +445,8 @@ public static List<Class<? extends Service>> serviceClassList(
 	 * @see ClassLoader#getSystemClassLoader()
 	 */
 	public static ClassLoader getClassLoader() {
-		final ClassLoader contextCL = Thread.currentThread().getContextClassLoader();
+		final ClassLoader contextCL = Thread.currentThread()
+			.getContextClassLoader();
 		return contextCL != null ? contextCL : ClassLoader.getSystemClassLoader();
 	}
 
@@ -570,8 +571,8 @@ private static PluginIndex plugins(final boolean empty) {
 	}
 
 	private static List<Class<? extends Service>> services(final boolean empty) {
-		if (empty) return Collections.<Class<? extends Service>>emptyList();
-		return Arrays.<Class<? extends Service>>asList(Service.class);
+		if (empty) return Collections.<Class<? extends Service>> emptyList();
+		return Arrays.<Class<? extends Service>> asList(Service.class);
 	}
 
 	private static boolean strict() {

From a63cd8ff51938186c7a5ca3a0a4c0a2fae1493ba Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 14 Aug 2020 13:18:46 -0500
Subject: [PATCH 0965/1208] Make Context AutoCloseable

This will provide developers hints that the Context should be disposed
after creation.

See https://github.com/scijava/scijava-common/pull/394
---
 src/main/java/org/scijava/Context.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index e4d2bda14..2576b4c37 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -58,7 +58,7 @@
  * @author Curtis Rueden
  * @see Service
  */
-public class Context implements Disposable {
+public class Context implements Disposable, AutoCloseable {
 
 	// -- Constants --
 
@@ -248,6 +248,13 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 	 * those of lower priority). See {@link ServiceHelper#loadServices()} for more
 	 * information.
 	 * </p>
+	 * <p>
+	 * NB: Instiantiation of a Context has an implied requirement of a
+	 * corresponding call to {@link Context#dispose()} at the end of the SciJava
+	 * applicaton's lifecycle. This cleans up any remaining resources and allows
+	 * the JVM to exit gracefully. This is called automatically when constructed as
+	 * an {@link AutoCloseable}.
+	 * </p>
 	 *
 	 * @param serviceClasses A collection of types that implement the
 	 *          {@link Service} interface (e.g., {@code DisplayService.class}).
@@ -423,6 +430,13 @@ public void dispose() {
 		}
 	}
 
+	// -- AutoCloseable methods --
+
+	@Override
+	public void close() throws Exception {
+		dispose();
+	}
+
 	// -- Utility methods --
 
 	/**

From b9e7b951d1b57919f8ec45ce2f5a7a2ce5716bdd Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Thu, 30 Apr 2020 15:50:39 +0200
Subject: [PATCH 0966/1208] Add WidgetStyle utility class to centralize style
 logic

This should replace isStyle() implementations and other case logic around (possibly multiple) style attributes of parameters.

Also add a test exercising this utility class.
---
 .../scijava/widget/DefaultWidgetModel.java    |  7 +-
 .../java/org/scijava/widget/WidgetStyle.java  | 35 ++++++++++
 .../org/scijava/script/ScriptInfoTest.java    |  6 +-
 .../org/scijava/widget/WidgetStyleTest.java   | 68 +++++++++++++++++++
 4 files changed, 108 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/org/scijava/widget/WidgetStyle.java
 create mode 100644 src/test/java/org/scijava/widget/WidgetStyleTest.java

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index ffb19061f..1a768d5d7 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -129,12 +129,7 @@ public String getWidgetLabel() {
 
 	@Override
 	public boolean isStyle(final String style) {
-		final String widgetStyle = getItem().getWidgetStyle();
-		if (widgetStyle == null) return style == null;
-		for (final String s : widgetStyle.split(",")) {
-			if (s.equals(style)) return true;
-		}
-		return false;
+		return WidgetStyle.isStyle(getItem(), style);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
new file mode 100644
index 000000000..346262d01
--- /dev/null
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -0,0 +1,35 @@
+package org.scijava.widget;
+
+import org.scijava.module.ModuleItem;
+
+public class WidgetStyle {
+	private WidgetStyle() {
+		// prevent instantiation of utility class
+	}
+
+	public static boolean isStyle(String widgetStyle, String target) {
+		if (widgetStyle == null || target == null)
+			return widgetStyle == target;
+		for (final String s : widgetStyle.split(",")) {
+			if (s.trim().toLowerCase().equals(target.toLowerCase())) return true;
+		}
+		return false;
+	}
+
+	public static boolean isStyle(ModuleItem<?> item, String target) {
+		return isStyle(item.getWidgetStyle(), target);
+	}
+
+	public static String[] getStyleModifiers(String widgetStyle, String target) {
+		if (widgetStyle == null || target == null)
+			return null;
+		String[] styles = widgetStyle.split(",");
+		for (String s : styles) {
+			if (s.trim().toLowerCase().startsWith(target.toLowerCase())) {
+				String suffix = s.split(":")[1];
+				return suffix.split("/");
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 38c0ffa2f..678996628 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -65,6 +65,7 @@
 import org.scijava.test.TestUtils;
 import org.scijava.util.DigestUtils;
 import org.scijava.util.FileUtils;
+import org.scijava.widget.WidgetStyle;
 
 /**
  * Tests {@link ScriptInfo}.
@@ -251,7 +252,7 @@ public void testParameters() {
 		final String script = "" + //
 			"#@ LogService (required = false) log\n" + //
 			"#@ int (label=\"Slider Value\", softMin=5, softMax=15, " + //
-			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
+			"stepSize=3, value=11, style=\" slidEr,\") sliderValue\n" + //
 			"#@ String (persist = false, family='Carnivora', " + //
 			"choices={'quick brown fox', 'lazy dog'}) animal\n" + //
 			"#@ Double (autoFill = false) notAutoFilled\n" + //
@@ -269,7 +270,8 @@ public void testParameters() {
 
 		final ModuleItem<?> sliderValue = info.getInput("sliderValue");
 		assertItem("sliderValue", int.class, "Slider Value", ItemIO.INPUT, true,
-			true, null, "slider", 11, null, null, 5, 15, 3.0, noChoices, sliderValue);
+			true, null, " slidEr,", 11, null, null, 5, 15, 3.0, noChoices, sliderValue);
+		assertTrue("Case-insensitive trimmed style", WidgetStyle.isStyle(sliderValue, "slider"));
 
 		final ModuleItem<?> animal = info.getInput("animal");
 		final List<String> animalChoices = //
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
new file mode 100644
index 000000000..d7b3c0564
--- /dev/null
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -0,0 +1,68 @@
+package org.scijava.widget;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Enclosed.class)
+public class WidgetStyleTest {
+
+	@RunWith(Parameterized.class)
+	public static class TestIsStyle {
+
+		static String[] styleStrings = { "foo, bar, someThing", " FOO, BAR, SOMEthing ", "foo  ", "  bar",
+				"trash, sOmEtHiNg", null };
+
+		static String[] stylesToTest = { "foo", "bar", "someThing", null };
+
+		static boolean[][] stylesToHave = { // foo, bar, someThing
+				new boolean[] { true, true, true, false }, new boolean[] { true, true, true, false },
+				new boolean[] { true, false, false, false }, new boolean[] { false, true, false, false },
+				new boolean[] { false, false, true, false }, new boolean[] { false, false, false, true } };
+
+		@Parameters(name = "{0}")
+		public static List<Object[]> params() {
+			return IntStream.range(0, styleStrings.length)
+					.mapToObj(i -> new Object[] { styleStrings[i], stylesToHave[i] }).collect(Collectors.toList());
+		}
+
+		@Parameter
+		public String styleString;
+
+		@Parameter(1)
+		public boolean[] targetStyles;
+
+		@Test
+		public void testSimpleStyles() {
+			for (int i = 0; i < stylesToTest.length; i++) {
+				assertEquals("style: " + stylesToTest[i], targetStyles[i],
+						WidgetStyle.isStyle(styleString, stylesToTest[i]));
+			}
+		}
+	}
+
+	public static class TestStyleModifiers {
+		@Test
+		public void testStyleModifiers() {
+			String style = "open, extensions:tiff/tif/jpeg/jpg";
+			Set<String> extensions = new HashSet<>(Arrays.asList(WidgetStyle.getStyleModifiers(style, "extensions")));
+			Set<String> expected = new HashSet<>(Arrays.asList("tiff", "jpg", "jpeg", "tif"));
+			assertEquals(expected, extensions);
+		}
+	}
+}

From 3d64e2a2ea9f6eab5d75c7e778dc3da75bd03f90 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Fri, 18 Sep 2020 08:25:40 -0500
Subject: [PATCH 0967/1208] Don't persist test inputs

If inputs are pesisted then they may be populated even without the
MockInputHarvester, which is confusing.
---
 .../java/org/scijava/command/InputsTest.java  | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index f53146d26..57df8ff62 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -40,8 +40,6 @@
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.InstantiableException;
-import org.scijava.log.LogLevel;
-import org.scijava.log.LogService;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
 import org.scijava.module.MutableModuleItem;
@@ -81,7 +79,7 @@ public void testSingleInput() {
 		}});
 		Inputs inputs = new Inputs(context);
 		inputs.getInfo().setName("testSingleInput");//TEMP
-		inputs.addInput("sigma", Float.class);
+		addTempInput(inputs, "sigma", Float.class);
 		float sigma = (Float) inputs.harvest().get("sigma");
 		assertEquals(3.9f, sigma, 0);
 	}
@@ -95,8 +93,8 @@ public void testTwoInputs() {
 		}});
 		Inputs inputs = new Inputs(context);
 		inputs.getInfo().setName("testTwoInputs");//TEMP
-		inputs.addInput("name", String.class);
-		inputs.addInput("age", Integer.class);
+		addTempInput(inputs, "name", String.class);
+		addTempInput(inputs, "age", Integer.class);
 		Map<String, Object> values = inputs.harvest();
 		String name = (String) values.get("name");
 		int age = (Integer) values.get("age");
@@ -113,11 +111,13 @@ public void testWithConfiguration() {
 		}});
 		Inputs inputs = new Inputs(context);
 		inputs.getInfo().setName("testWithConfiguration");//TEMP
-		MutableModuleItem<String> wordInput = inputs.addInput("word", String.class);
+		MutableModuleItem<String> wordInput = addTempInput(inputs, "word",
+			String.class);
 		wordInput.setLabel("Favorite word");
 		wordInput.setChoices(Arrays.asList("quick", "brown", "fox"));
 		wordInput.setDefaultValue("fox");
-		MutableModuleItem<Double> opacityInput = inputs.addInput("opacity", Double.class);
+		MutableModuleItem<Double> opacityInput = addTempInput(inputs, "opacity",
+			Double.class);
 		opacityInput.setMinimumValue(0.0);
 		opacityInput.setMaximumValue(1.0);
 		opacityInput.setDefaultValue(0.5);
@@ -145,6 +145,18 @@ public PreprocessorPlugin createInstance() throws InstantiableException {
 		context.service(PluginService.class).addPlugin(info);
 	}
 
+	/**
+	 * Add a non-persisted input to ensure we are testing with the mock input
+	 * harvester.
+	 */
+	private static <T> MutableModuleItem<T> addTempInput(Inputs inputs,
+		String inputName, Class<T> inputType)
+	{
+		MutableModuleItem<T> input = inputs.addInput(inputName, inputType);
+		input.setPersisted(false);
+		return input;
+	}
+
 	public static class MockInputHarvester extends AbstractPreprocessorPlugin {
 		private Map<String, Object> expected;
 		public void setExpected(final Map<String, Object> expected) {

From b1bab6945931fb2798ef5d5dd9797cabf4a83326 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Sun, 25 Oct 2020 21:33:55 +0100
Subject: [PATCH 0968/1208] Always ignore commented script parameters

Before this commit, commented-out new-style (#@) script parameters were ignored when in the script body, but parsed when in the script header, because they matched the pattern for old-style parameter syntax.
We now explicitly omit lines with new-style syntax preceded by non-word characters from being matched, so the behavior is consistent independent of the position of the parameter in the script.

Without this change in ParameterScriptProcessor, the test added in this commit would fail with:

[ERROR]   ParameterScriptProcessorTest.testScriptParameterParsing:49 expected null, but was:<commentedHeaderParameter: required=true, persisted=true>
---
 .../process/ParameterScriptProcessor.java     |  6 ++-
 .../process/ParameterScriptProcessorTest.java | 54 +++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java

diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index fb73cdc16..0ed4d7212 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -129,7 +129,7 @@ public void begin(final ScriptInfo scriptInfo) {
 
 	@Override
 	public String process(final String line) {
-		// parse new-style parameters starting with @# anywhere in the script.
+		// parse new-style parameters starting with #@ anywhere in the script.
 		if (line.matches("^#@.*")) {
 			final int at = line.indexOf('@');
 			return process(line, line.substring(at + 1));
@@ -140,7 +140,9 @@ public String process(final String line) {
 			// NB: Check if line contains an '@' with no prior alphameric
 			// characters. This assumes that only non-alphanumeric characters can
 			// be used as comment line markers.
-			if (line.matches("^[^\\w]*@.*")) {
+			// NB: In addition, to allow for commented-out new-style parameters, we exclude
+			// lines that have the new-style #@ preceded by non-alphanumeric characters.
+			if (line.matches("^[^\\w]*[^\\w#]@.*")) {
 				final int at = line.indexOf('@');
 				return process(line, line.substring(at + 1));
 			}
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
new file mode 100644
index 000000000..3e29007bb
--- /dev/null
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -0,0 +1,54 @@
+package org.scijava.script.process;
+
+import static org.junit.Assert.*;
+
+import java.io.StringReader;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.script.ScriptInfo;
+
+public class ParameterScriptProcessorTest {
+
+	private Context context;
+
+	@Before
+	public void setUp() {
+		context = new Context();
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	@Test
+	public void testScriptParameterParsing() {
+		String script = "" + //
+				"% @String legacyStyleParameter\n" +
+				"% #@ String commentedHeaderParameter\n" +
+				"% ############## Some Comment ###########\n" +
+				"#@ String implicitInputParameter\n" +
+				"#@input String explicitInputParameter\n" +
+				"\n" +
+				"% @String legacyStyleBodyParameter\n" +
+				"% #@ String commentedBodyParameter\n" +
+				"\n" +
+				"#@output implicitlyTypedOutputParameter\n" +
+				"#@output String explicitlyTypedOutputParameter\n";
+		final ScriptInfo info = new ScriptInfo(context, ".bsizes", new StringReader(script));
+		assertEquals("legacyStyleParameter", info.getInput("legacyStyleParameter").getName());
+		assertEquals("implicitInputParameter", info.getInput("implicitInputParameter").getName());
+		assertEquals("explicitInputParameter", info.getInput("explicitInputParameter").getName());
+
+		assertEquals("implicitlyTypedOutputParameter", info.getOutput("implicitlyTypedOutputParameter").getName());
+		assertEquals("explicitlyTypedOutputParameter", info.getOutput("explicitlyTypedOutputParameter").getName());
+
+		assertNull(info.getInput("commentedHeaderParameter"));
+		assertNull(info.getInput("legacyStyleBodyParameter"));
+		assertNull(info.getInput("commentedBodyParameter"));
+	}
+
+}

From b389657a1f22b23afc5ba802e3e417b50af5d9ba Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 29 Oct 2020 18:49:53 -0500
Subject: [PATCH 0969/1208] Add missing copyright headers

---
 .../java/org/scijava/widget/WidgetStyle.java  | 28 +++++++++++++++++++
 .../process/ParameterScriptProcessorTest.java | 28 +++++++++++++++++++
 .../org/scijava/widget/WidgetStyleTest.java   | 28 +++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index 346262d01..7b71a80fc 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.widget;
 
 import org.scijava.module.ModuleItem;
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
index 3e29007bb..756a2dc9d 100644
--- a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.script.process;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
index d7b3c0564..1c1a3aa22 100644
--- a/src/test/java/org/scijava/widget/WidgetStyleTest.java
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2020 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.widget;
 
 import static org.junit.Assert.assertArrayEquals;

From 80d0a38fc9e9c1d85c3a5602cddedf6cd10984a7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 29 Oct 2020 18:51:03 -0500
Subject: [PATCH 0970/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8b8fef07a..893a968ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.84.1-SNAPSHOT</version>
+	<version>2.85.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 1e70db29dc461d25ce2c887e83c7851b12506d93 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Thu, 3 Dec 2020 15:47:10 +0100
Subject: [PATCH 0971/1208] LogService: Make getLevel() more robust against
 ClassNotFoundException

---
 .../org/scijava/log/AbstractLogService.java   |  2 +-
 .../org/scijava/log/CallingClassUtils.java    | 32 +++++++++++++++++++
 .../org/scijava/log/IgnoreAsCallingClass.java |  2 +-
 .../scijava/log/CallingClassUtilsTest.java    | 18 ++++++-----
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index e813e10e3..e749bf59a 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -104,7 +104,7 @@ public LogSource getSource() {
 	@Override
 	public int getLevel() {
 		if (classAndPackageLevels.isEmpty()) return currentLevel;
-		return getLevelForClass(CallingClassUtils.getCallingClass().getName(),
+		return getLevelForClass(CallingClassUtils.getCallingClassName(),
 			currentLevel);
 	}
 
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index 5bcf98460..bbe5357ed 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -43,12 +43,44 @@ private CallingClassUtils() {
 	}
 
 	/**
+	 * Inspects the stack trace to return the name of the class that calls
+	 * this method, but ignores every class annotated with @IgnoreAsCallingClass.
+	 * <p>
+	 * If every class on the stack trace is annotated, then the class at the
+	 * root of the stack trace is returned.
+	 */
+	public static String getCallingClassName() {
+		StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+		for (int i = 1; i < stackTrace.length - 2; i++) {
+			String className = stackTrace[i].getClassName();
+			if (!hasIgnoreAsCallingClassAnnotation(className)) return className;
+		}
+		return stackTrace[stackTrace.length - 1].getClassName();
+	}
+
+	private static boolean hasIgnoreAsCallingClassAnnotation(String className) {
+		try {
+			Class< ? > clazz = Class.forName(className);
+			return clazz.isAnnotationPresent(IgnoreAsCallingClass.class);
+		}
+		catch (ClassNotFoundException ignore) {
+			return false;
+		}
+	}
+
+	/**
+	 * @deprecated Use {@link #getCallingClassName()} instead.
+	 *
+	 * Warning: This method throws a IllegalStateException as soon as it comes
+	 * across a class that can't be loaded with the default class loader.
+	 *
 	 * Inspects the stack trace to return the class that calls this method, but
 	 * ignores every class annotated with @IgnoreAsCallingClass.
 	 *
 	 * @throws IllegalStateException if every method on the stack, is in a class
 	 *           annotated with @IgnoreAsCallingClass.
 	 */
+	@Deprecated
 	public static Class<?> getCallingClass() {
 		try {
 			StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index d6ff175f1..62aefe2db 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -34,7 +34,7 @@
 
 /**
  * Classes annotated with {@link IgnoreAsCallingClass} are ignored by
- * {@link CallingClassUtils#getCallingClass()}.
+ * {@link CallingClassUtils#getCallingClassName()}.
  *
  * @author Matthias Arzt
  */
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index a23f8fee0..ff6d3df24 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -31,6 +31,8 @@
 
 import org.junit.Test;
 
+import java.util.function.Supplier;
+
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -41,26 +43,26 @@
 public class CallingClassUtilsTest {
 	@Test
 	public void testGetCallingClass() {
-		Class<?> callingClass = CallingClassUtils.getCallingClass();
-		assertEquals(this.getClass(), callingClass);
+		String callingClass = CallingClassUtils.getCallingClassName();
+		assertEquals(this.getClass().getName(), callingClass);
 	}
 
 	@Test
 	public void testIgnoreAsCallingClass() {
-		assertEquals(ClassA.class, ClassA.returnGetCallingClass());
-		assertEquals(this.getClass(), ClassB.returnGetCallingClass());
+		assertEquals(ClassA.class.getName(), ClassA.returnGetCallingClass());
+		assertEquals(this.getClass().getName(), ClassB.returnGetCallingClass());
 	}
 
 	public static class ClassA {
-		static Class<?> returnGetCallingClass() {
-			return CallingClassUtils.getCallingClass();
+		static String returnGetCallingClass() {
+			return CallingClassUtils.getCallingClassName();
 		}
 	}
 
 	@IgnoreAsCallingClass
 	private static class ClassB {
-		static Class<?> returnGetCallingClass() {
-			return CallingClassUtils.getCallingClass();
+		static String returnGetCallingClass() {
+			return CallingClassUtils.getCallingClassName();
 		}
 	}
 }

From 2231238f85072c2460ed3148edeeb7fd13fe079c Mon Sep 17 00:00:00 2001
From: Ulrik Guenther <hello@ulrik.is>
Date: Wed, 25 Nov 2020 18:04:30 +0100
Subject: [PATCH 0972/1208] ScriptREPL: Add language parameter to constructor
 to indicate preference for a scripting language

---
 .../java/org/scijava/script/ScriptREPL.java   | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index d6c10adfd..edfafa538 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -69,6 +69,8 @@ public class ScriptREPL {
 
 	private final PrintStream out;
 
+	private String languagePreference = null;
+
 	/** List of interpreter-friendly script languages. */
 	private List<ScriptLanguage> languages;
 
@@ -88,6 +90,15 @@ public ScriptREPL(final Context context, final OutputStream out) {
 			(PrintStream) out : new PrintStream(out);
 	}
 
+	public ScriptREPL(final Context context, final String language) {
+		this(context, language, System.out);
+	}
+
+	public ScriptREPL(final Context context, final String language, final OutputStream out) {
+		this(context, out);
+		languagePreference = language;
+	}
+
 	/**
 	 * Gets the list of languages compatible with the REPL.
 	 * <p>
@@ -162,12 +173,35 @@ public void initialize(final boolean verbose) {
 			}
 			out.println("Have fun!");
 			out.println();
-			lang(langs.get(0).getLanguageName());
+
+			if(languagePreference != null) {
+			    selectPreferredLanguage(langs);
+			} else {
+				lang(langs.get(0).getLanguageName());
+			}
 		}
-		else if (!langs.isEmpty()) lang(langs.get(0));
+		else if (!langs.isEmpty()) {
+			if(languagePreference != null) {
+				selectPreferredLanguage(langs);
+			} else {
+				lang(langs.get(0));
+			}
+		}
+
 		populateBindings(interpreter.getBindings());
 	}
 
+	private void selectPreferredLanguage(List<ScriptLanguage> langs) {
+		final ScriptLanguage preference = langs
+				.stream().filter(lang -> languagePreference.equals(lang.getLanguageName()))
+				.findAny().orElse(null);
+		if(preference != null) {
+			lang(preference);
+		} else {
+			lang(langs.get(0).getLanguageName());
+		}
+	}
+
 	/** Outputs the prompt. */
 	public void prompt() {
 		out.print(interpreter == null || interpreter.isReady() ? "> " : "\\ ");
@@ -310,8 +344,15 @@ public static void main(final String... args) throws Exception {
 		// make a SciJava application context
 		final Context context = new Context();
 
-		// create the script interpreter
-		final ScriptREPL scriptCLI = new ScriptREPL(context);
+		// see if we have a preferred language
+		// and create the script interpreter
+		final ScriptREPL scriptCLI;
+		if(args.length > 0) {
+			final String preference = args[0];
+			scriptCLI = new ScriptREPL(context, preference);
+		} else {
+			scriptCLI = new ScriptREPL(context);
+		}
 
 		// start the REPL
 		scriptCLI.loop();

From 5c3c7b74b09852b4430df183483a78d6a603ca1a Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Mon, 7 Dec 2020 11:08:53 -0600
Subject: [PATCH 0973/1208] Bump minor version

Public API added in 2231238f85072c2460ed3148edeeb7fd13fe079c.
---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 893a968ca..b2f1fe541 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.85.1-SNAPSHOT</version>
+	<version>2.86.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
@@ -154,6 +154,8 @@
 	</ciManagement>
 
 	<properties>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.release>8</maven.compiler.release>
 		<package-name>org.scijava</package-name>
 
 		<license.licenseName>bsd_2</license.licenseName>

From 509ff2b16613096f872a66c8a09475b8ec9d2d4a Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Mon, 7 Dec 2020 11:21:06 -0600
Subject: [PATCH 0974/1208] Remove accidental maven.compiler config

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2f1fe541..af0a9af81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,8 +154,6 @@
 	</ciManagement>
 
 	<properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.release>8</maven.compiler.release>
 		<package-name>org.scijava</package-name>
 
 		<license.licenseName>bsd_2</license.licenseName>

From 0aa57e4779b4e0ff4cd2627b5b4e8a24db86bd65 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Mon, 7 Dec 2020 11:26:29 -0600
Subject: [PATCH 0975/1208] DataEventTest: make cross-platform

Remove *nix-style path.
---
 .../java/org/scijava/io/event/DataEventTest.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index 45568b12e..e2d9457cd 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -28,15 +28,20 @@
  */
 package org.scijava.io.event;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.Test;
+
 public class DataEventTest {
 
 	@Test
-	public void testDeprecatedMethods() {
-		String localPath = "/local/absolute/path.txt";
+	public void testDeprecatedMethods() throws IOException {
+		File tmpFile = File.createTempFile("path", "txt");
+		tmpFile.deleteOnExit();
+		String localPath = tmpFile.getAbsolutePath();
 		Object obj = null;
 		DataOpenedEvent openedEvent = new DataOpenedEvent(localPath, obj);
 		DataSavedEvent savedEvent = new DataSavedEvent(localPath, obj);

From 13c1763f0dcd06dfe4625798f644921ed4269b48 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Mon, 7 Dec 2020 11:33:59 -0600
Subject: [PATCH 0976/1208] Bump to next development cycle

Signed-off-by: Mark Hiner <hinerm@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index af0a9af81..8065fba5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.86.0-SNAPSHOT</version>
+	<version>2.86.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From b80f6fe18be696716c2545a43440c14534e92115 Mon Sep 17 00:00:00 2001
From: Matthias Arzt <arzt@mpi-cbg.de>
Date: Wed, 9 Dec 2020 14:24:03 +0100
Subject: [PATCH 0977/1208] CallingClassUtils: replace Class.forName() with
 Context.getClassLoader()

Class.forName() will fail if the threads class loader is not set.
---
 src/main/java/org/scijava/log/CallingClassUtils.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index bbe5357ed..66bef3263 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -29,6 +29,8 @@
 
 package org.scijava.log;
 
+import org.scijava.Context;
+
 /**
  * Utility class for getting the calling class of a method.
  *
@@ -60,7 +62,7 @@ public static String getCallingClassName() {
 
 	private static boolean hasIgnoreAsCallingClassAnnotation(String className) {
 		try {
-			Class< ? > clazz = Class.forName(className);
+			Class< ? > clazz = Context.getClassLoader().loadClass(className);
 			return clazz.isAnnotationPresent(IgnoreAsCallingClass.class);
 		}
 		catch (ClassNotFoundException ignore) {

From f6d8749965411a07c9ec96029ad2991620626a1a Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Tue, 5 Jan 2021 11:14:28 +0100
Subject: [PATCH 0978/1208] Fix Types.raw for GenericArrayType

Also add minimal test for array types with generics.

See https://github.com/scijava/scijava-common/issues/415
---
 src/main/java/org/scijava/util/Types.java     |  2 +
 .../scijava/util/GenericArrayTypesTest.java   | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 src/test/java/org/scijava/util/GenericArrayTypesTest.java

diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index adfbc3fcb..597e2bb06 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -365,6 +365,8 @@ public static String name(final Type t) {
 	public static Class<?> raw(final Type type) {
 		if (type == null) return null;
 		if (type instanceof Class) return (Class<?>) type;
+		if (type instanceof GenericArrayType)
+			return array(raw(((GenericArrayType) type).getGenericComponentType()));
 		final List<Class<?>> c = raws(type);
 		if (c == null || c.size() == 0) return null;
 		return c.get(0);
diff --git a/src/test/java/org/scijava/util/GenericArrayTypesTest.java b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
new file mode 100644
index 000000000..689d5328d
--- /dev/null
+++ b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
@@ -0,0 +1,50 @@
+package org.scijava.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+import org.junit.Test;
+
+public class GenericArrayTypesTest {
+
+	@Test
+	public void testArrayFields() throws NoSuchFieldException, SecurityException {
+		Field rawField = Types.field(ClassWithFields.class, "rawListArray");
+		Field genericWildcardField = Types.field(ClassWithFields.class, "wildcardListArray");
+		Field genericTypedField = Types.field(ClassWithFields.class, "integerListArray");
+
+		Type rawFieldType = Types.fieldType(rawField, ClassWithFields.class);
+		Type genericWildcardFieldType = Types.fieldType(genericWildcardField, ClassWithFields.class);
+		Type genericTypedFieldType = Types.fieldType(genericTypedField, ClassWithFields.class);
+
+		// raw type
+		assertFalse(rawFieldType instanceof GenericArrayType);
+		assertTrue(rawFieldType instanceof Class);
+
+		// generic array types
+		assertTrue(genericWildcardFieldType instanceof GenericArrayType);
+		assertTrue(genericTypedFieldType instanceof GenericArrayType);
+
+		assertEquals(rawField.getGenericType(), rawFieldType);
+		assertEquals(genericWildcardField.getGenericType(), genericWildcardFieldType);
+		assertEquals(genericTypedField.getGenericType(), genericTypedFieldType);
+
+		assertSame(List[].class, Types.raw(rawFieldType));
+		assertSame(List[].class, Types.raw(genericWildcardFieldType));
+		assertSame(List[].class, Types.raw(genericTypedFieldType));
+	}
+
+	@SuppressWarnings({ "rawtypes", "unused" })
+	private static class ClassWithFields {
+		public List[] rawListArray;
+		public List<?>[] wildcardListArray;
+		public List<Integer>[] integerListArray;
+	}
+}

From b15807535d2822c3a0e1d69040f21267ff6cd989 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Tue, 5 Jan 2021 13:33:56 +0100
Subject: [PATCH 0979/1208] TypesTest: test for array types with generics

---
 src/test/java/org/scijava/util/TypesTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index f5eef7b01..f18a60c95 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -222,6 +222,7 @@ class Struct {
 			private String[][] strings;
 			private Void v;
 			private List<String> list;
+			private List<String>[] listArray;
 			private HashMap<Integer, Float> map;
 		}
 		assertSame(int[].class, raw(Struct.class, "intArray"));
@@ -229,6 +230,7 @@ class Struct {
 		assertSame(String[][].class, raw(Struct.class, "strings"));
 		assertSame(Void.class, raw(Struct.class, "v"));
 		assertSame(List.class, raw(Struct.class, "list"));
+		assertSame(List[].class, raw(Struct.class, "listArray"));
 		assertSame(HashMap.class, raw(Struct.class, "map"));
 	}
 

From c7aa9f497534cb23765a8af80b4d4caa117d3a05 Mon Sep 17 00:00:00 2001
From: Nicolas Chiaruttini <nicolas.chiaruttini@epfl.ch>
Date: Mon, 4 Jan 2021 22:16:52 +0100
Subject: [PATCH 0980/1208] adds test for string to array conversion in command

---
 .../command/CommandArrayConverterTest.java    | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 src/test/java/org/scijava/command/CommandArrayConverterTest.java

diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
new file mode 100644
index 000000000..b42d2eae7
--- /dev/null
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -0,0 +1,162 @@
+package org.scijava.command;
+
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.ItemIO;
+import org.scijava.Priority;
+import org.scijava.convert.AbstractConverter;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.*;
+
+public class CommandArrayConverterTest {
+
+    @Test
+    public void testArrayCommandRaw() throws InterruptedException,
+            ExecutionException
+    {
+        final Context context = new Context(CommandService.class);
+        final CommandService commandService = context.service(CommandService.class);
+
+        UserClass[] userObjects = new UserClass[2];
+        userObjects[0] = new UserClass("User Object 0", new Object());
+        userObjects[1] = new UserClass("User Object 1", new Object());
+
+        final CommandModule module = //
+                commandService.run(CommandRawArrayInput.class, true, "userObjects", userObjects  ).get(); //
+        assertEquals("User Object 0;User Object 1;", module.getOutput("result"));
+    }
+
+    @Test
+    public void testArrayConvertFromStringCommandRaw() throws InterruptedException,
+            ExecutionException
+    {
+        final Context context = new Context(CommandService.class);
+        final CommandService commandService = context.service(CommandService.class);
+
+        final CommandModule module = //
+                commandService.run(CommandRawArrayInput.class, true, "userObjects", "User Object 0,User Object 1"  ).get(); //
+
+        assertEquals("User Object 0;User Object 1;", module.getOutput("result"));
+    }
+
+    @Test
+    public void testArrayCommandWildcardGenerics() throws InterruptedException,
+            ExecutionException
+    {
+        final Context context = new Context(CommandService.class);
+        final CommandService commandService = context.service(CommandService.class);
+
+        UserClass[] userObjects = new UserClass[2];
+        userObjects[0] = new UserClass("User Object 0", new Object());
+        userObjects[1] = new UserClass("User Object 1", new Object());
+
+        final CommandModule module = //
+                commandService.run(CommandGenericsWildcardArrayInput.class, true, "userObjects", userObjects  ).get(); //
+        assertEquals("User Object 0;User Object 1;", module.getOutput("result"));
+    }
+
+    @Test
+    public void testArrayConvertFromStringCommandWildcardGenerics() throws InterruptedException,
+            ExecutionException
+    {
+        final Context context = new Context(CommandService.class);
+        final CommandService commandService = context.service(CommandService.class);
+
+        final CommandModule module = //
+                commandService.run(CommandGenericsWildcardArrayInput.class, true, "userObjects", "User Object 0,User Object 1"  ).get(); //
+
+        assertEquals("User Object 0;User Object 1;", module.getOutput("result"));
+    }
+
+    /** A command which uses a UserClass Raw Array parameter. */
+    @Plugin(type = Command.class)
+    public static class CommandRawArrayInput implements Command {
+
+        @Parameter
+        private UserClass[] userObjects;
+
+        @Parameter(type = ItemIO.OUTPUT)
+        private String result = "default";
+
+        @Override
+        public void run() {
+            final StringBuilder sb = new StringBuilder();
+            System.out.println("userObjects length : "+userObjects.length);
+            System.out.println("class : "+userObjects.getClass());
+            for (UserClass obj : userObjects) {
+                System.out.println("\t"+obj);
+                sb.append(obj.toString()+";");
+            }
+            result = sb.toString();
+        }
+    }
+
+    /** A command which uses a UserClass Array with generics wildcard  */
+    @Plugin(type = Command.class)
+    public static class CommandGenericsWildcardArrayInput implements Command {
+
+        @Parameter
+        private UserClass<?>[] userObjects;
+
+        @Parameter(type = ItemIO.OUTPUT)
+        private String result = "default";
+
+        @Override
+        public void run() {
+            final StringBuilder sb = new StringBuilder();
+            System.out.println("userObjects length : "+userObjects.length);
+            System.out.println("class : "+userObjects.getClass());
+            for (UserClass obj : userObjects) {
+                System.out.println("\t"+obj);
+                sb.append(obj.toString()+";");
+            }
+            result = sb.toString();
+        }
+    }
+
+    @Plugin(type = org.scijava.convert.Converter.class, priority = Priority.LOW)
+    public static class StringToUserClassConverterNoGenerics extends AbstractConverter<String, UserClass[]> {
+
+        @Override
+        public <T> T convert(Object src, Class<T> dest) {
+            String str = (String) src;
+            String[] names = str.split(",");
+            UserClass[] userObjects = new UserClass[names.length];
+            for (int index = 0; index < names.length ; index++) {
+                userObjects[index] = new UserClass(names[index], new Object());
+            }
+            return (T) userObjects;
+        }
+
+        @Override
+        public Class<UserClass[]> getOutputType() {
+            return UserClass[].class;
+        }
+
+        @Override
+        public Class<String> getInputType() {
+            return String.class;
+        }
+    }
+
+    /**
+     * Simple class to test input arrays in command
+     */
+    public static class UserClass<T> {
+
+        String name;
+
+        public UserClass(String objectName, T generic_object) {
+            name = objectName;
+        }
+
+        public String toString() {
+            return  name;
+        }
+    }
+
+}

From 46ca0d04c5c86eeb51f9daa9f130b0d7c8decd65 Mon Sep 17 00:00:00 2001
From: Mark Hiner <hinerm@gmail.com>
Date: Tue, 19 Jan 2021 11:54:33 -0600
Subject: [PATCH 0981/1208] Bump pom-scijava to 30.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8065fba5a..92de9613c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>29.2.1</version>
+		<version>30.0.0</version>
 		<relativePath />
 	</parent>
 

From c8ab4ad9ae0f76588ea92e61c741a703a94d7f19 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Fri, 16 Oct 2020 20:28:06 +0200
Subject: [PATCH 0982/1208] DefaultWidgetModel: check for null choicesList

Let's fail fast and return null when item.getChoices() returns null.
---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 1a768d5d7..91e301684 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -221,6 +221,7 @@ public Number getStepSize() {
 	@Override
 	public String[] getChoices() {
 		final List<?> choicesList = item.getChoices();
+		if (choicesList == null) return null;
 		final String[] choices = new String[choicesList.size()];
 		for (int i = 0; i < choices.length; i++) {
 			choices[i] = objectService.getName(choicesList.get(i));

From c4cb3a71f6e5c02d78d27bcee728adb096f579ef Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Apr 2021 10:23:43 -0500
Subject: [PATCH 0983/1208] FileHandle: infer mode based on file permissions

Instead of always trying read/write, which throws an exception
for existing but read-only files.
---
 .../org/scijava/io/handle/FileHandle.java     | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 3bcbfe6dd..39b6e0448 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -29,8 +29,11 @@
 
 package org.scijava.io.handle;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Date;
 
 import org.scijava.io.location.FileLocation;
@@ -50,7 +53,7 @@ public class FileHandle extends AbstractDataHandle<FileLocation> {
 	private RandomAccessFile raf;
 
 	/** The mode of the {@link RandomAccessFile}. */
-	private String mode = "rw";
+	private String mode;
 
 	/** True iff the {@link #close()} has already been called. */
 	private boolean closed;
@@ -232,6 +235,28 @@ public synchronized void close() throws IOException {
 		closed = true;
 	}
 
+	// -- WrapperPlugin methods --
+
+	@Override
+	public void set(FileLocation loc) {
+		super.set(loc);
+
+		// Infer the initial mode based on file existence + permissions.
+		final File file = loc.getFile();
+		String mode;
+		if (file.exists()) {
+			final Path path = loc.getFile().toPath();
+			mode = "";
+			if (Files.isReadable(path)) mode += "r";
+			if (Files.isWritable(path)) mode += "w";
+		}
+		else {
+			// Non-existent file; assume the intent is to create it.
+			mode = "rw";
+		}
+		setMode(mode);
+	}
+
 	// -- Typed methods --
 
 	@Override

From 7cc0b56df02ec944dcc65913a1af1ceb63a83e86 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Tue, 11 May 2021 21:28:20 +0200
Subject: [PATCH 0984/1208] CommandInfo: allow shadowed Service parameters

When a command extends another command, we often have both classes use specific services.
It's better to be able to name these Service parameters consistently, than to avoid shadowing parameters at all costs. So let's exclude all Service parameters from the validity check.
---
 .../java/org/scijava/command/CommandInfo.java |  4 +-
 .../org/scijava/command/CommandInfoTest.java  | 38 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 8d843d457..806c6f2ae 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -52,6 +52,7 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.plugin.PluginInfo;
+import org.scijava.service.Service;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.StringMaker;
 import org.scijava.util.Types;
@@ -460,7 +461,8 @@ private void checkFields(final Class<?> type) {
 			}
 
 			final String name = f.getName();
-			if (inputMap.containsKey(name) || outputMap.containsKey(name)) {
+			if ((inputMap.containsKey(name) || outputMap.containsKey(name))
+					&& !Service.class.isAssignableFrom(f.getType())) {
 				// NB: Shadowed parameters are bad because they are ambiguous.
 				final String error = "Invalid duplicate parameter: " + f;
 				problems.add(new ValidityProblem(error));
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 63a698b23..822686f86 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -39,10 +39,12 @@
 import java.util.Arrays;
 import java.util.Iterator;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.command.CommandInfoTest.CommandWithEnumParam.Choice;
+import org.scijava.log.LogService;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
 
@@ -53,14 +55,20 @@
  */
 public class CommandInfoTest {
 
+	private Context ctx;
 	private CommandService commandService;
 
 	@Before
 	public void setUp() {
-		final Context ctx = new Context(CommandService.class);
+		ctx = new Context(CommandService.class);
 		commandService = ctx.getService(CommandService.class);
 	}
 
+	@After
+	public void tearDown() {
+		ctx.dispose();
+	}
+
 	@Test
 	public void testEnumParam() {
 		final CommandInfo info = commandService.getCommand(
@@ -88,6 +96,12 @@ public void testEnumParam() {
 			choice.getChoices());
 	}
 
+	@Test
+	public void testDuplicateServiceParameters() {
+		CommandInfo commandInfo = new CommandInfo(ExtendedServiceCommand.class);
+		assertTrue(commandInfo.isValid());
+	}
+
 	// -- Helper classes --
 
 	/** A command with an enum parameter. */
@@ -112,4 +126,26 @@ public void run() {
 			// NB: No implementation needed.
 		}
 	}
+
+	private static class ServiceCommand implements Command {
+
+		@Parameter
+		private LogService logService;
+
+		@Override
+		public void run() {
+			// do nothing
+		}
+	}
+
+	private static class ExtendedServiceCommand extends ServiceCommand {
+
+		@Parameter
+		private LogService logService;
+
+		@Override
+		public void run() {
+			// do nothing
+		}
+	}
 }

From 565f9a995ca69923f02177330d1c600abaa23eb0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 1 Jul 2021 16:12:07 -0500
Subject: [PATCH 0985/1208] Switch from Travis CI to GitHub Actions

---
 .github/build.sh                 |   3 +++
 .github/setup.sh                 |   3 +++
 .github/workflows/build-main.yml |  42 +++++++++++++++++++++++++++++++
 .github/workflows/build-pr.yml   |  35 ++++++++++++++++++++++++++
 .travis.yml                      |  17 -------------
 .travis/build.sh                 |   3 ---
 .travis/signingkey.asc.enc       | Bin 9632 -> 0 bytes
 README.md                        |   2 +-
 pom.xml                          |   6 ++---
 9 files changed, 86 insertions(+), 25 deletions(-)
 create mode 100755 .github/build.sh
 create mode 100755 .github/setup.sh
 create mode 100644 .github/workflows/build-main.yml
 create mode 100644 .github/workflows/build-pr.yml
 delete mode 100644 .travis.yml
 delete mode 100755 .travis/build.sh
 delete mode 100644 .travis/signingkey.asc.enc

diff --git a/.github/build.sh b/.github/build.sh
new file mode 100755
index 000000000..7da42622b
--- /dev/null
+++ b/.github/build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
+sh ci-build.sh
diff --git a/.github/setup.sh b/.github/setup.sh
new file mode 100755
index 000000000..f359bbeeb
--- /dev/null
+++ b/.github/setup.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
+sh ci-setup-github-actions.sh
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
new file mode 100644
index 000000000..45b6b5e69
--- /dev/null
+++ b/.github/workflows/build-main.yml
@@ -0,0 +1,42 @@
+name: build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache m2 folder
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-m2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'zulu'
+      - name: Set up CI environment
+        run: .github/setup.sh
+      - name: Execute the build
+        run: .github/build.sh
+        env:
+          GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+          OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
+          SIGNING_ASC: ${{ secrets.SIGNING_ASC }}
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
new file mode 100644
index 000000000..92a019264
--- /dev/null
+++ b/.github/workflows/build-pr.yml
@@ -0,0 +1,35 @@
+name: build PR
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache m2 folder
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-m2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'zulu'
+      - name: Set up CI environment
+        run: .github/setup.sh
+      - name: Execute the build
+        run: .github/build.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3bc57c558..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: java
-jdk: openjdk8
-branches:
-  only:
-  - master
-  - "/.*-[0-9]+\\..*/"
-install: true
-script: ".travis/build.sh"
-cache:
-  directories:
-  - "~/.m2/repository"
-env:
-  global:
-  - secure: Xkwu2u/v0+kBqW2Mt80FpMS+2NRMnfRaZ6ptiEW44sViKkaENnJegmYVjdSm9RAwAJx9DEp6KYTLH4Hh56JbWp6s8qGcxm2vCbAWBE6ZesOj3oTvv/T4lucxarocZ8hK9NqfY9iCePjl8R10UDePThZgWBFidUQjvPbH+LcXo9g=
-  - secure: Jgj204N4hKv+7sUrXGtXMvUoXYuHAerhUvwbHsm0BJFpzUSyHP5QWJH2tHvCUL9Yb4VhNEjc46RLFVmiIXynJwAdAWJodT/VEnOTb5Cf7+0UHK4qCyjyjVHiWq1cf+R8Lr9fuKRqxUAdz9Hw6g0Yt23TX8kCa+wQW9lwchn0IG8=
-  - secure: RuGzuPrxyvBRJwsCpSJ10p9PdP2Hzc9lxb29L//Y/Fkc3bJwNMlNa0ST83oGNHJapYc4dWuFk22Ooy/2YioNgsVvR4n5MAslqXQXSY0VDle1Nbf1pudAlPU+quaiYxcAyyysjUUtqc5wADVgpkrDA7GJzAuCOWb4aSwiiIn6u4A=
-  - secure: bnsjVlj9MBJto8ahZdMwGpVPjZeyF7r5tZh+t+NhDuZsP0WMlURzGZ9/lJOO4quklgiWCyeVDB5uvDvsdG9BReBe5Q8Q6WZyxhxYtP2iLV0zRWSWsGKk0stGcrmJKk8wbicIJdXD8suiP+2Li5GfxTge/hkhL4CL0OOr6b1JqrM=
diff --git a/.travis/build.sh b/.travis/build.sh
deleted file mode 100755
index 094a570ee..000000000
--- a/.travis/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh
-sh travis-build.sh $encrypted_d2fbfc37eea9_key $encrypted_d2fbfc37eea9_iv
diff --git a/.travis/signingkey.asc.enc b/.travis/signingkey.asc.enc
deleted file mode 100644
index 4e4802b462a4c4ae860a84af0c7ec1d1390408e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9632
zcmV;RC12W{wS_|d+vp;Au{m6gL+BFhM?-BCikSk7{kH6M6KnW+ponRb-+96rEk7hE
z$R3OOz6*I!!Y2GYes}r67t%!(VNWQ7qP*|qENU*=!#tm1+5INUY9FkY9^~29Bx@=7
zruzk)i_++1DCkU_00z&cF$$(I+M(`CXe}*3VEJC?yhdPZP=qd&K^mQ75k^OudIacK
zVLw-#qc0TF<Ai#b7OeC>_%wx?JNaM-l4|Ur>;e7pOzr3bRQQx*w@X4BF8pE%i$1Gy
zcNFnE2yx@W9soPHEql?WsrGi3^#M==o;{v}wTPXKtyvB{@L<?Tz1&*+FYWNy!114_
zU}SS)F13K}ja|$HJ3Dgn!3NoO##11|5p%$XUTM#vW%9gPd$5fbAnnTdFF6X$0@gm9
zVipEMS9&7(T<ZVCht%GSc0e1Sne+o71<8E;)7f^tp?HFFX??ReG4Rlj7GkSCOXhI3
zEHTM3@L6OTO}9T>jfpouVE{#GloOG5sxN<y9A$$>u!P5tX?_CvMQx)Am@hpsU43k}
zYPZQBz7I<e)tH0`hiv+a^0{?M)_vz=Q*d+2CJBq;NL1_$+8iyb-6h8;&5M0mRWTpb
z4<7xCVD6|KnX-jH)|xfzVJqDu$}UXx04j$NXneaWLfLf`Vbfa_Qg~v1SW44-WUr%^
zEP$cafpZiiKh}HgIR;sS$&7tN<%YEhfs`6a$Ms4lUow=R+|&qPA@y@FSF`nBi+OUn
zLV5p5Wk2ecOYYp^Nw|^&dBqk^n6=}^o*MqQvO;39fPoo;Otji1-+kW45V9z<@6H?>
z3of{<P}rJH6hqx@W&G*NW#{=Hy9*|EK@gpa4F6%ul%y?~xlF-cnn&ua7SU2KA7NOj
zE1<ua*un;6@u`4_=a*D^S_$w+*wFBzgxC@^v+Pwnr!U{C3qx<4&nuot)iw&zo7IF(
zj#;i44ES><?G<iDjyw92pHP|aF1V++J<oBD6(tg!+!GG(4^7@%FNP=l0z!Q=z}dY%
z&pqpRUUygi3-h3^MUsx47!P;@!#*ti9|NLpZu^-MDt4zk&id1P+Pr{ClGOpHyvdoU
z5bASPEL*96)Pb)Ns~}>=oGWvJ*F%3?Rc>md&i~AdY>@qa<P^Nn53nfOxa&x{blRZ&
zB9MR!*t%h-%!FUErof_rcagsBmXXt6^GSz4#MfGBm!(N{w8$@7qg<DRm!v#0w(|#{
z?Qr<{wQ-`$BEuKpHQF=#w%Zd@bG*!heI6S~1b$(anzMpiI}JGDY%(6Akh}aj{d+}(
zR~CFE0uO1@l6KhIoUCfKh6dAY1UoNG^f8EjgOEC-HNUC{JoC$|dS*|6VWd5!!1;*V
z)?2N6anV@s-Kp&F0S{4WLcQFP2=yGbPYKl2-AC`XKuNHbAl9YV!j2@Ea7YpBbnX;A
zqqGvxY8*<t2X*C#;<ug$*V7$jTp5h?PGjgH2*yDtkM$edwAIf1(@J=SqzwtsfK}<+
z22M>W`z4zuwebm48MAz~>(8Y<EpT(le@#edpz8!7V_xD;>_EJ~5I_1kQvTpe%G>to
z@7KSDF9U(-50|{zI~Aq}g+5~eiv{BDV8%{W-C9$rj>J5_X%9hFIgRfH1$hZ4zYJfC
zzuv^k^^Wc4>@`UBE?dAQGN*bDp}3vJ$RzWz_&2U`^ge)f;)nHILYa5K=kkWFE|98k
z22?Jbp?-9nle9&u32u?tT?3wc+n=q3nA=$e#{8++^x??Zo~j(%tv%Jpr-!<g=~V{1
zk5+UpbTy}`oQGn{uzX4TYC)P{<6!7rM{^Us$>4$@&$LvPcp-<PqnKMHuBI12a2Y3Q
z`jPu-BnZd6JhL`$1T~p2FcZSWHnt1Ja46QwiS-jmgT>=jH&SSC#@Eb4WUHeNB`$}g
zrDnPg<<r{d$SE)SwBF{Ej`AOGoO)SKv7TFC<sF_=9SL(QBXGq`=&i*H=K|Cf#c=gQ
zLj8GR2ohYU^`K~ElZwPt%BcN!Igcb+Yf_iRAaLTJu<2YG=b^k^BOo1CvUkKrx;nzh
z#I3Pt{I+xG*?l<MA~!17Zu7FvR)K0q@Zx8!Cn>Wj<@5dBLEfrTI6OuZ!Y7v%vb5v^
zpZk(){UM7dD(Q1ujM&(&`0__IaS-ZTlO=U@^_Ol)qCcsaaR;j-H9bB8Ni22TFxMOn
zXW&`yZq~3q?0$P$`!>p#K4YgB7}nm?9udcdi}j?tu@sN(+V?GAWQ{?mvVCKeazu&B
zl07qGBs(l34Z4;(2oNvgk;cyA`wBhmquhj@Uu?PJu+QbNfK10mE@%#Za>Le?_;HJ$
zx5yRm*=@!3R*yGPlp@&_+cZCKBgkmuZcVvqY3_J=d5im&=lcwOlV(tDPt@xCTdXCX
zjjyQ|fvu*MOxGkVoZ?!NOwv`U0|@s4i%zZXOr`))oOmV|m;n#MH47++H$c|_tr+-F
zL=gIGa~6Oj`FW)Rht{NAqRRFFKSHkVZR@D-*DSnCDi7F#k*RsY_Vgnmr+KpFMxMo9
z_03xUvlI;^qOc5mdiCOmxp;O7NI>e*+0v#V5wP*HBBIR}5wrgR@Iq;!4yboTIL$a9
z2eEQO`USO+;U~s*GjZ=KA(=xb^~bPBK8}i*%6b|N`{u@t2D&fp(_G{m+n}*QgZ?JM
zFYEHm_=UW&4eV{6VwbvMbDGqpAmIrDYM2Fuw*A8yGOjEfzX}3+*_T$%4W3DZ)w~ts
z+x)`kAl~m0h*WH=(@EFX3h$KV`~6w1v$4j6uv6nAxvql=2O8u>@KU_({g1H}ryjCg
zN>>Lu0EXRWw^KV=&ZJ~T7$1rxW9sQyqW25(B)MZ*nWDKaPOTm-RYSBsvCY}`Ow6+R
z7mc+pgf?teGfp+5Fo|?IDzgDNY3PAS?QZ(yM_JP4H&F!oK<1k}e&xfZ+nPI8y13wF
z?}3POC42V1-35>`BvdK=o?KONxM0d&3qn@>zvmm!<9cO?z8&TXtFC636AIj2q%42X
zUYE_peTV-NY)b+lZ+c{qKBRpyEs2C;8Q-x<0_E@|VBq!Q=k-*ySEKFAHv6n7(Iw&+
z$Uloh)Xq{ie?}~y$X|5@NblY^%Q`-l{j7xVmr8~;EoJ$cIrRks))RbkkSs*d$wy;g
z_F8IN1g5?7)r$aK;~Bx{Kkgry$ZBj-VOKpB<QP<Zmj`?C9sp@=5mfz*!;C_+0ASxu
ziE?&ox2)!sokaRXoRHp>)P3CWL9PgUG(6Q$P5(mitfsf|$QDxY#|6VdMOR*@((!$v
z?hXXB9+IdBc$V$l^;Fv?;VbjuO$bphrvjfR%8{j7G&at!8K_9t$-tKo>M6>LA*uca
ze^?f^^ppmk{D>6Gl6u7awg_yyDqJR~2zmXTfoh}i5^6`v+J;{O(U|TH`1SD*c`CTH
zOsvrz!WD}6^9krB%6X_9@jEsX@&xh4?En5-`5oIIrycJ)<w>speiNEAbah2Obpvgn
zJZ`kzgdju>kz~D~7LpRJL<H4_277RQSJ$)|l%NWIS;e@qmfg>GF3_oAI`a24%7@)s
zRJdJ~t>F%+F%D^9h+4@1Fp0T!#N0#Nf&56<Y*YlVwv_R__!PZ1FUMCP3joDuh5xFy
z%U{tu1h>p~7OR0!==X9IM*oP=*d`vcTl)m1Ifv-AwoIv5C=CZ`?b=$wq-_`-LxJd2
zeKL|H8k7SY4?D*+ac1no+`;#J!a?}jz)Xt@twqfrz(oOuP3zlskhrvJ3Ll*Mb5w2N
z*C1kOZ}A7j^%0R{<(iwHpQmZ<Q(?Hoqorl5_Om~__hLH(YJ1bp6k<GWUQK|#)Y^YB
z!etR3t(f?G;*G_GWxcQ(Uvd^(ZyfIC5;u(ehw5hsbw*jVv=TiCaQF{BxDVi37Ts7O
zaJ%M_wQYJ*gs8dPCFuCP{Rs+R4g2Ev1&thD;&v<Z&cTj$3&s7f&7lDL(b5Xp@`$h4
zBFDLQK(Em5`O||Rm;szx#UZ7bnVE6M{bwqe$pRF5m=jborP8OgX}e4W?*^I_fLyR>
zu8g~zc7z>%8EG-liO`ei-yLaF>JF~@N4IYYdQGnLdO&#GW}U-vEES;eJKLRBbkxRn
z`Zgrsx4DhxIjqWfY4auC<+OTz^U;lV0MRxynYRZ>1){x>T30l+F099~0alYsy;7Vz
z^1sN9JNl9G6wl0S%9&m&m>QbM?3SG#Gr3bWwzICXW`485&Q6B^H}&|zd^@zYJ8hM&
z6(JX`*zNLCwXArzoDF=UwWc$?&4ru8H<O_{c~;sE0t3VF%|&S*s_bLuZtoaL4iDzP
zpe>-&oaWVBLtHgQb|w->l!pK(?^<GV9-%4)L<vEtk0g$jh$fp52;>e)Kq`X{Fj}!;
z(IKV+V(ejC!=7m6u)vtad3W&4#+>u4e%?M?kwzm(&>4v*Pi+pTIDDC{+8491Ndu&^
zoWt-~V2P^7oQ0E9d~N+cB;1Q_Z6-Z(0_RY>By$>y!vKn_2wPcsoDCXQ?<JTJ8XUl!
z0D1gjZN+nx#K~UriNOj4C{iXMgXj580f-wKk)B(%2w8Ts<YkOS1BG=0N>vA}hq8_f
zLxX(hB4lcj28IjbTcT~^YS|~>Qs-8;oJeWq+Lq7^Y~m)F2_j*~{10r^>_3ppBXs0R
zWe)`bE9H=kyFi^ebn}Ggf2aoYJk1jPF(&*f?Ej3FAXZF5lwffAoY}%k%)Cvz_FjI>
z*a+vy?8$_E0-$eIP=v5=_*ScT_VbxV_3yB*u8a7<nYKk#kOVy(Q5tR)&THhRM0lSU
zEPXQxCNeoHi+u~cYj2oz5!299esR37$rN(brOr`%9!Q1;nt)-PQ|zGQFW}JxzpO53
z)t+KT<L~YM|0e64gcyx!n1fc<{75uiKH+W}v-GA(T{<i^`s=NV1?K}sCj+atlj=>~
zQy%1L&X+L|@P=)BL2zlS<nac1z-v(DEY3|%5NPhh^iS!>d5oV3Ee-T({9J1F;BNgS
zaX-f|Y8Tv{#&6>C<yjZ}ZscsOmB#(PQ+JliQ&v)yFBh-^{rO4<pdy_ux!(y8v-X_6
za6sKL2OnDv6bR^jO99QTbpDu&V!Wz@bBn7I5$1N)t*5l)G{sIEmm0Fv6N*-mwAl^`
z9CjqlSXfH?&1r)vq2e3)J^-VhN(r5p>v-Suh+l!3W@HDZ0mRyo!hyWE@y#>^WN<lg
zi#ji(YXHr$6$|oC`|GpEcUot~jHMF)`LTR(!9}@2nC&+L6D{ST$46|&%(sCIAsK`r
zAH0_8^4;}rIX?e_?gH<cKw{almeGA9gri*6+WwC-vp=A>J|m6?&C2}lk|8rNX!QOD
zmMCmdB+7yu&QEXbp8yC*ON=AJQ}Ja&1G3sA*4Xe_^yVm@hgD}E_R{GfDK)*toPBCW
z=NW1A?K>0}nj-?{aIa_v#1nm@0RTSW%VFV>mTVyBUgo5LQwcl~d|hGp=ybmrBB#W4
zXl<V60L$_-eZC#GRh~C3PZY6Kb7Rn<fnP?s_ZQo`rLc63r>`l~9+>cehYXv#<h^OS
zL6HpM%ocFu_%*8;Sxyb=f-2w<OzPH(uhSa+Sr<61jN|vsVL>b$yU4r0GL>rj;y~&}
zTMF>sIci_%-WqF<Qs?$j!_6|8>bifx4M8Snb|$J-mg29QcY@psRaDCbeCDp0fR;>`
zB|KNDvu?_lV@?7KL)n9Cqw`BAl&<u4((s$XBJ6%D<K||cdl1JxRyuH_J&_g!F{v!V
zI5SikOmv=m84DD#Z{5X$RTDA;V_X<fbbNW>BPU?tK$46K*Q1XP)2oIY+Z#~FDSFtZ
zsgEFsGaC+dq_1{*nojjaR6#H|Me_=H{u@{Ng-k_@c!C)<Hv_H26T`EC;GobI0i^#1
zFlNh<ASok}2j@X=aWhOFi+}e~=JiC4yBvpPELAm?o_+gp1TB1jkCxb#Yy7Vt&$1Q;
z5-ZfpUOGNQE`pP816xH>p65n?uS>YO2FwPqz%ns!871!T#7CTbodeIz94E{hmIY}|
z#$j9s_*PgW0`KR{^@H;C7;sZ>rp1VcZf7HD24I%iZp4H1It@D~#HFOb{1Pi%mF#e^
z(Sf}zrWYuRF#8wYGStYC4#3xs46o?8S6<uz#!5wiUe&mx7?ZmqVU~u;5dxlO<Rbn0
zYO%Zw!o1VXr=&#hHT{g*w2)ZUUk--}p+(bZqsn=iRxw<I*NV|oz{pDRcHJ{p^+y!}
zfbbc1ZvUAL7q45zE0FjYZ@zjVd&s@3X4>svWLuAL=|1-@3;l*3k=-}*6CJ6u{ROR0
z-84w0t!aku+e`djC{zW~G430O_5zTnQdQxxQ3Ta=#%j5*U<SE#$~$Ayx-MMp;{j-g
zORj;nnqf!Hz?5^)hsKIO#~dL6=L!V8{jP}SYDj+3g#{vmi)eAb4P4;v(SR<d(p6^&
zahgED-HoGH`B)5qR~B&TtzFHQYiqTacVm)=z#l=G>7rz3Nx0U?YEFfmWacMEkJkb$
ztBuxlLd_nb1MEMsXlnqhpX=!An*m}E<slY>|0iGU_~Uf&Q&y#QD=-<mlxifyED3CY
zI1zVth6kxUhK>z%W%F1<!N^%H4z=RPWpPpuk3NiDjy3frbPjodN5*mW<{D_HRqwh&
z(DAb%21bc=N;<LtQ6Xn`**vEcBziAH=`>g3RO6N6EJh(lbBw@f(Lmn6xcq8Cxm=(`
zhaq7MY{O-l-EWW6RLdWCz#)OXAR*r+UCc)7<Is^3NAhXvENUCae;uSFDdt5~!Gr!`
z`x6|$D`$hD35HUE8P~=F)ap9j(4#EP$Gl09wKITY`A7+F^|(UxfKclHEVSa!Qg=*H
z9Qqa-6!*W%?9PJVjwJb?9DNg)a)(?9&M(TFmn{YK7}oqJyXpoIF<Dca3+4q;yuVfy
zFFT>caGE#3rSZVUTsMm;&K_?;;j4b%P3>#B0yF-z+88po2q}#DVbYi&(Oe7@7ri73
z^N@4^zyeo2+l)ae0{+2`hB%%t_mh8ed@HwQ+)emtj$e|VOy!^Xsk)l~=1o@`JMR&p
zCG@<uw7^@3(eSc;9kjk2Ra~1N)~~YQql$HhH1oS6E1fZrHS2zu936y>ws})m9`_Z`
z=I;=6hT}o){c@P!Jqn}bbpfg22-k~4-aX~FqUC&?x3rO!Nq{-@8gYR6;4JVtoD#!z
zZq>K!Jw48r)9inh@^B845PCz{u^>6TaCb@{uk)uUQEo(!3v<okrJw0S9!3sZVi{0}
z#laY@nr2FnbT1W)K$6jn=g@HV{5sUcD3CZK<_+Tf4)ggaM6)F|NAr;rfiY*<O4T&@
z+wWcFSqqQuj}}`4Z*sVrC5lGHFFf(MwYUKbMZ$}zXF%;#IF2q`OZl{`ubg%L1}7)D
z3(f8Ir!T(?9u4n1vmSyl#LqE7al5GokENhYgUyp;S@wfo94-r$mzwbeICg97bg%1?
zzk8WrulxHiwEVa9Dl5&6>&xixvG`ym3*786a$0Ssd6P_qc7UIuJU4((uBmxs%$b8?
ztgcO-rU6<Iv!aiuMAMe^$5ZPl9^(K)qia>wax?gQ>>Di`&F%<2R(U~UFMWzQJ?vGr
zU1JV4$?+!rN&L!o(8^a#g23ph{{*L{GXDm)YXk<U#f*dcIj-5i(jRB!os8glnYj(!
z`hhL)-jMy?F;~9J4N9nK6$R-yl;jg)Au~J}-FEBRCG5&Z3`^*lL1|w0-34fcV;g<;
z15DlD$g*o{5ld&rVoln*AX$fLezJ9gt-)hX)mE;t;n}cpj7{0csDI;FzrU?9q9<B@
zl_d5QYQ{p4=Pil2urpI<n#M$6M{eI?><+cV&b<a=?}yheaM&@K%XvGs+D~rfLYv{N
z8DRKXvykh7;1bOAQbtZA@O4tjdcFf!Jy?p^J)!ipkzBDpB)rB9(PYQK@%IU$_K7+U
z-b1lY$pGkEufj^MY+WUVOeSM~@(AqAUGTHr!{jstptRSwt+2dd)*WVHf{Tl)%yDzd
z<}CJEGwoIa4aVi=6nP3^jhvm^Dy1DzE>WaW`bo^=0BuebR`kAy%=x~`gom#&=B|m5
z`qf};;ELo6uo2@t+OjWPaacH03#@_pYpEj5(r!!EdJsREMHn(n{^&g+RKX`(=571>
z3*4nW801sGZhe9NvvZC`V?n;)h9)%w;GyiSePJcy1`$6Vu&bXvmE_Kn1(i1)qp#-{
zu#k{#+y`|P#IqZvU-B&VhGyyZ;{7q+-mS_le~BJJ_Ne6_rvsg&NaC~{wF3WM*q`yx
z<*-^_Fx-ECk*RjM3#(AY>=zmJMgH4?kqS_#Mb<VePatld!lZy<GNGPMOJaisX1Vxo
z4eEyZh2%q`7=gnK=^+b235#}L^T^$?y~T|(0|lL5Za=ZXRO~%A&Uuoi>BEz<Jh3v*
zymtREV4H|;O`zz%B!d|0kZ@NOT4i!8HkMQ%?;UTrF$sLgRCA`^0{B}lwq!ss_{|VZ
zzEF=d|HQ>?!>yb+Z8@_9ZKxdhK)j>|kX>GlMfM*y1OLN?FBp+4mJYlK=*ztHxhjQr
z;DX1f7lc$+Wyh)!nm!$IXr(|)qG!Jle>`M!o<y#-vl=qY=34tHpZ_$o!vK4Td>zc;
zQ-y)mStI5n3|CTmtNko19P6)08&hFC`p^o8terFgBOU{^hgcFzeiwGaj68-o&V`l&
zotpr{o$l7eYUH7NbrD#Z1TV-w1c+z$TCMH;k~crSAnS6s?7uZ1Lh!uWXh*(nPfawN
zjQJ^qIu>uyQ&dPXMk1jtK-ts?BDwkNb9EJgs7CLrH?+qZo=~**Q^EJI#H0x|xL|PP
zV3{e$m$ZS9I2#{<-Uj~9TC;Enx>dcQzeH7xf{yh}Pma8s9i!mcGU<lz-lRwJzSRM^
z>I-DAIR#+6U7C7clHMR9J`je&g7<Grbwo%<2xKSCa`F(ac$z=I)9*Ny=KKh~qGAb8
z6ttYC1~@l^T_}6~<gedc2lPGV`C)F>mK!#d37ou&BaT7F1ON6((^Ue_eGd!EHDE`L
z;He`g`l$XaRX@qJgdy1u-P<@>B5fm>o9s&TjG>z4gStKc4rIwMt_c$_7wD5GZB^Sk
zq8#r`#&K#8DV{#X7+#$b?HVd=flTf)?juR)BF%bOpS=irmjdUz&`S;1nP88a(T^no
zXcM^gv~QQx;xr9H8Nt_YJsJ%qK5W9V>1YFBU!qk}q4s2TJvmOfLiu`P!YfNz!5383
zkcccx&ZpU9+cz~zl^0gC!QRd&)oco|5biL7c9qPio!;WDOKGT?ybLt#x8@@60iS%S
zX(Ed9mK4Ya1Oro@<CO>Pm;E9(`_a5bnD<O4v9ouvxO?tCup1pHPgWE2n>-kg+A1;h
zg>i#q#5Is<i<y|snavoHKF0!DfcF?f>sCmMn_a3Lr-8uOV#5-$;w>IdAF`6-4M%JT
zaS=!JPz9!pgkQbzC@nG%9ePJCiJ}&IElQlRFOIG(?OT<}WR2N!Y;MxZ-{1z84Ww@f
zePUD-s0>|5_-OH>2Z#BeP$;%DoR%Aw+cS=(u>}bNA_>|ONaijG%Mx53x3)|ekv)r*
zmZKFqF_W>pHzhQRHP+7SCcgRui8&&QNVxqh7Dxq9Q@l`L?EX~M(@b$?!4Vu#*9nMS
zY|Zd>U$H$ln&7PIjV7R3>^Xevv(X;?;nHedM;IkI(^YpcHClEq=X%bWf@PLN#9K|9
zl4jIdx%Wu=t_8o6HN@%OOtG~J_2gcKVZSxxW@Tvn$1a^+V4(`;?Qw0?spN+y6@}bH
z&PkrrtUw~I3S^swp$x(}Mv>h{&afJ4as?BUk)U1Xg}6S{TqWrVCnfK3>TvaJS%S#y
zgFie|vnE2gvjHTQ^{;|m084L%DCxbZ`eI0}2|k8q5WxKaXqE(}SSn}<O)AO6254N9
z5oTXWoLL%Ph2aW}CqT$!5`u!2*<n=cw!%v~ecCJ0q8-7`QMm~yo_37;M+N7A6mx-}
zmF&)QcE@+9g^z&7x3=9Il)gaSyeRj07HIf%yrgSi_HxJdv`}M{ZVA~&(Ly5LT3TXH
zIt)>D{C(fZ|NAB>lIJB-j5Ob%>}K!Y|KwA;6pTn}+ft-UR;ld5@yx~3#3dxYw>L?0
zQD*MX+E2Wr{sDKT_;*55T*guBLDK$2!Njt)SKGwdW{#1(;k2V9MTzSs_?%-O#XXgs
zCxE9KjTm2uH=hg}8jkz>@(dW00Fp+ZC;h{3>U%LILlYSg?}J;v2HGxY!w#qH;biqO
zd7XdIynnt2A<Z_HZ87!>Farb|zK^*@68<gOl}}jv@xr+CUMx)tKr>30W%Kf^6sUgf
z!0Ni7pl4lD)`h8X*v>pt))cAQ1PGbTg)G?x!u2fMGhDPwSMS{DLo|K~)or?@oWTl-
zlpNC7Ec~gg4*D(vL4zX1g!mDtFMYeL$rf|CdJ3{(EwP>HqLG51$|uFo_2=e~{}G~%
zAWH52-~L1N%Kqtw)403`GdF?tbVgJp^;g!mz~3mVdhR|~g|M@UI0<;OuUv+JakX0(
zkIvI$(68W47-z!vW<dGXP~X@fTb&Al^YpfhV$f=>=zi%thgm%zruV%js(<L02`bAv
zTfNN?MRkA9nTIi>HjN;0#>UIMTS?1)uo9tmTjqB9awPD9aOFPGhU~MK(xw{f<-zc8
zlY=6bIvB#~yO>8)zU&hCyCL_FPo;!shdT4}SF`vkoAHSAo~D3%x(w7u=1NR^$H#Tm
z);Ra@*;)NHP$?@TsPT2{#3}spgPaSgd{jyuk%z2KCVOGk&lY7l@QP+eC>$h8GNQE$
zPuSd)S<Ik;1$z6D%05JMk;Fd+avgeBdZuuU$nvc!F>8L3+)69I*cCj<x-zU*6fPve
zsr{S>z1xEif|7~2#n|QLE|XEYk_7>wtreogAh)xtq|vfz3XC*)$xUCBXL8^gMrK;c
z(>=?-oGZ|#T<^h%A&s6frd=wTcgf)n%Ry&9+p%x;#s))BtHx?ShOFcM=H5~M`xBJa
zSLdlv3_Dx#94G3B*U6o`W8mkBK%468&<X=*c#QZ<mm0T+fM+i4U<bx?nv+(aLHU6o
zYk4}%>W1kkJ-ZQCiwKOaMujrACfdQFPb3#>&3N-Bgu0iKtK#2rTIiyd?3m^s;KS;K
z!WNo?(Y)bU)PEG3b=6~XMz&ZrjXlI@xm~pv@Q=J8Xc6=n8ZK9}WFaSwuwI6`(ZEy^
ze0J(zLCD#zT7H}8$hqkh&hmHj*A>~QwX8JtdNstyQQ<W00r${M)var7QrF+Uq1DYs
zDt}jUt`A86!2QwCsdS3vd{es*^HY9KuP>)qKV|3B(aA}_!JpTTGnc~|#YW`Ras=SJ
zTBHguYR*BTx|pW)CA;N{B5JUY54gi{nO-qe>C~EQtPhJY@NR;-%JRR1;<mDQ*Ps7C
zvqkZmKtwmZ99V|yyMxi1g_A{fX4a-oF!q*L5@kuIGq1XzBm<;u&xcY#P9Nc%UA%B*
zAW1IxH)*7Bf$qoZi&}RX#~j5wzNcz|HUZxn$ycLU2v@?uj`VG7k6;YN8O-EvDBivN
zu%;UL>C7r^Na96@K?cvIG!_7r36q|a6sx@uA;>*CZ8qD+f4X&{847U|Dz+MpOOCvf
z{9Lhs@o<Cf+TiW&@keSO2y2yZny526gb->KSD&q41(eE%SjU}cXBzB<Rq${{yJVh@
z%G>Vk)b7DE$4O=eS;xL&nGH&H|M;(d0a;$U$%(A=Jsu-`nlb$yC+m@umt2oG(IjBc
z-?&m8S9>4oVG6Gwi3QuECVUXq`Spv}c%^tI4~`lFFd4B2`(l$}MdW(=mZB@iSFWCu
zAxC38|MxINHQS;Ldig%5+qo3x)zJHDV-f~~YQ8tq;jIypIFZ|oB)^?W{$hkT!B-FN
zcU}T~#dtKm#ea-o>xPn4%9F;|&xr~Lq;e;NH~ue-62FEDUoOjem^$R;%G7p%XykZ!
zXwD<s6Bb6wa>3At0GqEObPf3U3?2NXkrobdqiehi4^<vM%*bL-ohIA7lgekUl@8G0
zmP*~ywZ=A*cK#<@BTN2B|E9vw5xV@oO%MYjzJ8YypeP-bKExRN#?%pSL^}_nYL{6V
zzRbaN(k<cLr*YvE_Kcp@C?)j?OebObTrCC!BiE{D>141|N?D6KU5Tki$O-7{tyG7L
zwfTc5rhj`-uBHhXI$Z~~+wQV^ZE`{~N9&iM1Y85|-Fcr4(1@{)&1Y#M;J;;lG=e^)
z|A1_@f=6cdIVw|X<@7UP=F!UjXTId@z)!Z3(NfwrM+lou=Dat~c_-;ec9UTOn372t
zfk7K*aFeAwj%V1XRUiUyp$Ef4AOrE^7##eZNp+l`8^H3CB5264FqRU9Gi`$`e(8Wb
zMMWc5;0(4y1JTu&(%0+Fv+rhm7jt8dZBkgzS5C^b&4>z$dP^8LjG$<P*kg^J7K8)h
z-d6V>pjwlDe^3iY+VPjR^C-pDmQo~(LfAQCPJ+vsVcgXIy63bs?Km6^xkf?s?ZF2O
z<k!S_My#=cy!e}$l$srKfw(FpX&>{%jBi?--Txg;9o_QRT*Cs`MdULC2*U7JB+t*u
z*{aG&n1im4_}NuyK3dgCKd2KJ=NVOE9~*Qr(3<I@0i!AL?C;OHQ*r&;MzRt!UV7ch
WJ^V>}4^6{gFAVMRb-5P!&ePv(%K_j3

diff --git a/README.md b/README.md
index 0838f7b7b..b7f00e234 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
-[![](https://travis-ci.org/scijava/scijava-common.svg?branch=master)](https://travis-ci.org/scijava/scijava-common)
+[![](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml)
 [![Join the chat at https://gitter.im/scijava/scijava-common](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scijava/scijava-common?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 SciJava Common is a common library for SciJava software. It provides a
diff --git a/pom.xml b/pom.xml
index 92de9613c..52035522b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,8 +149,8 @@
 		<url>https://github.com/scijava/scijava-common/issues</url>
 	</issueManagement>
 	<ciManagement>
-		<system>Travis CI</system>
-		<url>https://travis-ci.org/scijava/scijava-common</url>
+		<system>GitHub Actions</system>
+		<url>https://github.com/scijava/scijava-common/actions</url>
 	</ciManagement>
 
 	<properties>
@@ -159,8 +159,6 @@
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
-
-		<parsington.version>2.0.0</parsington.version>
 	</properties>
 
 	<dependencies>

From be5b13ee90290b669a46f55830189b52581185a9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 1 Jul 2021 16:34:54 -0500
Subject: [PATCH 0986/1208] POMTest: update test for GitHub Actions

---
 src/test/java/org/scijava/util/POMTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index b398d98f8..6d3c5e9cb 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -92,9 +92,9 @@ public void testAccessors() throws ParserConfigurationException,
 		assertEquals("org.scijava", pom.getGroupId());
 		assertEquals("scijava-common", pom.getArtifactId());
 		assertNotNull(pom.getVersion());
-		assertEquals("Travis CI", pom.getCIManagementSystem());
+		assertEquals("GitHub Actions", pom.getCIManagementSystem());
 		final String ciManagementURL = pom.getCIManagementURL();
-		assertEquals("https://travis-ci.org/scijava/scijava-common",
+		assertEquals("https://github.com/scijava/scijava-common/actions",
 			ciManagementURL);
 		assertEquals("GitHub Issues", pom.getIssueManagementSystem());
 		final String issueManagementURL = pom.getIssueManagementURL();

From d24acd6c686227a3ff9a875b3c4024e6f94ae20f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 2 Jul 2021 09:48:29 -0500
Subject: [PATCH 0987/1208] CI: build release tags

---
 .github/workflows/build-main.yml               | 2 ++
 src/main/java/org/scijava/util/ClassUtils.java | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index 45b6b5e69..3fb562252 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    tags:
+      - "*-[0-9]+.*"
 
 jobs:
   build:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 9bc2000ea..b238586fe 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -189,6 +189,9 @@ public static <A extends Annotation> void getAnnotatedFields(
 			cacheAnnotatedObjects(c, query);
 			cachedFields = fieldCache.getList(c, annotationClass);
 		}
+		// CTR START HERE: cachedFields should never be null now.
+		// But it is, with FilamentDetector 1.0.0. Figure out why and fix.
+		// Then cut release of scijava-common, and FilamentDetector.
 
 		fields.addAll(cachedFields);
 	}

From 77ef6b3c2f29a379463ca78caebd191da88de85f Mon Sep 17 00:00:00 2001
From: ktian8 <69399418+ktian8@users.noreply.github.com>
Date: Tue, 27 Jul 2021 03:04:48 -0500
Subject: [PATCH 0988/1208] Add a check to decide whether use writer() or
 reader()

---
 src/main/java/org/scijava/io/handle/FileHandle.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 39b6e0448..93cdd4610 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -136,7 +136,12 @@ public int read(final byte[] b, final int off, final int len)
 
 	@Override
 	public void seek(final long pos) throws IOException {
-		reader().seek(pos);
+		if (isWritable()) {
+			writer().seek(pos);
+		}
+		else {
+			reader().seek(pos);
+		}
 	}
 
 	// -- DataInput methods --

From e406d63ac88968bcc41dbfbafabbc9c1c1f00dd9 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Fri, 30 Oct 2020 17:20:46 +0100
Subject: [PATCH 0989/1208] WidgetStyle: add javadoc and new method

While getStyleModifiers() is useful for things like "extensions:png/gif/bmp", this commit adds a new getStyleModifier() method that simply returns the suffix after the colon, for cases like "format:#0.001".

See also https://github.com/scijava/scijava-ui-swing/pull/52.
---
 .../java/org/scijava/widget/WidgetStyle.java  | 58 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index 7b71a80fc..6e7b04b87 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -35,6 +35,16 @@ private WidgetStyle() {
 		// prevent instantiation of utility class
 	}
 
+	/**
+	 * Check whether a given widget style contains the target style.
+	 * 
+	 * @param widgetStyle
+	 *            The style declaration to test, usually a comma-separated
+	 *            {@code String}; trailing spaces are ignored.
+	 * @param target
+	 *            The style being checked, case-insensitive.
+	 * @return {@code true} if the target style matches.
+	 */
 	public static boolean isStyle(String widgetStyle, String target) {
 		if (widgetStyle == null || target == null)
 			return widgetStyle == target;
@@ -44,20 +54,62 @@ public static boolean isStyle(String widgetStyle, String target) {
 		return false;
 	}
 
+	/**
+	 * Check whether a given {@link ModuleItem} has the target style.
+	 * 
+	 * @param item
+	 *            The module item to test.
+	 * @param target
+	 *            The style being checked, case-insensitive.
+	 * @return {@code true} if the module item has the target style.
+	 */
 	public static boolean isStyle(ModuleItem<?> item, String target) {
 		return isStyle(item.getWidgetStyle(), target);
 	}
 
-	public static String[] getStyleModifiers(String widgetStyle, String target) {
+	/**
+	 * Get the modifying value for a given style attribute in a style declaration.
+	 * 
+	 * <p>
+	 * For example, for {@code style="format:#0.00"}, this will return
+	 * {@code "#0.00"}.
+	 * </p>
+	 * 
+	 * @param widgetStyle
+	 *            The style declaration string, e.g. <code>"format:#0.00"</code>.
+	 * @param target
+	 *            The target style attribute, e.g. <code>"format"</code>.
+	 * @return The modifier for the given target, e.g. <code>"#0.00"</code>.
+	 */
+	public static String getStyleModifier(String widgetStyle, String target) {
 		if (widgetStyle == null || target == null)
 			return null;
 		String[] styles = widgetStyle.split(",");
 		for (String s : styles) {
 			if (s.trim().toLowerCase().startsWith(target.toLowerCase())) {
-				String suffix = s.split(":")[1];
-				return suffix.split("/");
+				return s.split(":")[1];
 			}
 		}
 		return null;
 	}
+
+	/**
+	 * Get an array of all modifying values for a given style attribute.
+	 * 
+	 * <p>
+	 * For example, for {@code style="extensions:png/gif/bmp"}, this will return {@code ["png", "gif", "bmp"]}.
+	 * </p>
+	 * 
+	 * @param widgetStyle
+	 *            The style declaration string, e.g. <code>"extensions:png/gif/bmp"</code>.
+	 * @param target
+	 *            The target style attribute, e.g. <code>"extensions"</code>.
+	 * @return An array of modifiers for the given target, e.g. <code>["png", "gif", "bmp"]</code>.
+	 */
+	public static String[] getStyleModifiers(String widgetStyle, String target) {
+		String suffix = getStyleModifier(widgetStyle, target);
+		if (suffix == null) return null;
+		return suffix.split("/");
+	}
+
 }

From fdfc89ca57ac58756842d2d11afc94764f358ff4 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Tue, 7 Sep 2021 09:58:03 -0500
Subject: [PATCH 0990/1208] Update minor version

API added in e406d63ac88968bcc41dbfbafabbc9c1c1f00dd9
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 52035522b..264a48d6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.86.1-SNAPSHOT</version>
+	<version>2.87.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From db0a56d2d2579520eb5e4df70ac5ac9b124e8087 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 9 Sep 2021 10:02:25 -0500
Subject: [PATCH 0991/1208] Happy New Year 2021

---
 LICENSE.txt                                   |  2 +-
 src/it/apt-test/pom.xml                       |  2 +-
 src/it/apt-test/setup.bsh                     |  2 +-
 .../org/scijava/annotation/its/Annotated.java |  2 +-
 .../annotation/its/CustomAnnotation.java      |  2 +-
 src/it/apt-test/verify.bsh                    |  2 +-
 src/it/settings.xml                           |  2 +-
 .../org/scijava/AbstractBasicDetails.java     |  2 +-
 .../java/org/scijava/AbstractContextual.java  |  2 +-
 .../java/org/scijava/AbstractGateway.java     |  2 +-
 .../java/org/scijava/AbstractUIDetails.java   |  2 +-
 src/main/java/org/scijava/BasicDetails.java   |  2 +-
 src/main/java/org/scijava/Cancelable.java     |  2 +-
 src/main/java/org/scijava/Context.java        |  2 +-
 src/main/java/org/scijava/Contextual.java     |  2 +-
 src/main/java/org/scijava/Disposable.java     |  2 +-
 src/main/java/org/scijava/Gateway.java        |  2 +-
 src/main/java/org/scijava/Identifiable.java   |  2 +-
 src/main/java/org/scijava/Initializable.java  |  2 +-
 src/main/java/org/scijava/Instantiable.java   |  2 +-
 .../org/scijava/InstantiableException.java    |  2 +-
 src/main/java/org/scijava/ItemIO.java         |  2 +-
 src/main/java/org/scijava/ItemVisibility.java |  2 +-
 src/main/java/org/scijava/Locatable.java      |  2 +-
 src/main/java/org/scijava/MenuEntry.java      |  2 +-
 src/main/java/org/scijava/MenuPath.java       |  2 +-
 src/main/java/org/scijava/Named.java          |  2 +-
 .../org/scijava/NoSuchServiceException.java   |  2 +-
 .../org/scijava/NullContextException.java     |  2 +-
 src/main/java/org/scijava/Optional.java       |  2 +-
 src/main/java/org/scijava/Prioritized.java    |  2 +-
 src/main/java/org/scijava/Priority.java       |  2 +-
 src/main/java/org/scijava/SciJava.java        |  2 +-
 src/main/java/org/scijava/Typed.java          |  2 +-
 src/main/java/org/scijava/UIDetails.java      |  2 +-
 src/main/java/org/scijava/Validated.java      |  2 +-
 .../java/org/scijava/ValidityProblem.java     |  2 +-
 src/main/java/org/scijava/Versioned.java      |  2 +-
 .../annotations/AbstractIndexWriter.java      |  2 +-
 .../annotations/AnnotationCombiner.java       |  2 +-
 .../annotations/AnnotationProcessor.java      |  2 +-
 .../scijava/annotations/ByteCodeAnalyzer.java |  2 +-
 .../scijava/annotations/DirectoryIndexer.java |  2 +-
 .../scijava/annotations/EclipseHelper.java    |  2 +-
 .../java/org/scijava/annotations/Index.java   |  2 +-
 .../org/scijava/annotations/IndexItem.java    |  2 +-
 .../org/scijava/annotations/IndexReader.java  |  2 +-
 .../org/scijava/annotations/Indexable.java    |  2 +-
 .../annotations/legacy/LegacyReader.java      |  2 +-
 .../java/org/scijava/app/AbstractApp.java     |  2 +-
 src/main/java/org/scijava/app/App.java        |  2 +-
 src/main/java/org/scijava/app/AppService.java |  2 +-
 .../org/scijava/app/DefaultAppService.java    |  2 +-
 .../org/scijava/app/DefaultStatusService.java |  2 +-
 src/main/java/org/scijava/app/SciJavaApp.java |  2 +-
 .../java/org/scijava/app/StatusService.java   |  2 +-
 .../org/scijava/app/event/StatusEvent.java    |  2 +-
 .../java/org/scijava/cache/CacheService.java  |  2 +-
 .../scijava/cache/DefaultCacheService.java    |  2 +-
 .../java/org/scijava/command/Command.java     |  2 +-
 .../java/org/scijava/command/CommandInfo.java |  2 +-
 .../org/scijava/command/CommandModule.java    |  2 +-
 .../scijava/command/CommandModuleItem.java    |  2 +-
 .../org/scijava/command/CommandService.java   |  2 +-
 .../org/scijava/command/ContextCommand.java   |  2 +-
 .../command/DefaultCommandService.java        |  2 +-
 .../org/scijava/command/DynamicCommand.java   |  2 +-
 .../scijava/command/DynamicCommandInfo.java   |  2 +-
 src/main/java/org/scijava/command/Inputs.java |  2 +-
 .../java/org/scijava/command/Interactive.java |  2 +-
 .../scijava/command/InteractiveCommand.java   |  2 +-
 .../org/scijava/command/ModuleCommand.java    |  2 +-
 .../java/org/scijava/command/Previewable.java |  2 +-
 .../scijava/command/UnimplementedCommand.java |  2 +-
 .../scijava/command/console/RunArgument.java  |  2 +-
 .../command/run/CommandCodeRunner.java        |  2 +-
 .../console/AbstractConsoleArgument.java      |  2 +-
 .../org/scijava/console/ConsoleArgument.java  |  2 +-
 .../org/scijava/console/ConsoleService.java   |  2 +-
 .../org/scijava/console/ConsoleUtils.java     |  2 +-
 .../console/DefaultConsoleService.java        |  2 +-
 .../scijava/console/MultiOutputStream.java    |  2 +-
 .../org/scijava/console/MultiPrintStream.java |  2 +-
 .../java/org/scijava/console/OutputEvent.java |  2 +-
 .../org/scijava/console/OutputListener.java   |  2 +-
 .../console/SystemPropertyArgument.java       |  2 +-
 .../convert/AbstractConvertService.java       |  2 +-
 .../scijava/convert/AbstractConverter.java    |  2 +-
 .../convert/AbstractDelegateConverter.java    |  2 +-
 .../org/scijava/convert/ArrayConverters.java  |  2 +-
 .../org/scijava/convert/CastingConverter.java |  2 +-
 .../scijava/convert/ConversionRequest.java    |  2 +-
 .../org/scijava/convert/ConvertService.java   |  2 +-
 .../java/org/scijava/convert/Converter.java   |  2 +-
 .../convert/DefaultConvertService.java        |  2 +-
 .../org/scijava/convert/DefaultConverter.java |  2 +-
 .../scijava/convert/FileListConverters.java   |  2 +-
 .../org/scijava/convert/NullConverter.java    |  2 +-
 .../org/scijava/convert/NumberConverters.java |  2 +-
 .../convert/NumberToBigDecimalConverter.java  |  2 +-
 .../convert/NumberToBigIntegerConverter.java  |  2 +-
 .../convert/NumberToDoubleConverter.java      |  2 +-
 .../convert/NumberToFloatConverter.java       |  2 +-
 .../convert/NumberToIntegerConverter.java     |  2 +-
 .../convert/NumberToLongConverter.java        |  2 +-
 .../convert/NumberToNumberConverter.java      |  2 +-
 .../convert/NumberToShortConverter.java       |  2 +-
 .../convert/PrimitiveArrayUnwrapper.java      |  2 +-
 .../convert/PrimitiveArrayWrapper.java        |  2 +-
 .../org/scijava/display/AbstractDisplay.java  |  2 +-
 .../display/ActiveDisplayPreprocessor.java    |  2 +-
 .../org/scijava/display/DefaultDisplay.java   |  2 +-
 .../display/DefaultDisplayService.java        |  2 +-
 .../scijava/display/DefaultTextDisplay.java   |  2 +-
 .../java/org/scijava/display/Display.java     |  2 +-
 .../scijava/display/DisplayPostprocessor.java |  2 +-
 .../org/scijava/display/DisplayService.java   |  2 +-
 .../java/org/scijava/display/Displayable.java |  2 +-
 .../java/org/scijava/display/TextDisplay.java |  2 +-
 .../display/event/DisplayActivatedEvent.java  |  2 +-
 .../display/event/DisplayCreatedEvent.java    |  2 +-
 .../display/event/DisplayDeletedEvent.java    |  2 +-
 .../scijava/display/event/DisplayEvent.java   |  2 +-
 .../display/event/DisplayUpdatedEvent.java    |  2 +-
 .../display/event/input/InputEvent.java       |  2 +-
 .../scijava/display/event/input/KyEvent.java  |  2 +-
 .../display/event/input/KyPressedEvent.java   |  2 +-
 .../display/event/input/KyReleasedEvent.java  |  2 +-
 .../display/event/input/KyTypedEvent.java     |  2 +-
 .../display/event/input/MsButtonEvent.java    |  2 +-
 .../display/event/input/MsClickedEvent.java   |  2 +-
 .../display/event/input/MsDraggedEvent.java   |  2 +-
 .../display/event/input/MsEnteredEvent.java   |  2 +-
 .../scijava/display/event/input/MsEvent.java  |  2 +-
 .../display/event/input/MsExitedEvent.java    |  2 +-
 .../display/event/input/MsMovedEvent.java     |  2 +-
 .../display/event/input/MsPressedEvent.java   |  2 +-
 .../display/event/input/MsReleasedEvent.java  |  2 +-
 .../display/event/input/MsWheelEvent.java     |  2 +-
 .../event/window/WinActivatedEvent.java       |  2 +-
 .../display/event/window/WinClosedEvent.java  |  2 +-
 .../display/event/window/WinClosingEvent.java |  2 +-
 .../event/window/WinDeactivatedEvent.java     |  2 +-
 .../event/window/WinDeiconifiedEvent.java     |  2 +-
 .../display/event/window/WinEvent.java        |  2 +-
 .../event/window/WinIconifiedEvent.java       |  2 +-
 .../display/event/window/WinOpenedEvent.java  |  2 +-
 .../download/DefaultDownloadService.java      |  2 +-
 .../scijava/download/DiskLocationCache.java   |  2 +-
 .../java/org/scijava/download/Download.java   |  2 +-
 .../org/scijava/download/DownloadService.java |  2 +-
 .../org/scijava/download/LocationCache.java   |  2 +-
 .../scijava/download/MultiWriteHandle.java    |  2 +-
 .../scijava/event/ContextDisposingEvent.java  |  2 +-
 .../org/scijava/event/DefaultEventBus.java    |  2 +-
 .../scijava/event/DefaultEventHistory.java    |  2 +-
 .../scijava/event/DefaultEventService.java    |  2 +-
 .../java/org/scijava/event/EventDetails.java  |  2 +-
 .../java/org/scijava/event/EventHandler.java  |  2 +-
 .../java/org/scijava/event/EventHistory.java  |  2 +-
 .../scijava/event/EventHistoryListener.java   |  2 +-
 .../java/org/scijava/event/EventService.java  |  2 +-
 .../org/scijava/event/EventSubscriber.java    |  2 +-
 .../java/org/scijava/event/SciJavaEvent.java  |  2 +-
 .../java/org/scijava/input/Accelerator.java   |  2 +-
 .../scijava/input/DefaultInputService.java    |  2 +-
 .../org/scijava/input/InputModifiers.java     |  2 +-
 .../java/org/scijava/input/InputService.java  |  2 +-
 src/main/java/org/scijava/input/KeyCode.java  |  2 +-
 .../java/org/scijava/input/MouseCursor.java   |  2 +-
 .../java/org/scijava/io/AbstractIOPlugin.java |  2 +-
 .../scijava/io/AbstractTypedIOService.java    |  2 +-
 .../org/scijava/io/ByteArrayByteBank.java     |  2 +-
 src/main/java/org/scijava/io/ByteBank.java    |  2 +-
 .../java/org/scijava/io/DefaultIOService.java |  2 +-
 .../scijava/io/DefaultRecentFileService.java  |  2 +-
 src/main/java/org/scijava/io/IOPlugin.java    |  2 +-
 src/main/java/org/scijava/io/IOService.java   |  2 +-
 .../org/scijava/io/RecentFileService.java     |  2 +-
 .../java/org/scijava/io/TypedIOService.java   |  2 +-
 .../org/scijava/io/console/OpenArgument.java  |  2 +-
 .../org/scijava/io/event/DataOpenedEvent.java |  2 +-
 .../org/scijava/io/event/DataSavedEvent.java  |  2 +-
 .../java/org/scijava/io/event/IOEvent.java    |  2 +-
 .../scijava/io/handle/AbstractDataHandle.java |  2 +-
 .../io/handle/AbstractHigherOrderHandle.java  |  2 +-
 .../handle/AbstractSeekableStreamHandle.java  |  2 +-
 .../io/handle/AbstractStreamHandle.java       |  2 +-
 .../org/scijava/io/handle/BytesHandle.java    |  2 +-
 .../org/scijava/io/handle/DataHandle.java     |  2 +-
 .../io/handle/DataHandleInputStream.java      |  2 +-
 .../io/handle/DataHandleOutputStream.java     |  2 +-
 .../scijava/io/handle/DataHandleService.java  |  2 +-
 .../org/scijava/io/handle/DataHandles.java    |  2 +-
 .../io/handle/DefaultDataHandleService.java   |  2 +-
 .../org/scijava/io/handle/DummyHandle.java    |  2 +-
 .../org/scijava/io/handle/FileHandle.java     |  2 +-
 .../io/handle/ReadBufferDataHandle.java       |  2 +-
 .../io/handle/ResettableStreamHandle.java     |  2 +-
 .../io/handle/SeekableStreamHandle.java       |  2 +-
 .../org/scijava/io/handle/StreamHandle.java   |  2 +-
 .../io/handle/WriteBufferDataHandle.java      |  2 +-
 .../scijava/io/location/AbstractLocation.java |  2 +-
 .../io/location/AbstractLocationResolver.java |  2 +-
 .../io/location/AbstractRemoteLocation.java   |  2 +-
 .../io/location/BrowsableLocation.java        |  2 +-
 .../scijava/io/location/BytesLocation.java    |  2 +-
 .../io/location/DefaultLocationService.java   |  2 +-
 .../scijava/io/location/DummyLocation.java    |  2 +-
 .../org/scijava/io/location/FileLocation.java |  2 +-
 .../io/location/FileLocationResolver.java     |  2 +-
 .../org/scijava/io/location/Location.java     |  2 +-
 .../scijava/io/location/LocationResolver.java |  2 +-
 .../scijava/io/location/LocationService.java  |  2 +-
 .../scijava/io/location/RemoteLocation.java   |  2 +-
 .../org/scijava/io/location/URILocation.java  |  2 +-
 .../org/scijava/io/location/URLLocation.java  |  2 +-
 .../scijava/io/nio/ByteBufferByteBank.java    |  2 +-
 .../org/scijava/io/nio/DefaultNIOService.java |  2 +-
 .../java/org/scijava/io/nio/NIOService.java   |  2 +-
 .../org/scijava/log/AbstractLogService.java   |  2 +-
 .../org/scijava/log/CallingClassUtils.java    |  2 +-
 .../java/org/scijava/log/DefaultLogger.java   |  2 +-
 .../log/DefaultUncaughtExceptionHandler.java  |  2 +-
 .../org/scijava/log/IgnoreAsCallingClass.java |  2 +-
 src/main/java/org/scijava/log/LogLevel.java   |  2 +-
 .../java/org/scijava/log/LogListener.java     |  2 +-
 src/main/java/org/scijava/log/LogMessage.java |  2 +-
 src/main/java/org/scijava/log/LogService.java |  2 +-
 src/main/java/org/scijava/log/LogSource.java  |  2 +-
 src/main/java/org/scijava/log/Logged.java     |  2 +-
 src/main/java/org/scijava/log/Logger.java     |  2 +-
 .../org/scijava/log/StderrLogService.java     |  2 +-
 .../org/scijava/main/DefaultMainService.java  |  2 +-
 .../java/org/scijava/main/MainService.java    |  2 +-
 .../scijava/main/console/MainArgument.java    |  2 +-
 .../org/scijava/main/run/MainCodeRunner.java  |  2 +-
 .../org/scijava/menu/AbstractMenuCreator.java |  2 +-
 .../org/scijava/menu/DefaultMenuService.java  |  2 +-
 .../java/org/scijava/menu/MenuConstants.java  |  2 +-
 .../java/org/scijava/menu/MenuCreator.java    |  2 +-
 .../java/org/scijava/menu/MenuService.java    |  2 +-
 .../java/org/scijava/menu/ShadowMenu.java     |  2 +-
 .../org/scijava/menu/ShadowMenuIterator.java  |  2 +-
 .../org/scijava/menu/event/MenuEvent.java     |  2 +-
 .../scijava/menu/event/MenusAddedEvent.java   |  2 +-
 .../scijava/menu/event/MenusRemovedEvent.java |  2 +-
 .../scijava/menu/event/MenusUpdatedEvent.java |  2 +-
 .../org/scijava/module/AbstractModule.java    |  2 +-
 .../scijava/module/AbstractModuleInfo.java    |  2 +-
 .../scijava/module/AbstractModuleItem.java    |  2 +-
 .../scijava/module/DefaultModuleService.java  |  2 +-
 .../scijava/module/DefaultMutableModule.java  |  2 +-
 .../module/DefaultMutableModuleInfo.java      |  2 +-
 .../module/DefaultMutableModuleItem.java      |  2 +-
 .../scijava/module/MethodCallException.java   |  2 +-
 .../java/org/scijava/module/MethodRef.java    |  2 +-
 src/main/java/org/scijava/module/Module.java  |  2 +-
 .../module/ModuleCanceledException.java       |  2 +-
 .../org/scijava/module/ModuleException.java   |  2 +-
 .../java/org/scijava/module/ModuleIndex.java  |  2 +-
 .../java/org/scijava/module/ModuleInfo.java   |  2 +-
 .../java/org/scijava/module/ModuleItem.java   |  2 +-
 .../java/org/scijava/module/ModuleRunner.java |  2 +-
 .../org/scijava/module/ModuleService.java     |  2 +-
 .../org/scijava/module/MutableModule.java     |  2 +-
 .../org/scijava/module/MutableModuleInfo.java |  2 +-
 .../org/scijava/module/MutableModuleItem.java |  2 +-
 .../module/event/ModuleCanceledEvent.java     |  2 +-
 .../org/scijava/module/event/ModuleEvent.java |  2 +-
 .../module/event/ModuleExecutedEvent.java     |  2 +-
 .../module/event/ModuleExecutingEvent.java    |  2 +-
 .../module/event/ModuleExecutionEvent.java    |  2 +-
 .../module/event/ModuleFinishedEvent.java     |  2 +-
 .../module/event/ModulePostprocessEvent.java  |  2 +-
 .../module/event/ModulePreprocessEvent.java   |  2 +-
 .../module/event/ModuleProcessEvent.java      |  2 +-
 .../module/event/ModuleStartedEvent.java      |  2 +-
 .../module/event/ModulesAddedEvent.java       |  2 +-
 .../module/event/ModulesListEvent.java        |  2 +-
 .../module/event/ModulesRemovedEvent.java     |  2 +-
 .../module/event/ModulesUpdatedEvent.java     |  2 +-
 .../process/AbstractPostprocessorPlugin.java  |  2 +-
 .../process/AbstractPreprocessorPlugin.java   |  2 +-
 .../AbstractSingleInputPreprocessor.java      |  2 +-
 .../process/CheckInputsPreprocessor.java      |  2 +-
 .../module/process/DebugPostprocessor.java    |  2 +-
 .../module/process/DebugPreprocessor.java     |  2 +-
 .../process/DefaultValuePreprocessor.java     |  2 +-
 .../module/process/GatewayPreprocessor.java   |  2 +-
 .../module/process/InitPreprocessor.java      |  2 +-
 .../process/LoadInputsPreprocessor.java       |  2 +-
 .../module/process/LoggerPreprocessor.java    |  2 +-
 .../module/process/ModulePostprocessor.java   |  2 +-
 .../module/process/ModulePreprocessor.java    |  2 +-
 .../module/process/ModuleProcessor.java       |  2 +-
 .../module/process/PostprocessorPlugin.java   |  2 +-
 .../module/process/PreprocessorPlugin.java    |  2 +-
 .../process/SaveInputsPreprocessor.java       |  2 +-
 .../module/process/ServicePreprocessor.java   |  2 +-
 .../module/process/ValidityPreprocessor.java  |  2 +-
 .../scijava/module/run/ModuleCodeRunner.java  |  2 +-
 .../scijava/object/DefaultObjectService.java  |  2 +-
 .../java/org/scijava/object/LazyObjects.java  |  2 +-
 .../org/scijava/object/NamedObjectIndex.java  |  2 +-
 .../java/org/scijava/object/ObjectIndex.java  |  2 +-
 .../org/scijava/object/ObjectService.java     |  2 +-
 .../org/scijava/object/SortedObjectIndex.java |  2 +-
 .../org/scijava/object/event/ListEvent.java   |  2 +-
 .../object/event/ObjectCreatedEvent.java      |  2 +-
 .../object/event/ObjectDeletedEvent.java      |  2 +-
 .../org/scijava/object/event/ObjectEvent.java |  2 +-
 .../object/event/ObjectModifiedEvent.java     |  2 +-
 .../object/event/ObjectsAddedEvent.java       |  2 +-
 .../object/event/ObjectsListEvent.java        |  2 +-
 .../object/event/ObjectsRemovedEvent.java     |  2 +-
 .../options/DefaultOptionsService.java        |  2 +-
 .../org/scijava/options/OptionsPlugin.java    |  2 +-
 .../org/scijava/options/OptionsService.java   |  2 +-
 .../scijava/options/event/OptionsEvent.java   |  2 +-
 .../scijava/parse/DefaultParseService.java    |  2 +-
 src/main/java/org/scijava/parse/Item.java     |  2 +-
 src/main/java/org/scijava/parse/Items.java    |  2 +-
 .../java/org/scijava/parse/ParseService.java  |  2 +-
 .../scijava/platform/AbstractPlatform.java    |  2 +-
 .../org/scijava/platform/AppEventService.java |  2 +-
 .../platform/DefaultAppEventService.java      |  2 +-
 .../org/scijava/platform/DefaultPlatform.java |  2 +-
 .../platform/DefaultPlatformService.java      |  2 +-
 .../java/org/scijava/platform/Platform.java   |  2 +-
 .../org/scijava/platform/PlatformService.java |  2 +-
 .../scijava/platform/event/AppAboutEvent.java |  2 +-
 .../scijava/platform/event/AppFocusEvent.java |  2 +-
 .../platform/event/AppMenusCreatedEvent.java  |  2 +-
 .../platform/event/AppOpenFilesEvent.java     |  2 +-
 .../platform/event/AppPreferencesEvent.java   |  2 +-
 .../scijava/platform/event/AppPrintEvent.java |  2 +-
 .../scijava/platform/event/AppQuitEvent.java  |  2 +-
 .../platform/event/AppReOpenEvent.java        |  2 +-
 .../platform/event/AppScreenSleepEvent.java   |  2 +-
 .../scijava/platform/event/AppSleepEvent.java |  2 +-
 .../platform/event/AppSystemSleepEvent.java   |  2 +-
 .../platform/event/AppUserSessionEvent.java   |  2 +-
 .../platform/event/AppVisibleEvent.java       |  2 +-
 .../platform/event/ApplicationEvent.java      |  2 +-
 .../scijava/plugin/AbstractHandlerPlugin.java |  2 +-
 .../plugin/AbstractHandlerService.java        |  2 +-
 .../org/scijava/plugin/AbstractPTService.java |  2 +-
 .../scijava/plugin/AbstractRichPlugin.java    |  2 +-
 .../plugin/AbstractSingletonService.java      |  2 +-
 .../scijava/plugin/AbstractTypedPlugin.java   |  2 +-
 .../scijava/plugin/AbstractTypedService.java  |  2 +-
 .../scijava/plugin/AbstractWrapperPlugin.java |  2 +-
 .../plugin/AbstractWrapperService.java        |  2 +-
 src/main/java/org/scijava/plugin/Attr.java    |  2 +-
 .../scijava/plugin/DefaultPluginFinder.java   |  2 +-
 .../scijava/plugin/DefaultPluginService.java  |  2 +-
 .../org/scijava/plugin/HandlerPlugin.java     |  2 +-
 .../org/scijava/plugin/HandlerService.java    |  2 +-
 .../org/scijava/plugin/HasPluginInfo.java     |  2 +-
 src/main/java/org/scijava/plugin/Menu.java    |  2 +-
 .../java/org/scijava/plugin/PTService.java    |  2 +-
 .../java/org/scijava/plugin/Parameter.java    |  2 +-
 src/main/java/org/scijava/plugin/Plugin.java  |  2 +-
 .../java/org/scijava/plugin/PluginFinder.java |  2 +-
 .../java/org/scijava/plugin/PluginIndex.java  |  2 +-
 .../java/org/scijava/plugin/PluginInfo.java   |  2 +-
 .../org/scijava/plugin/PluginService.java     |  2 +-
 .../java/org/scijava/plugin/RichPlugin.java   |  2 +-
 .../org/scijava/plugin/SciJavaPlugin.java     |  2 +-
 .../org/scijava/plugin/SingletonPlugin.java   |  2 +-
 .../org/scijava/plugin/SingletonService.java  |  2 +-
 .../org/scijava/plugin/SortablePlugin.java    |  2 +-
 .../java/org/scijava/plugin/TypedPlugin.java  |  2 +-
 .../java/org/scijava/plugin/TypedService.java |  2 +-
 .../org/scijava/plugin/WrapperPlugin.java     |  2 +-
 .../org/scijava/plugin/WrapperService.java    |  2 +-
 .../plugin/event/PluginsAddedEvent.java       |  2 +-
 .../plugin/event/PluginsListEvent.java        |  2 +-
 .../plugin/event/PluginsRemovedEvent.java     |  2 +-
 .../scijava/prefs/AbstractPrefService.java    |  2 +-
 .../org/scijava/prefs/DefaultPrefService.java |  2 +-
 .../java/org/scijava/prefs/PrefService.java   |  2 +-
 .../org/scijava/run/AbstractCodeRunner.java   |  2 +-
 src/main/java/org/scijava/run/CodeRunner.java |  2 +-
 .../org/scijava/run/DefaultRunService.java    |  2 +-
 src/main/java/org/scijava/run/RunService.java |  2 +-
 .../org/scijava/run/console/RunArgument.java  |  2 +-
 .../scijava/script/AbstractAutoCompleter.java |  2 +-
 .../scijava/script/AbstractScriptContext.java |  2 +-
 .../scijava/script/AbstractScriptEngine.java  |  2 +-
 .../scijava/script/AbstractScriptHeader.java  |  2 +-
 .../script/AbstractScriptLanguage.java        |  2 +-
 .../scijava/script/AdaptedScriptEngine.java   |  2 +-
 .../scijava/script/AdaptedScriptLanguage.java |  2 +-
 .../org/scijava/script/AutoCompleter.java     |  2 +-
 .../scijava/script/AutoCompletionResult.java  |  2 +-
 .../org/scijava/script/CodeGenerator.java     |  2 +-
 .../org/scijava/script/CodeGeneratorJava.java |  2 +-
 .../scijava/script/DefaultAutoCompleter.java  |  2 +-
 .../script/DefaultScriptHeaderService.java    |  2 +-
 .../script/DefaultScriptInterpreter.java      |  2 +-
 .../scijava/script/DefaultScriptService.java  |  2 +-
 .../org/scijava/script/InvocationObject.java  |  2 +-
 .../org/scijava/script/ParameterObject.java   |  2 +-
 .../java/org/scijava/script/ScriptFinder.java |  2 +-
 .../java/org/scijava/script/ScriptHeader.java |  2 +-
 .../scijava/script/ScriptHeaderService.java   |  2 +-
 .../java/org/scijava/script/ScriptInfo.java   |  2 +-
 .../org/scijava/script/ScriptInterpreter.java |  2 +-
 .../org/scijava/script/ScriptLanguage.java    |  2 +-
 .../scijava/script/ScriptLanguageIndex.java   |  2 +-
 .../java/org/scijava/script/ScriptModule.java |  2 +-
 .../java/org/scijava/script/ScriptREPL.java   |  2 +-
 .../org/scijava/script/ScriptService.java     |  2 +-
 .../script/console/RunScriptArgument.java     |  2 +-
 .../org/scijava/script/io/ScriptIOPlugin.java |  2 +-
 .../DefaultScriptProcessorService.java        |  2 +-
 .../process/DirectiveScriptProcessor.java     |  2 +-
 .../process/ParameterScriptProcessor.java     |  2 +-
 .../script/process/ScriptCallback.java        |  2 +-
 .../ScriptDirectiveScriptProcessor.java       |  2 +-
 .../script/process/ScriptProcessor.java       |  2 +-
 .../process/ScriptProcessorService.java       |  2 +-
 .../process/ShebangScriptProcessor.java       |  2 +-
 .../scijava/script/run/ScriptCodeRunner.java  |  2 +-
 .../org/scijava/service/AbstractService.java  |  2 +-
 .../org/scijava/service/SciJavaService.java   |  2 +-
 .../java/org/scijava/service/Service.java     |  2 +-
 .../org/scijava/service/ServiceHelper.java    |  2 +-
 .../org/scijava/service/ServiceIndex.java     |  2 +-
 .../service/event/ServicesLoadedEvent.java    |  2 +-
 .../startup/DefaultStartupService.java        |  2 +-
 .../org/scijava/startup/StartupService.java   |  2 +-
 .../java/org/scijava/task/DefaultTask.java    |  2 +-
 .../org/scijava/task/DefaultTaskService.java  |  2 +-
 src/main/java/org/scijava/task/Task.java      |  2 +-
 .../java/org/scijava/task/TaskService.java    |  2 +-
 .../org/scijava/task/event/TaskEvent.java     |  2 +-
 src/main/java/org/scijava/test/TestUtils.java |  2 +-
 .../org/scijava/text/AbstractTextFormat.java  |  2 +-
 .../org/scijava/text/DefaultTextService.java  |  2 +-
 .../java/org/scijava/text/TextFormat.java     |  2 +-
 .../java/org/scijava/text/TextService.java    |  2 +-
 .../scijava/text/io/DefaultTextIOService.java |  2 +-
 .../org/scijava/text/io/TextIOPlugin.java     |  2 +-
 .../org/scijava/text/io/TextIOService.java    |  2 +-
 .../scijava/thread/DefaultThreadService.java  |  2 +-
 .../org/scijava/thread/ThreadService.java     |  2 +-
 .../java/org/scijava/tool/AbstractTool.java   |  2 +-
 .../org/scijava/tool/CustomDrawnTool.java     |  2 +-
 .../org/scijava/tool/DefaultToolService.java  |  2 +-
 src/main/java/org/scijava/tool/DummyTool.java |  2 +-
 .../java/org/scijava/tool/IconDrawer.java     |  2 +-
 .../java/org/scijava/tool/IconService.java    |  2 +-
 src/main/java/org/scijava/tool/Tool.java      |  2 +-
 .../java/org/scijava/tool/ToolService.java    |  2 +-
 .../tool/event/ToolActivatedEvent.java        |  2 +-
 .../tool/event/ToolDeactivatedEvent.java      |  2 +-
 .../org/scijava/tool/event/ToolEvent.java     |  2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java   |  2 +-
 .../ui/AbstractInputHarvesterPlugin.java      |  2 +-
 .../org/scijava/ui/AbstractUIInputWidget.java |  2 +-
 .../org/scijava/ui/AbstractUserInterface.java |  2 +-
 .../java/org/scijava/ui/ApplicationFrame.java |  2 +-
 src/main/java/org/scijava/ui/Arrangeable.java |  2 +-
 .../java/org/scijava/ui/CloseConfirmable.java |  2 +-
 .../java/org/scijava/ui/DefaultUIService.java |  2 +-
 src/main/java/org/scijava/ui/Desktop.java     |  2 +-
 .../java/org/scijava/ui/DialogPrompt.java     |  2 +-
 .../org/scijava/ui/FileListPreprocessor.java  |  2 +-
 .../java/org/scijava/ui/FilePreprocessor.java |  2 +-
 src/main/java/org/scijava/ui/StatusBar.java   |  2 +-
 .../java/org/scijava/ui/SystemClipboard.java  |  2 +-
 src/main/java/org/scijava/ui/ToolBar.java     |  2 +-
 .../java/org/scijava/ui/UIPreprocessor.java   |  2 +-
 src/main/java/org/scijava/ui/UIService.java   |  2 +-
 .../java/org/scijava/ui/UserInterface.java    |  2 +-
 .../ui/console/AbstractConsolePane.java       |  2 +-
 .../org/scijava/ui/console/ConsolePane.java   |  2 +-
 .../scijava/ui/console/HeadlessArgument.java  |  2 +-
 .../scijava/ui/console/ShowUIArgument.java    |  2 +-
 .../org/scijava/ui/console/UIArgument.java    |  2 +-
 .../ui/dnd/AbstractDragAndDropData.java       |  2 +-
 .../ui/dnd/AbstractDragAndDropHandler.java    |  2 +-
 .../ui/dnd/DefaultDragAndDropData.java        |  2 +-
 .../ui/dnd/DefaultDragAndDropService.java     |  2 +-
 .../org/scijava/ui/dnd/DragAndDropData.java   |  2 +-
 .../scijava/ui/dnd/DragAndDropHandler.java    |  2 +-
 .../scijava/ui/dnd/DragAndDropService.java    |  2 +-
 .../ui/dnd/FileDragAndDropHandler.java        |  2 +-
 .../ui/dnd/ListDragAndDropHandler.java        |  2 +-
 .../java/org/scijava/ui/dnd/MIMEType.java     |  2 +-
 .../ui/dnd/ScriptFileDragAndDropHandler.java  |  2 +-
 .../ui/dnd/event/DragAndDropEvent.java        |  2 +-
 .../scijava/ui/dnd/event/DragEnterEvent.java  |  2 +-
 .../scijava/ui/dnd/event/DragExitEvent.java   |  2 +-
 .../scijava/ui/dnd/event/DragOverEvent.java   |  2 +-
 .../org/scijava/ui/dnd/event/DropEvent.java   |  2 +-
 .../java/org/scijava/ui/event/UIEvent.java    |  2 +-
 .../org/scijava/ui/event/UIShownEvent.java    |  2 +-
 .../ui/headless/HeadlessDisplayViewer.java    |  2 +-
 .../org/scijava/ui/headless/HeadlessUI.java   |  2 +-
 .../org/scijava/ui/headlessUI/HeadlessUI.java |  2 +-
 .../ui/viewer/AbstractDisplayViewer.java      |  2 +-
 .../org/scijava/ui/viewer/DisplayPanel.java   |  2 +-
 .../org/scijava/ui/viewer/DisplayViewer.java  |  2 +-
 .../org/scijava/ui/viewer/DisplayWindow.java  |  2 +-
 .../text/AbstractTextDisplayViewer.java       |  2 +-
 .../ui/viewer/text/TextDisplayPanel.java      |  2 +-
 .../ui/viewer/text/TextDisplayViewer.java     |  2 +-
 .../scijava/util/AbstractPrimitiveArray.java  |  2 +-
 src/main/java/org/scijava/util/AppUtils.java  |  2 +-
 .../java/org/scijava/util/ArrayUtils.java     |  2 +-
 src/main/java/org/scijava/util/BoolArray.java |  2 +-
 src/main/java/org/scijava/util/ByteArray.java |  2 +-
 src/main/java/org/scijava/util/Bytes.java     |  2 +-
 src/main/java/org/scijava/util/CharArray.java |  2 +-
 .../java/org/scijava/util/CheckSezpoz.java    |  2 +-
 .../java/org/scijava/util/ClassUtils.java     |  2 +-
 src/main/java/org/scijava/util/ColorRGB.java  |  2 +-
 src/main/java/org/scijava/util/ColorRGBA.java |  2 +-
 src/main/java/org/scijava/util/Colors.java    |  2 +-
 .../org/scijava/util/CombineAnnotations.java  |  2 +-
 src/main/java/org/scijava/util/Combiner.java  |  2 +-
 .../org/scijava/util/ConversionUtils.java     |  2 +-
 .../java/org/scijava/util/DebugUtils.java     |  2 +-
 .../org/scijava/util/DefaultTreeNode.java     |  2 +-
 .../java/org/scijava/util/DigestUtils.java    |  2 +-
 .../java/org/scijava/util/DoubleArray.java    |  2 +-
 src/main/java/org/scijava/util/FileUtils.java |  2 +-
 .../java/org/scijava/util/FloatArray.java     |  2 +-
 .../java/org/scijava/util/GenericUtils.java   |  2 +-
 src/main/java/org/scijava/util/IntArray.java  |  2 +-
 src/main/java/org/scijava/util/IntCoords.java |  2 +-
 src/main/java/org/scijava/util/IntRect.java   |  2 +-
 .../java/org/scijava/util/IteratorPlus.java   |  2 +-
 .../org/scijava/util/LastRecentlyUsed.java    |  2 +-
 .../org/scijava/util/LineOutputStream.java    |  2 +-
 src/main/java/org/scijava/util/ListUtils.java |  2 +-
 src/main/java/org/scijava/util/LongArray.java |  2 +-
 src/main/java/org/scijava/util/Manifest.java  |  2 +-
 .../org/scijava/util/MersenneTwisterFast.java |  2 +-
 .../org/scijava/util/MetaInfCombiner.java     |  2 +-
 .../java/org/scijava/util/MirrorWebsite.java  |  2 +-
 src/main/java/org/scijava/util/MiscUtils.java |  2 +-
 .../java/org/scijava/util/NumberUtils.java    |  2 +-
 .../java/org/scijava/util/ObjectArray.java    |  2 +-
 src/main/java/org/scijava/util/POM.java       |  2 +-
 .../java/org/scijava/util/PlatformUtils.java  |  2 +-
 src/main/java/org/scijava/util/Prefs.java     |  2 +-
 .../java/org/scijava/util/PrimitiveArray.java |  2 +-
 .../java/org/scijava/util/ProcessUtils.java   |  2 +-
 src/main/java/org/scijava/util/Query.java     |  2 +-
 src/main/java/org/scijava/util/ReadInto.java  |  2 +-
 .../java/org/scijava/util/RealCoords.java     |  2 +-
 src/main/java/org/scijava/util/RealRect.java  |  2 +-
 .../org/scijava/util/ReflectException.java    |  2 +-
 .../org/scijava/util/ReflectedUniverse.java   |  2 +-
 .../org/scijava/util/ServiceCombiner.java     |  2 +-
 .../java/org/scijava/util/ShortArray.java     |  2 +-
 src/main/java/org/scijava/util/Sizable.java   |  2 +-
 .../org/scijava/util/SizableArrayList.java    |  2 +-
 .../java/org/scijava/util/StringMaker.java    |  2 +-
 .../java/org/scijava/util/StringUtils.java    |  2 +-
 src/main/java/org/scijava/util/Timing.java    |  2 +-
 src/main/java/org/scijava/util/TreeNode.java  |  2 +-
 .../java/org/scijava/util/TunePlayer.java     |  2 +-
 src/main/java/org/scijava/util/Types.java     |  2 +-
 src/main/java/org/scijava/util/UnitUtils.java |  2 +-
 .../java/org/scijava/util/VersionUtils.java   |  2 +-
 src/main/java/org/scijava/util/XML.java       |  2 +-
 .../welcome/DefaultWelcomeService.java        |  2 +-
 .../org/scijava/welcome/WelcomeService.java   |  2 +-
 .../scijava/welcome/event/WelcomeEvent.java   |  2 +-
 .../widget/AbstractInputHarvester.java        |  2 +-
 .../scijava/widget/AbstractInputPanel.java    |  2 +-
 .../scijava/widget/AbstractInputWidget.java   |  2 +-
 src/main/java/org/scijava/widget/Button.java  |  2 +-
 .../java/org/scijava/widget/ButtonWidget.java |  2 +-
 .../java/org/scijava/widget/ChoiceWidget.java |  2 +-
 .../java/org/scijava/widget/ColorWidget.java  |  2 +-
 .../java/org/scijava/widget/DateWidget.java   |  2 +-
 .../scijava/widget/DefaultWidgetModel.java    |  2 +-
 .../scijava/widget/DefaultWidgetService.java  |  2 +-
 .../org/scijava/widget/FileListWidget.java    |  2 +-
 .../java/org/scijava/widget/FileWidget.java   |  2 +-
 .../org/scijava/widget/InputHarvester.java    |  2 +-
 .../java/org/scijava/widget/InputPanel.java   |  2 +-
 .../java/org/scijava/widget/InputWidget.java  |  2 +-
 .../org/scijava/widget/MessageWidget.java     |  2 +-
 .../java/org/scijava/widget/NumberWidget.java |  2 +-
 .../java/org/scijava/widget/ObjectWidget.java |  2 +-
 .../java/org/scijava/widget/TextWidget.java   |  2 +-
 .../java/org/scijava/widget/ToggleWidget.java |  2 +-
 .../java/org/scijava/widget/UIComponent.java  |  2 +-
 .../java/org/scijava/widget/WidgetModel.java  |  2 +-
 .../org/scijava/widget/WidgetService.java     |  2 +-
 .../java/org/scijava/widget/WidgetStyle.java  |  2 +-
 .../java/org/scijava/ContextCreationTest.java |  2 +-
 .../org/scijava/ContextInjectionTest.java     |  2 +-
 src/test/java/org/scijava/SciJavaTest.java    |  2 +-
 .../org/scijava/annotations/AnnotatedA.java   |  2 +-
 .../org/scijava/annotations/AnnotatedB.java   |  2 +-
 .../org/scijava/annotations/AnnotatedC.java   |  2 +-
 .../org/scijava/annotations/AnnotatedD.java   |  2 +-
 .../annotations/AnnotatedInnerClass.java      |  2 +-
 .../java/org/scijava/annotations/Complex.java |  2 +-
 .../annotations/DirectoryIndexerTest.java     |  2 +-
 .../annotations/EclipseHelperTest.java        |  2 +-
 .../java/org/scijava/annotations/Fruit.java   |  2 +-
 .../org/scijava/annotations/LegacyTest.java   |  2 +-
 .../java/org/scijava/annotations/Simple.java  |  2 +-
 .../org/scijava/app/StatusServiceTest.java    |  2 +-
 .../command/CommandArrayConverterTest.java    | 28 +++++++++++++++++++
 .../org/scijava/command/CommandInfoTest.java  |  2 +-
 .../scijava/command/CommandModuleTest.java    |  2 +-
 .../scijava/command/CommandServiceTest.java   |  2 +-
 .../java/org/scijava/command/InputsTest.java  |  2 +-
 .../scijava/command/InvalidCommandTest.java   |  2 +-
 .../command/run/CommandCodeRunnerTest.java    |  2 +-
 .../scijava/console/ConsoleServiceTest.java   |  2 +-
 .../console/SystemPropertyArgumentTest.java   |  2 +-
 .../convert/AbstractNumberConverterTests.java |  2 +-
 .../BigIntegerToBigDecimalConverterTest.java  |  2 +-
 .../ByteToBigDecimalConverterTest.java        |  2 +-
 .../ByteToBigIntegerConverterTest.java        |  2 +-
 .../convert/ByteToDoubleConverterTest.java    |  2 +-
 .../convert/ByteToFloatConverterTest.java     |  2 +-
 .../convert/ByteToIntegerConverterTest.java   |  2 +-
 .../convert/ByteToLongConverterTest.java      |  2 +-
 .../convert/ByteToShortConverterTest.java     |  2 +-
 .../scijava/convert/ConvertServiceTest.java   |  2 +-
 .../org/scijava/convert/ConverterTest.java    |  2 +-
 .../convert/DelegateConverterTest.java        |  2 +-
 .../DoubleToBigDecimalConverterTest.java      |  2 +-
 .../convert/FileListConverterTest.java        |  2 +-
 .../FloatToBigDecimalConverterTest.java       |  2 +-
 .../convert/FloatToDoubleConverterTest.java   |  2 +-
 .../IntegerToBigDecimalConverterTest.java     |  2 +-
 .../IntegerToBigIntegerConverterTest.java     |  2 +-
 .../convert/IntegerToDoubleConverterTest.java |  2 +-
 .../convert/IntegerToLongConverterTest.java   |  2 +-
 .../LongToBigDecimalConverterTest.java        |  2 +-
 .../LongToBigIntegerConverterTest.java        |  2 +-
 .../ShortToBigDecimalConverterTest.java       |  2 +-
 .../ShortToBigIntegerConverterTest.java       |  2 +-
 .../convert/ShortToDoubleConverterTest.java   |  2 +-
 .../convert/ShortToFloatConverterTest.java    |  2 +-
 .../convert/ShortToIntegerConverterTest.java  |  2 +-
 .../convert/ShortToLongConverterTest.java     |  2 +-
 .../java/org/scijava/display/DisplayTest.java |  2 +-
 .../scijava/download/DownloadServiceTest.java |  2 +-
 .../org/scijava/event/EventServiceTest.java   |  2 +-
 .../org/scijava/io/ByteArrayByteBankTest.java |  2 +-
 .../java/org/scijava/io/ByteBankTest.java     |  2 +-
 .../java/org/scijava/io/IOServiceTest.java    |  2 +-
 .../org/scijava/io/TypedIOServiceTest.java    |  2 +-
 .../org/scijava/io/event/DataEventTest.java   |  2 +-
 .../scijava/io/handle/BytesHandleTest.java    |  2 +-
 .../io/handle/DataHandleEdgeCaseTests.java    |  2 +-
 .../org/scijava/io/handle/DataHandleTest.java |  2 +-
 .../scijava/io/handle/DataHandlesTest.java    |  2 +-
 .../org/scijava/io/handle/FileHandleTest.java |  2 +-
 .../handle/ReadBufferDataHandleMockTest.java  |  2 +-
 .../io/handle/ReadBufferDataHandleTest.java   |  2 +-
 .../io/handle/WriteBufferDataHandleTest.java  |  2 +-
 .../io/location/BytesLocationTest.java        |  2 +-
 .../io/location/FileLocationResolverTest.java |  2 +-
 .../scijava/io/location/FileLocationTest.java |  2 +-
 .../io/location/LocationServiceTest.java      |  2 +-
 .../scijava/io/location/URILocationTest.java  |  2 +-
 .../scijava/io/location/URLLocationTest.java  |  2 +-
 .../io/nio/ByteBufferByteBankTest.java        |  2 +-
 .../scijava/log/CallingClassUtilsTest.java    |  2 +-
 .../org/scijava/log/DefaultLoggerTest.java    |  2 +-
 .../java/org/scijava/log/LogMessageTest.java  |  2 +-
 .../java/org/scijava/log/LogServiceTest.java  |  2 +-
 .../java/org/scijava/log/LogSourceTest.java   |  2 +-
 .../org/scijava/log/StderrLogServiceTest.java |  2 +-
 .../java/org/scijava/log/TestLogListener.java |  2 +-
 .../org/scijava/main/MainServiceTest.java     |  2 +-
 .../scijava/main/run/MainCodeRunnerTest.java  |  2 +-
 .../org/scijava/menu/MenuServiceTest.java     |  2 +-
 .../java/org/scijava/menu/ShadowMenuTest.java |  2 +-
 .../org/scijava/module/ModuleServiceTest.java |  2 +-
 .../process/LoggerPreprocessorTest.java       |  2 +-
 .../module/run/ModuleCodeRunnerTest.java      |  2 +-
 .../scijava/object/NamedObjectIndexTest.java  |  2 +-
 .../org/scijava/object/ObjectIndexTest.java   |  2 +-
 .../org/scijava/object/ObjectServiceTest.java |  2 +-
 .../scijava/object/SortedObjectIndexTest.java |  2 +-
 .../java/org/scijava/options/OptionsTest.java |  2 +-
 .../org/scijava/parse/ParseServiceTest.java   |  2 +-
 .../org/scijava/plugin/PluginFinderTest.java  |  2 +-
 .../org/scijava/plugin/PluginIndexTest.java   |  2 +-
 .../org/scijava/plugin/PluginInfoTest.java    |  2 +-
 .../scijava/plugin/SingletonServiceTest.java  |  2 +-
 .../org/scijava/prefs/PrefServiceTest.java    |  2 +-
 .../java/org/scijava/run/RunServiceTest.java  |  2 +-
 .../script/AbstractScriptLanguageTest.java    |  2 +-
 .../org/scijava/script/ScriptEngineTest.java  |  2 +-
 .../org/scijava/script/ScriptFinderTest.java  |  2 +-
 .../org/scijava/script/ScriptInfoTest.java    |  2 +-
 .../org/scijava/script/ScriptServiceTest.java |  2 +-
 .../process/ParameterScriptProcessorTest.java |  2 +-
 .../org/scijava/service/ServiceIndexTest.java |  2 +-
 .../org/scijava/task/TaskServiceTest.java     |  2 +-
 .../org/scijava/test/AbstractSciJavaTest.java |  2 +-
 .../java/org/scijava/test/TestUtilsTest.java  |  2 +-
 .../org/scijava/thread/ThreadServiceTest.java |  2 +-
 .../java/org/scijava/ui/UIServiceTest.java    |  2 +-
 .../java/org/scijava/util/AppUtilsTest.java   |  2 +-
 .../java/org/scijava/util/ArrayUtilsTest.java |  2 +-
 .../java/org/scijava/util/BoolArrayTest.java  |  2 +-
 .../java/org/scijava/util/ByteArrayTest.java  |  2 +-
 .../java/org/scijava/util/CharArrayTest.java  |  2 +-
 .../java/org/scijava/util/ClassUtilsTest.java |  2 +-
 .../java/org/scijava/util/ColorRGBTest.java   |  2 +-
 .../org/scijava/util/ConversionUtilsTest.java |  2 +-
 .../org/scijava/util/DigestUtilsTest.java     |  2 +-
 .../org/scijava/util/DoubleArrayTest.java     |  2 +-
 .../java/org/scijava/util/FileUtilsTest.java  |  2 +-
 .../java/org/scijava/util/FloatArrayTest.java |  2 +-
 .../scijava/util/GenericArrayTypesTest.java   | 28 +++++++++++++++++++
 .../java/org/scijava/util/IntArrayTest.java   |  2 +-
 .../scijava/util/LastRecentlyUsedTest.java    |  2 +-
 .../java/org/scijava/util/LongArrayTest.java  |  2 +-
 .../org/scijava/util/ObjectArrayTest.java     |  2 +-
 src/test/java/org/scijava/util/POMTest.java   |  2 +-
 .../org/scijava/util/PrimitiveArrayTest.java  |  2 +-
 .../org/scijava/util/ProcessUtilsTest.java    |  2 +-
 .../java/org/scijava/util/ShortArrayTest.java |  2 +-
 .../org/scijava/util/StringUtilsTest.java     |  2 +-
 src/test/java/org/scijava/util/TypesTest.java |  2 +-
 .../java/org/scijava/util/UnitUtilsTest.java  |  2 +-
 .../org/scijava/util/VersionUtilsTest.java    |  2 +-
 .../org/scijava/widget/WidgetStyleTest.java   |  2 +-
 738 files changed, 792 insertions(+), 736 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 7d75d811c..43b1df69e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2020, SciJava developers.
+Copyright (c) 2009 - 2021, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index f250325d7..c28b04b3b 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2020 SciJava developers.
+  Copyright (C) 2009 - 2021 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index a2a1dab92..8d0aff88c 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index d7322e748..2cdd86b5d 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index bf204259b..a2b88d6d8 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index 66d036d7b..d0130489e 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index d5b5c19c7..a658c93af 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2020 SciJava developers.
+  Copyright (C) 2009 - 2021 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index e8f52a049..c1957ba7b 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index 647ea1d97..f1746123e 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 5c3dbd446..5975db5b7 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 3d86efba7..0113ae104 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index 454929e6b..3d2fd592b 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 968b66586..645e4d0f9 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 2576b4c37..dee623861 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 416f03ff9..9a3f5ec98 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index df22b8ec8..1713edd7b 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 59fe12810..a8d00fa71 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index 512d69b11..f7f4a607e 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index efa9854ab..025b1023a 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index 85480ad34..df9a4c02f 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index c3904f7b4..38dffb74a 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index eacc23958..8d85f3d92 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index 749e91ae3..f9750c56b 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index e855158ab..51cdaed24 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index d8ca1961a..b0967e474 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index d18d5045f..762a2f230 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index b30c410a1..7fdb52160 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index e19a58270..1ac3e1370 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index e3eb1c731..ce2ec0ebd 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 570991bb8..9661b38ac 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index a3b9b7223..990bc4f9e 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 61776fff4..064a860c7 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index f41be8bbe..aed3bb358 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index 26d2ef9e2..c38fa1d37 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 49b508347..2c293a899 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index cd2c8c04e..5bc4b934a 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index 9c31dd435..dede56c21 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index e14786fd2..aa4d19c7f 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 5d3749e9d..21a2a90cf 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 3855ed454..9e3fbd0f7 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 5e8c1febc..72fa9e051 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 88e4229be..94a4f62f9 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 8b5650e48..098afabe0 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 72c521ead..194cdbf50 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index 6507152be..0688fd264 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index 34956a4f6..52083be38 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index 32ac714e5..fce9a2535 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 2c72f011c..8dc6fbe3e 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 44aa9dd49..31eccfb14 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index f4d5f9d8e..91d6ee387 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index c4d2515af..319424009 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index cdf4bbdf0..3327d8ac5 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 40f7816fa..aa94bb420 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 0fab08453..5ff4059d5 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 32bf3f5e2..2b40968af 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 2748361e1..7fee4c9af 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index e94ad4eb1..9a341198b 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index 2cae0d038..669ccb3d9 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 0b4242720..142528f5e 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 66c9decca..efe93bef4 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 806c6f2ae..8f1a5da5f 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 3cff108b9..745bd8a6f 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 7be4d3e9f..219e8d3e9 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 9caa8a956..e526aa92c 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index a804b41a5..0d7b52c1d 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index 86abd98c9..dd17f807a 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index c9919ef33..6276cdec6 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index 172273b06..65054b9cc 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index a686bf4ff..cb314b844 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index 864d9ba5e..b79030cd4 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index ed52be5df..45cdbcc89 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index e51acee46..b0685a3de 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 211ad5033..69a246b0b 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 1b9e0cb49..8d714abe8 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 770ba3366..77a8ebcba 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index 863c404ef..204129581 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 21cb3883c..0f9ca35c2 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index 06834e22c..06ceb965a 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 1a9fdc3d9..377bbb37b 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index eab050323..8e36b0d0c 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index b30bdd2e7..7ae73c9d7 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 84c3e9a82..999db00e2 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 80224eb76..093ccc004 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index 5255a41be..3b7b91213 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index 895ba73a5..afdce7781 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index 725fbe44c..638941d24 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 5bc2d5d3b..9b98b2925 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 08699df4f..098d25fb1 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index 047c9070e..d4a503876 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 0ed8136e8..4a3be7d96 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 71a5b3d87..edb6f7aed 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 173733bc6..c9f9b77cb 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 2ae80eb74..d94a67711 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 687f1f80f..118a188e2 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index 023f3f2a3..dc8610947 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index b7a30e12d..68ebb8e89 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index 87ef0b625..5c1e1ff9a 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index fee7fd868..862c91507 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index f5b290f7a..596ac4f0b 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index d478b3a52..f48ba06ea 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 8f9809beb..76a96d49f 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 4476c7c39..768c514ad 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index 46e2ebdbc..716ab1db2 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index 0bd5fd940..106836372 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index 9cf6119cf..26688e057 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index 185a05cc5..ea5a58340 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 28685a49e..0cc896d99 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index 98d2968bb..e56efd060 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index b7e2bffbb..86de8361b 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index 53d48f526..a3f9215b7 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index acb44807c..4d1796f26 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index 03ecfdf8e..3096e8db7 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index 9875f381a..457d20f63 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index 9b1344f1e..fc8b812ad 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index aea51db20..d22fcd67a 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 71dd23651..5fed339ab 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index df6402848..55436b60e 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index 2a3d401ab..f705b1e42 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 133dbe33c..f2ca2e2be 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index b2fdcdc3e..e0da2212e 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index cc31035d2..315a98f0a 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index e9c2d2591..bac010462 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 8623bef2e..cd54e08be 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index aac425b78..b962e4119 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index cb965f47d..76a7ff92b 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index 72240dd43..e17a02507 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 5114179df..4b56d81ab 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 7dd73548e..17469b570 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index 357c325aa..c13badf41 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index 9f06970c6..f1124f023 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 1303ed7bc..706ec58df 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index f82342037..54b0f24b6 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index 4f9633cc7..2237f2c74 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index c31d00fec..72f08ad0b 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index 89e22cc84..1b74f0bb8 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index 71b0f9de8..01d23456a 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index ac91255cd..afe13bf50 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 7b0d29a11..033e91326 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 550ff39d4..8f65e28f4 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index 151c7a075..becbbd348 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 599cd2f2e..aee1651ff 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index c1cbb600f..915cf34af 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index 5087352c1..25422b3bf 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 7a6bf981c..f3ac7e1d5 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index 2f5a5628a..8ad776940 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 197640421..82add267c 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index d3a24080f..80a9d3a59 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index 41fd8d36c..99806a4fa 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index 1cb2b2cf4..414d879df 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index 499e3ffd7..abecc1a10 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index 1471ce490..f09f706ab 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index aa93b5b96..a281d81f3 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index f47928ce2..6e4dc23e1 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 2a7533c30..48496d441 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 09110c29b..7236ac5d6 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index b5e9678ec..2fa1e0cce 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 76530d7af..5d56a77c7 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index 77cbe8ec6..8d6f91436 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index adb6e6f72..76160a25c 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index a74eb57b2..ac11eb5a3 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index a860eacda..3f4737d90 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 63565cf64..2d4d36234 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index ce8d38274..9fe27543f 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index 92fa10abe..c2d23a37f 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index c5fefc304..cf19d15a5 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 5901b3fbe..54a4c56b0 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index 6df1198cb..e09651abc 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index d402ebd85..109c70636 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 5a0ae0139..60250f4de 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index 3c0521552..24910d279 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 98dd6fef7..a8493340f 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 45403af49..2c93f3c88 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index 699d9ed59..4617a2b3b 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index e5462f035..9933b7298 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index bfdaf35a2..0d08321c4 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index a15b172b5..dc2f00418 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 298cf6252..e7f3e68bc 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 0d6ad9340..038bc320f 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index a2f98459c..be9946e62 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index ca27e9bf7..c75fd4225 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 7ca6363de..498dd39a8 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 2d9c50929..adad59e67 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index 600eccafc..a4b2ceb43 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 89bfe0f27..37e0e570b 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index 6242fff7e..41ae3ce81 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index 9953eb226..99b9b5b07 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
index bdc345e5b..361c1ef42 100644
--- a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
index 80619f38b..6debf7f7a 100644
--- a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 8d58024ee..e45dde502 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index c20b043ee..641403570 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index f0d15852c..bd0780c13 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index c702f9bf9..49349caa6 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index ecd96333e..dbe4ccdbb 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index 91522eb9b..3a26c109e 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index af7c931cf..70bb96137 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 45b9b5571..37d143afe 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 93cdd4610..64e3fed06 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index 05e442405..32b9880a4 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
index 98bc48e62..74bb85170 100644
--- a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
index 8b5f767b6..3031d5e30 100644
--- a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
index 3483932dc..cc34c567e 100644
--- a/src/main/java/org/scijava/io/handle/StreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
index 86e63ec81..ff1fe6ad5 100644
--- a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index 6b493a391..a11750d63 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
index dc6f613d4..10e909deb 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index 2a31dcfe6..0a7ca02dc 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
index 52356fbc1..5e831059b 100644
--- a/src/main/java/org/scijava/io/location/BrowsableLocation.java
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index a4d870b6f..f79933193 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index f84ddb1e5..a86971eba 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index f393a381a..2b6a8979f 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 618f8a3b0..073717716 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
index 5873b5285..b690802d8 100644
--- a/src/main/java/org/scijava/io/location/FileLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index 6b87ab2ec..11e935934 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
index 3f9c84048..9c6ce6bc1 100644
--- a/src/main/java/org/scijava/io/location/LocationResolver.java
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 8cfb3cda1..117611779 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index da2b59f3c..b1b8007ed 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 5413e8bb6..5fb1318a5 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index ac9a7a34e..a7938f43c 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 10fc18e42..3934d4f4e 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 29218ea6e..6a6f9c702 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index 6ebf4d618..c750e2680 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index e749bf59a..331879bb5 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index 66bef3263..55c8943e9 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 506b02447..3a261f2e2 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index 0c313435f..83247b49a 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index 62aefe2db..7dee3b2e9 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index dab6e9583..3b2524b5b 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index 918895891..c93a0680d 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index a9755e034..7284bbe65 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index d8dd1c2b0..7e8ec0bec 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index 16fdd6c6b..4ecab5831 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index 3f31f51c5..867ccb551 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 492203115..657ae6fe0 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 39f09ac2d..13919c18a 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 17ef070f6..e141b6320 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index 7ecc9ff67..2a04d13e6 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index b01f55636..1f0598ce7 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 5b6a17acf..8b673eea1 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index acda55b48..451db4217 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index dc43dd7d5..4b4fcca1e 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index eb80cbc89..9b5c45d19 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index a9d510f9c..83b1802db 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index f7fc4a7e7..a993825d9 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 7872caaa3..a38bd3d96 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index 42e0d1970..fb26e5f3f 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index 3dbeca85c..f58a6a7ef 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index f824c3ad6..34684640e 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index 70926115c..f7d2779b3 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index df5b30223..c403b8518 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 04ad15e3a..94a259fad 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 334f9f37e..5c1b797f2 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index da260b12a..665c1cb14 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 26fac0d84..171eb8ce2 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 011c9336a..801c3f468 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index af331696e..18d5f1da2 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 4c8354d14..27b2a241b 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index d17923d9b..eca9c26ff 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index a3399c35e..38bae5059 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 70a45398b..eabfb9809 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index 08dd0ef3f..8978ddf0e 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 6c07451f4..9c1af227d 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index 431924783..86da5b169 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index 2e1dbb476..20186524e 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 4abd391ea..06a837c42 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index b8ec3a20a..705b33b61 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 0767fb2f4..b2dbfd664 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 302b321e4..da6be43ef 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index 6436b0d42..378d04add 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 58c146a81..9f7cf991f 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index d40bf6a9f..f79fc99fe 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index cd618e566..59aad02fd 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index 5771a16ee..71644fcbd 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index b9e8231d3..0091f7019 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 6b674ad84..257680232 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index 8a6d748b9..ddf1205e9 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 5f5c3a7bf..e0b8f25af 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index 468d5ef66..6a702a26e 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 57482a65a..5c049fe41 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index 28933c8ad..c26a07bc0 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index 98f9f3b39..c49bdde61 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 467ac137b..632bc88b5 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index fabc602a0..049ceae3f 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index 00a3ef6cb..bd2cac2fc 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index 73f5a2dcf..f39ca300e 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index 861e00f33..3fc4567c4 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index 864d780a8..b6b2bc72a 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index 58d6fc890..2b7a48798 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 4cff4eb06..9066ae88c 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index bd3e2826d..a7d898206 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 431d80f52..9e1dd7178 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index c71fe444a..095a0764d 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 5e1dad59f..31566a112 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index 3e9b01ca5..fc0db2aea 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 19306d59c..f918dee36 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index 8293fd796..16c781ee0 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index e2c48d3b0..1735bf142 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 4cb204c62..47561dc45 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index ada646e05..bff0bbe0e 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index af68aeffc..85a1df8f9 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index ce19bfd45..92c0e772e 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 85e8aec4f..bce52f377 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index bf33a6d7c..a533e2da7 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index d94a04a80..51fece17e 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index c72dcf434..4c0e5af62 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index c0b5ab00c..fed095cc9 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index 2fe990d15..f80e66077 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index 47f1efd25..1cf7d432c 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index e68eaf1c4..3406eb167 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index c89921129..2b5470e58 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index c863add41..176acf991 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index 0b92de092..b17c86287 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index e5857e7f7..58516916d 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index e9b649635..7e7fd581a 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 51b2bf3fb..d2cb07ebf 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index 7030ec9f9..0ff9b213b 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index 3790576c7..05f20d0f6 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 8dda4a1b5..3d371eb9d 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 3067f7c4d..5266d4e45 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 40e07da97..900109983 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index 2c0bc2e7b..235853e40 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index 71970cd2d..de0a12a0c 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 05262097b..21bc7d8d5 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index 1a7217d02..34547dc18 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index dd7a0a8a1..9d5a42df0 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 6a4b7bf80..4395c17f0 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index f97e4b6d4..c3cee3fcc 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index 8591a610b..9811d86bb 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index b3957baec..291d3fce7 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index fb6e44fab..7815f8955 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index 7bcc67b26..932048b0a 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 99c801f66..ea244411f 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index f0825da3b..7c4ec53db 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 1abf52932..0e8f5c7f6 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 48d8a1dc9..92163037a 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 871321496..1e8fa0289 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index 38f6d114d..10afdd083 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index 67e214539..08c44def8 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index 1e7ca07da..926421cd6 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index 445bb83c0..0317cdcd6 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index 6fce38f6e..d05449948 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index 7d6626e11..43776691f 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index 7ff2d58f9..8b8278736 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index 56347c8cf..ccfd0d442 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index a35cde8d9..fc22d4198 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 8e63de1a8..27f833171 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index f9ae6a778..79933bf37 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 5242b040f..1ab4989e3 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index 4d5dfe5ec..40088d311 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 5c5cef87e..73a95c611 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 179dcf60a..7b6197cb9 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index 81fe6d810..60b31c6c6 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 088516aa4..962918659 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 15f2b2f50..6c46ef9c0 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index 86834e247..41daaff61 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 44319cb0a..df87969ea 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index dbff0e208..1c8f6101e 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 3cb59909e..f8e0c9d49 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 2920aeb92..0563024ae 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index 9a70628d9..f023888c2 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index cf72138fa..4275ec970 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index ffd2326c5..12c06b806 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index 33bda0f4a..be5d37bdd 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 9d45d2ebb..72a0fc638 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index ac24dd5e6..b419bc31e 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index f71c9d0b8..e44215498 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 3437229c1..15f0fe877 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index ac783ec41..0fd466d23 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 55b6034a8..ae48603ab 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index afe785048..c2d525c6a 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index 528e378dc..1218852a6 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 3c4014149..3ed3fa771 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 64c52b840..cd71d2be7 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 71a1f09d1..64f90005d 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index 596f536d9..42c729638 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index ff5866890..4eb666f1d 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 052a00aca..42929b3b2 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index b2391b7de..a05355487 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index 08fb27213..fd6da8767 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index 4f9e4cb72..38ff5c9c9 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index 9a65c9fb0..cd3fd6997 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index 98eca3ac8..7f871aaeb 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 21ea5976f..f1dbfdf38 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 229c8deed..47676d4b2 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index ba4f40876..5862a1895 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 3f10ada1a..7e5104dd9 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index c3dd29465..e42a9aa6b 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index fd481f213..5adef39f3 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index d0f293b92..d4a124b22 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 3f5d01fb4..0b3ba6bce 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index f06224bfd..7846a8b68 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index 452a7b212..84942758b 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index 13b9d56d3..326eb216f 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index f2cd2549a..66385208f 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index c3b0934c8..c537f8587 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index 506da8b54..5b0f15d9d 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index 804fa7e80..f1f353939 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index 37c2960e4..791676279 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index 90e1000db..e405df4c9 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index 461b2cd1c..9628ffb1f 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index a6911a839..97aa72ee4 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index 0f9878e88..5196a5bd5 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index 39b718050..ac88d9514 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 58fb7e4b0..8d0e9e994 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 974b4e517..4c5f3925d 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index d90d3b4d6..d78ef45bb 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 7142501d8..a7bebe51b 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index ef358a778..2608120d9 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index 631183696..3a960398c 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index 54fb2e316..333555a40 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index ce199cbe8..de1c7caae 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index bea31b1bd..c889fe818 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index da77e84a3..73a86f94e 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 66035b130..84b202634 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 7e398fb55..2df926592 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index edfafa538..bbc00fcbc 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index b295fdadd..064ac980b 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index db593af9e..ff2e0c448 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index f881dc429..80cf99e7d 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index b3486a274..21ff9ebc0 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
index 047b09986..c5260ffb8 100644
--- a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index 0ed4d7212..9ef7ecd83 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index d3c21ac86..41a347362 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index 3521add73..9b7e49b86 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index 28ef60b73..23fae5d9a 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index cbf37f84c..056bbd7be 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index f0acd3f06..3aa87d4b9 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index 007f7eb5e..3ca981b0e 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index 3aaef93d9..a7c360ece 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index a1dad4f9d..993fcff82 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index 31b5c5137..83767672e 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index f4222cd09..0af3dff5a 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index 4507986b0..fdba46c9a 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index aa43d1d6f..84fb560c9 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index e37f3684c..de8ad6baa 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
index 8f886e34a..2b9d69d35 100644
--- a/src/main/java/org/scijava/startup/StartupService.java
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index fae38bd39..15736ad9d 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
index 67f5c60c8..5b58f66ce 100644
--- a/src/main/java/org/scijava/task/DefaultTaskService.java
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index f2ea69aef..eb515000b 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
index 82d015847..019709766 100644
--- a/src/main/java/org/scijava/task/TaskService.java
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
index 9b88b2642..9a6c68266 100644
--- a/src/main/java/org/scijava/task/event/TaskEvent.java
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 3a71c3fa0..750b1d1a2 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index ce1a419dc..928143097 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index 82d09cf40..8739af515 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index aeb62d315..fb4f0e23b 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 03209c58c..d9e9fc9a1 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
index e29a1c796..219a6f06d 100644
--- a/src/main/java/org/scijava/text/io/DefaultTextIOService.java
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 523ff2c34..e8f8172df 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
index d196c893a..24f105c64 100644
--- a/src/main/java/org/scijava/text/io/TextIOService.java
+++ b/src/main/java/org/scijava/text/io/TextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 626fb7a24..bfcf79d0e 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index 69a6c13bf..b00f6fe80 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index b1bbfbff9..22492cb2e 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 48af501ac..7eea24aa4 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index f907ce6fc..7aacdcee1 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index 0da513789..b6375479e 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index 782c1eda3..a7cae7e4e 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index e293a5a79..b51a31be4 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index 118e54529..664a20284 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 175fc01d3..7d09765d9 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 33665f794..125a3b6ca 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 5099ed283..95d5a6e1a 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index c6bf80824..13967a4ed 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index 1601a2b07..9f223593c 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index 920b4e6a0..a39e1aa89 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index ca37e8503..c402a1f2e 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 1efa8139b..2c9adba78 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index 30a63ca2d..10477bab6 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index bdcbaafa7..0d082a58e 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index c0f410b6b..4e6027ed6 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 96fc2ea6d..939ea5331 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index f8407428e..db3920956 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index 82401f183..9ec7c6f5c 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index fbb5cea5b..82ee890fa 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index 02b8d1a04..c87674ef4 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 8d11e6ddb..695d28cdb 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index 42e2bd1cd..694d9dbd2 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index 91555eb7f..5fdd4cdc7 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index abf939667..4d726baed 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index efd1cbccf..516ce1384 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index ca5c86cee..7c1654dbd 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index d8e66b589..57fcdfe26 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index 28336c6d6..bd347f69e 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index ff1079f3f..0aa658fc1 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index aabaa1c0f..9489db54f 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index 39053f14e..e454ee13e 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 6f26986bd..364ee52c3 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index 512f01035..f311b89fe 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index f89136087..17f007443 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index bf7230819..b542e7405 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index 2d59d4af9..391064a8b 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 140f61ada..0de0dd56a 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index 5dfbaa90c..bb999c01b 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 02289b6e4..7b8a0ff34 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index ba24d62b9..fba1ac075 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index eb3b860af..90c539fa4 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index ae911864b..b519354aa 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index 3be4929f6..2b06f058f 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index 76b2eb9d2..da9285286 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 7fd8845af..11b1ad1a8 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index 286ddbe03..b2f3cfe4b 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index 8fe5364b5..99ca4f859 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index 3c974ac4d..6f80f9f88 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index 1a57865a4..2de8238eb 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index b265c389b..31bea8a62 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index b315b377f..bf2c128af 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 928168d90..4efc3fd1f 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index aa75ca0fc..1cc70a7a9 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index ba7f324ff..786a95a2d 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index cfe9570e7..3805bf1a7 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index 825510501..a990d1a48 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index ba48ce527..9cd858082 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 38513d1f8..59b9e5068 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index b052d4f58..7937f7a2b 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index e745e5ba2..71f620135 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index ea93137b1..4e7038849 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 6d396fd36..3dae18ade 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index e2f69e924..13e378677 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index 3f56a3089..5803f10b9 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index ea7415fe5..bdf52bbcb 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index a3e661f26..1816709d7 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index c5d535281..dcb6c17ee 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index b238586fe..d1be649dd 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 39d15a21f..c90ee211a 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index d9abbd395..4cdf59c25 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index db2db000f..35b3486e4 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index fd8804f96..1b4676bca 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index 064d32bb3..b8f4c25a7 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index d12ad5281..a90039651 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index dc08f1085..5be10e252 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
index 9e9351a2d..7b2e2f529 100644
--- a/src/main/java/org/scijava/util/DefaultTreeNode.java
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 08d4fe587..cc862f321 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index 00dd0dec6..b54ed91e3 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 69a658896..cd1eb3781 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index 61d7102d7..e3eab4d3d 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index ff45ab5ce..b1e623e12 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 21592e25d..491dbdc35 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index e368dbab7..3232d6634 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index 2ed65bbb2..0d6c621cd 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index 5827b173b..07a2699a1 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 4f23438ce..baa11ea6d 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index de517f696..befb5c3d8 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index 09981d20f..781980da9 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index fce832a0b..e8fdab952 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index e0dae6e79..460becff0 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index d7e178c59..8b781c8e9 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index c34b3a236..66df0b78b 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index d6f5ff1c6..08e7f6ccb 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 0a6286d19..fffae00f5 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index f3b8d84c6..1a77f54d6 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index 6b6ce4e60..252a551a1 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 0811cdb21..2517c09ed 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index c6412303a..1dbf798a0 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index 9e1bc9191..d013b489c 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 7fc4935df..694a5d1e2 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index 233fca0c3..00be9935b 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index 431176950..eb9e40e13 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 3ef783c28..b6292da6a 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index 781b38910..bb2038ed5 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index b2fabab85..e39fe223e 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index f3841cbc6..3dc5d5fde 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index e3bb179fe..444f7aa13 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index 92ab6595e..d6d80b4d5 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index e6552acb4..967279cb8 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index 69826743e..415e5cda8 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index a4882d018..56f37d9a3 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 84a4b1338..35e57613f 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index ba1f57305..9bc7a5eb6 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 56c71c050..3cb1b2ad9 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
index 9402f1db7..5bea3299e 100644
--- a/src/main/java/org/scijava/util/TreeNode.java
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index 7460c8bcf..5b67f2573 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 597e2bb06..6044ba831 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 315c69149..55934b8be 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index 0dac9702f..f207865b4 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index aee47bf36..c9edda41b 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 763fe8a08..70781baae 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index dfdc1ace1..afababa6e 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index 09e67f6ab..b84d124b5 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 582b72b77..52ee74ae9 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index d0483f911..da306e7f2 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 379521c9a..c62cfb201 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index ef8c22460..fe268b23d 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index f06772fa4..865a879c9 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index d7b5449c5..158119163 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 77363a9f3..15a835f02 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index 1bed7f3bd..c58aacd41 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 1a768d5d7..1ff982265 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 5487289d1..f41a248d4 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index a47cc89c9..331344f76 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index 2e3b5fac1..dd2ea0aad 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 80640cd83..2c364e914 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 78ee87076..d13b01161 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 5107eb2aa..0e7bfc07a 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index c1245b479..020ca8435 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index 1e6f85a30..39122cb03 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index d13a56261..fdde6e55a 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index 4f5dab5f5..41f38498c 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index af9e18369..7e128e7f5 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index c03d375be..9a5e636ba 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 80f033de0..3e8d9f953 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index fd0eee169..323c1f257 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index 6e7b04b87..508f29e0a 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index ccf76e426..f34259805 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index f05706dfa..ee6d087cf 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
index b66a0587f..fc7cb0db4 100644
--- a/src/test/java/org/scijava/SciJavaTest.java
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index b30632b66..7fdfba27e 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index c6a2af6b1..88103149c 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index 098b4597a..72c387845 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index 9baa28c3d..242180095 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 8a7be9293..5acfd4beb 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index cf767f6b3..e2348e92b 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 06ce50b5b..3ad441f01 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index e47ee1d4d..204257bac 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index 657d3ecb5..bdc884e7d 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index 7e7290c52..b1eea96ac 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index 5b713e1d9..62eb0e389 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 02b074e38..35630e00d 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
index b42d2eae7..bdc0c1682 100644
--- a/src/test/java/org/scijava/command/CommandArrayConverterTest.java
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2021 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.command;
 
 import org.junit.Test;
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 822686f86..fabad17f0 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 8f32e59bd..5620d4cd2 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index ca89f8084..521dae0f2 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index 57df8ff62..0ed5fbcee 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 8ab7b7c53..7c9c4e509 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index d9a47c566..8b94a4396 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 45f3af9c5..7f6f9ce76 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index a1b0b5992..1fa912c8d 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index c28ff6247..5dd0fb908 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index 966ca3501..2b604398a 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index c988e252e..8ef681e1b 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index db0ce1531..2985dcd7a 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index 153986d8f..e62bd6741 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index d5fe939ff..8c003a1de 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index b5eeddebb..0d3388b30 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index dc76b0314..3d60ed5c8 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index ac4169511..4cf3772de 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 1634f8e57..75553f0a6 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 9473e4a16..af7e64dbf 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
index ab3941050..d85d11090 100644
--- a/src/test/java/org/scijava/convert/DelegateConverterTest.java
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index c903e33eb..c235a8005 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index e690f926e..95ecad501 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index b67714c14..bc32f0223 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index fe2c586b4..8c54546ba 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index ac3d1d222..19325bd76 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index 980fdee94..5517d4fa3 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index be4045cd4..bfdadf07b 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index d3c174f2f..312a85679 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 684c6480f..091132b8a 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 67a3aa196..79031df8d 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index b70c66c99..94f762a12 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index 5770c77a9..ea1e57231 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index b02e438f2..de2cc0830 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index 29592cd6c..3990fd988 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 83079e693..4447698b8 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index 9e7dcac9d..b41a7f34e 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index 45d667eb9..ebf9badd2 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index 3a4f3abfb..b825cb23a 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index b8b5c1c32..06c43b617 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index 8466a16e0..ea9a55f08 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index b6350fb83..51836b92c 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index 5e39835ea..5a6888c6e 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index affbbf66d..dbbccebd2 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index e2d9457cd..961fcca13 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index 991d2663b..75777d74e 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
index 6e0398aa8..33e77b6ff 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 99ce93e35..b3b0335e8 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
index 6bc45b329..4da36f681 100644
--- a/src/test/java/org/scijava/io/handle/DataHandlesTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 687161d90..408481690 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index ee964d265..aeea4acaa 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index 52d1436b0..4885c44f5 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index efa3c70d7..894e2c831 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index 583861392..ae7d7693c 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
index 9b58fe467..f61e64659 100644
--- a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index aa12f5df7..dfdfc5e69 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index c298896da..032fbe403 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index a8314552a..02d561c89 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index 5a802b5f9..487673059 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 61e4a6c46..023b403f6 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index ff6d3df24..69a8e3dcd 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index f19707bec..dbdbfe16d 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 8ad7252e3..199768671 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 79d2b5362..700d6a173 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index 2348731ef..d8096fd27 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index 72c1de930..f18bbb3cb 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
index a07dc82e1..626d4e5dd 100644
--- a/src/test/java/org/scijava/log/TestLogListener.java
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index 1280da8ee..296008e36 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index 8dc7b9449..961a21211 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index a5df5b5fa..c098f4ad0 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index e1056e81e..4387f23e1 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index 90c9107b7..e41fd82ab 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index f39cbccb8..98ab6288a 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index 03f5b059c..d3249eb30 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
index 29544816a..7375ab0b4 100644
--- a/src/test/java/org/scijava/object/NamedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index e31d2b54d..244fce9ca 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
index 0a473a3ba..cfaf44c7a 100644
--- a/src/test/java/org/scijava/object/ObjectServiceTest.java
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index a1922ad25..63f966fe4 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index c4de55bbd..d83de80e8 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index 69ab7c3f9..7f1b3070a 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index 6df16a8d7..28790ae03 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 2fb4e4f59..5d44ea093 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 3e46bf072..abb5b7fbc 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index f2cf3075e..2f00f5020 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index 9f9733037..5797cab0f 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index 304bce5cb..b8bdbce28 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index e99d850e0..1b67d8fc1 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index a45d9b66e..c6ee8830c 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 92bcfd1cb..8979affba 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 678996628..43750e601 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index b9c5d14da..ab774845f 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
index 756a2dc9d..1f9cbde21 100644
--- a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 972697a01..fa5d07512 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index 1dce2952a..3f80516b9 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index 9064f9f92..2ba9fa0ea 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index b47d94f79..38058c958 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 1bde42216..dcdc5822b 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index f4c43008d..66c9fb892 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index 11ac49cb5..e951aefc1 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index 7e98f5bf0..20c7b1e04 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index f481aab12..54ff4f062 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index b0c22be5e..7897f5a46 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index deb2b2a66..65bd49e8f 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index e48c59dde..5276f427c 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 5302f04d8..f4925301a 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 84ee67931..4406e2cda 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 792bac870..a0dbd98e3 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index 42d9dbeb9..cfe85860c 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index 64c3a0024..89e83b4a9 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index d68961a92..72a8350f0 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/GenericArrayTypesTest.java b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
index 689d5328d..fdf443b05 100644
--- a/src/test/java/org/scijava/util/GenericArrayTypesTest.java
+++ b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2021 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.util;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index e55154002..c495d0e35 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 55e7157cb..7d701c838 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index 43d742da3..554f4b2be 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index 9b9ff1eab..5eb9056a3 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 6d3c5e9cb..3a6890ae9 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index 7b64063fd..679327709 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index 300cd5b01..82bc10524 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index 1a3211c03..bff05f0c2 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 168ef614b..bc31d533b 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index f18a60c95..545877756 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index e5ecb806b..116f8ad8e 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index 57bf77718..4874af6eb 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
index 1c1a3aa22..079ed72a5 100644
--- a/src/test/java/org/scijava/widget/WidgetStyleTest.java
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2020 SciJava developers.
+ * Copyright (C) 2009 - 2021 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From 986cf8260ceca8778a598022bb9c5a182d0b73e9 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 9 Sep 2021 10:03:19 -0500
Subject: [PATCH 0992/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 264a48d6f..738ab9db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.87.0-SNAPSHOT</version>
+	<version>2.87.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 582bafeefd85eac6a3bfcbdb1cc368a5bd21a86d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 9 Sep 2021 12:23:12 -0500
Subject: [PATCH 0993/1208] ClassUtils: be defensive about field annotations

We already do this when caching annotations for methods;
see 52acc853ed1dd77b9b487f0d3c9cfac45f7fbd6d.

It is possible for the list of fields to be null if
something goes sideways regarding class loading.
---
 src/main/java/org/scijava/util/ClassUtils.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index d1be649dd..12a727530 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -189,11 +189,8 @@ public static <A extends Annotation> void getAnnotatedFields(
 			cacheAnnotatedObjects(c, query);
 			cachedFields = fieldCache.getList(c, annotationClass);
 		}
-		// CTR START HERE: cachedFields should never be null now.
-		// But it is, with FilamentDetector 1.0.0. Figure out why and fix.
-		// Then cut release of scijava-common, and FilamentDetector.
 
-		fields.addAll(cachedFields);
+		if (cachedFields != null) fields.addAll(cachedFields);
 	}
 
 	/**

From f8c14fd032021c38b03e8c7d58926792751e7e06 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 10 Oct 2021 16:15:14 -0500
Subject: [PATCH 0994/1208] Context: do not let close() throw Exception

The dispose() method does not throw exceptions, and we do not need to throw
one when auto-closing. This prevents the compilation error:

  Unhandled exception type Exception thrown by automatic close() invocation on context

which occurs with code of the form:

  try (Context context = new Context()) {
    ...
  }
---
 src/main/java/org/scijava/Context.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index dee623861..c1559cb4c 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -433,7 +433,7 @@ public void dispose() {
 	// -- AutoCloseable methods --
 
 	@Override
-	public void close() throws Exception {
+	public void close() {
 		dispose();
 	}
 

From f1aaf7d38cdab772177bca9921dfadf215c84bf0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 23 Oct 2021 18:46:12 -0500
Subject: [PATCH 0995/1208] POM: update parent POM version and imagej.net URLs

---
 pom.xml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 738ab9db2..e78356f70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>30.0.0</version>
+		<version>31.1.0</version>
 		<relativePath />
 	</parent>
 
@@ -31,7 +31,7 @@
 		<developer>
 			<id>ctrueden</id>
 			<name>Curtis Rueden</name>
-			<url>https://imagej.net/User:Rueden</url>
+			<url>https://imagej.net/people/ctrueden</url>
 			<roles>
 				<role>founder</role>
 				<role>lead</role>
@@ -46,13 +46,13 @@
 	<contributors>
 		<contributor>
 			<name>Mark Hiner</name>
-			<url>https://imagej.net/User:Hinerm</url>
+			<url>https://imagej.net/people/hinerm</url>
 			<roles><role>founder</role></roles>
 			<properties><id>hinerm</id></properties>
 		</contributor>
 		<contributor>
 			<name>Johannes Schindelin</name>
-			<url>https://imagej.net/User:Schindelin</url>
+			<url>https://imagej.net/people/dscho</url>
 			<properties><id>dscho</id></properties>
 		</contributor>
 		<contributor>
@@ -61,69 +61,72 @@
 		</contributor>
 		<contributor>
 			<name>Barry DeZonia</name>
-			<url>https://imagej.net/User:Bdezonia</url>
+			<url>https://imagej.net/people/bdezonia</url>
 			<properties><id>bdezonia</id></properties>
 		</contributor>
 		<contributor>
 			<name>Christian Dietz</name>
-			<url>https://imagej.net/User:Dietzc</url>
+			<url>https://imagej.net/people/dietzc</url>
 			<properties><id>dietzc</id></properties>
 		</contributor>
 		<contributor>
 			<name>Richard Domander</name>
-			<url>https://imagej.net/User:Rdom</url>
+			<url>https://imagej.net/people/rimadoma</url>
 			<properties><id>rimadoma</id></properties>
 		</contributor>
 		<contributor>
 			<name>Gabriel Einsdorf</name>
-			<url>https://imagej.net/User:Gab1one</url>
+			<url>https://imagej.net/people/gab1one</url>
 			<properties><id>gab1one</id></properties>
 		</contributor>
 		<contributor>
 			<name>Aivar Grislis</name>
-			<url>https://imagej.net/User:Grislis</url>
+			<url>https://imagej.net/people/grislis</url>
 			<properties><id>grislis</id></properties>
 		</contributor>
 		<contributor>
 			<name>Jonathan Hale</name>
+			<url>https://imagej.net/people/Squareys</url>
 			<properties><id>Squareys</id></properties>
 		</contributor>
 		<contributor>
 			<name>Grant Harris</name>
-			<url>https://imagej.net/User:Harris</url>
+			<url>https://imagej.net/people/tnargsirrah</url>
 			<properties><id>tnargsirrah</id></properties>
 		</contributor>
 		<contributor>
 			<name>Lee Kamentsky</name>
-			<url>https://imagej.net/User:Leek</url>
+			<url>https://imagej.net/people/LeeKamentsky</url>
 			<properties><id>LeeKamentsky</id></properties>
 		</contributor>
 		<contributor>
 			<name>Rick Lentz</name>
-			<url>https://imagej.net/User:Lentz</url>
+			<url>https://imagej.net/people/ricklentz</url>
+			<properties><id>ricklentz</id></properties>
 		</contributor>
 		<contributor>
 			<name>Melissa Linkert</name>
-			<url>https://imagej.net/User:Linkert</url>
+			<url>https://imagej.net/people/melissalinkert</url>
 			<properties><id>melissalinkert</id></properties>
 		</contributor>
 		<contributor>
 			<name>Kevin Mader</name>
-			<url>https://imagej.net/User:Ksmader</url>
+			<url>https://imagej.net/people/kmader</url>
 			<properties><id>kmader</id></properties>
 		</contributor>
 		<contributor>
 			<name>Hadrien Mary</name>
-			<url>https://imagej.net/User:Hadim</url>
+			<url>https://imagej.net/people/hadim</url>
 			<properties><id>hadim</id></properties>
 		</contributor>
 		<contributor>
 			<name>Alison Walter</name>
-			<url>https://imagej.net/User:Awalter2</url>
+			<url>https://imagej.net/people/awalter17</url>
 			<properties><id>awalter17</id></properties>
 		</contributor>
 		<contributor>
 			<name>Jay Warrick</name>
+			<url>https://imagej.net/people/jaywarrick</url>
 			<properties><id>jaywarrick</id></properties>
 		</contributor>
 	</contributors>

From 65b8595666406515e58e94648758dcfb75eec9e8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 23 Oct 2021 18:47:24 -0500
Subject: [PATCH 0996/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e78356f70..7cc934d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.87.1-SNAPSHOT</version>
+	<version>2.87.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 2cfa934aae6a75f47629ce7b313f131853ff2259 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 8 Nov 2021 15:42:10 -0600
Subject: [PATCH 0997/1208] POM: Stop using git:// protocol with github.com

The GitHub platform is discontinuing support for it.

See: https://github.blog/2021-09-01-improving-git-protocol-security-github/#whats-changing
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7cc934d49..0560f653a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
 	</mailingLists>
 
 	<scm>
-		<connection>scm:git:git://github.com/scijava/scijava-common</connection>
+		<connection>scm:git:https://github.com/scijava/scijava-common</connection>
 		<developerConnection>scm:git:git@github.com:scijava/scijava-common</developerConnection>
 		<tag>HEAD</tag>
 		<url>https://github.com/scijava/scijava-common</url>

From 780acadbb236ef7edf03106371f6d4f41179429a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 9 Nov 2021 22:08:11 -0600
Subject: [PATCH 0998/1208] POMTest: update scm connection URL

We cannot use git:// anymore; see previous commit.
---
 src/test/java/org/scijava/util/POMTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 3a6890ae9..3dbfac27a 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -110,7 +110,7 @@ public void testAccessors() throws ParserConfigurationException,
 		assertEquals("https://github.com/scijava/scijava-common", //
 			pom.getProjectURL());
 		final String scmConnection = pom.getSCMConnection();
-		assertEquals("scm:git:git://github.com/scijava/scijava-common",
+		assertEquals("scm:git:https://github.com/scijava/scijava-common",
 			scmConnection);
 		final String scmDeveloperConnection = pom.getSCMDeveloperConnection();
 		assertEquals("scm:git:git@github.com:scijava/scijava-common",

From 0889da279e75666ac680849cb6b5b98d72b7a512 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 9 Nov 2021 22:08:31 -0600
Subject: [PATCH 0999/1208] UIService: fix behavior of isHeadless/setHeadless

When setHeadless is called, it should toggle a flag local to the
context, not override the java.awt.headless system property.
That way, each context can be headless or not independently.

Closes #424.
---
 .../java/org/scijava/ui/DefaultUIService.java   | 14 ++++++++++++--
 src/main/java/org/scijava/ui/UIService.java     | 17 ++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 939ea5331..06f8c8289 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -116,6 +116,14 @@ public final class DefaultUIService extends AbstractService implements
 	/** The default user interface to use, if one is not explicitly specified. */
 	private UserInterface defaultUI;
 
+	/**
+	 * When true, {@link #isHeadless()} will return true regardless of the value
+	 * of the {@code java.awt.headless} system property. When false, {@link
+	 * #isHeadless()} matches the global JVM headless state defined by {@code
+	 * java.awt.headless}.
+	 */
+	private boolean forceHeadless;
+
 	private boolean activationInvocationPending = false;
 
 	// -- UIService methods --
@@ -178,12 +186,14 @@ public boolean isVisible(final String name) {
 
 	@Override
 	public void setHeadless(final boolean headless) {
-		System.setProperty("java.awt.headless", String.valueOf(headless));
+		forceHeadless = headless;
 	}
 
 	@Override
 	public boolean isHeadless() {
-		return Boolean.getBoolean("java.awt.headless");
+		// NB: We do not use java.awt.GraphicsConfiguration.isHeadless()
+		// because scijava-common eschews java.awt.* classes when possible.
+		return forceHeadless || Boolean.getBoolean("java.awt.headless");
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 516ce1384..82a35a686 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -101,7 +101,22 @@ public interface UIService extends SciJavaService {
 	/** Gets whether the UI with the given name or class name is visible. */
 	boolean isVisible(String name);
 
-	/** Sets whether the application is running in headless mode (no UI). */
+	/**
+	 * Sets whether the application should run in headless mode (no UI).
+	 * <p>
+	 * Note that if the system itself is headless&mdash;which can be detected via
+	 * the {@code java.awt.headless} system property or by calling
+	 * {@code java.awt.GraphicsEnvironment.isHeadless()}&mdash;then calling
+	 * {@code setHeadless(false)} will have no effect; the system will still be
+	 * headless, and {@link #isHeadless()} will still return true.
+	 * </p>
+	 * <p>
+	 * But if the system itself is <em>not</em> headless, calling
+	 * {@code setHeadless(true)} will force {@link #isHeadless()} to return true,
+	 * instructing the application to behave in a headless manner insofar as it
+	 * can.
+	 * </p>
+	 */
 	void setHeadless(boolean isHeadless);
 
 	/** Gets whether the UI is running in headless mode (no UI). */

From cb6d2fa7af33eb2a394778d3d4b1b9120d4aa331 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 8 Dec 2021 09:40:10 -0600
Subject: [PATCH 1000/1208] DebugUtils: use a lambda for comparator

---
 src/main/java/org/scijava/util/DebugUtils.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 5be10e252..f2d3a3de5 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -36,7 +36,6 @@
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Map;
 
 /**
@@ -105,13 +104,7 @@ public static String getStackDump() {
 		// sort list of threads by name
 		final ArrayList<Thread> threads =
 			new ArrayList<>(stackTraces.keySet());
-		Collections.sort(threads, new Comparator<Thread>() {
-
-			@Override
-			public int compare(final Thread t1, final Thread t2) {
-				return t1.getName().compareTo(t2.getName());
-			}
-		});
+		Collections.sort(threads, (t1, t2) -> t1.getName().compareTo(t2.getName()));
 
 		for (final Thread t : threads) {
 			dumpThread(t, stackTraces.get(t), sb);

From c342f87279b94adcc25a5012ae244adcd49a30ab Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 15 Dec 2021 09:22:44 -0600
Subject: [PATCH 1001/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0560f653a..432bbb837 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.87.2-SNAPSHOT</version>
+	<version>2.87.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 9a9e241e9b7b11f0743ad7d878661a517a0f1b9e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 11 Jan 2022 16:00:41 -0600
Subject: [PATCH 1002/1208] ReadBufferDataHandle: fix buffer copying bug

And fix a couple of typos and a warning while we're at it.
---
 .../org/scijava/io/handle/ReadBufferDataHandle.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index 32b9880a4..991fde6cf 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -211,9 +211,9 @@ public int read(final byte[] b, final int targetOffset, final int len)
 			// calculate local offsets
 			final int pageOffset = globalToLocalOffset(offset);
 			int localLength = pageSize - pageOffset;
-			if (read + localLength > readLength) {
-				localLength = readLength - read;
-			}
+			localLength = Math.min(localLength, readLength - read);
+			localLength = Math.min(localLength, b.length - localTargetOff);
+			if (localLength == 0) break; // we've read all we can
 
 			// copy the data
 			System.arraycopy(currentPage, pageOffset, b, localTargetOff, localLength);
@@ -281,7 +281,7 @@ private class LRUReplacementStrategy {
 		public LRUReplacementStrategy(final int numSlots) {
 			queue = new ArrayDeque<>(numSlots);
 
-			// fill the que
+			// fill the queue
 			for (int i = 0; i < numSlots; i++) {
 				queue.add(i);
 			}
@@ -295,12 +295,12 @@ public LRUReplacementStrategy(final int numSlots) {
 		 *            the id of the slot that has been accessed
 		 */
 		public void accessed(final int slotID) {
-			// put accessed element to the end of the que
+			// put accessed element to the end of the queue
 			queue.remove(slotID);
 			queue.add(slotID);
 		}
 
-		public int pickVictim(final int pageID) {
+		public int pickVictim(@SuppressWarnings("unused") final int pageID) {
 			return queue.peek();
 		}
 	}

From 9af7cb67285bca342c4357e6eaf32f9acfc22adf Mon Sep 17 00:00:00 2001
From: Nicolas Chiaruttini <nicolas.chiaruttini@epfl.ch>
Date: Tue, 29 Mar 2022 23:53:35 +0200
Subject: [PATCH 1003/1208] Task interface and DefaultTask modifications -
 backward compatible

With this commit task events are published automatically when an asynchronous task (task.run(runnable)))
is started and finished. Additionally, task can be run in a synchronous manner and can trigger task events
with additional methods added to the Task interface.

This commit brings additional methods to the Task interface (empty default implementations provided):
* start and finish method: a job can notify when it is starting and ending in a synchronous manner
* setCancelCallback(runnable) method: Can be used to add a callback when a task is canceled

The DefaultTask implementation is modified:
* TaskEvent are published when start() and finish() are called (synchronous task)
* TaskEvent are published just before the runnable is started and after it is  finished
* A try finally statement is used in the async case to ensure a taskevent is sent even in the case of job execution failure
* And event is called when cancel is called, and:
  * Async job : future.cancel(true) is called, + the custom cancel callback is called, if set
  * Sync job : the custom cancel callback is called, if set

* adds a test to check whether many parallel tasks send an event when they are starting and when they are done
* documentation
---
 .../java/org/scijava/task/DefaultTask.java    |  69 +++++++++++-
 src/main/java/org/scijava/task/Task.java      |  44 +++++++-
 .../java/org/scijava/task/TaskEventTest.java  | 106 ++++++++++++++++++
 3 files changed, 210 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/org/scijava/task/TaskEventTest.java

diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 15736ad9d..3e9a910c5 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -36,11 +36,32 @@
 import org.scijava.thread.ThreadService;
 
 /**
- * Default implementation of {@link Task}. It launches code via the linked
- * {@link ThreadService}, and reports status updates via the linked
- * {@link EventService}.
+ * Default implementation of {@link Task}. Throughout the task (or job),
+ * {@link Task#setProgressValue(long)} can be called to inform
+ * how the job is progressing.
  *
- * @author Curtis Rueden
+ * Asynchronous case:
+ * - A job (runnable) is sent for execution to the linked {@link ThreadService}.
+ * It reports status updates via the linked {@link EventService}.
+ * A {@link org.scijava.task.event.TaskEvent} is sent before the job
+ * is started and when finished.
+ * In the asynchronous case, upon task cancellation ({@link Task#cancel(String)} call),
+ * the runnable associated to the ThreadService is attempted to be stopped
+ * by calling {@link Future#cancel(boolean)}.
+ * This default behaviour can be supplemented by an additional
+ * custom callback which can be set in {@link Task#setCancelCallBack(Runnable)}.
+ *
+ * Synchronous case:
+ * - A job that reports its status in between calls of {@link Task#start()},
+ * and {@link Task#finish()}. It also reports its status via
+ * the linked {@link EventService}.
+ * Start and finish calls allow publishing proper {@link org.scijava.task.event.TaskEvent}
+ * to subscribers (with the EventService).
+ * Upon cancellation of a synchronous task, it is the responsibility
+ * of the synchronous task to handle its own cancellation through
+ * a custom callback which can be set via {@link Task#setCancelCallBack(Runnable)}.
+ *
+ * @author Curtis Rueden, Nicolas Chiaruttini
  */
 public class DefaultTask implements Task {
 
@@ -51,6 +72,7 @@ public class DefaultTask implements Task {
 
 	private boolean canceled;
 	private String cancelReason;
+	volatile boolean isDone = false;
 
 	private String status;
 	private long step;
@@ -58,6 +80,8 @@ public class DefaultTask implements Task {
 
 	private String name;
 
+	private Runnable cancelCallBack;
+
 	/**
 	 * Creates a new task.
 	 * 
@@ -76,20 +100,35 @@ public DefaultTask(final ThreadService threadService,
 
 	// -- Task methods --
 
+	// - Asynchronous
 	@Override
 	public void run(final Runnable r) {
 		if (r == null) throw new NullPointerException();
 		future(r);
 	}
 
+	// - Asynchronous
 	@Override
 	public void waitFor() throws InterruptedException, ExecutionException {
 		future().get();
 	}
 
+	// - Synchronous
+	@Override
+	public void start() {
+		fireTaskEvent();
+	}
+
+	// - Synchronous
+	@Override
+	public void finish() {
+		isDone=true;
+		fireTaskEvent();
+	}
+
 	@Override
 	public boolean isDone() {
-		return future != null && future.isDone();
+		return (isDone) || (future != null && future.isDone());
 	}
 
 	@Override
@@ -136,6 +175,16 @@ public boolean isCanceled() {
 	public void cancel(final String reason) {
 		canceled = true;
 		cancelReason = reason;
+		if (cancelCallBack!=null) cancelCallBack.run();
+		if (future!=null) {
+			isDone = future.cancel(true);
+		}
+		fireTaskEvent();
+	}
+
+	@Override
+	public void setCancelCallBack(Runnable r) {
+		this.cancelCallBack = r;
 	}
 
 	@Override
@@ -169,7 +218,15 @@ private Future<?> future(final Runnable r) {
 	private synchronized void initFuture(final Runnable r) {
 		if (future != null) return;
 		if (r == null) throw new IllegalArgumentException("Must call run first");
-		future = threadService.run(r);
+		future = threadService.run(() -> {
+			try {
+				fireTaskEvent(); // Triggers an event just before the task is executed
+				r.run();
+			} finally {
+				isDone = true;
+				fireTaskEvent(); // Triggers an event just after the task has successfully completed or failed
+			}
+		});
 	}
 
 	private void fireTaskEvent() {
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index eb515000b..6d5ce478d 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -37,19 +37,39 @@
 /**
  * A self-aware job which reports its status and progress as it runs.
  *
- * @author Curtis Rueden
+ * There are two ways to use a Task object:
+ * - A job can be run asynchronously by using {@link Task#run(Runnable)}, and
+ * can report its progression from within the Runnable.
+ *
+ * - A {@link Task} object can simply be used to report in a synchronous manner
+ * the progression of a piece of code. In the case of synchronous reporting,
+ * the job is considered started when {@link Task#start()} is called and
+ * finished when {@link Task#finish()} is called. A finished job can be finished
+ * either because it is done or because it has been cancelled.
+ *
+ * A cancel callback can be set with {@link Task#setCancelCallBack(Runnable)}.
+ * The runnable argument will be executed in the case of an external event
+ * requesting a cancellation of the task - typically, if a user clicks
+ * a cancel button on the GUI, task.cancel("User cancellation requested") will
+ * be called. As a result, the task implementors should run the callback.
+ * This callback can be used to make the task aware that a cancellation
+ * has been requested, and should proceed to stop its execution.
+ *
+ * See also {@link TaskService}, {@link DefaultTask}
+ *
+ * @author Curtis Rueden, Nicolas Chiaruttini
  */
 public interface Task extends Cancelable, Named {
 
 	/**
-	 * Starts running the task.
+	 * Starts running the task - asynchronous job
 	 *
 	 * @throws IllegalStateException if the task was already started.
 	 */
 	void run(Runnable r);
 
 	/**
-	 * Waits for the task to complete.
+	 * Waits for the task to complete - asynchronous job
 	 *
 	 * @throws IllegalStateException if {@link #run} has not been called yet.
 	 * @throws InterruptedException if the task is interrupted.
@@ -57,6 +77,16 @@ public interface Task extends Cancelable, Named {
 	 */
 	void waitFor() throws InterruptedException, ExecutionException;
 
+	/**
+	 * reports that the task is started - synchronous job
+	 */
+	default void start() {}
+
+	/**
+	 * reports that the task is finished - synchronous job
+	 */
+	default void finish() {}
+
 	/** Checks whether the task has completed. */
 	boolean isDone();
 
@@ -102,4 +132,12 @@ public interface Task extends Cancelable, Named {
 	 * @see #getProgressMaximum()
 	 */
 	void setProgressMaximum(long max);
+
+	/**
+	 * If the task is cancelled (external call to {@link Task#cancel(String)}),
+	 * the input runnable argument should be executed by task implementors.
+	 *
+	 * @param runnable : should be executed if this task is cancelled through {@link Task#cancel(String)}
+	 */
+	default void setCancelCallBack(Runnable runnable) {}
 }
diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
new file mode 100644
index 000000000..9a0b2f71f
--- /dev/null
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -0,0 +1,106 @@
+package org.scijava.task;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.event.EventHandler;
+import org.scijava.task.event.TaskEvent;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Tests whether many tasks run in parallel consistently trigger an Event
+ * when each task is started and when each task is ended.
+ *
+ * The test fails inconsistently, sometimes with a few tasks remaining, sometimes with almost all tasks remaining.
+ */
+
+public class TaskEventTest {
+
+    private TaskService taskService;
+    private TaskEventListener eventListener;
+
+    static int nTasks = 500; // Putting higher value can lead to issues because too many threads cannot be launched in parallel
+
+    @Before
+    public void setUp() {
+        final Context ctx = new Context(TaskService.class);
+        taskService = ctx.service(TaskService.class);
+        eventListener = new TaskEventListener();
+        ctx.inject(eventListener);
+    }
+
+    @After
+    public void tearDown() {
+        taskService.context().dispose();
+    }
+
+    @Test
+    public void testManyTasks() throws InterruptedException {
+        for (int i=0;i<nTasks;i++) {
+            createTask(taskService, "Task_"+i, 100, 10, 100);
+        }
+        Thread.sleep(5000);
+        assertEquals(0, eventListener.getLeftOvers().size());
+    }
+
+    public static void createTask(
+            TaskService taskService,
+            String taskName,
+            int msBeforeStart,
+            int msUpdate,
+            int msTaskDuration) {
+        Task task = taskService.createTask(taskName);
+
+        new Thread(
+                () -> {
+                    try {
+                        System.out.println("Waiting to start task "+taskName);
+                        Thread.sleep(msBeforeStart);
+
+                        // Task started
+                        task.setProgressMaximum(100);
+
+                        task.run(() -> {
+                            int totalMs = 0;
+                            while(totalMs<msTaskDuration) {
+                                try {
+                                    Thread.sleep(msUpdate);
+                                } catch (InterruptedException e) {
+                                    e.printStackTrace();
+                                }
+                                totalMs+=msUpdate;
+                                task.setProgressValue((int)(((double)totalMs/msTaskDuration)*100.0));
+                            }
+                            // Task ended
+                        });
+
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+    }
+
+    public static class TaskEventListener {
+
+        Set<Task> tasks = new HashSet<>();
+
+        @EventHandler
+        private synchronized void onEvent(final TaskEvent evt) {
+            Task task = evt.getTask();
+            if (task.isDone()) {
+                tasks.remove(task);
+            } else {
+                tasks.add(task);
+            }
+        }
+
+        public synchronized Set<Task> getLeftOvers() {
+            return new HashSet<>(tasks);
+        }
+    }
+}
\ No newline at end of file

From 0bac95333327205d5868c714a652670f85b420a8 Mon Sep 17 00:00:00 2001
From: Nicolas Chiaruttini <nicolas.chiaruttini@epfl.ch>
Date: Mon, 4 Apr 2022 22:36:57 +0200
Subject: [PATCH 1004/1208] The task interface now contains a method to
 retrieve its cancel callback. Use case: adding a confirmation dialog before
 cancelling.

---
 .../java/org/scijava/task/DefaultTask.java    | 19 ++++++++++++++-----
 src/main/java/org/scijava/task/Task.java      | 12 ++++++++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 3e9a910c5..6de1d4507 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.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
@@ -84,7 +84,7 @@ public class DefaultTask implements Task {
 
 	/**
 	 * Creates a new task.
-	 * 
+	 *
 	 * @param threadService Service to use for launching the task in its own
 	 *          thread. Required.
 	 * @param eventService Service to use for reporting status updates as
@@ -92,10 +92,11 @@ public class DefaultTask implements Task {
 	 *          reported.
 	 */
 	public DefaultTask(final ThreadService threadService,
-		final EventService eventService)
+					   final EventService eventService)
 	{
 		this.threadService = threadService;
 		this.eventService = eventService;
+		cancelCallBack = this::defaultCancelCallback;
 	}
 
 	// -- Task methods --
@@ -176,10 +177,13 @@ public void cancel(final String reason) {
 		canceled = true;
 		cancelReason = reason;
 		if (cancelCallBack!=null) cancelCallBack.run();
+		fireTaskEvent();
+	}
+
+	void defaultCancelCallback() {
 		if (future!=null) {
 			isDone = future.cancel(true);
 		}
-		fireTaskEvent();
 	}
 
 	@Override
@@ -187,6 +191,11 @@ public void setCancelCallBack(Runnable r) {
 		this.cancelCallBack = r;
 	}
 
+	@Override
+	public Runnable getCancelCallBack() {
+		return this.cancelCallBack;
+	}
+
 	@Override
 	public String getCancelReason() {
 		return cancelReason;
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index 6d5ce478d..6267dfd7b 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.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
@@ -140,4 +140,12 @@ default void finish() {}
 	 * @param runnable : should be executed if this task is cancelled through {@link Task#cancel(String)}
 	 */
 	default void setCancelCallBack(Runnable runnable) {}
+
+	/**
+	 * Returns the current cancel callback runnable,
+	 * This can be used to concatenate callbacks in order,
+	 * for instance, to ask for a user confirmation before cancelling the task
+	 */
+	default Runnable getCancelCallBack() { return () -> {}; }
+
 }

From 6e431dd6d01a3330a3200e47d7443622d435e350 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Thu, 7 Apr 2022 10:37:20 -0500
Subject: [PATCH 1005/1208] Apply scijava-formatter

NB: the class-level javadoc was skipped. See:
https://github.com/scijava/scijava-coding-style/issues/4
---
 src/main/java/org/scijava/task/DefaultTask.java    | 14 ++++++++------
 src/main/java/org/scijava/task/Task.java           | 13 ++++++++-----
 .../java/org/scijava/task/TaskServiceTest.java     |  1 +
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 6de1d4507..54b69f8d0 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -92,7 +92,7 @@ public class DefaultTask implements Task {
 	 *          reported.
 	 */
 	public DefaultTask(final ThreadService threadService,
-					   final EventService eventService)
+		final EventService eventService)
 	{
 		this.threadService = threadService;
 		this.eventService = eventService;
@@ -123,7 +123,7 @@ public void start() {
 	// - Synchronous
 	@Override
 	public void finish() {
-		isDone=true;
+		isDone = true;
 		fireTaskEvent();
 	}
 
@@ -176,12 +176,12 @@ public boolean isCanceled() {
 	public void cancel(final String reason) {
 		canceled = true;
 		cancelReason = reason;
-		if (cancelCallBack!=null) cancelCallBack.run();
+		if (cancelCallBack != null) cancelCallBack.run();
 		fireTaskEvent();
 	}
 
 	void defaultCancelCallback() {
-		if (future!=null) {
+		if (future != null) {
 			isDone = future.cancel(true);
 		}
 	}
@@ -231,9 +231,11 @@ private synchronized void initFuture(final Runnable r) {
 			try {
 				fireTaskEvent(); // Triggers an event just before the task is executed
 				r.run();
-			} finally {
+			}
+			finally {
 				isDone = true;
-				fireTaskEvent(); // Triggers an event just after the task has successfully completed or failed
+				fireTaskEvent(); // Triggers an event just after the task has
+													// successfully completed or failed
 			}
 		});
 	}
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index 6267dfd7b..4867954da 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -137,15 +137,18 @@ default void finish() {}
 	 * If the task is cancelled (external call to {@link Task#cancel(String)}),
 	 * the input runnable argument should be executed by task implementors.
 	 *
-	 * @param runnable : should be executed if this task is cancelled through {@link Task#cancel(String)}
+	 * @param runnable : should be executed if this task is cancelled through
+	 *          {@link Task#cancel(String)}
 	 */
 	default void setCancelCallBack(Runnable runnable) {}
 
 	/**
-	 * Returns the current cancel callback runnable,
-	 * This can be used to concatenate callbacks in order,
-	 * for instance, to ask for a user confirmation before cancelling the task
+	 * Returns the current cancel callback runnable, This can be used to
+	 * concatenate callbacks in order, for instance, to ask for a user
+	 * confirmation before cancelling the task
 	 */
-	default Runnable getCancelCallBack() { return () -> {}; }
+	default Runnable getCancelCallBack() {
+		return () -> {};
+	}
 
 }
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index 3f80516b9..2471cdaa1 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -26,6 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
+
 package org.scijava.task;
 
 import static org.junit.Assert.assertEquals;

From c753406111dfd4c5712ace4f6723caf990b559b5 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Thu, 7 Apr 2022 10:42:01 -0500
Subject: [PATCH 1006/1208] Bump minor version for API additions

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 432bbb837..20f135e6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.87.3-SNAPSHOT</version>
+	<version>2.88.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 4864a2a15eba64307f686a87390a30274788c8ae Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 9 Apr 2022 10:47:32 -0500
Subject: [PATCH 1007/1208] POM: use HTTPS for schema location URL

Maven no longer supports plain HTTP for the schema location.

And using HTTP now generates errors in Eclipse (and probably other IDEs).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 20f135e6d..5ef9ba2bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>

From 566983b52aa809134124964787943f5fcf6822ff Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 9 Apr 2022 10:47:39 -0500
Subject: [PATCH 1008/1208] Happy New Year 2022

---
 LICENSE.txt                                   |  2 +-
 src/it/apt-test/pom.xml                       |  2 +-
 src/it/apt-test/setup.bsh                     |  2 +-
 .../org/scijava/annotation/its/Annotated.java |  2 +-
 .../annotation/its/CustomAnnotation.java      |  2 +-
 src/it/apt-test/verify.bsh                    |  2 +-
 src/it/settings.xml                           |  2 +-
 .../org/scijava/AbstractBasicDetails.java     |  2 +-
 .../java/org/scijava/AbstractContextual.java  |  2 +-
 .../java/org/scijava/AbstractGateway.java     |  2 +-
 .../java/org/scijava/AbstractUIDetails.java   |  2 +-
 src/main/java/org/scijava/BasicDetails.java   |  2 +-
 src/main/java/org/scijava/Cancelable.java     |  2 +-
 src/main/java/org/scijava/Context.java        |  2 +-
 src/main/java/org/scijava/Contextual.java     |  2 +-
 src/main/java/org/scijava/Disposable.java     |  2 +-
 src/main/java/org/scijava/Gateway.java        |  2 +-
 src/main/java/org/scijava/Identifiable.java   |  2 +-
 src/main/java/org/scijava/Initializable.java  |  2 +-
 src/main/java/org/scijava/Instantiable.java   |  2 +-
 .../org/scijava/InstantiableException.java    |  2 +-
 src/main/java/org/scijava/ItemIO.java         |  2 +-
 src/main/java/org/scijava/ItemVisibility.java |  2 +-
 src/main/java/org/scijava/Locatable.java      |  2 +-
 src/main/java/org/scijava/MenuEntry.java      |  2 +-
 src/main/java/org/scijava/MenuPath.java       |  2 +-
 src/main/java/org/scijava/Named.java          |  2 +-
 .../org/scijava/NoSuchServiceException.java   |  2 +-
 .../org/scijava/NullContextException.java     |  2 +-
 src/main/java/org/scijava/Optional.java       |  2 +-
 src/main/java/org/scijava/Prioritized.java    |  2 +-
 src/main/java/org/scijava/Priority.java       |  2 +-
 src/main/java/org/scijava/SciJava.java        |  2 +-
 src/main/java/org/scijava/Typed.java          |  2 +-
 src/main/java/org/scijava/UIDetails.java      |  2 +-
 src/main/java/org/scijava/Validated.java      |  2 +-
 .../java/org/scijava/ValidityProblem.java     |  2 +-
 src/main/java/org/scijava/Versioned.java      |  2 +-
 .../annotations/AbstractIndexWriter.java      |  2 +-
 .../annotations/AnnotationCombiner.java       |  2 +-
 .../annotations/AnnotationProcessor.java      |  2 +-
 .../scijava/annotations/ByteCodeAnalyzer.java |  2 +-
 .../scijava/annotations/DirectoryIndexer.java |  2 +-
 .../scijava/annotations/EclipseHelper.java    |  2 +-
 .../java/org/scijava/annotations/Index.java   |  2 +-
 .../org/scijava/annotations/IndexItem.java    |  2 +-
 .../org/scijava/annotations/IndexReader.java  |  2 +-
 .../org/scijava/annotations/Indexable.java    |  2 +-
 .../annotations/legacy/LegacyReader.java      |  2 +-
 .../java/org/scijava/app/AbstractApp.java     |  2 +-
 src/main/java/org/scijava/app/App.java        |  2 +-
 src/main/java/org/scijava/app/AppService.java |  2 +-
 .../org/scijava/app/DefaultAppService.java    |  2 +-
 .../org/scijava/app/DefaultStatusService.java |  2 +-
 src/main/java/org/scijava/app/SciJavaApp.java |  2 +-
 .../java/org/scijava/app/StatusService.java   |  2 +-
 .../org/scijava/app/event/StatusEvent.java    |  2 +-
 .../java/org/scijava/cache/CacheService.java  |  2 +-
 .../scijava/cache/DefaultCacheService.java    |  2 +-
 .../java/org/scijava/command/Command.java     |  2 +-
 .../java/org/scijava/command/CommandInfo.java |  2 +-
 .../org/scijava/command/CommandModule.java    |  2 +-
 .../scijava/command/CommandModuleItem.java    |  2 +-
 .../org/scijava/command/CommandService.java   |  2 +-
 .../org/scijava/command/ContextCommand.java   |  2 +-
 .../command/DefaultCommandService.java        |  2 +-
 .../org/scijava/command/DynamicCommand.java   |  2 +-
 .../scijava/command/DynamicCommandInfo.java   |  2 +-
 src/main/java/org/scijava/command/Inputs.java |  2 +-
 .../java/org/scijava/command/Interactive.java |  2 +-
 .../scijava/command/InteractiveCommand.java   |  2 +-
 .../org/scijava/command/ModuleCommand.java    |  2 +-
 .../java/org/scijava/command/Previewable.java |  2 +-
 .../scijava/command/UnimplementedCommand.java |  2 +-
 .../scijava/command/console/RunArgument.java  |  2 +-
 .../command/run/CommandCodeRunner.java        |  2 +-
 .../console/AbstractConsoleArgument.java      |  2 +-
 .../org/scijava/console/ConsoleArgument.java  |  2 +-
 .../org/scijava/console/ConsoleService.java   |  2 +-
 .../org/scijava/console/ConsoleUtils.java     |  2 +-
 .../console/DefaultConsoleService.java        |  2 +-
 .../scijava/console/MultiOutputStream.java    |  2 +-
 .../org/scijava/console/MultiPrintStream.java |  2 +-
 .../java/org/scijava/console/OutputEvent.java |  2 +-
 .../org/scijava/console/OutputListener.java   |  2 +-
 .../console/SystemPropertyArgument.java       |  2 +-
 .../convert/AbstractConvertService.java       |  2 +-
 .../scijava/convert/AbstractConverter.java    |  2 +-
 .../convert/AbstractDelegateConverter.java    |  2 +-
 .../org/scijava/convert/ArrayConverters.java  |  2 +-
 .../org/scijava/convert/CastingConverter.java |  2 +-
 .../scijava/convert/ConversionRequest.java    |  2 +-
 .../org/scijava/convert/ConvertService.java   |  2 +-
 .../java/org/scijava/convert/Converter.java   |  2 +-
 .../convert/DefaultConvertService.java        |  2 +-
 .../org/scijava/convert/DefaultConverter.java |  2 +-
 .../scijava/convert/FileListConverters.java   |  2 +-
 .../org/scijava/convert/NullConverter.java    |  2 +-
 .../org/scijava/convert/NumberConverters.java |  2 +-
 .../convert/NumberToBigDecimalConverter.java  |  2 +-
 .../convert/NumberToBigIntegerConverter.java  |  2 +-
 .../convert/NumberToDoubleConverter.java      |  2 +-
 .../convert/NumberToFloatConverter.java       |  2 +-
 .../convert/NumberToIntegerConverter.java     |  2 +-
 .../convert/NumberToLongConverter.java        |  2 +-
 .../convert/NumberToNumberConverter.java      |  2 +-
 .../convert/NumberToShortConverter.java       |  2 +-
 .../convert/PrimitiveArrayUnwrapper.java      |  2 +-
 .../convert/PrimitiveArrayWrapper.java        |  2 +-
 .../org/scijava/display/AbstractDisplay.java  |  2 +-
 .../display/ActiveDisplayPreprocessor.java    |  2 +-
 .../org/scijava/display/DefaultDisplay.java   |  2 +-
 .../display/DefaultDisplayService.java        |  2 +-
 .../scijava/display/DefaultTextDisplay.java   |  2 +-
 .../java/org/scijava/display/Display.java     |  2 +-
 .../scijava/display/DisplayPostprocessor.java |  2 +-
 .../org/scijava/display/DisplayService.java   |  2 +-
 .../java/org/scijava/display/Displayable.java |  2 +-
 .../java/org/scijava/display/TextDisplay.java |  2 +-
 .../display/event/DisplayActivatedEvent.java  |  2 +-
 .../display/event/DisplayCreatedEvent.java    |  2 +-
 .../display/event/DisplayDeletedEvent.java    |  2 +-
 .../scijava/display/event/DisplayEvent.java   |  2 +-
 .../display/event/DisplayUpdatedEvent.java    |  2 +-
 .../display/event/input/InputEvent.java       |  2 +-
 .../scijava/display/event/input/KyEvent.java  |  2 +-
 .../display/event/input/KyPressedEvent.java   |  2 +-
 .../display/event/input/KyReleasedEvent.java  |  2 +-
 .../display/event/input/KyTypedEvent.java     |  2 +-
 .../display/event/input/MsButtonEvent.java    |  2 +-
 .../display/event/input/MsClickedEvent.java   |  2 +-
 .../display/event/input/MsDraggedEvent.java   |  2 +-
 .../display/event/input/MsEnteredEvent.java   |  2 +-
 .../scijava/display/event/input/MsEvent.java  |  2 +-
 .../display/event/input/MsExitedEvent.java    |  2 +-
 .../display/event/input/MsMovedEvent.java     |  2 +-
 .../display/event/input/MsPressedEvent.java   |  2 +-
 .../display/event/input/MsReleasedEvent.java  |  2 +-
 .../display/event/input/MsWheelEvent.java     |  2 +-
 .../event/window/WinActivatedEvent.java       |  2 +-
 .../display/event/window/WinClosedEvent.java  |  2 +-
 .../display/event/window/WinClosingEvent.java |  2 +-
 .../event/window/WinDeactivatedEvent.java     |  2 +-
 .../event/window/WinDeiconifiedEvent.java     |  2 +-
 .../display/event/window/WinEvent.java        |  2 +-
 .../event/window/WinIconifiedEvent.java       |  2 +-
 .../display/event/window/WinOpenedEvent.java  |  2 +-
 .../download/DefaultDownloadService.java      |  2 +-
 .../scijava/download/DiskLocationCache.java   |  2 +-
 .../java/org/scijava/download/Download.java   |  2 +-
 .../org/scijava/download/DownloadService.java |  2 +-
 .../org/scijava/download/LocationCache.java   |  2 +-
 .../scijava/download/MultiWriteHandle.java    |  2 +-
 .../scijava/event/ContextDisposingEvent.java  |  2 +-
 .../org/scijava/event/DefaultEventBus.java    |  2 +-
 .../scijava/event/DefaultEventHistory.java    |  2 +-
 .../scijava/event/DefaultEventService.java    |  2 +-
 .../java/org/scijava/event/EventDetails.java  |  2 +-
 .../java/org/scijava/event/EventHandler.java  |  2 +-
 .../java/org/scijava/event/EventHistory.java  |  2 +-
 .../scijava/event/EventHistoryListener.java   |  2 +-
 .../java/org/scijava/event/EventService.java  |  2 +-
 .../org/scijava/event/EventSubscriber.java    |  2 +-
 .../java/org/scijava/event/SciJavaEvent.java  |  2 +-
 .../java/org/scijava/input/Accelerator.java   |  2 +-
 .../scijava/input/DefaultInputService.java    |  2 +-
 .../org/scijava/input/InputModifiers.java     |  2 +-
 .../java/org/scijava/input/InputService.java  |  2 +-
 src/main/java/org/scijava/input/KeyCode.java  |  2 +-
 .../java/org/scijava/input/MouseCursor.java   |  2 +-
 .../java/org/scijava/io/AbstractIOPlugin.java |  2 +-
 .../scijava/io/AbstractTypedIOService.java    |  2 +-
 .../org/scijava/io/ByteArrayByteBank.java     |  2 +-
 src/main/java/org/scijava/io/ByteBank.java    |  2 +-
 .../java/org/scijava/io/DefaultIOService.java |  2 +-
 .../scijava/io/DefaultRecentFileService.java  |  2 +-
 src/main/java/org/scijava/io/IOPlugin.java    |  2 +-
 src/main/java/org/scijava/io/IOService.java   |  2 +-
 .../org/scijava/io/RecentFileService.java     |  2 +-
 .../java/org/scijava/io/TypedIOService.java   |  2 +-
 .../org/scijava/io/console/OpenArgument.java  |  2 +-
 .../org/scijava/io/event/DataOpenedEvent.java |  2 +-
 .../org/scijava/io/event/DataSavedEvent.java  |  2 +-
 .../java/org/scijava/io/event/IOEvent.java    |  2 +-
 .../scijava/io/handle/AbstractDataHandle.java |  2 +-
 .../io/handle/AbstractHigherOrderHandle.java  |  2 +-
 .../handle/AbstractSeekableStreamHandle.java  |  2 +-
 .../io/handle/AbstractStreamHandle.java       |  2 +-
 .../org/scijava/io/handle/BytesHandle.java    |  2 +-
 .../org/scijava/io/handle/DataHandle.java     |  2 +-
 .../io/handle/DataHandleInputStream.java      |  2 +-
 .../io/handle/DataHandleOutputStream.java     |  2 +-
 .../scijava/io/handle/DataHandleService.java  |  2 +-
 .../org/scijava/io/handle/DataHandles.java    |  2 +-
 .../io/handle/DefaultDataHandleService.java   |  2 +-
 .../org/scijava/io/handle/DummyHandle.java    |  2 +-
 .../org/scijava/io/handle/FileHandle.java     |  2 +-
 .../io/handle/ReadBufferDataHandle.java       |  2 +-
 .../io/handle/ResettableStreamHandle.java     |  2 +-
 .../io/handle/SeekableStreamHandle.java       |  2 +-
 .../org/scijava/io/handle/StreamHandle.java   |  2 +-
 .../io/handle/WriteBufferDataHandle.java      |  2 +-
 .../scijava/io/location/AbstractLocation.java |  2 +-
 .../io/location/AbstractLocationResolver.java |  2 +-
 .../io/location/AbstractRemoteLocation.java   |  2 +-
 .../io/location/BrowsableLocation.java        |  2 +-
 .../scijava/io/location/BytesLocation.java    |  2 +-
 .../io/location/DefaultLocationService.java   |  2 +-
 .../scijava/io/location/DummyLocation.java    |  2 +-
 .../org/scijava/io/location/FileLocation.java |  2 +-
 .../io/location/FileLocationResolver.java     |  2 +-
 .../org/scijava/io/location/Location.java     |  2 +-
 .../scijava/io/location/LocationResolver.java |  2 +-
 .../scijava/io/location/LocationService.java  |  2 +-
 .../scijava/io/location/RemoteLocation.java   |  2 +-
 .../org/scijava/io/location/URILocation.java  |  2 +-
 .../org/scijava/io/location/URLLocation.java  |  2 +-
 .../scijava/io/nio/ByteBufferByteBank.java    |  2 +-
 .../org/scijava/io/nio/DefaultNIOService.java |  2 +-
 .../java/org/scijava/io/nio/NIOService.java   |  2 +-
 .../org/scijava/log/AbstractLogService.java   |  2 +-
 .../org/scijava/log/CallingClassUtils.java    |  2 +-
 .../java/org/scijava/log/DefaultLogger.java   |  2 +-
 .../log/DefaultUncaughtExceptionHandler.java  |  2 +-
 .../org/scijava/log/IgnoreAsCallingClass.java |  2 +-
 src/main/java/org/scijava/log/LogLevel.java   |  2 +-
 .../java/org/scijava/log/LogListener.java     |  2 +-
 src/main/java/org/scijava/log/LogMessage.java |  2 +-
 src/main/java/org/scijava/log/LogService.java |  2 +-
 src/main/java/org/scijava/log/LogSource.java  |  2 +-
 src/main/java/org/scijava/log/Logged.java     |  2 +-
 src/main/java/org/scijava/log/Logger.java     |  2 +-
 .../org/scijava/log/StderrLogService.java     |  2 +-
 .../org/scijava/main/DefaultMainService.java  |  2 +-
 .../java/org/scijava/main/MainService.java    |  2 +-
 .../scijava/main/console/MainArgument.java    |  2 +-
 .../org/scijava/main/run/MainCodeRunner.java  |  2 +-
 .../org/scijava/menu/AbstractMenuCreator.java |  2 +-
 .../org/scijava/menu/DefaultMenuService.java  |  2 +-
 .../java/org/scijava/menu/MenuConstants.java  |  2 +-
 .../java/org/scijava/menu/MenuCreator.java    |  2 +-
 .../java/org/scijava/menu/MenuService.java    |  2 +-
 .../java/org/scijava/menu/ShadowMenu.java     |  2 +-
 .../org/scijava/menu/ShadowMenuIterator.java  |  2 +-
 .../org/scijava/menu/event/MenuEvent.java     |  2 +-
 .../scijava/menu/event/MenusAddedEvent.java   |  2 +-
 .../scijava/menu/event/MenusRemovedEvent.java |  2 +-
 .../scijava/menu/event/MenusUpdatedEvent.java |  2 +-
 .../org/scijava/module/AbstractModule.java    |  2 +-
 .../scijava/module/AbstractModuleInfo.java    |  2 +-
 .../scijava/module/AbstractModuleItem.java    |  2 +-
 .../scijava/module/DefaultModuleService.java  |  2 +-
 .../scijava/module/DefaultMutableModule.java  |  2 +-
 .../module/DefaultMutableModuleInfo.java      |  2 +-
 .../module/DefaultMutableModuleItem.java      |  2 +-
 .../scijava/module/MethodCallException.java   |  2 +-
 .../java/org/scijava/module/MethodRef.java    |  2 +-
 src/main/java/org/scijava/module/Module.java  |  2 +-
 .../module/ModuleCanceledException.java       |  2 +-
 .../org/scijava/module/ModuleException.java   |  2 +-
 .../java/org/scijava/module/ModuleIndex.java  |  2 +-
 .../java/org/scijava/module/ModuleInfo.java   |  2 +-
 .../java/org/scijava/module/ModuleItem.java   |  2 +-
 .../java/org/scijava/module/ModuleRunner.java |  2 +-
 .../org/scijava/module/ModuleService.java     |  2 +-
 .../org/scijava/module/MutableModule.java     |  2 +-
 .../org/scijava/module/MutableModuleInfo.java |  2 +-
 .../org/scijava/module/MutableModuleItem.java |  2 +-
 .../module/event/ModuleCanceledEvent.java     |  2 +-
 .../org/scijava/module/event/ModuleEvent.java |  2 +-
 .../module/event/ModuleExecutedEvent.java     |  2 +-
 .../module/event/ModuleExecutingEvent.java    |  2 +-
 .../module/event/ModuleExecutionEvent.java    |  2 +-
 .../module/event/ModuleFinishedEvent.java     |  2 +-
 .../module/event/ModulePostprocessEvent.java  |  2 +-
 .../module/event/ModulePreprocessEvent.java   |  2 +-
 .../module/event/ModuleProcessEvent.java      |  2 +-
 .../module/event/ModuleStartedEvent.java      |  2 +-
 .../module/event/ModulesAddedEvent.java       |  2 +-
 .../module/event/ModulesListEvent.java        |  2 +-
 .../module/event/ModulesRemovedEvent.java     |  2 +-
 .../module/event/ModulesUpdatedEvent.java     |  2 +-
 .../process/AbstractPostprocessorPlugin.java  |  2 +-
 .../process/AbstractPreprocessorPlugin.java   |  2 +-
 .../AbstractSingleInputPreprocessor.java      |  2 +-
 .../process/CheckInputsPreprocessor.java      |  2 +-
 .../module/process/DebugPostprocessor.java    |  2 +-
 .../module/process/DebugPreprocessor.java     |  2 +-
 .../process/DefaultValuePreprocessor.java     |  2 +-
 .../module/process/GatewayPreprocessor.java   |  2 +-
 .../module/process/InitPreprocessor.java      |  2 +-
 .../process/LoadInputsPreprocessor.java       |  2 +-
 .../module/process/LoggerPreprocessor.java    |  2 +-
 .../module/process/ModulePostprocessor.java   |  2 +-
 .../module/process/ModulePreprocessor.java    |  2 +-
 .../module/process/ModuleProcessor.java       |  2 +-
 .../module/process/PostprocessorPlugin.java   |  2 +-
 .../module/process/PreprocessorPlugin.java    |  2 +-
 .../process/SaveInputsPreprocessor.java       |  2 +-
 .../module/process/ServicePreprocessor.java   |  2 +-
 .../module/process/ValidityPreprocessor.java  |  2 +-
 .../scijava/module/run/ModuleCodeRunner.java  |  2 +-
 .../scijava/object/DefaultObjectService.java  |  2 +-
 .../java/org/scijava/object/LazyObjects.java  |  2 +-
 .../org/scijava/object/NamedObjectIndex.java  |  2 +-
 .../java/org/scijava/object/ObjectIndex.java  |  2 +-
 .../org/scijava/object/ObjectService.java     |  2 +-
 .../org/scijava/object/SortedObjectIndex.java |  2 +-
 .../org/scijava/object/event/ListEvent.java   |  2 +-
 .../object/event/ObjectCreatedEvent.java      |  2 +-
 .../object/event/ObjectDeletedEvent.java      |  2 +-
 .../org/scijava/object/event/ObjectEvent.java |  2 +-
 .../object/event/ObjectModifiedEvent.java     |  2 +-
 .../object/event/ObjectsAddedEvent.java       |  2 +-
 .../object/event/ObjectsListEvent.java        |  2 +-
 .../object/event/ObjectsRemovedEvent.java     |  2 +-
 .../options/DefaultOptionsService.java        |  2 +-
 .../org/scijava/options/OptionsPlugin.java    |  2 +-
 .../org/scijava/options/OptionsService.java   |  2 +-
 .../scijava/options/event/OptionsEvent.java   |  2 +-
 .../scijava/parse/DefaultParseService.java    |  2 +-
 src/main/java/org/scijava/parse/Item.java     |  2 +-
 src/main/java/org/scijava/parse/Items.java    |  2 +-
 .../java/org/scijava/parse/ParseService.java  |  2 +-
 .../scijava/platform/AbstractPlatform.java    |  2 +-
 .../org/scijava/platform/AppEventService.java |  2 +-
 .../platform/DefaultAppEventService.java      |  2 +-
 .../org/scijava/platform/DefaultPlatform.java |  2 +-
 .../platform/DefaultPlatformService.java      |  2 +-
 .../java/org/scijava/platform/Platform.java   |  2 +-
 .../org/scijava/platform/PlatformService.java |  2 +-
 .../scijava/platform/event/AppAboutEvent.java |  2 +-
 .../scijava/platform/event/AppFocusEvent.java |  2 +-
 .../platform/event/AppMenusCreatedEvent.java  |  2 +-
 .../platform/event/AppOpenFilesEvent.java     |  2 +-
 .../platform/event/AppPreferencesEvent.java   |  2 +-
 .../scijava/platform/event/AppPrintEvent.java |  2 +-
 .../scijava/platform/event/AppQuitEvent.java  |  2 +-
 .../platform/event/AppReOpenEvent.java        |  2 +-
 .../platform/event/AppScreenSleepEvent.java   |  2 +-
 .../scijava/platform/event/AppSleepEvent.java |  2 +-
 .../platform/event/AppSystemSleepEvent.java   |  2 +-
 .../platform/event/AppUserSessionEvent.java   |  2 +-
 .../platform/event/AppVisibleEvent.java       |  2 +-
 .../platform/event/ApplicationEvent.java      |  2 +-
 .../scijava/plugin/AbstractHandlerPlugin.java |  2 +-
 .../plugin/AbstractHandlerService.java        |  2 +-
 .../org/scijava/plugin/AbstractPTService.java |  2 +-
 .../scijava/plugin/AbstractRichPlugin.java    |  2 +-
 .../plugin/AbstractSingletonService.java      |  2 +-
 .../scijava/plugin/AbstractTypedPlugin.java   |  2 +-
 .../scijava/plugin/AbstractTypedService.java  |  2 +-
 .../scijava/plugin/AbstractWrapperPlugin.java |  2 +-
 .../plugin/AbstractWrapperService.java        |  2 +-
 src/main/java/org/scijava/plugin/Attr.java    |  2 +-
 .../scijava/plugin/DefaultPluginFinder.java   |  2 +-
 .../scijava/plugin/DefaultPluginService.java  |  2 +-
 .../org/scijava/plugin/HandlerPlugin.java     |  2 +-
 .../org/scijava/plugin/HandlerService.java    |  2 +-
 .../org/scijava/plugin/HasPluginInfo.java     |  2 +-
 src/main/java/org/scijava/plugin/Menu.java    |  2 +-
 .../java/org/scijava/plugin/PTService.java    |  2 +-
 .../java/org/scijava/plugin/Parameter.java    |  2 +-
 src/main/java/org/scijava/plugin/Plugin.java  |  2 +-
 .../java/org/scijava/plugin/PluginFinder.java |  2 +-
 .../java/org/scijava/plugin/PluginIndex.java  |  2 +-
 .../java/org/scijava/plugin/PluginInfo.java   |  2 +-
 .../org/scijava/plugin/PluginService.java     |  2 +-
 .../java/org/scijava/plugin/RichPlugin.java   |  2 +-
 .../org/scijava/plugin/SciJavaPlugin.java     |  2 +-
 .../org/scijava/plugin/SingletonPlugin.java   |  2 +-
 .../org/scijava/plugin/SingletonService.java  |  2 +-
 .../org/scijava/plugin/SortablePlugin.java    |  2 +-
 .../java/org/scijava/plugin/TypedPlugin.java  |  2 +-
 .../java/org/scijava/plugin/TypedService.java |  2 +-
 .../org/scijava/plugin/WrapperPlugin.java     |  2 +-
 .../org/scijava/plugin/WrapperService.java    |  2 +-
 .../plugin/event/PluginsAddedEvent.java       |  2 +-
 .../plugin/event/PluginsListEvent.java        |  2 +-
 .../plugin/event/PluginsRemovedEvent.java     |  2 +-
 .../scijava/prefs/AbstractPrefService.java    |  2 +-
 .../org/scijava/prefs/DefaultPrefService.java |  2 +-
 .../java/org/scijava/prefs/PrefService.java   |  2 +-
 .../org/scijava/run/AbstractCodeRunner.java   |  2 +-
 src/main/java/org/scijava/run/CodeRunner.java |  2 +-
 .../org/scijava/run/DefaultRunService.java    |  2 +-
 src/main/java/org/scijava/run/RunService.java |  2 +-
 .../org/scijava/run/console/RunArgument.java  |  2 +-
 .../scijava/script/AbstractAutoCompleter.java |  2 +-
 .../scijava/script/AbstractScriptContext.java |  2 +-
 .../scijava/script/AbstractScriptEngine.java  |  2 +-
 .../scijava/script/AbstractScriptHeader.java  |  2 +-
 .../script/AbstractScriptLanguage.java        |  2 +-
 .../scijava/script/AdaptedScriptEngine.java   |  2 +-
 .../scijava/script/AdaptedScriptLanguage.java |  2 +-
 .../org/scijava/script/AutoCompleter.java     |  2 +-
 .../scijava/script/AutoCompletionResult.java  |  2 +-
 .../org/scijava/script/CodeGenerator.java     |  2 +-
 .../org/scijava/script/CodeGeneratorJava.java |  2 +-
 .../scijava/script/DefaultAutoCompleter.java  |  2 +-
 .../script/DefaultScriptHeaderService.java    |  2 +-
 .../script/DefaultScriptInterpreter.java      |  2 +-
 .../scijava/script/DefaultScriptService.java  |  2 +-
 .../org/scijava/script/InvocationObject.java  |  2 +-
 .../org/scijava/script/ParameterObject.java   |  2 +-
 .../java/org/scijava/script/ScriptFinder.java |  2 +-
 .../java/org/scijava/script/ScriptHeader.java |  2 +-
 .../scijava/script/ScriptHeaderService.java   |  2 +-
 .../java/org/scijava/script/ScriptInfo.java   |  2 +-
 .../org/scijava/script/ScriptInterpreter.java |  2 +-
 .../org/scijava/script/ScriptLanguage.java    |  2 +-
 .../scijava/script/ScriptLanguageIndex.java   |  2 +-
 .../java/org/scijava/script/ScriptModule.java |  2 +-
 .../java/org/scijava/script/ScriptREPL.java   |  2 +-
 .../org/scijava/script/ScriptService.java     |  2 +-
 .../script/console/RunScriptArgument.java     |  2 +-
 .../org/scijava/script/io/ScriptIOPlugin.java |  2 +-
 .../DefaultScriptProcessorService.java        |  2 +-
 .../process/DirectiveScriptProcessor.java     |  2 +-
 .../process/ParameterScriptProcessor.java     |  2 +-
 .../script/process/ScriptCallback.java        |  2 +-
 .../ScriptDirectiveScriptProcessor.java       |  2 +-
 .../script/process/ScriptProcessor.java       |  2 +-
 .../process/ScriptProcessorService.java       |  2 +-
 .../process/ShebangScriptProcessor.java       |  2 +-
 .../scijava/script/run/ScriptCodeRunner.java  |  2 +-
 .../org/scijava/service/AbstractService.java  |  2 +-
 .../org/scijava/service/SciJavaService.java   |  2 +-
 .../java/org/scijava/service/Service.java     |  2 +-
 .../org/scijava/service/ServiceHelper.java    |  2 +-
 .../org/scijava/service/ServiceIndex.java     |  2 +-
 .../service/event/ServicesLoadedEvent.java    |  2 +-
 .../startup/DefaultStartupService.java        |  2 +-
 .../org/scijava/startup/StartupService.java   |  2 +-
 .../java/org/scijava/task/DefaultTask.java    |  6 ++--
 .../org/scijava/task/DefaultTaskService.java  |  2 +-
 src/main/java/org/scijava/task/Task.java      |  6 ++--
 .../java/org/scijava/task/TaskService.java    |  2 +-
 .../org/scijava/task/event/TaskEvent.java     |  2 +-
 src/main/java/org/scijava/test/TestUtils.java |  2 +-
 .../org/scijava/text/AbstractTextFormat.java  |  2 +-
 .../org/scijava/text/DefaultTextService.java  |  2 +-
 .../java/org/scijava/text/TextFormat.java     |  2 +-
 .../java/org/scijava/text/TextService.java    |  2 +-
 .../scijava/text/io/DefaultTextIOService.java |  2 +-
 .../org/scijava/text/io/TextIOPlugin.java     |  2 +-
 .../org/scijava/text/io/TextIOService.java    |  2 +-
 .../scijava/thread/DefaultThreadService.java  |  2 +-
 .../org/scijava/thread/ThreadService.java     |  2 +-
 .../java/org/scijava/tool/AbstractTool.java   |  2 +-
 .../org/scijava/tool/CustomDrawnTool.java     |  2 +-
 .../org/scijava/tool/DefaultToolService.java  |  2 +-
 src/main/java/org/scijava/tool/DummyTool.java |  2 +-
 .../java/org/scijava/tool/IconDrawer.java     |  2 +-
 .../java/org/scijava/tool/IconService.java    |  2 +-
 src/main/java/org/scijava/tool/Tool.java      |  2 +-
 .../java/org/scijava/tool/ToolService.java    |  2 +-
 .../tool/event/ToolActivatedEvent.java        |  2 +-
 .../tool/event/ToolDeactivatedEvent.java      |  2 +-
 .../org/scijava/tool/event/ToolEvent.java     |  2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java   |  2 +-
 .../ui/AbstractInputHarvesterPlugin.java      |  2 +-
 .../org/scijava/ui/AbstractUIInputWidget.java |  2 +-
 .../org/scijava/ui/AbstractUserInterface.java |  2 +-
 .../java/org/scijava/ui/ApplicationFrame.java |  2 +-
 src/main/java/org/scijava/ui/Arrangeable.java |  2 +-
 .../java/org/scijava/ui/CloseConfirmable.java |  2 +-
 .../java/org/scijava/ui/DefaultUIService.java |  2 +-
 src/main/java/org/scijava/ui/Desktop.java     |  2 +-
 .../java/org/scijava/ui/DialogPrompt.java     |  2 +-
 .../org/scijava/ui/FileListPreprocessor.java  |  2 +-
 .../java/org/scijava/ui/FilePreprocessor.java |  2 +-
 src/main/java/org/scijava/ui/StatusBar.java   |  2 +-
 .../java/org/scijava/ui/SystemClipboard.java  |  2 +-
 src/main/java/org/scijava/ui/ToolBar.java     |  2 +-
 .../java/org/scijava/ui/UIPreprocessor.java   |  2 +-
 src/main/java/org/scijava/ui/UIService.java   |  2 +-
 .../java/org/scijava/ui/UserInterface.java    |  2 +-
 .../ui/console/AbstractConsolePane.java       |  2 +-
 .../org/scijava/ui/console/ConsolePane.java   |  2 +-
 .../scijava/ui/console/HeadlessArgument.java  |  2 +-
 .../scijava/ui/console/ShowUIArgument.java    |  2 +-
 .../org/scijava/ui/console/UIArgument.java    |  2 +-
 .../ui/dnd/AbstractDragAndDropData.java       |  2 +-
 .../ui/dnd/AbstractDragAndDropHandler.java    |  2 +-
 .../ui/dnd/DefaultDragAndDropData.java        |  2 +-
 .../ui/dnd/DefaultDragAndDropService.java     |  2 +-
 .../org/scijava/ui/dnd/DragAndDropData.java   |  2 +-
 .../scijava/ui/dnd/DragAndDropHandler.java    |  2 +-
 .../scijava/ui/dnd/DragAndDropService.java    |  2 +-
 .../ui/dnd/FileDragAndDropHandler.java        |  2 +-
 .../ui/dnd/ListDragAndDropHandler.java        |  2 +-
 .../java/org/scijava/ui/dnd/MIMEType.java     |  2 +-
 .../ui/dnd/ScriptFileDragAndDropHandler.java  |  2 +-
 .../ui/dnd/event/DragAndDropEvent.java        |  2 +-
 .../scijava/ui/dnd/event/DragEnterEvent.java  |  2 +-
 .../scijava/ui/dnd/event/DragExitEvent.java   |  2 +-
 .../scijava/ui/dnd/event/DragOverEvent.java   |  2 +-
 .../org/scijava/ui/dnd/event/DropEvent.java   |  2 +-
 .../java/org/scijava/ui/event/UIEvent.java    |  2 +-
 .../org/scijava/ui/event/UIShownEvent.java    |  2 +-
 .../ui/headless/HeadlessDisplayViewer.java    |  2 +-
 .../org/scijava/ui/headless/HeadlessUI.java   |  2 +-
 .../org/scijava/ui/headlessUI/HeadlessUI.java |  2 +-
 .../ui/viewer/AbstractDisplayViewer.java      |  2 +-
 .../org/scijava/ui/viewer/DisplayPanel.java   |  2 +-
 .../org/scijava/ui/viewer/DisplayViewer.java  |  2 +-
 .../org/scijava/ui/viewer/DisplayWindow.java  |  2 +-
 .../text/AbstractTextDisplayViewer.java       |  2 +-
 .../ui/viewer/text/TextDisplayPanel.java      |  2 +-
 .../ui/viewer/text/TextDisplayViewer.java     |  2 +-
 .../scijava/util/AbstractPrimitiveArray.java  |  2 +-
 src/main/java/org/scijava/util/AppUtils.java  |  2 +-
 .../java/org/scijava/util/ArrayUtils.java     |  2 +-
 src/main/java/org/scijava/util/BoolArray.java |  2 +-
 src/main/java/org/scijava/util/ByteArray.java |  2 +-
 src/main/java/org/scijava/util/Bytes.java     |  2 +-
 src/main/java/org/scijava/util/CharArray.java |  2 +-
 .../java/org/scijava/util/CheckSezpoz.java    |  2 +-
 .../java/org/scijava/util/ClassUtils.java     |  2 +-
 src/main/java/org/scijava/util/ColorRGB.java  |  2 +-
 src/main/java/org/scijava/util/ColorRGBA.java |  2 +-
 src/main/java/org/scijava/util/Colors.java    |  2 +-
 .../org/scijava/util/CombineAnnotations.java  |  2 +-
 src/main/java/org/scijava/util/Combiner.java  |  2 +-
 .../org/scijava/util/ConversionUtils.java     |  2 +-
 .../java/org/scijava/util/DebugUtils.java     |  2 +-
 .../org/scijava/util/DefaultTreeNode.java     |  2 +-
 .../java/org/scijava/util/DigestUtils.java    |  2 +-
 .../java/org/scijava/util/DoubleArray.java    |  2 +-
 src/main/java/org/scijava/util/FileUtils.java |  2 +-
 .../java/org/scijava/util/FloatArray.java     |  2 +-
 .../java/org/scijava/util/GenericUtils.java   |  2 +-
 src/main/java/org/scijava/util/IntArray.java  |  2 +-
 src/main/java/org/scijava/util/IntCoords.java |  2 +-
 src/main/java/org/scijava/util/IntRect.java   |  2 +-
 .../java/org/scijava/util/IteratorPlus.java   |  2 +-
 .../org/scijava/util/LastRecentlyUsed.java    |  2 +-
 .../org/scijava/util/LineOutputStream.java    |  2 +-
 src/main/java/org/scijava/util/ListUtils.java |  2 +-
 src/main/java/org/scijava/util/LongArray.java |  2 +-
 src/main/java/org/scijava/util/Manifest.java  |  2 +-
 .../org/scijava/util/MersenneTwisterFast.java |  2 +-
 .../org/scijava/util/MetaInfCombiner.java     |  2 +-
 .../java/org/scijava/util/MirrorWebsite.java  |  2 +-
 src/main/java/org/scijava/util/MiscUtils.java |  2 +-
 .../java/org/scijava/util/NumberUtils.java    |  2 +-
 .../java/org/scijava/util/ObjectArray.java    |  2 +-
 src/main/java/org/scijava/util/POM.java       |  2 +-
 .../java/org/scijava/util/PlatformUtils.java  |  2 +-
 src/main/java/org/scijava/util/Prefs.java     |  2 +-
 .../java/org/scijava/util/PrimitiveArray.java |  2 +-
 .../java/org/scijava/util/ProcessUtils.java   |  2 +-
 src/main/java/org/scijava/util/Query.java     |  2 +-
 src/main/java/org/scijava/util/ReadInto.java  |  2 +-
 .../java/org/scijava/util/RealCoords.java     |  2 +-
 src/main/java/org/scijava/util/RealRect.java  |  2 +-
 .../org/scijava/util/ReflectException.java    |  2 +-
 .../org/scijava/util/ReflectedUniverse.java   |  2 +-
 .../org/scijava/util/ServiceCombiner.java     |  2 +-
 .../java/org/scijava/util/ShortArray.java     |  2 +-
 src/main/java/org/scijava/util/Sizable.java   |  2 +-
 .../org/scijava/util/SizableArrayList.java    |  2 +-
 .../java/org/scijava/util/StringMaker.java    |  2 +-
 .../java/org/scijava/util/StringUtils.java    |  2 +-
 src/main/java/org/scijava/util/Timing.java    |  2 +-
 src/main/java/org/scijava/util/TreeNode.java  |  2 +-
 .../java/org/scijava/util/TunePlayer.java     |  2 +-
 src/main/java/org/scijava/util/Types.java     |  2 +-
 src/main/java/org/scijava/util/UnitUtils.java |  2 +-
 .../java/org/scijava/util/VersionUtils.java   |  2 +-
 src/main/java/org/scijava/util/XML.java       |  2 +-
 .../welcome/DefaultWelcomeService.java        |  2 +-
 .../org/scijava/welcome/WelcomeService.java   |  2 +-
 .../scijava/welcome/event/WelcomeEvent.java   |  2 +-
 .../widget/AbstractInputHarvester.java        |  2 +-
 .../scijava/widget/AbstractInputPanel.java    |  2 +-
 .../scijava/widget/AbstractInputWidget.java   |  2 +-
 src/main/java/org/scijava/widget/Button.java  |  2 +-
 .../java/org/scijava/widget/ButtonWidget.java |  2 +-
 .../java/org/scijava/widget/ChoiceWidget.java |  2 +-
 .../java/org/scijava/widget/ColorWidget.java  |  2 +-
 .../java/org/scijava/widget/DateWidget.java   |  2 +-
 .../scijava/widget/DefaultWidgetModel.java    |  2 +-
 .../scijava/widget/DefaultWidgetService.java  |  2 +-
 .../org/scijava/widget/FileListWidget.java    |  2 +-
 .../java/org/scijava/widget/FileWidget.java   |  2 +-
 .../org/scijava/widget/InputHarvester.java    |  2 +-
 .../java/org/scijava/widget/InputPanel.java   |  2 +-
 .../java/org/scijava/widget/InputWidget.java  |  2 +-
 .../org/scijava/widget/MessageWidget.java     |  2 +-
 .../java/org/scijava/widget/NumberWidget.java |  2 +-
 .../java/org/scijava/widget/ObjectWidget.java |  2 +-
 .../java/org/scijava/widget/TextWidget.java   |  2 +-
 .../java/org/scijava/widget/ToggleWidget.java |  2 +-
 .../java/org/scijava/widget/UIComponent.java  |  2 +-
 .../java/org/scijava/widget/WidgetModel.java  |  2 +-
 .../org/scijava/widget/WidgetService.java     |  2 +-
 .../java/org/scijava/widget/WidgetStyle.java  |  2 +-
 .../java/org/scijava/ContextCreationTest.java |  2 +-
 .../org/scijava/ContextInjectionTest.java     |  2 +-
 src/test/java/org/scijava/SciJavaTest.java    |  2 +-
 .../org/scijava/annotations/AnnotatedA.java   |  2 +-
 .../org/scijava/annotations/AnnotatedB.java   |  2 +-
 .../org/scijava/annotations/AnnotatedC.java   |  2 +-
 .../org/scijava/annotations/AnnotatedD.java   |  2 +-
 .../annotations/AnnotatedInnerClass.java      |  2 +-
 .../java/org/scijava/annotations/Complex.java |  2 +-
 .../annotations/DirectoryIndexerTest.java     |  2 +-
 .../annotations/EclipseHelperTest.java        |  2 +-
 .../java/org/scijava/annotations/Fruit.java   |  2 +-
 .../org/scijava/annotations/LegacyTest.java   |  2 +-
 .../java/org/scijava/annotations/Simple.java  |  2 +-
 .../org/scijava/app/StatusServiceTest.java    |  2 +-
 .../command/CommandArrayConverterTest.java    |  2 +-
 .../org/scijava/command/CommandInfoTest.java  |  2 +-
 .../scijava/command/CommandModuleTest.java    |  2 +-
 .../scijava/command/CommandServiceTest.java   |  2 +-
 .../java/org/scijava/command/InputsTest.java  |  2 +-
 .../scijava/command/InvalidCommandTest.java   |  2 +-
 .../command/run/CommandCodeRunnerTest.java    |  2 +-
 .../scijava/console/ConsoleServiceTest.java   |  2 +-
 .../console/SystemPropertyArgumentTest.java   |  2 +-
 .../convert/AbstractNumberConverterTests.java |  2 +-
 .../BigIntegerToBigDecimalConverterTest.java  |  2 +-
 .../ByteToBigDecimalConverterTest.java        |  2 +-
 .../ByteToBigIntegerConverterTest.java        |  2 +-
 .../convert/ByteToDoubleConverterTest.java    |  2 +-
 .../convert/ByteToFloatConverterTest.java     |  2 +-
 .../convert/ByteToIntegerConverterTest.java   |  2 +-
 .../convert/ByteToLongConverterTest.java      |  2 +-
 .../convert/ByteToShortConverterTest.java     |  2 +-
 .../scijava/convert/ConvertServiceTest.java   |  2 +-
 .../org/scijava/convert/ConverterTest.java    |  2 +-
 .../convert/DelegateConverterTest.java        |  2 +-
 .../DoubleToBigDecimalConverterTest.java      |  2 +-
 .../convert/FileListConverterTest.java        |  2 +-
 .../FloatToBigDecimalConverterTest.java       |  2 +-
 .../convert/FloatToDoubleConverterTest.java   |  2 +-
 .../IntegerToBigDecimalConverterTest.java     |  2 +-
 .../IntegerToBigIntegerConverterTest.java     |  2 +-
 .../convert/IntegerToDoubleConverterTest.java |  2 +-
 .../convert/IntegerToLongConverterTest.java   |  2 +-
 .../LongToBigDecimalConverterTest.java        |  2 +-
 .../LongToBigIntegerConverterTest.java        |  2 +-
 .../ShortToBigDecimalConverterTest.java       |  2 +-
 .../ShortToBigIntegerConverterTest.java       |  2 +-
 .../convert/ShortToDoubleConverterTest.java   |  2 +-
 .../convert/ShortToFloatConverterTest.java    |  2 +-
 .../convert/ShortToIntegerConverterTest.java  |  2 +-
 .../convert/ShortToLongConverterTest.java     |  2 +-
 .../java/org/scijava/display/DisplayTest.java |  2 +-
 .../scijava/download/DownloadServiceTest.java |  2 +-
 .../org/scijava/event/EventServiceTest.java   |  2 +-
 .../org/scijava/io/ByteArrayByteBankTest.java |  2 +-
 .../java/org/scijava/io/ByteBankTest.java     |  2 +-
 .../java/org/scijava/io/IOServiceTest.java    |  2 +-
 .../org/scijava/io/TypedIOServiceTest.java    |  2 +-
 .../org/scijava/io/event/DataEventTest.java   |  2 +-
 .../scijava/io/handle/BytesHandleTest.java    |  2 +-
 .../io/handle/DataHandleEdgeCaseTests.java    |  2 +-
 .../org/scijava/io/handle/DataHandleTest.java |  2 +-
 .../scijava/io/handle/DataHandlesTest.java    |  2 +-
 .../org/scijava/io/handle/FileHandleTest.java |  2 +-
 .../handle/ReadBufferDataHandleMockTest.java  |  2 +-
 .../io/handle/ReadBufferDataHandleTest.java   |  2 +-
 .../io/handle/WriteBufferDataHandleTest.java  |  2 +-
 .../io/location/BytesLocationTest.java        |  2 +-
 .../io/location/FileLocationResolverTest.java |  2 +-
 .../scijava/io/location/FileLocationTest.java |  2 +-
 .../io/location/LocationServiceTest.java      |  2 +-
 .../scijava/io/location/URILocationTest.java  |  2 +-
 .../scijava/io/location/URLLocationTest.java  |  2 +-
 .../io/nio/ByteBufferByteBankTest.java        |  2 +-
 .../scijava/log/CallingClassUtilsTest.java    |  2 +-
 .../org/scijava/log/DefaultLoggerTest.java    |  2 +-
 .../java/org/scijava/log/LogMessageTest.java  |  2 +-
 .../java/org/scijava/log/LogServiceTest.java  |  2 +-
 .../java/org/scijava/log/LogSourceTest.java   |  2 +-
 .../org/scijava/log/StderrLogServiceTest.java |  2 +-
 .../java/org/scijava/log/TestLogListener.java |  2 +-
 .../org/scijava/main/MainServiceTest.java     |  2 +-
 .../scijava/main/run/MainCodeRunnerTest.java  |  2 +-
 .../org/scijava/menu/MenuServiceTest.java     |  2 +-
 .../java/org/scijava/menu/ShadowMenuTest.java |  2 +-
 .../org/scijava/module/ModuleServiceTest.java |  2 +-
 .../process/LoggerPreprocessorTest.java       |  2 +-
 .../module/run/ModuleCodeRunnerTest.java      |  2 +-
 .../scijava/object/NamedObjectIndexTest.java  |  2 +-
 .../org/scijava/object/ObjectIndexTest.java   |  2 +-
 .../org/scijava/object/ObjectServiceTest.java |  2 +-
 .../scijava/object/SortedObjectIndexTest.java |  2 +-
 .../java/org/scijava/options/OptionsTest.java |  2 +-
 .../org/scijava/parse/ParseServiceTest.java   |  2 +-
 .../org/scijava/plugin/PluginFinderTest.java  |  2 +-
 .../org/scijava/plugin/PluginIndexTest.java   |  2 +-
 .../org/scijava/plugin/PluginInfoTest.java    |  2 +-
 .../scijava/plugin/SingletonServiceTest.java  |  2 +-
 .../org/scijava/prefs/PrefServiceTest.java    |  2 +-
 .../java/org/scijava/run/RunServiceTest.java  |  2 +-
 .../script/AbstractScriptLanguageTest.java    |  2 +-
 .../org/scijava/script/ScriptEngineTest.java  |  2 +-
 .../org/scijava/script/ScriptFinderTest.java  |  2 +-
 .../org/scijava/script/ScriptInfoTest.java    |  2 +-
 .../org/scijava/script/ScriptServiceTest.java |  2 +-
 .../process/ParameterScriptProcessorTest.java |  2 +-
 .../org/scijava/service/ServiceIndexTest.java |  2 +-
 .../java/org/scijava/task/TaskEventTest.java  | 30 ++++++++++++++++++-
 .../org/scijava/task/TaskServiceTest.java     |  2 +-
 .../org/scijava/test/AbstractSciJavaTest.java |  2 +-
 .../java/org/scijava/test/TestUtilsTest.java  |  2 +-
 .../org/scijava/thread/ThreadServiceTest.java |  2 +-
 .../java/org/scijava/ui/UIServiceTest.java    |  2 +-
 .../java/org/scijava/util/AppUtilsTest.java   |  2 +-
 .../java/org/scijava/util/ArrayUtilsTest.java |  2 +-
 .../java/org/scijava/util/BoolArrayTest.java  |  2 +-
 .../java/org/scijava/util/ByteArrayTest.java  |  2 +-
 .../java/org/scijava/util/CharArrayTest.java  |  2 +-
 .../java/org/scijava/util/ClassUtilsTest.java |  2 +-
 .../java/org/scijava/util/ColorRGBTest.java   |  2 +-
 .../org/scijava/util/ConversionUtilsTest.java |  2 +-
 .../org/scijava/util/DigestUtilsTest.java     |  2 +-
 .../org/scijava/util/DoubleArrayTest.java     |  2 +-
 .../java/org/scijava/util/FileUtilsTest.java  |  2 +-
 .../java/org/scijava/util/FloatArrayTest.java |  2 +-
 .../scijava/util/GenericArrayTypesTest.java   |  2 +-
 .../java/org/scijava/util/IntArrayTest.java   |  2 +-
 .../scijava/util/LastRecentlyUsedTest.java    |  2 +-
 .../java/org/scijava/util/LongArrayTest.java  |  2 +-
 .../org/scijava/util/ObjectArrayTest.java     |  2 +-
 src/test/java/org/scijava/util/POMTest.java   |  2 +-
 .../org/scijava/util/PrimitiveArrayTest.java  |  2 +-
 .../org/scijava/util/ProcessUtilsTest.java    |  2 +-
 .../java/org/scijava/util/ShortArrayTest.java |  2 +-
 .../org/scijava/util/StringUtilsTest.java     |  2 +-
 src/test/java/org/scijava/util/TypesTest.java |  2 +-
 .../java/org/scijava/util/UnitUtilsTest.java  |  2 +-
 .../org/scijava/util/VersionUtilsTest.java    |  2 +-
 .../org/scijava/widget/WidgetStyleTest.java   |  2 +-
 739 files changed, 771 insertions(+), 743 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 43b1df69e..5f08911f4 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2021, SciJava developers.
+Copyright (c) 2009 - 2022, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index c28b04b3b..8bfa04980 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2021 SciJava developers.
+  Copyright (C) 2009 - 2022 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 8d0aff88c..1aa0b6938 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index 2cdd86b5d..1bda32ca5 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index a2b88d6d8..77e414da2 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index d0130489e..bf20d6cc0 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index a658c93af..be7d7b999 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2021 SciJava developers.
+  Copyright (C) 2009 - 2022 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index c1957ba7b..96ba66746 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index f1746123e..b8a074336 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 5975db5b7..c6be31959 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 0113ae104..0b887cafa 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index 3d2fd592b..b3ab1e40f 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 645e4d0f9..0b1098ca0 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index c1559cb4c..f93f22991 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 9a3f5ec98..cd247a466 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index 1713edd7b..cde51c0fc 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index a8d00fa71..47b346156 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index f7f4a607e..0774e0fb2 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index 025b1023a..149e8d503 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index df9a4c02f..5be5d288d 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index 38dffb74a..bf31a522f 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index 8d85f3d92..e9955fcaf 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index f9750c56b..d69da15d2 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index 51cdaed24..e200df42e 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index b0967e474..ee0ac4b75 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 762a2f230..508eec37b 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index 7fdb52160..2307e06f3 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 1ac3e1370..498c0989f 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index ce2ec0ebd..7c13e82ba 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 9661b38ac..8ce2fc46f 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 990bc4f9e..bb49dc76f 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 064a860c7..a495ec026 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index aed3bb358..3c1180e43 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index c38fa1d37..a600d4718 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 2c293a899..949cf24cb 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index 5bc4b934a..f3383a252 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index dede56c21..65cfa240c 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index aa4d19c7f..c12d5be9b 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 21a2a90cf..9132512e6 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 9e3fbd0f7..88f92ca9e 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 72fa9e051..03cc759b0 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 94a4f62f9..316ce2601 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 098afabe0..84a176e00 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 194cdbf50..d8b457f29 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index 0688fd264..e9fe9a5c4 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index 52083be38..3a3fc8b54 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index fce9a2535..061226272 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 8dc6fbe3e..31315dcf0 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 31eccfb14..300a03da0 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 91d6ee387..3efbfc005 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index 319424009..ad603f17f 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 3327d8ac5..876475de3 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index aa94bb420..26642e99b 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 5ff4059d5..c622c12ea 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 2b40968af..1c9679b06 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 7fee4c9af..e2c64ebf0 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index 9a341198b..cb34e3f4e 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index 669ccb3d9..f91b37214 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 142528f5e..210ed2558 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index efe93bef4..420c5c2e9 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 8f1a5da5f..cdde41992 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 745bd8a6f..fc1e59469 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 219e8d3e9..38b52ac11 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index e526aa92c..6e777ea5b 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index 0d7b52c1d..86094df90 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index dd17f807a..64ee66b62 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index 6276cdec6..4d6f8e980 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index 65054b9cc..f45561e6b 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index cb314b844..291f748cb 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index b79030cd4..cb35b9314 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index 45cdbcc89..51e7b9ffa 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index b0685a3de..5cb014814 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 69a246b0b..5115b88a1 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 8d714abe8..f803e283c 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 77a8ebcba..d066e9d74 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index 204129581..ea493609c 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 0f9ca35c2..88d64af7a 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index 06ceb965a..2067aae10 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 377bbb37b..97299556c 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 8e36b0d0c..80713b5bd 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 7ae73c9d7..9f474b2f7 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 999db00e2..dc2a3ec62 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 093ccc004..991f24710 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index 3b7b91213..ffacdfa07 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index afdce7781..1486f70f0 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index 638941d24..c6a053fbc 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 9b98b2925..89b883f63 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 098d25fb1..9b2ae2cda 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index d4a503876..4e447eb79 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 4a3be7d96..507ff693e 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index edb6f7aed..d55b9663a 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index c9f9b77cb..36fc745a9 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index d94a67711..f82552970 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 118a188e2..bf63a19d8 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index dc8610947..bb5ec9d50 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 68ebb8e89..d2daea418 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index 5c1e1ff9a..5aad27fb1 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 862c91507..594468617 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index 596ac4f0b..d2d23e617 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index f48ba06ea..1b646057d 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 76a96d49f..b2f29f89d 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 768c514ad..79ca2723b 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index 716ab1db2..8c036173a 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index 106836372..cc1aad5d7 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index 26688e057..834388f9c 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index ea5a58340..edbe1aeda 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 0cc896d99..3c0666f2a 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index e56efd060..c9e1a0412 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index 86de8361b..96fdd4211 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index a3f9215b7..b3aa8cc47 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 4d1796f26..b480f84d1 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index 3096e8db7..8813ccd1b 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index 457d20f63..836f105f5 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index fc8b812ad..f9b0d3171 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index d22fcd67a..0662c15f6 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 5fed339ab..1f1db6ac0 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 55436b60e..cc4a96b89 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index f705b1e42..d079a4c96 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index f2ca2e2be..63f58eb36 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index e0da2212e..715a4a291 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index 315a98f0a..9cca17b84 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index bac010462..a558604a7 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index cd54e08be..8bdd74598 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index b962e4119..ee62e8ad9 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index 76a7ff92b..bae65d081 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index e17a02507..c045d99d2 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 4b56d81ab..c8d73d8fb 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 17469b570..ca7fdd18c 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index c13badf41..f18264ef5 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index f1124f023..51cf3adbb 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 706ec58df..b4af7b6b8 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index 54b0f24b6..d02a8f9e9 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index 2237f2c74..1fefc1f1c 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index 72f08ad0b..e2288e32e 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index 1b74f0bb8..f47cda06f 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index 01d23456a..c1c1030ce 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index afe13bf50..cebaebae1 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 033e91326..d9b39fe7d 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 8f65e28f4..008b66c11 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index becbbd348..7220064e8 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index aee1651ff..e8e470175 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index 915cf34af..fa7b1bd79 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index 25422b3bf..7d5e0b3e4 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index f3ac7e1d5..2af77304f 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index 8ad776940..bfe00ebde 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 82add267c..7d50a608b 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index 80a9d3a59..3affb4051 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index 99806a4fa..f87355f54 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index 414d879df..6442d9c27 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index abecc1a10..146c7eb96 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index f09f706ab..94ed5ce53 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index a281d81f3..3f902f44e 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index 6e4dc23e1..eb9443133 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 48496d441..77ef59e3d 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 7236ac5d6..7a7fd98bc 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 2fa1e0cce..57cab6bdc 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 5d56a77c7..d18b5c62e 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index 8d6f91436..b10ee4ff4 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 76160a25c..ad94bda55 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index ac11eb5a3..3d0adfbad 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index 3f4737d90..b06812dc0 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 2d4d36234..96d35aba1 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index 9fe27543f..69725c846 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index c2d23a37f..4adf94671 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index cf19d15a5..4615ffd21 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 54a4c56b0..b31364f48 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index e09651abc..51dca592c 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index 109c70636..5966c06d7 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 60250f4de..e09a75dd5 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index 24910d279..e04d7d9da 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index a8493340f..787879832 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 2c93f3c88..4ca97bd1b 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index 4617a2b3b..e3b833405 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index 9933b7298..c79cbd5d4 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 0d08321c4..b59d2113d 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index dc2f00418..050b22e78 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index e7f3e68bc..118b693e2 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 038bc320f..499e18ea5 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index be9946e62..019d0a6a1 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index c75fd4225..0439544e8 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 498dd39a8..a198a946e 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index adad59e67..a13d20c18 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index a4b2ceb43..427da0e6a 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 37e0e570b..f3ff1652a 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index 41ae3ce81..c9007e250 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index 99b9b5b07..fb191561c 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
index 361c1ef42..838cc9229 100644
--- a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
index 6debf7f7a..3c86730a8 100644
--- a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index e45dde502..c967b1380 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 641403570..7be53f5bb 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index bd0780c13..92e72dcab 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index 49349caa6..6b30e1c59 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index dbe4ccdbb..dfb5007f4 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index 3a26c109e..0ed55abc0 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index 70bb96137..1349653a6 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 37d143afe..a5b2754b9 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 64e3fed06..ad9822101 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index 991fde6cf..1d26e20c0 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
index 74bb85170..17859653a 100644
--- a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
index 3031d5e30..1740b7b70 100644
--- a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
index cc34c567e..5a4169535 100644
--- a/src/main/java/org/scijava/io/handle/StreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
index ff1fe6ad5..db400b26a 100644
--- a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index a11750d63..a629c9b48 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
index 10e909deb..93616403e 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index 0a7ca02dc..c36f21bbf 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
index 5e831059b..312df412c 100644
--- a/src/main/java/org/scijava/io/location/BrowsableLocation.java
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index f79933193..0d6210d69 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index a86971eba..92ba74047 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index 2b6a8979f..676bd87df 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 073717716..03480c0ae 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
index b690802d8..b8d642d3e 100644
--- a/src/main/java/org/scijava/io/location/FileLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index 11e935934..470c9cb22 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
index 9c6ce6bc1..9dd2c650c 100644
--- a/src/main/java/org/scijava/io/location/LocationResolver.java
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 117611779..0d6104815 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index b1b8007ed..f9bc1b608 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 5fb1318a5..3311412e0 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index a7938f43c..d7e4ed49e 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 3934d4f4e..8fb6b0c52 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 6a6f9c702..8bff57a73 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index c750e2680..cbc8d681d 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 331879bb5..5ae980645 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index 55c8943e9..fc1250e78 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 3a261f2e2..f11ec5ae0 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index 83247b49a..d8d45c4d5 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index 7dee3b2e9..775c7b4ff 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index 3b2524b5b..276970ae2 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index c93a0680d..8c4047849 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 7284bbe65..235de87f1 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 7e8ec0bec..4675e0eab 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index 4ecab5831..af8e6802e 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index 867ccb551..8e15caf9e 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 657ae6fe0..eccb06796 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 13919c18a..f387991d2 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index e141b6320..81677d5c2 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index 2a04d13e6..f1e76b85f 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 1f0598ce7..71a116fb6 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 8b673eea1..f1da7f002 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index 451db4217..8d076304c 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 4b4fcca1e..287e28e5b 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index 9b5c45d19..24e27506b 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index 83b1802db..d5ddc13d9 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index a993825d9..1a9a98a13 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index a38bd3d96..a364d827e 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index fb26e5f3f..5c1471f7d 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index f58a6a7ef..56a29995a 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index 34684640e..77b4626d4 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index f7d2779b3..717f4be7c 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index c403b8518..781a6c998 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 94a259fad..e30a52a1c 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 5c1b797f2..196b11ab5 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index 665c1cb14..b96941e8d 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 171eb8ce2..228cee0b1 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 801c3f468..29c28bdfb 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index 18d5f1da2..a7b2c8de2 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 27b2a241b..fc74b85d0 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index eca9c26ff..823220f4c 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index 38bae5059..2761aaa25 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index eabfb9809..35ae5decd 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index 8978ddf0e..df33ba8c9 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 9c1af227d..59d490f17 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index 86da5b169..f40875599 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index 20186524e..bcf7107f5 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 06a837c42..b226bcde0 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 705b33b61..0a4cff44e 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index b2dbfd664..ffcbb4d0d 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index da6be43ef..294a7c66a 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index 378d04add..976603838 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 9f7cf991f..fc3dfa6a0 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index f79fc99fe..eef9c42d1 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index 59aad02fd..f059dd3a9 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index 71644fcbd..f8b17ed12 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index 0091f7019..e3ba97c10 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 257680232..3f6aa0c97 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index ddf1205e9..d72d0cd07 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index e0b8f25af..6402c8e1a 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index 6a702a26e..0eedb7c05 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 5c049fe41..8dba30973 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index c26a07bc0..cbe7f0518 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index c49bdde61..8ef3dcf44 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 632bc88b5..7fba52f93 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index 049ceae3f..87b43a956 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index bd2cac2fc..610ad5a94 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index f39ca300e..8242389bb 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index 3fc4567c4..93d3726a2 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index b6b2bc72a..1fcdc7403 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index 2b7a48798..d5323ad2f 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 9066ae88c..1927c68aa 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index a7d898206..69e9a0099 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 9e1dd7178..7239743f9 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 095a0764d..86ad0eb5e 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 31566a112..2ca0e647b 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index fc0db2aea..62b6ad5bd 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index f918dee36..6145337ac 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index 16c781ee0..a64b52723 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index 1735bf142..293610033 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 47561dc45..c14c275b3 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index bff0bbe0e..07081b6c9 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index 85a1df8f9..66b10b86a 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 92c0e772e..1998a76d1 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index bce52f377..048f0da82 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index a533e2da7..ac86b2020 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 51fece17e..2ee78144c 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 4c0e5af62..0b112b662 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index fed095cc9..3fc476f79 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index f80e66077..9cd2aeae6 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index 1cf7d432c..e97521043 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 3406eb167..392e476d5 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 2b5470e58..77b231a0c 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index 176acf991..ecf3103e9 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index b17c86287..7f0615f4c 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index 58516916d..47fc3c88c 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index 7e7fd581a..80816a27b 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index d2cb07ebf..966294653 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index 0ff9b213b..9da819a74 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index 05f20d0f6..f9880b3e6 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 3d371eb9d..4a0872e99 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 5266d4e45..7e44fb84a 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 900109983..bda0f4df2 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index 235853e40..72ead76f2 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index de0a12a0c..48c53fffc 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 21bc7d8d5..febbba898 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index 34547dc18..efb86a527 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index 9d5a42df0..a54117481 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 4395c17f0..de88860dd 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index c3cee3fcc..6c8cfa5bc 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index 9811d86bb..26d2b4555 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index 291d3fce7..2101d8c04 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 7815f8955..6d61317fe 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index 932048b0a..2a1c671ae 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index ea244411f..3a663bb85 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 7c4ec53db..2f771bd35 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 0e8f5c7f6..46eed9b31 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 92163037a..36d5605a0 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 1e8fa0289..1e9dd3f9e 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index 10afdd083..5b3bdcde1 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index 08c44def8..2b4883129 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index 926421cd6..013a70e79 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index 0317cdcd6..de8d9be40 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index d05449948..907e83148 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index 43776691f..fcedfd3a3 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index 8b8278736..776b80fba 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index ccfd0d442..f7c426e3a 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index fc22d4198..e3ee34255 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 27f833171..307895791 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 79933bf37..0b359cd46 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 1ab4989e3..3187fcd23 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index 40088d311..4ede3e5aa 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 73a95c611..7d96d2770 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 7b6197cb9..2d53decac 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index 60b31c6c6..c54f26ee5 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 962918659..8d9e4a1f3 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 6c46ef9c0..17ea8f400 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index 41daaff61..26fcc5e47 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index df87969ea..516ad9d69 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index 1c8f6101e..d45a4f0b0 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index f8e0c9d49..99fc8fd18 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 0563024ae..02b905f56 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index f023888c2..b511aab11 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 4275ec970..1a2bfa119 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 12c06b806..19c3da732 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index be5d37bdd..0c00e546b 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 72a0fc638..4feb02532 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index b419bc31e..0a41c094d 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index e44215498..a1f7af866 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 15f0fe877..0b9ff441e 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 0fd466d23..73763ef03 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index ae48603ab..a9e4b5e09 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index c2d525c6a..07f44a6ca 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index 1218852a6..d649eb5aa 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 3ed3fa771..ff4bd3c7a 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index cd71d2be7..b26ee37cc 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 64f90005d..07c2ff091 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index 42c729638..e3ab8e244 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index 4eb666f1d..26ae5468e 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 42929b3b2..26f1c60bf 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index a05355487..d867aeef8 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index fd6da8767..2377a9fef 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index 38ff5c9c9..cae5e3792 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index cd3fd6997..927d76bee 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index 7f871aaeb..f46d54bf9 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index f1dbfdf38..8fc849c20 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 47676d4b2..76a688924 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 5862a1895..9e787f436 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 7e5104dd9..37ebab4cb 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index e42a9aa6b..13062df91 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index 5adef39f3..cb9a7249e 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index d4a124b22..e0f8de3bb 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 0b3ba6bce..ba056a6e8 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index 7846a8b68..b8368dbff 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index 84942758b..abd258195 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index 326eb216f..f306ee488 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 66385208f..41b3185bc 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index c537f8587..0f65a99c2 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index 5b0f15d9d..39c8012a3 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index f1f353939..ff96c74a3 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index 791676279..f56ec50fb 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index e405df4c9..89ae99097 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index 9628ffb1f..7e95f1e78 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 97aa72ee4..7f75c39fd 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index 5196a5bd5..95bcc94c0 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index ac88d9514..39941978e 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 8d0e9e994..147c141af 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 4c5f3925d..188123998 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index d78ef45bb..a7f373a7c 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index a7bebe51b..184fb8209 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 2608120d9..13f3fb37a 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index 3a960398c..57ca01749 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index 333555a40..692869a8f 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index de1c7caae..02b6c46cf 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index c889fe818..df59b6a36 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 73a86f94e..e8c1be0cc 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 84b202634..728c20831 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 2df926592..b10e504dc 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index bbc00fcbc..9c5be1528 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 064ac980b..602883be0 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index ff2e0c448..8389d55f6 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index 80cf99e7d..da60b2357 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index 21ff9ebc0..3ad01f908 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
index c5260ffb8..231ef68c7 100644
--- a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index 9ef7ecd83..70e696f16 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index 41a347362..32ad3cebf 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index 9b7e49b86..cdf39b128 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index 23fae5d9a..e4d86a36e 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 056bbd7be..458613b45 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index 3aa87d4b9..5951b6dbb 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index 3ca981b0e..ac6535c89 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index a7c360ece..39062d6a8 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index 993fcff82..afcad184a 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index 83767672e..c11d3c2a8 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 0af3dff5a..0e8db19d6 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index fdba46c9a..9632da00d 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index 84fb560c9..0a9e58c27 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index de8ad6baa..4104c3d19 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
index 2b9d69d35..1dc08a2ee 100644
--- a/src/main/java/org/scijava/startup/StartupService.java
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 54b69f8d0..44f1c3b30 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -2,17 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
index 5b58f66ce..09375262a 100644
--- a/src/main/java/org/scijava/task/DefaultTaskService.java
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index 4867954da..7e6b66062 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -2,17 +2,17 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * 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
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
index 019709766..887acf804 100644
--- a/src/main/java/org/scijava/task/TaskService.java
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
index 9a6c68266..79d55f7d2 100644
--- a/src/main/java/org/scijava/task/event/TaskEvent.java
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 750b1d1a2..7f9c63075 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 928143097..202092996 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index 8739af515..dab8a2898 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index fb4f0e23b..40a314e8a 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index d9e9fc9a1..8f640ba5f 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
index 219a6f06d..b1c9ad530 100644
--- a/src/main/java/org/scijava/text/io/DefaultTextIOService.java
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index e8f8172df..04018a44f 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
index 24f105c64..42e36e64a 100644
--- a/src/main/java/org/scijava/text/io/TextIOService.java
+++ b/src/main/java/org/scijava/text/io/TextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index bfcf79d0e..3262ee21d 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index b00f6fe80..afddb6f8f 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index 22492cb2e..054fd1a8b 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 7eea24aa4..3a3905780 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index 7aacdcee1..d78e1a53a 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index b6375479e..baef6dfe3 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index a7cae7e4e..0d1b45824 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index b51a31be4..43ac9f66f 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index 664a20284..cadfcf115 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 7d09765d9..a254a91e3 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 125a3b6ca..5142bbe18 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 95d5a6e1a..7503eed17 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 13967a4ed..6c6f1f185 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index 9f223593c..5d7678f61 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index a39e1aa89..9d12ab82f 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index c402a1f2e..394ec8829 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 2c9adba78..0c3e22da5 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index 10477bab6..dbda0cc80 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index 0d082a58e..fb5a06dff 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index 4e6027ed6..56450088f 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 06f8c8289..42899053b 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index db3920956..bfca746d9 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index 9ec7c6f5c..26c0ede95 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index 82ee890fa..13d8feb68 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index c87674ef4..d03e43bc4 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 695d28cdb..9b6b71377 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index 694d9dbd2..8eb4e8bf6 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index 5fdd4cdc7..95a137aa5 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index 4d726baed..87a755a14 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 82a35a686..d3111bb3e 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 7c1654dbd..162532dac 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index 57fcdfe26..db4817ceb 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index bd347f69e..7145ed54a 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index 0aa658fc1..3a10f459d 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index 9489db54f..9d0c1161b 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index e454ee13e..0deeba42b 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 364ee52c3..09e3efb79 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index f311b89fe..05d350bd7 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index 17f007443..0529ea7c5 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index b542e7405..524f5a887 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index 391064a8b..d5924bbbc 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 0de0dd56a..4f7d47043 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index bb999c01b..a7b394407 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 7b8a0ff34..11aa98108 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index fba1ac075..9ca0833ca 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 90c539fa4..c5fd7ec61 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index b519354aa..a798ff7ec 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index 2b06f058f..20c240ead 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index da9285286..f219555ab 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 11b1ad1a8..fbe9b6ce1 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index b2f3cfe4b..f0376b017 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index 99ca4f859..0fd7677e6 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index 6f80f9f88..0f4e3a9b0 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index 2de8238eb..d7b893f3c 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index 31bea8a62..3352913e3 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index bf2c128af..c8aceb5ae 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 4efc3fd1f..96f51ff72 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index 1cc70a7a9..35cefdadc 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index 786a95a2d..f438822c0 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index 3805bf1a7..657e860b5 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index a990d1a48..d9d4945c4 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index 9cd858082..2b6e93004 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 59b9e5068..3f0ba3fec 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 7937f7a2b..302a6f41a 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index 71f620135..735f286b0 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 4e7038849..e83e06798 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 3dae18ade..c6487c5cf 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 13e378677..72e192bbe 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index 5803f10b9..f1e831c0e 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index bdf52bbcb..fbce5e167 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index 1816709d7..bfe0ae73e 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index dcb6c17ee..459260f05 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 12a727530..d9d3b2f67 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index c90ee211a..129eaf5f4 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index 4cdf59c25..b7c55622b 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index 35b3486e4..f32b4fad9 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index 1b4676bca..002659f4a 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index b8f4c25a7..e4babbe96 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index a90039651..99b30254c 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index f2d3a3de5..4e88f180b 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
index 7b2e2f529..db60c7673 100644
--- a/src/main/java/org/scijava/util/DefaultTreeNode.java
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index cc862f321..b78af02ae 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index b54ed91e3..928d62af6 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index cd1eb3781..4de14f37f 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index e3eab4d3d..f232814d6 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index b1e623e12..fd5d3e9a7 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 491dbdc35..6d0086a17 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index 3232d6634..80d18eafc 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index 0d6c621cd..508fc5eeb 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index 07a2699a1..990246fd9 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index baa11ea6d..84ea1ecb8 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index befb5c3d8..38b014a14 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index 781980da9..170124839 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index e8fdab952..61ffed4a9 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 460becff0..807eaa05f 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 8b781c8e9..2abb4d206 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 66df0b78b..745c39195 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index 08e7f6ccb..d8f076e40 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index fffae00f5..492e2150e 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 1a77f54d6..ea9f684ac 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index 252a551a1..2564da853 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 2517c09ed..8de96e17f 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index 1dbf798a0..d1b82104d 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index d013b489c..f946b587f 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 694a5d1e2..8e72eb8ec 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index 00be9935b..698b1ae78 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index eb9e40e13..2973c004e 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index b6292da6a..5e822926b 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index bb2038ed5..d55f0cdfe 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index e39fe223e..c58fbb7a8 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index 3dc5d5fde..2096b73cf 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 444f7aa13..53c0e0ab7 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index d6d80b4d5..65bf24190 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 967279cb8..50ca80a10 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index 415e5cda8..b4939d7c8 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index 56f37d9a3..163ae5939 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 35e57613f..97af599da 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 9bc7a5eb6..6516777b2 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 3cb1b2ad9..d533840f6 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
index 5bea3299e..a0ed8a293 100644
--- a/src/main/java/org/scijava/util/TreeNode.java
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index 5b67f2573..a59e2019b 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 6044ba831..441516eaa 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 55934b8be..1d45f7aac 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index f207865b4..994a4aa71 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index c9edda41b..e1b570d37 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 70781baae..186b28260 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index afababa6e..c7a1ec948 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index b84d124b5..8ea1f3424 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 52ee74ae9..1f65ae1d5 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index da306e7f2..2a8bb49a5 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index c62cfb201..f527847b0 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index fe268b23d..286cd1fb4 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index 865a879c9..c869fc13e 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index 158119163..b900ac0ba 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 15a835f02..84284a9dd 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index c58aacd41..d05049bf7 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index c30fbb0e3..229195289 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index f41a248d4..2606eed13 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index 331344f76..d74ea12f5 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index dd2ea0aad..dc70e0ce1 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 2c364e914..08b1a9fe3 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index d13b01161..0813ee375 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 0e7bfc07a..43d931c01 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 020ca8435..4092544eb 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index 39122cb03..886d423ea 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index fdde6e55a..2870ff270 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index 41f38498c..384523125 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index 7e128e7f5..bdb87913a 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 9a5e636ba..54e38acb9 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 3e8d9f953..83e8a2f9f 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index 323c1f257..ef74c794a 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index 508f29e0a..ec5e1c466 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index f34259805..b00b19dfb 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index ee6d087cf..b5b958a4e 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
index fc7cb0db4..7e1f2866a 100644
--- a/src/test/java/org/scijava/SciJavaTest.java
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 7fdfba27e..1226a7e2b 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index 88103149c..7993d867a 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index 72c387845..5e50040a2 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index 242180095..7049ea841 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 5acfd4beb..41e9a3849 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index e2348e92b..4d3b2ae4a 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 3ad441f01..894dc5aa7 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index 204257bac..cffbc9228 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index bdc884e7d..28f04a12c 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index b1eea96ac..c12e8930c 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index 62eb0e389..2a0b751e3 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 35630e00d..5dde120ff 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
index bdc0c1682..effe7a046 100644
--- a/src/test/java/org/scijava/command/CommandArrayConverterTest.java
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index fabad17f0..d7830f59e 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 5620d4cd2..372ca5267 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index 521dae0f2..a66fe78e3 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index 0ed5fbcee..a5387d6b9 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 7c9c4e509..3d5e11649 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index 8b94a4396..afde6646f 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 7f6f9ce76..9bdb66ba4 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index 1fa912c8d..830ad7047 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 5dd0fb908..1ab9f17d4 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index 2b604398a..a345e9cbd 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 8ef681e1b..28ea79d65 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index 2985dcd7a..fed7c84ce 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index e62bd6741..3b33abecb 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 8c003a1de..4395c5789 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 0d3388b30..61724ec62 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 3d60ed5c8..00866555b 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index 4cf3772de..2c307dcce 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 75553f0a6..cca1b2acc 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index af7e64dbf..dd96e6191 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
index d85d11090..045eabd6a 100644
--- a/src/test/java/org/scijava/convert/DelegateConverterTest.java
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index c235a8005..ed092262e 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index 95ecad501..632e82f4a 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index bc32f0223..0be67f354 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index 8c54546ba..245ba6233 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 19325bd76..ffe7dc17b 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index 5517d4fa3..76690b449 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index bfdadf07b..9f4555224 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index 312a85679..1552f8da7 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 091132b8a..929eb9bf7 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 79031df8d..69fcb27bc 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index 94f762a12..fb8dfae28 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index ea1e57231..d0c4d67ee 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index de2cc0830..a7befa860 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index 3990fd988..2ce0c775b 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 4447698b8..cb8505498 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index b41a7f34e..b9ca04268 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index ebf9badd2..bb862450c 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index b825cb23a..adf5fad02 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index 06c43b617..c1e6e74e3 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index ea9a55f08..e7ee584eb 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index 51836b92c..2c69cd595 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index 5a6888c6e..68ceb121a 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index dbbccebd2..8e100352c 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index 961fcca13..477f6be79 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index 75777d74e..9e023e1be 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
index 33e77b6ff..abc9d99a8 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index b3b0335e8..d62bdca7f 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
index 4da36f681..7aa81bfb1 100644
--- a/src/test/java/org/scijava/io/handle/DataHandlesTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 408481690..8b405416c 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index aeea4acaa..13a93571e 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index 4885c44f5..bd1a9ed14 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index 894e2c831..b9295187e 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index ae7d7693c..f7f26c67e 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
index f61e64659..f3326660a 100644
--- a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index dfdfc5e69..cb7562977 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index 032fbe403..feb628fa4 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index 02d561c89..08c886467 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index 487673059..9b939f4a1 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 023b403f6..90919ed48 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index 69a8e3dcd..a5893c905 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index dbdbfe16d..865e306aa 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 199768671..733e28ff5 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 700d6a173..fccbc18fb 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index d8096fd27..848a5e17d 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index f18bbb3cb..00d3a698b 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
index 626d4e5dd..ef6224cfa 100644
--- a/src/test/java/org/scijava/log/TestLogListener.java
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index 296008e36..e96794ed8 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index 961a21211..eaf05da9b 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index c098f4ad0..d3c7428d5 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 4387f23e1..f24093192 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index e41fd82ab..b7f94ca7a 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index 98ab6288a..a0dd141ff 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index d3249eb30..3425c654b 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
index 7375ab0b4..ad5fd4aa7 100644
--- a/src/test/java/org/scijava/object/NamedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 244fce9ca..e81c87e1f 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
index cfaf44c7a..321a402cb 100644
--- a/src/test/java/org/scijava/object/ObjectServiceTest.java
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 63f966fe4..61894ab78 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index d83de80e8..3ed1d5f08 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index 7f1b3070a..a5053766c 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index 28790ae03..004165143 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 5d44ea093..485484287 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index abb5b7fbc..c7e2fbea5 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index 2f00f5020..a4eabeec7 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index 5797cab0f..1f2ee361a 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index b8bdbce28..5b0189b7b 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index 1b67d8fc1..42d0a0707 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index c6ee8830c..62914f64a 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 8979affba..5c77988a6 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 43750e601..53691a948 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index ab774845f..f3dda2de3 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
index 1f9cbde21..3256d6062 100644
--- a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index fa5d07512..af260c4ca 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
index 9a0b2f71f..5ef418894 100644
--- a/src/test/java/org/scijava/task/TaskEventTest.java
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 package org.scijava.task;
 
 import org.junit.After;
@@ -103,4 +131,4 @@ public synchronized Set<Task> getLeftOvers() {
             return new HashSet<>(tasks);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index 2471cdaa1..7f6705495 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index 2ba9fa0ea..ae0e45338 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 38058c958..31eee18d4 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index dcdc5822b..0e92db904 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 66c9fb892..815b186d4 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index e951aefc1..ddf392bec 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index 20c7b1e04..c31e809a1 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index 54ff4f062..51c5f6b4c 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index 7897f5a46..31287b2a6 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 65bd49e8f..343a64b80 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 5276f427c..35e9c134e 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index f4925301a..4f3f68323 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 4406e2cda..d04118628 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index a0dbd98e3..657ee757d 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index cfe85860c..093adb0a8 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index 89e83b4a9..dab013e7a 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index 72a8350f0..b5bc6801e 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/GenericArrayTypesTest.java b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
index fdf443b05..73e6046df 100644
--- a/src/test/java/org/scijava/util/GenericArrayTypesTest.java
+++ b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index c495d0e35..33b515224 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 7d701c838..2d17082ba 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index 554f4b2be..81f41c692 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index 5eb9056a3..bb654fa0f 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 3dbfac27a..dad7a7aa7 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index 679327709..747b0fdac 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index 82bc10524..2b717cb92 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index bff05f0c2..e4d3f7ed6 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index bc31d533b..4fac7e5e7 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 545877756..21fce520d 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index 116f8ad8e..e095f60a0 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index 4874af6eb..7b0844225 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
index 079ed72a5..321342736 100644
--- a/src/test/java/org/scijava/widget/WidgetStyleTest.java
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2021 SciJava developers.
+ * Copyright (C) 2009 - 2022 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From 207d99f577be6d113cff35e2764769d59a69063e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 9 Apr 2022 10:50:59 -0500
Subject: [PATCH 1009/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5ef9ba2bd..126935ebf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.88.0-SNAPSHOT</version>
+	<version>2.88.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From e05ef57a79820cacb9de3f69cfb335e2d88d6d5f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 9 Apr 2022 11:15:47 -0500
Subject: [PATCH 1010/1208] POM: add NicoKiaru to contributors list

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 126935ebf..a26f167bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,11 @@
 			<name>Chris Allan</name>
 			<properties><id>chris-allan</id></properties>
 		</contributor>
+		<contributor>
+			<name>Nicolas Chiaruttini</name>
+			<url>https://imagej.net/people/NicoKiaru</url>
+			<properties><id>NicoKiaru</id></properties>
+		</contributor>
 		<contributor>
 			<name>Barry DeZonia</name>
 			<url>https://imagej.net/people/bdezonia</url>

From 51dffd29c5c65645c6592c65a7bb3bd5cb5820fe Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 29 Apr 2022 03:29:58 -0500
Subject: [PATCH 1011/1208] POM: update parent to pom-scijava 32.0.0-beta-3

---
 pom.xml                                                  | 2 +-
 src/main/java/org/scijava/parse/DefaultParseService.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a26f167bc..71ca6bc3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>31.1.0</version>
+		<version>32.0.0-beta-3</version>
 		<relativePath />
 	</parent>
 
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index febbba898..53bdbe46a 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -35,7 +35,7 @@
 import java.util.Map;
 
 import org.scijava.parsington.Variable;
-import org.scijava.parsington.eval.DefaultEvaluator;
+import org.scijava.parsington.eval.DefaultTreeEvaluator;
 import org.scijava.plugin.Plugin;
 import org.scijava.service.AbstractService;
 import org.scijava.service.Service;
@@ -97,7 +97,7 @@ public boolean isList() {
 		}
 
 		private void parseItems(final String arg, final boolean strict) {
-			final DefaultEvaluator e = new DefaultEvaluator();
+			final DefaultTreeEvaluator e = new DefaultTreeEvaluator();
 			e.setStrict(strict);
 			final Object result = e.evaluate("(" + arg + ")");
 			if (result == null) {

From a3590c6e05eee21e4c9731f3c9979e1f3e5629ee Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 29 Apr 2022 03:30:06 -0500
Subject: [PATCH 1012/1208] Remove print statements from tests

---
 .../java/org/scijava/command/CommandArrayConverterTest.java | 6 ------
 src/test/java/org/scijava/task/TaskEventTest.java           | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
index effe7a046..26dfebfc9 100644
--- a/src/test/java/org/scijava/command/CommandArrayConverterTest.java
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -113,10 +113,7 @@ public static class CommandRawArrayInput implements Command {
         @Override
         public void run() {
             final StringBuilder sb = new StringBuilder();
-            System.out.println("userObjects length : "+userObjects.length);
-            System.out.println("class : "+userObjects.getClass());
             for (UserClass obj : userObjects) {
-                System.out.println("\t"+obj);
                 sb.append(obj.toString()+";");
             }
             result = sb.toString();
@@ -136,10 +133,7 @@ public static class CommandGenericsWildcardArrayInput implements Command {
         @Override
         public void run() {
             final StringBuilder sb = new StringBuilder();
-            System.out.println("userObjects length : "+userObjects.length);
-            System.out.println("class : "+userObjects.getClass());
             for (UserClass obj : userObjects) {
-                System.out.println("\t"+obj);
                 sb.append(obj.toString()+";");
             }
             result = sb.toString();
diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
index 5ef418894..fadecc683 100644
--- a/src/test/java/org/scijava/task/TaskEventTest.java
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -87,7 +87,6 @@ public static void createTask(
         new Thread(
                 () -> {
                     try {
-                        System.out.println("Waiting to start task "+taskName);
                         Thread.sleep(msBeforeStart);
 
                         // Task started

From 309dc33241cefab2a2207ae31b32c8f137072996 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 29 Apr 2022 03:31:41 -0500
Subject: [PATCH 1013/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 71ca6bc3a..b49783f68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.88.1-SNAPSHOT</version>
+	<version>2.88.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 487a40e1fd23246b366396aa26ec0c21c2c42478 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 31 May 2022 14:25:48 -0500
Subject: [PATCH 1014/1208] ScriptModule: make context class loader non-null

Groovy assumes it will be non-null, and crashes if it's null.

When is it null? Not totally clear. But it can happen! See its javadoc.
---
 src/main/java/org/scijava/script/ScriptModule.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index b10e504dc..f05cbc7ed 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -123,6 +123,13 @@ public ScriptInfo getInfo() {
 
 	@Override
 	public void run() {
+		// HACK: Work around code (Groovy!) assuming
+		// context class loader can't be null.
+		final ClassLoader cl = Thread.currentThread().getContextClassLoader();
+		if (cl == null) {
+			Thread.currentThread().setContextClassLoader(Context.getClassLoader());
+		}
+
 		final ScriptEngine engine = getEngine();
 		final String path = getInfo().getPath();
 

From 5d8c6ca9e3d3e82faa0644622af6f3d6f502e787 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 14 Jun 2022 15:54:00 -0500
Subject: [PATCH 1015/1208] CI: cache ~/.m2/repository correctly

---
 .github/workflows/build-main.yml | 18 +++---------------
 .github/workflows/build-pr.yml   | 18 +++---------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index 3fb562252..5ef569202 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -13,24 +13,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Cache m2 folder
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-m2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up Java
+        uses: actions/setup-java@v3
         with:
           java-version: '8'
           distribution: 'zulu'
+          cache: 'maven'
       - name: Set up CI environment
         run: .github/setup.sh
       - name: Execute the build
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 92a019264..925b57658 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -11,24 +11,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
-      - name: Cache m2 folder
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-m2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Set up Java
+        uses: actions/setup-java@v3
         with:
           java-version: '8'
           distribution: 'zulu'
+          cache: 'maven'
       - name: Set up CI environment
         run: .github/setup.sh
       - name: Execute the build

From df29cac4272f4e78b2ef408c8b3e02f15c43fd96 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 17 Jun 2022 11:08:39 -0500
Subject: [PATCH 1016/1208] Split Strings before wrapping into ObjectArray

We make the executive decision to always delimit by a comma
---
 src/main/java/org/scijava/util/ArrayUtils.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index c6487c5cf..0fda592c5 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -58,7 +58,9 @@
 
 package org.scijava.util;
 
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -120,6 +122,12 @@ public static Collection<?> toCollection(final Object value) {
 		if (value instanceof Object[]) {
 			return new ObjectArray<>((Object[]) value);
 		}
+		if (value instanceof String) {
+			String[] arr = ((String) value).split("\\s*,\\s*");
+			Collection<?> c = new ObjectArray<String>(arr);
+			c.removeIf(o -> o.equals(""));
+			return c;
+		}
 		// This object is neither an array nor a collection.
 		// So we wrap it in a list and return.
 		final List<Object> list = new ObjectArray<>(Object.class);

From 4191f81317cf4f583b58ae416af4d7a79382b8e5 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 17 Jun 2022 11:09:49 -0500
Subject: [PATCH 1017/1208] Improve array conversion to String

---
 .../org/scijava/convert/DefaultConverter.java | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index d2daea418..651f171fd 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -39,6 +39,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
@@ -168,10 +169,21 @@ public <T> T convert(final Object src, final Class<T> dest) {
 		}
 		if (saneDest == String.class) {
 			// destination type is String; use Object.toString() method
-			final String sValue = src.toString();
-			@SuppressWarnings("unchecked")
-			final T result = (T) sValue;
-			return result;
+			if (src.getClass().isArray()) {
+				final String elementString = ArrayUtils.toCollection(src).stream() //
+					.map(object -> convert(object, String.class)) //
+					.collect(Collectors.joining(","));
+				String sb = "[" + elementString + ']';
+				@SuppressWarnings("unchecked")
+				final T result = (T) elementString;
+				return result;
+			}
+			else {
+				final String sValue = src.toString();
+				@SuppressWarnings("unchecked")
+				final T result = (T) sValue;
+				return result;
+			}
 		}
 
 		// wrap the original object with one of the new type, using a constructor

From 37753fa342a7ef79b17a1cb7836d19965b5b894a Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 16 Jun 2022 16:29:06 -0500
Subject: [PATCH 1018/1208] Test Module saving and loading for array types

---
 .../org/scijava/module/ModuleServiceTest.java | 72 +++++++++++++++++--
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index b7f94ca7a..dffd09e02 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -29,11 +29,9 @@
 
 package org.scijava.module;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
@@ -42,6 +40,9 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.util.ObjectArray;
+
+import static org.junit.Assert.*;
 
 /**
  * Tests {@link ModuleService}.
@@ -158,6 +159,66 @@ public void testGetSingleInput() throws ModuleException {
 		assertSame(info.getInput("double2"), singleDouble);
 	}
 
+	@Test
+	public void testSaveAndLoad() {
+
+		List<Object[]> parameterizations = new ArrayList<>();
+		parameterizations.add(new Object[] { //
+			double[].class, new double[] {} //
+		});
+		parameterizations.add(new Object[] { //
+			double[].class, new double[] { 1., 2., 3. } //
+		});
+		parameterizations.add(new Object[] { //
+			Double[].class, new Double[] {} //
+		});
+		parameterizations.add(new Object[] { //
+			Double[].class, new Double[] { 1., 2., 3. } //
+		});
+
+		for (Object[] params : parameterizations) {
+			Class<?> type = (Class<?>) params[0];
+			Object expected = params[1];
+			// Get a ModuleItem of the right type
+			MutableModule m = new DefaultMutableModule();
+			m.getInfo().addInput(new DefaultMutableModuleItem<>(m, "a", type));
+			@SuppressWarnings("unchecked")
+			final ModuleItem<Object> item = (ModuleItem<Object>) moduleService
+				.getSingleInput(m, type);
+			// Save a value to the ModuleItem
+			moduleService.save(item, expected);
+			// Load that value from the ModuleItem
+			Object actual = moduleService.load(item);
+			// Assert equality
+			if (expected.getClass().isArray()) assertArrayEquality(expected, actual);
+			else assertEquals(expected, actual);
+		}
+	}
+
+	private void assertArrayEquality(Object arr1, Object arr2) {
+		// Ensure that both Objects are arrays of the same type!
+		assertEquals(arr1.getClass(), arr2.getClass());
+		assertTrue(arr1.getClass().isArray());
+
+		// We must check primitive arrays as they cannot be cast to Object[]
+		if (arr1 instanceof boolean[]) //
+			assertArrayEquals((boolean[]) arr1, (boolean[]) arr2);
+		else if (arr1 instanceof short[]) //
+			assertArrayEquals((short[]) arr1, (short[]) arr2);
+		else if (arr1 instanceof int[]) //
+			assertArrayEquals((int[]) arr1, (int[]) arr2);
+		else if (arr1 instanceof long[]) //
+			assertArrayEquals((long[]) arr1, (long[]) arr2);
+		else if (arr1 instanceof float[]) //
+			assertArrayEquals((float[]) arr1, (float[]) arr2, 1e-6f);
+		else if (arr1 instanceof double[]) //
+			assertArrayEquals((double[]) arr1, (double[]) arr2, 1e-6);
+		else if (arr1 instanceof char[]) //
+			assertArrayEquals((char[]) arr1, (char[]) arr2);
+		// Otherwise we can just cast to Object[]
+		else assertArrayEquals((Object[]) arr1, (Object[]) arr2);
+	}
+
 	// -- Helper methods --
 
 	private Object[] createInputArray() {
@@ -167,7 +228,7 @@ private Object[] createInputArray() {
 			"integer1", -2, //
 			"integer2", 7, //
 			"double1", Math.E, //
-			"double2", Math.PI //
+			"double2", Math.PI, //
 		};
 	}
 
@@ -198,7 +259,6 @@ private static String mapToString(final Map<String, Object> map) {
 
 	/** A sample module for testing the module service. */
 	public static class FooModule extends AbstractModule {
-
 		private final FooModuleInfo info;
 
 		public FooModule(final FooModuleInfo info) {

From 8cc1a5f7afac25c5f104cc67c7c8ec274d2810d9 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 17 Jun 2022 11:28:30 -0500
Subject: [PATCH 1019/1208] Remove unused variable

---
 src/main/java/org/scijava/convert/DefaultConverter.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 651f171fd..f01f9668b 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -173,7 +173,6 @@ public <T> T convert(final Object src, final Class<T> dest) {
 				final String elementString = ArrayUtils.toCollection(src).stream() //
 					.map(object -> convert(object, String.class)) //
 					.collect(Collectors.joining(","));
-				String sb = "[" + elementString + ']';
 				@SuppressWarnings("unchecked")
 				final T result = (T) elementString;
 				return result;

From bd40f0554ca9efffc4e60c48648d0708a24fb6f4 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 1 Jul 2022 15:12:23 -0500
Subject: [PATCH 1020/1208] Add a StringToNumberConverter

---
 .../convert/StringToNumberConverter.java      |  56 +++++++++
 .../convert/StringToNumberConverterTest.java  | 112 ++++++++++++++++++
 2 files changed, 168 insertions(+)
 create mode 100644 src/main/java/org/scijava/convert/StringToNumberConverter.java
 create mode 100644 src/test/java/org/scijava/convert/StringToNumberConverterTest.java

diff --git a/src/main/java/org/scijava/convert/StringToNumberConverter.java b/src/main/java/org/scijava/convert/StringToNumberConverter.java
new file mode 100644
index 000000000..cd22eeafa
--- /dev/null
+++ b/src/main/java/org/scijava/convert/StringToNumberConverter.java
@@ -0,0 +1,56 @@
+
+package org.scijava.convert;
+
+import org.scijava.plugin.Plugin;
+import org.scijava.util.Types;
+
+/**
+ * Converts a {@link String} to a {@link Number}. Currently handles all boxed
+ * and unboxed primitives, along with the Numbers. In particular,
+ * {@link String}s converted {@link Number}s are just {@link Double}s, as this
+ * features the broadest range of integers.
+ *
+ * @author Gabriel Selzer
+ */
+@Plugin(type = Converter.class)
+public class StringToNumberConverter extends AbstractConverter<String, Number> {
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> T convert(Object src, Class<T> dest) {
+		// ensure type is well-behaved, rather than a primitive type
+		Class<T> saneDest = Types.box(dest);
+		if (!(src instanceof String)) throw new IllegalArgumentException(
+			"Expected src to be a String but got a " + src.getClass());
+		if (!(Number.class.isAssignableFrom(saneDest)))
+			throw new IllegalArgumentException(
+				"Expected dest to be Number.class (or a subclass of Number, or a numerical primitive), but got " +
+					saneDest);
+		String srcString = (String) src;
+		if (saneDest == Byte.class) return (T) new Byte(srcString);
+		if (saneDest == Short.class) return (T) new Short(srcString);
+		if (saneDest == Integer.class) return (T) new Integer(srcString);
+		if (saneDest == Long.class) return (T) new Long(srcString);
+		if (saneDest == Float.class) return (T) new Float(srcString);
+		if (saneDest == Double.class) return (T) new Double(srcString);
+		if (saneDest == Number.class) return (T) new Double(srcString);
+		else throw new IllegalArgumentException("Unknown destination type: " +
+			saneDest);
+	}
+
+	@Override
+	public Class<Number> getOutputType() {
+		return Number.class;
+	}
+
+	@Override
+	public Class<String> getInputType() {
+		return String.class;
+	}
+
+	@Override
+	public boolean canConvert(Object src, Class<?> dest) {
+		if (!Types.isAssignable(src.getClass(), String.class)) return false;
+		return Types.isAssignable(Types.box(dest), Number.class);
+	}
+}
diff --git a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
new file mode 100644
index 000000000..efee1acd1
--- /dev/null
+++ b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
@@ -0,0 +1,112 @@
+
+package org.scijava.convert;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests {@link StringToNumberConverter}
+ *
+ * @author Gabriel Selzer
+ */
+public class StringToNumberConverterTest {
+
+	Converter<String, Number> conv;
+
+	@Before
+	public void setUp() {
+		conv = new StringToNumberConverter();
+	}
+
+	@Test
+	public void stringToByteTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, Byte.class));
+		Assert.assertEquals(new Byte((byte) 0), conv.convert(s, Byte.class));
+	}
+
+	@Test
+	public void stringToPrimitiveByteTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, byte.class));
+		Assert.assertEquals(0, (int) conv.convert(s, byte.class));
+	}
+
+	@Test
+	public void stringToShortTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, Short.class));
+		Assert.assertEquals(new Short((short) 0), conv.convert(s, Short.class));
+	}
+
+	@Test
+	public void stringToPrimitiveShortTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, short.class));
+		Assert.assertEquals(0, (int) conv.convert(s, short.class));
+	}
+
+	@Test
+	public void stringToIntegerTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, Integer.class));
+		Assert.assertEquals(new Integer(0), conv.convert(s, Integer.class));
+	}
+
+	@Test
+	public void stringToPrimitiveIntegerTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, int.class));
+		Assert.assertEquals(0, (int) conv.convert(s, int.class));
+	}
+
+	@Test
+	public void stringToLongTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, Long.class));
+		Assert.assertEquals(new Long(0), conv.convert(s, Long.class));
+	}
+
+	@Test
+	public void stringToPrimitiveLongTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, long.class));
+		Assert.assertEquals(0L, (long) conv.convert(s, long.class));
+	}
+
+	@Test
+	public void stringToFloatTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, Float.class));
+		Assert.assertEquals(new Float(0), conv.convert(s, Float.class));
+	}
+
+	@Test
+	public void stringToPrimitiveFloat() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, float.class));
+		Assert.assertEquals(0f, conv.convert(s, float.class), 1e-6);
+	}
+
+	@Test
+	public void stringToDoubleTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, Double.class));
+		Assert.assertEquals(new Double(0), conv.convert(s, Double.class));
+	}
+
+	@Test
+	public void stringToPrimitiveDouble() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, double.class));
+		Assert.assertEquals(0d, conv.convert(s, double.class), 1e-6);
+	}
+
+	@Test
+	public void stringToNumberTest() {
+		String s = "0";
+		Assert.assertTrue(conv.canConvert(s, Number.class));
+		Assert.assertEquals(0d, conv.convert(s, Number.class));
+	}
+}

From 5c160d28404aa328ffdb5c20735a49cefe6f5049 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 1 Jul 2022 15:41:00 -0500
Subject: [PATCH 1021/1208] Ensure that invalid strings cannot be converted

---
 .../convert/StringToNumberConverter.java      | 21 ++++++++++++++++---
 .../convert/StringToNumberConverterTest.java  |  8 +++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/convert/StringToNumberConverter.java b/src/main/java/org/scijava/convert/StringToNumberConverter.java
index cd22eeafa..0c75f579d 100644
--- a/src/main/java/org/scijava/convert/StringToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/StringToNumberConverter.java
@@ -19,7 +19,7 @@ public class StringToNumberConverter extends AbstractConverter<String, Number> {
 	@SuppressWarnings("unchecked")
 	public <T> T convert(Object src, Class<T> dest) {
 		// ensure type is well-behaved, rather than a primitive type
-		Class<T> saneDest = Types.box(dest);
+		Class<T> saneDest = sane(dest);
 		if (!(src instanceof String)) throw new IllegalArgumentException(
 			"Expected src to be a String but got a " + src.getClass());
 		if (!(Number.class.isAssignableFrom(saneDest)))
@@ -33,7 +33,6 @@ public <T> T convert(Object src, Class<T> dest) {
 		if (saneDest == Long.class) return (T) new Long(srcString);
 		if (saneDest == Float.class) return (T) new Float(srcString);
 		if (saneDest == Double.class) return (T) new Double(srcString);
-		if (saneDest == Number.class) return (T) new Double(srcString);
 		else throw new IllegalArgumentException("Unknown destination type: " +
 			saneDest);
 	}
@@ -51,6 +50,22 @@ public Class<String> getInputType() {
 	@Override
 	public boolean canConvert(Object src, Class<?> dest) {
 		if (!Types.isAssignable(src.getClass(), String.class)) return false;
-		return Types.isAssignable(Types.box(dest), Number.class);
+		// The only way to know if the conversion is valid is to actually do it.
+		try {
+			String srcString = (String) src;
+			sane(dest).getConstructor(String.class).newInstance(srcString);
+			return true;
+		}
+		catch (Exception e) {
+			return false;
+		}
+	}
+
+	// -- Helper functionality -- //
+
+	@SuppressWarnings("unchecked")
+	private <T> Class<T> sane(Class<T> c) {
+		if (c == Number.class) return (Class<T>) Double.class;
+		return Types.box(c);
 	}
 }
diff --git a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
index efee1acd1..8728bd47f 100644
--- a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
@@ -109,4 +109,12 @@ public void stringToNumberTest() {
 		Assert.assertTrue(conv.canConvert(s, Number.class));
 		Assert.assertEquals(0d, conv.convert(s, Number.class));
 	}
+
+	@Test
+	public void invalidStringToNumberTest() {
+		String s = "invalid";
+		Assert.assertFalse(conv.canConvert(s, Number.class));
+		Assert.assertThrows(IllegalArgumentException.class, () -> conv.convert(s,
+			Number.class));
+	}
 }

From 88f5eb0c9430b263bb2830172d138c7bd2042fb8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 11 Jul 2022 15:40:45 -0500
Subject: [PATCH 1022/1208] Add missing license header blocks

---
 .../convert/StringToNumberConverter.java      | 28 +++++++++++++++++++
 .../convert/StringToNumberConverterTest.java  | 28 +++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/src/main/java/org/scijava/convert/StringToNumberConverter.java b/src/main/java/org/scijava/convert/StringToNumberConverter.java
index 0c75f579d..6376a6a70 100644
--- a/src/main/java/org/scijava/convert/StringToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/StringToNumberConverter.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.convert;
 
diff --git a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
index 8728bd47f..b2778d128 100644
--- a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.convert;
 

From 0e120097555320a0045c109ae04d6eee2ac93370 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 11 Jul 2022 15:42:13 -0500
Subject: [PATCH 1023/1208] Update ImageJ -> ImageJ2

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7f00e234..06c483c15 100644
--- a/README.md
+++ b/README.md
@@ -5,5 +5,5 @@
 SciJava Common is a common library for SciJava software. It provides a
 plugin framework, with an extensible mechanism for service discovery, backed
 by its own annotation processor, so that plugins can be loaded dynamically.
-It is used by both [ImageJ](https://github.com/imagej/imagej) and
+It is used by both [ImageJ2](https://github.com/imagej/imagej2) and
 [SCIFIO](https://github.com/scifio/scifio).

From d50ae5b31d8912eeab9adbb62a8ee966c0c10c83 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 11 Jul 2022 15:43:25 -0500
Subject: [PATCH 1024/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b49783f68..fca6aef22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.88.2-SNAPSHOT</version>
+	<version>2.88.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From a82242019bdada83f102628225c92c73f25245f0 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 18 Jul 2022 09:09:20 -0500
Subject: [PATCH 1025/1208] Set the ScriptEngineManager to use Context's loader

---
 src/main/java/org/scijava/script/AdaptedScriptLanguage.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index ff96c74a3..ad952d54d 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -35,6 +35,7 @@
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptEngineManager;
 
+import org.scijava.Context;
 import org.scijava.plugin.PluginInfo;
 
 /**
@@ -140,7 +141,7 @@ public ScriptEngine getScriptEngine() {
 	// -- Helper methods --
 
 	private static ScriptEngineFactory findFactory(final String factoryName) {
-		final ScriptEngineManager manager = new ScriptEngineManager();
+		final ScriptEngineManager manager = new ScriptEngineManager(Context.getClassLoader());
 		for (final ScriptEngineFactory factory : manager.getEngineFactories()) {
 			for (final String name : factory.getNames()) {
 				if (factoryName.equals(name)) return factory;

From 7201d4d5cd08ac127af553e8602037a80736203e Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 28 Jul 2022 15:44:37 -0500
Subject: [PATCH 1026/1208] Add support for Number in NumberUtils

---
 .../java/org/scijava/util/NumberUtils.java    |  4 ++
 .../org/scijava/util/NumberUtilsTest.java     | 42 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/test/java/org/scijava/util/NumberUtilsTest.java

diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index ea9f684ac..9b3ad2488 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -78,6 +78,8 @@ public static Number getMinimumNumber(final Class<?> type) {
 		if (Types.isLong(type)) return Long.MIN_VALUE;
 		if (Types.isFloat(type)) return -Float.MAX_VALUE;
 		if (Types.isDouble(type)) return -Double.MAX_VALUE;
+		// Fallback for Number.class
+		if (Types.isNumber(type)) return -Double.MAX_VALUE;
 		return null;
 	}
 
@@ -88,6 +90,8 @@ public static Number getMaximumNumber(final Class<?> type) {
 		if (Types.isLong(type)) return Long.MAX_VALUE;
 		if (Types.isFloat(type)) return Float.MAX_VALUE;
 		if (Types.isDouble(type)) return Double.MAX_VALUE;
+		// Fallback for Number.class
+		if (Types.isNumber(type)) return Double.MAX_VALUE;
 		return null;
 	}
 
diff --git a/src/test/java/org/scijava/util/NumberUtilsTest.java b/src/test/java/org/scijava/util/NumberUtilsTest.java
new file mode 100644
index 000000000..78f94fbde
--- /dev/null
+++ b/src/test/java/org/scijava/util/NumberUtilsTest.java
@@ -0,0 +1,42 @@
+
+package org.scijava.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Tests {@link NumberUtils} functionality
+ *
+ * @author Gabriel Selzer
+ */
+public class NumberUtilsTest {
+
+	/** Tests {@link NumberUtils#getMinimumNumber(Class)} */
+	@Test
+	public void testGetMinimumNumber() {
+		assertEquals(Byte.MIN_VALUE, NumberUtils.getMinimumNumber(Byte.class));
+		assertEquals(Short.MIN_VALUE, NumberUtils.getMinimumNumber(Short.class));
+		assertEquals(Integer.MIN_VALUE, NumberUtils.getMinimumNumber(
+			Integer.class));
+		assertEquals(Long.MIN_VALUE, NumberUtils.getMinimumNumber(Long.class));
+		assertEquals(-Float.MAX_VALUE, NumberUtils.getMinimumNumber(Float.class));
+		assertEquals(-Double.MAX_VALUE, NumberUtils.getMinimumNumber(Double.class));
+		// Number's minimum value should be the smallest of all the above -> Double
+		assertEquals(-Double.MAX_VALUE, NumberUtils.getMinimumNumber(Number.class));
+	}
+
+	/** Tests {@link NumberUtils#getMaximumNumber(Class)} */
+	@Test
+	public void testGetMaximumNumber() {
+		assertEquals(Byte.MAX_VALUE, NumberUtils.getMaximumNumber(Byte.class));
+		assertEquals(Short.MAX_VALUE, NumberUtils.getMaximumNumber(Short.class));
+		assertEquals(Integer.MAX_VALUE, NumberUtils.getMaximumNumber(
+			Integer.class));
+		assertEquals(Long.MAX_VALUE, NumberUtils.getMaximumNumber(Long.class));
+		assertEquals(Float.MAX_VALUE, NumberUtils.getMaximumNumber(Float.class));
+		assertEquals(Double.MAX_VALUE, NumberUtils.getMaximumNumber(Double.class));
+		// Number's minimum value should be the smallest of all the above -> Double
+		assertEquals(Double.MAX_VALUE, NumberUtils.getMaximumNumber(Number.class));
+	}
+}

From 818a252d6816a1a054f33ebc4cfbaf0cc3bba811 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2022 10:40:26 -0500
Subject: [PATCH 1027/1208] POM: update parent to 32.0.0-beta-4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fca6aef22..4ee57020f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>32.0.0-beta-3</version>
+		<version>32.0.0-beta-4</version>
 		<relativePath />
 	</parent>
 

From 832b1818c069fbe76c4a5156941afbd561161aa8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2022 12:36:50 -0500
Subject: [PATCH 1028/1208] Add missing license header

---
 .../org/scijava/util/NumberUtilsTest.java     | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/test/java/org/scijava/util/NumberUtilsTest.java b/src/test/java/org/scijava/util/NumberUtilsTest.java
index 78f94fbde..e175ab8e7 100644
--- a/src/test/java/org/scijava/util/NumberUtilsTest.java
+++ b/src/test/java/org/scijava/util/NumberUtilsTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.util;
 

From b37c0628658f4ac10decbc2135a2e1f5eac6db0d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 15 Aug 2022 12:59:01 -0500
Subject: [PATCH 1029/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4ee57020f..0ed9c5fc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.88.3-SNAPSHOT</version>
+	<version>2.89.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 7751a9d2b91b5647f62d2a3f9d0f361f4b3ff6bc Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 17 Aug 2022 13:08:48 -0500
Subject: [PATCH 1030/1208] Refactor efforts into separate Converters

---
 .../convert/ArrayToStringConverter.java       |  90 +++++++++
 .../org/scijava/convert/DefaultConverter.java |  19 +-
 .../convert/StringToArrayConverter.java       | 178 ++++++++++++++++++
 .../java/org/scijava/util/ArrayUtils.java     |   6 -
 .../convert/ArrayToStringConverterTest.java   | 160 ++++++++++++++++
 .../convert/StringToArrayConverterTest.java   | 158 ++++++++++++++++
 .../org/scijava/module/ModuleServiceTest.java |  86 +++++----
 7 files changed, 637 insertions(+), 60 deletions(-)
 create mode 100644 src/main/java/org/scijava/convert/ArrayToStringConverter.java
 create mode 100644 src/main/java/org/scijava/convert/StringToArrayConverter.java
 create mode 100644 src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
 create mode 100644 src/test/java/org/scijava/convert/StringToArrayConverterTest.java

diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
new file mode 100644
index 000000000..922f2eac6
--- /dev/null
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -0,0 +1,90 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.scijava.Priority;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.util.ArrayUtils;
+import org.scijava.util.Types;
+
+/**
+ * A {@link Converter} that specializes in converting
+ * n-dimensional arrays into {@link String}s. This {@link Converter} can convert any array whose
+ * component types can be converted into {@link String}s. By default, this
+ * {@link Converter} delimits the array elements with commas.
+ * 
+ * @author Gabriel Selzer
+ */
+@Plugin(type = Converter.class, priority = Priority.VERY_LOW)
+public class ArrayToStringConverter extends AbstractConverter<Object, String> {
+
+	@Parameter private ConvertService convertService;
+
+	@Override public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		if (src == null) return false;
+		final Class<?> saneSrc = Types.box(src);
+		final Class<?> saneDest = Types.box(dest);
+		return saneSrc.isArray() && saneDest == String.class;
+	}
+
+	@Override public boolean canConvert(final Object src, final Class<?> dest) {
+		if (!canConvert(src.getClass(), dest)) return false;
+		if (Array.getLength(src) == 0) return true;
+		return convertService.supports(Array.get(src, 0), dest);
+	}
+
+	@Override public Object convert(Object src, Type dest) {
+		final String elementString = ArrayUtils.toCollection(src).stream() //
+				.map(object -> convertService.convert(object, String.class)) //
+				.collect(Collectors.joining(", "));
+		return "{" + elementString + "}";
+	}
+
+	@SuppressWarnings("unchecked") @Override
+	public <T> T convert(Object src, Class<T> dest) {
+		return (T) convert(src, (Type) dest);
+	}
+
+	@Override public Class<String> getOutputType() {
+		return String.class;
+	}
+
+	@Override public Class<Object> getInputType() {
+		return Object.class;
+	}
+
+}
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index f01f9668b..d2daea418 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -39,7 +39,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
@@ -169,20 +168,10 @@ public <T> T convert(final Object src, final Class<T> dest) {
 		}
 		if (saneDest == String.class) {
 			// destination type is String; use Object.toString() method
-			if (src.getClass().isArray()) {
-				final String elementString = ArrayUtils.toCollection(src).stream() //
-					.map(object -> convert(object, String.class)) //
-					.collect(Collectors.joining(","));
-				@SuppressWarnings("unchecked")
-				final T result = (T) elementString;
-				return result;
-			}
-			else {
-				final String sValue = src.toString();
-				@SuppressWarnings("unchecked")
-				final T result = (T) sValue;
-				return result;
-			}
+			final String sValue = src.toString();
+			@SuppressWarnings("unchecked")
+			final T result = (T) sValue;
+			return result;
 		}
 
 		// wrap the original object with one of the new type, using a constructor
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
new file mode 100644
index 000000000..fdc57d5b4
--- /dev/null
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -0,0 +1,178 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.scijava.Priority;
+import org.scijava.plugin.Parameter;
+import org.scijava.plugin.Plugin;
+import org.scijava.util.Types;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A {@link Converter} that specializes in converting {@link String}s to
+ * n-dimensional arrays. This {@link Converter} can convert any array whose
+ * component types can be created from a {@link String}. By default, this
+ * {@link Converter} delimits the {@link String} based on commas.
+ * 
+ * @author Gabriel Selzer
+ */
+@Plugin(type = Converter.class, priority=Priority.VERY_LOW)
+public class StringToArrayConverter extends AbstractConverter<String, Object> {
+
+	@Parameter
+	private ConvertService convertService;
+
+	@Override
+	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		if (src == null) return false;
+		final Class<?> saneSrc = Types.box(src);
+		final Class<?> saneDest = Types.box(dest);
+		return saneSrc == String.class && saneDest.isArray();
+	}
+
+	@Override
+	public boolean canConvert(final Object src, final Class<?> dest) {
+		if (!canConvert(src.getClass(), dest)) return false;
+		String srcString = (String) src;
+		if (!(srcString.startsWith("{") && srcString.endsWith("}"))) return false;
+		List<String> components = elements((String) src);
+		return components.size() == 0 || convertService.supports(components.get(0),
+			dest.getComponentType());
+	}
+
+	@Override
+	public Object convert(Object src, Type dest) {
+		final Type componentType = Types.component(dest);
+		if (componentType == null) throw new IllegalArgumentException(dest +
+			" is not an array type!");
+		return convertToArray((String) src, componentType);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T convert(Object src, Class<T> dest) {
+		return (T) convert((String) src, (Type) dest);
+	}
+
+	@Override
+	public Class<Object> getOutputType() {
+		return Object.class;
+	}
+
+	@Override
+	public Class<String> getInputType() {
+		return String.class;
+	}
+
+	// -- HELPER METHODS -- //
+
+	/**
+	 * Converts {@code src} into an array of component type {@code componentType}
+	 * 
+	 * @param src the {@link String} to convert
+	 * @param componentType the component type of the output array
+	 * @return an array of {@code componentType} whose elements were created from
+	 *         {@code src}
+	 */
+	private Object convertToArray(String src, final Type componentType) {
+		List<String> elements = elements( src);
+		Class<?> componentClass = Types.raw(componentType);
+		final Object array = Array.newInstance(componentClass, elements.size());
+		for (int i = 0; i < elements.size(); i++)
+			Array.set(array, i, convertService.convert(elements.get(i),
+				componentClass));
+		return array;
+	}
+
+	/**
+	 * Gets the elements of {@code src}.
+	 * 
+	 * @param src a {@link String} consisting of:
+	 *          <ol>
+	 *          <li>A leading curly brace</li>
+	 *          <li>Some non-negative number of elements, can be a sublist.</li>
+	 *          <li>A trailing curly brace</li>
+	 *          </ol>
+	 * @return the elements of {@code src}
+	 */
+	private List<String> elements(String src) {
+		// trim off the leading curly brace
+		if (src.startsWith("{")) src = src.substring(1);
+		// trim off the ending curly brace
+		if (src.endsWith("}")) src = src.substring(0, src.length() - 1);
+		return splitByComma(src);
+	}
+
+	/**
+	 * Custom method for {@link String} splitting. Splits on TOP-LEVEL commas.
+	 * TODO: Is there a regex for which {@link String#split(String)} would work?
+	 * 
+	 * @param s the {@link String} to split
+	 * @return a {@link List} of substrings, split by a comma.
+	 */
+	private List<String> splitByComma(String s) {
+		int openBraces = 0;
+		List<String> arrayList = new ArrayList<>();
+		int start = 0;
+		for (int i = 0; i < s.length(); i++) {
+			switch (s.charAt(i)) {
+				case '{':
+					openBraces++;
+					break;
+				case '}':
+					openBraces--;
+					break;
+				case ',':
+					if (openBraces == 0) {
+						addString(arrayList, s.substring(start, i));
+						start = i + 1;
+					}
+			}
+		}
+		// Get the last substring
+		addString(arrayList, s.substring(start));
+		return arrayList;
+	}
+
+	/**
+	 * Helper method used to filter and format the additions to {@code list}
+	 * @param list the {@link List} to add to
+	 * @param s the {@link String} to (potentially) be added.
+	 */
+	private void addString(List<String> list, String s) {
+		s = s.trim();
+		if (!s.equals("")) list.add(s);
+	}
+
+}
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 0fda592c5..81b6cf28b 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -122,12 +122,6 @@ public static Collection<?> toCollection(final Object value) {
 		if (value instanceof Object[]) {
 			return new ObjectArray<>((Object[]) value);
 		}
-		if (value instanceof String) {
-			String[] arr = ((String) value).split("\\s*,\\s*");
-			Collection<?> c = new ObjectArray<String>(arr);
-			c.removeIf(o -> o.equals(""));
-			return c;
-		}
 		// This object is neither an array nor a collection.
 		// So we wrap it in a list and return.
 		final List<Object> list = new ObjectArray<>(Object.class);
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
new file mode 100644
index 000000000..9e1de8785
--- /dev/null
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -0,0 +1,160 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+
+/**
+ * Tests {@link ArrayToStringConverter}.
+ * 
+ * @author Gabriel Selzer
+ */
+public class ArrayToStringConverterTest {
+
+	private final ArrayToStringConverter converter = new ArrayToStringConverter();
+	private ConvertService convertService;
+	private Context context;
+
+	@Before
+	public void setUp() {
+		context = new Context(ConvertService.class);
+		context.inject(converter);
+		convertService = context.getService(ConvertService.class);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	/**
+	 * Tests the ability of {@link StringToArrayConverter} in converting to arrays
+	 * of various types
+	 */
+	@Test
+	public void testArrayConversion() {
+		// Component types for array conversions
+		List<Object> arrays = Arrays.asList( //
+			new byte[] { 1, 2, 3 }, //
+			new Byte[] { 1, 2, 3 }, //
+			new short[] { 1, 2, 3 }, //
+			new Short[] { 1, 2, 3 }, //
+			new int[] { 1, 2, 3 }, //
+			new Integer[] { 1, 2, 3 }, //
+			new long[] { 1, 2, 3 }, //
+			new Long[] { 1L, 2L, 3L }, //
+			new float[] { 1, 2, 3 }, //
+			new Float[] { 1F, 2F, 3F }, //
+			new double[] { 1, 2, 3 }, //
+			new Double[] { 1., 2., 3. } //
+		);
+		// String expectation
+		String sInt = "{1, 2, 3}";
+		String sFloat = "{1.0, 2.0, 3.0}";
+		for (Object array : arrays) {
+			// Ensure our Converter can do the conversion
+			Assert.assertTrue(converter.canConvert(array, String.class));
+			// Do the conversion
+			String converted = converter.convert(array, String.class);
+			// Ensure correctness
+			Assert.assertTrue(converted.equals(sInt) || converted.equals(sFloat));
+		}
+	}
+
+	/**
+	 * Tests the ability of {@link ArrayToStringConverter} in converting
+	 * 2-dimensional arrays
+	 */
+	@Test
+	public void test2DArrayConversion() {
+		byte[][] arr = new byte[][] { new byte[] { 0, 1 }, new byte[] { 2, 3 } };
+		Assert.assertTrue(converter.canConvert(arr, String.class));
+		String actual = converter.convert(arr, String.class);
+		String expected = "{{0, 1}, {2, 3}}";
+		Assert.assertEquals(expected, actual);
+	}
+
+	/**
+	 * Tests the ability of {@link ArrayToStringConverter} in converting
+	 * 3-dimensional arrays
+	 */
+	@Test
+	public void test3DArrayConversion() {
+		byte[][][] arr = new byte[2][2][2];
+		for (int i = 0; i < 2; i++)
+			for (int j = 0; j < 2; j++)
+				for (int k = 0; k < 2; k++)
+					arr[i][j][k] = (byte) (i + j + k);
+
+		Assert.assertTrue(converter.canConvert(arr, String.class));
+		String actual = converter.convert(arr, String.class);
+		String expected = "{{{0, 1}, {1, 2}}, {{1, 2}, {2, 3}}}";
+		Assert.assertEquals(expected, actual);
+	}
+
+	/**
+	 * Tests the ability of {@link ArrayToStringConverter} in converting empty
+	 * arrays
+	 */
+	@Test
+	public void testEmptyArrayConversion() {
+		byte[] arr = new byte[0];
+		Assert.assertTrue(converter.canConvert(arr, String.class));
+		String actual = converter.convert(arr, String.class);
+		String expected = "{}";
+		Assert.assertEquals(expected, actual);
+	}
+
+	/**
+	 * Tests the ability of {@link ArrayToStringConverter} and
+	 * {@link StringToArrayConverter} to perform a cyclic conversion.
+	 */
+	@Test
+	public void testCyclicConversion() {
+		byte[] expected = new byte[] {1, 2, 3};
+		// Do the first conversion
+		ArrayToStringConverter c1 = new ArrayToStringConverter();
+		context.inject(c1);
+		String converted = c1.convert(expected, String.class);
+		// Convert back
+		StringToArrayConverter c2 = new StringToArrayConverter();
+		context.inject(c2);
+		byte[] actual = c2.convert(converted, byte[].class);
+		Assert.assertArrayEquals(expected, actual);
+	}
+
+}
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
new file mode 100644
index 000000000..f26bf804c
--- /dev/null
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -0,0 +1,158 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.convert;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Tests {@link StringToArrayConverter}.
+ * 
+ * @author Gabriel Selzer
+ */
+public class StringToArrayConverterTest {
+
+	private final StringToArrayConverter converter = new StringToArrayConverter();
+	private ConvertService convertService;
+	private Context context;
+
+	@Before
+	public void setUp() {
+		context = new Context(ConvertService.class);
+		context.inject(converter);
+		convertService = context.getService(ConvertService.class);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	/**
+	 * Tests the ability of {@link StringToArrayConverter} in converting to arrays
+	 * of various types
+	 */
+	@Test
+	public void testArrayConversion() {
+		// Component types for array conversions
+		List<Class<?>> classes = Arrays.asList( //
+			byte.class, //
+			Byte.class, //
+			short.class, //
+			Short.class, //
+			int.class, //
+			Integer.class, //
+			long.class, //
+			Long.class, //
+			float.class, //
+			Float.class, //
+			double.class, //
+			Double.class //
+		);
+		// String input
+		String s = "{0, 1, 2}";
+		for (Class<?> c : classes) {
+			// Make the array class
+			Class<?> arrayClass = Array.newInstance(c, 0).getClass();
+			// Ensure our Converter can do the conversion
+			Assert.assertTrue(converter.canConvert(s, arrayClass));
+			// Do the conversion
+			Object converted = converter.convert(s, arrayClass);
+			// Ensure the output is the expected type
+			Assert.assertEquals(arrayClass, converted.getClass());
+			for (int i = 0; i < 3; i++) {
+				// Ensure element correctness
+				Object expected = convertService.convert(i, c);
+				Assert.assertEquals(expected, Array.get(converted, i));
+			}
+		}
+	}
+
+	/**
+	 * Tests the ability of {@link StringToArrayConverter} in converting
+	 * 2-dimensional arrays
+	 */
+	@Test
+	public void test2DArrayConversion() {
+		String s = "{{0, 1}, {2, 3}}";
+		Assert.assertTrue(converter.canConvert(s, byte[][].class));
+		byte[][] actual = converter.convert(s, byte[][].class);
+		Assert.assertEquals(0, actual[0][0]);
+		Assert.assertEquals(1, actual[0][1]);
+		Assert.assertEquals(2, actual[1][0]);
+		Assert.assertEquals(3, actual[1][1]);
+	}
+
+	/**
+	 * Tests the ability of {@link StringToArrayConverter} in converting
+	 * 3-dimensional arrays
+	 */
+	@Test
+	public void test3DArrayConversion() {
+		String s = "{{{0, 1}, {1, 2}},{{1, 2}, {2, 3}}}";
+		Assert.assertTrue(converter.canConvert(s, byte[][][].class));
+		byte[][][] actual = converter.convert(s, byte[][][].class);
+
+		for (int i = 0; i < 2; i++)
+			for (int j = 0; j < 2; j++)
+				for (int k = 0; k < 2; k++)
+					Assert.assertEquals(i + j + k, actual[i][j][k]);
+	}
+
+	/**
+	 * Tests the ability of {@link StringToArrayConverter} in converting empty
+	 * arrays
+	 */
+	@Test
+	public void testEmptyArrayConversion() {
+		String s = "{}";
+		Assert.assertTrue(converter.canConvert(s, byte[].class));
+		byte[] actual = converter.convert(s, byte[].class);
+		Assert.assertEquals(0, actual.length);
+	}
+
+	/**
+	 * Tests the ability of {@link StringToArrayConverter} in converting only
+	 * arrays whose elements can be converted
+	 */
+	@Test
+	public void testInconvertibleArrayType() {
+		String s = "{ConverterA}";
+		Assert.assertFalse(converter.canConvert(s, Converter[].class));
+	}
+
+}
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index dffd09e02..dd9e15af8 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -40,9 +40,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.util.ObjectArray;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests {@link ModuleService}.
@@ -162,59 +165,63 @@ public void testGetSingleInput() throws ModuleException {
 	@Test
 	public void testSaveAndLoad() {
 
-		List<Object[]> parameterizations = new ArrayList<>();
-		parameterizations.add(new Object[] { //
-			double[].class, new double[] {} //
-		});
-		parameterizations.add(new Object[] { //
-			double[].class, new double[] { 1., 2., 3. } //
-		});
-		parameterizations.add(new Object[] { //
-			Double[].class, new Double[] {} //
-		});
-		parameterizations.add(new Object[] { //
-			Double[].class, new Double[] { 1., 2., 3. } //
-		});
-
-		for (Object[] params : parameterizations) {
-			Class<?> type = (Class<?>) params[0];
-			Object expected = params[1];
-			// Get a ModuleItem of the right type
-			MutableModule m = new DefaultMutableModule();
-			m.getInfo().addInput(new DefaultMutableModuleItem<>(m, "a", type));
-			@SuppressWarnings("unchecked")
-			final ModuleItem<Object> item = (ModuleItem<Object>) moduleService
-				.getSingleInput(m, type);
-			// Save a value to the ModuleItem
-			moduleService.save(item, expected);
-			// Load that value from the ModuleItem
-			Object actual = moduleService.load(item);
-			// Assert equality
-			if (expected.getClass().isArray()) assertArrayEquality(expected, actual);
-			else assertEquals(expected, actual);
+		List<Object[]> objects = new ArrayList<>();
+		objects.add(new Object[] { new double[] {} });
+		objects.add(new Object[] { new double[] { 1., 2., 3. } });
+		objects.add(new Object[] { new Double[] {} });
+		objects.add(new Object[] { new Double[] { 1., 2., 3. } });
+
+		for (Object[] params : objects) {
+			saveParam(params[0]);
 		}
 	}
 
+	private <T> void saveParam(T object) {
+		@SuppressWarnings("unchecked")
+		Class<T> c = (Class<T>) object.getClass();
+		// Get a ModuleItem of the right type
+		MutableModule m = new DefaultMutableModule();
+		m.getInfo().addInput(new DefaultMutableModuleItem<>(m, "a", c));
+		final ModuleItem<T> item = moduleService.getSingleInput(m, c);
+		// Save a value to the ModuleItem
+		moduleService.save(item, object);
+		// Load that value from the ModuleItem
+		Object actual = moduleService.load(item);
+		// Assert equality
+		if (object.getClass().isArray()) assertArrayEquality(object, actual);
+		else assertEquals(object, actual);
+	}
+
 	private void assertArrayEquality(Object arr1, Object arr2) {
 		// Ensure that both Objects are arrays of the same type!
 		assertEquals(arr1.getClass(), arr2.getClass());
 		assertTrue(arr1.getClass().isArray());
 
 		// We must check primitive arrays as they cannot be cast to Object[]
-		if (arr1 instanceof boolean[]) //
+		if (arr1 instanceof boolean[]) {
 			assertArrayEquals((boolean[]) arr1, (boolean[]) arr2);
-		else if (arr1 instanceof short[]) //
+		}
+		else if (arr1 instanceof byte[]) {
+			assertArrayEquals((byte[]) arr1, (byte[]) arr2);
+		}
+		else if (arr1 instanceof short[]) {
 			assertArrayEquals((short[]) arr1, (short[]) arr2);
-		else if (arr1 instanceof int[]) //
+		}
+		else if (arr1 instanceof int[]) {
 			assertArrayEquals((int[]) arr1, (int[]) arr2);
-		else if (arr1 instanceof long[]) //
+		}
+		else if (arr1 instanceof long[]) {
 			assertArrayEquals((long[]) arr1, (long[]) arr2);
-		else if (arr1 instanceof float[]) //
+		}
+		else if (arr1 instanceof float[]) {
 			assertArrayEquals((float[]) arr1, (float[]) arr2, 1e-6f);
-		else if (arr1 instanceof double[]) //
+		}
+		else if (arr1 instanceof double[]) {
 			assertArrayEquals((double[]) arr1, (double[]) arr2, 1e-6);
-		else if (arr1 instanceof char[]) //
+		}
+		else if (arr1 instanceof char[]) {
 			assertArrayEquals((char[]) arr1, (char[]) arr2);
+		}
 		// Otherwise we can just cast to Object[]
 		else assertArrayEquals((Object[]) arr1, (Object[]) arr2);
 	}
@@ -259,6 +266,7 @@ private static String mapToString(final Map<String, Object> map) {
 
 	/** A sample module for testing the module service. */
 	public static class FooModule extends AbstractModule {
+
 		private final FooModuleInfo info;
 
 		public FooModule(final FooModuleInfo info) {

From 0142f59d03e0a031b60a67ed4b94eb59ad4be510 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 18 Aug 2022 09:42:38 -0500
Subject: [PATCH 1031/1208] Add a note about StringToArray.canConvert

---
 .../java/org/scijava/convert/StringToArrayConverter.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index fdc57d5b4..d78df7d13 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -67,6 +67,11 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 		String srcString = (String) src;
 		if (!(srcString.startsWith("{") && srcString.endsWith("}"))) return false;
 		List<String> components = elements((String) src);
+		// NB this check is merely a heuristic. In the case of a heterogeneous
+		// array, canConvert may falsely return positive, if later elements in the
+		// string-ified array cannot be converted into Objects. We make this
+		// compromise in the interest of speed, however, as ensuring correctness
+		// would require a premature conversion of the entire array.
 		return components.size() == 0 || convertService.supports(components.get(0),
 			dest.getComponentType());
 	}

From 8203b522944594365c3bb78c192fda6996c1bc9a Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 18 Aug 2022 09:46:08 -0500
Subject: [PATCH 1032/1208] Format StringToArray.convert() IAE better

It doesn't wrap anymore.
---
 .../java/org/scijava/convert/StringToArrayConverter.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index d78df7d13..0dd55298f 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -79,8 +79,9 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 	@Override
 	public Object convert(Object src, Type dest) {
 		final Type componentType = Types.component(dest);
-		if (componentType == null) throw new IllegalArgumentException(dest +
-			" is not an array type!");
+		if (componentType == null) {
+			throw new IllegalArgumentException(dest + " is not an array type!");
+		}
 		return convertToArray((String) src, componentType);
 	}
 

From e852b7e3abc94e570977a933e313bf9d5efe515b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 18 Aug 2022 11:12:09 -0500
Subject: [PATCH 1033/1208] README: change chat badge from gitter to zulip

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 06c483c15..42cba38b4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
 [![](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml)
-[![Join the chat at https://gitter.im/scijava/scijava-common](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scijava/scijava-common?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![developer chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://imagesc.zulipchat.com/#narrow/stream/327237-SciJava)
 
 SciJava Common is a common library for SciJava software. It provides a
 plugin framework, with an extensible mechanism for service discovery, backed

From e1ae87d67a1ce0e4efb61b698f0ccff562415972 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 18 Aug 2022 11:39:02 -0500
Subject: [PATCH 1034/1208] Use Parsington for string parsing

---
 .../convert/StringToArrayConverter.java       | 94 +++++++++++++++----
 1 file changed, 78 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 0dd55298f..8bbbf54c3 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -30,6 +30,8 @@
 package org.scijava.convert;
 
 import org.scijava.Priority;
+import org.scijava.parsington.ExpressionParser;
+import org.scijava.parsington.SyntaxTree;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.Types;
@@ -38,6 +40,7 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * A {@link Converter} that specializes in converting {@link String}s to
@@ -47,12 +50,14 @@
  * 
  * @author Gabriel Selzer
  */
-@Plugin(type = Converter.class, priority=Priority.VERY_LOW)
+@Plugin(type = Converter.class, priority = Priority.VERY_LOW)
 public class StringToArrayConverter extends AbstractConverter<String, Object> {
 
 	@Parameter
 	private ConvertService convertService;
 
+	private final ExpressionParser parser = new ExpressionParser();
+
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
@@ -61,19 +66,35 @@ public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		return saneSrc == String.class && saneDest.isArray();
 	}
 
+	@Override
+	public boolean canConvert(final Object src, final Type dest) {
+		return canConvert(src, Types.raw(dest));
+	}
+
 	@Override
 	public boolean canConvert(final Object src, final Class<?> dest) {
+
+		// First, ensure the base types conform
 		if (!canConvert(src.getClass(), dest)) return false;
-		String srcString = (String) src;
-		if (!(srcString.startsWith("{") && srcString.endsWith("}"))) return false;
-		List<String> components = elements((String) src);
+		// Then, ensure we can parse the string
+		SyntaxTree tree;
+		try {
+			tree = parser.parseTree((String) src);
+		}
+		catch (IllegalArgumentException e) {
+			return false;
+		}
+		// We can always convert empty arrays as we don't have to create Objects
+		if (tree.count() == 0) return true;
+		// Finally, ensure that we can convert the elements of the array.
 		// NB this check is merely a heuristic. In the case of a heterogeneous
 		// array, canConvert may falsely return positive, if later elements in the
 		// string-ified array cannot be converted into Objects. We make this
 		// compromise in the interest of speed, however, as ensuring correctness
 		// would require a premature conversion of the entire array.
-		return components.size() == 0 || convertService.supports(components.get(0),
-			dest.getComponentType());
+		Object testSrc = firstElement(tree);
+		Class<?> testDest = unitComponentType(dest);
+		return convertService.supports(testSrc, testDest);
 	}
 
 	@Override
@@ -82,13 +103,19 @@ public Object convert(Object src, Type dest) {
 		if (componentType == null) {
 			throw new IllegalArgumentException(dest + " is not an array type!");
 		}
-		return convertToArray((String) src, componentType);
+		try {
+			SyntaxTree tree = parser.parseTree((String) src);
+			return convertToArray(tree, Types.raw(componentType));
+		}
+		catch (IllegalArgumentException e) {
+			return null;
+		}
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T convert(Object src, Class<T> dest) {
-		return (T) convert((String) src, (Type) dest);
+		return (T) convert(src, (Type) dest);
 	}
 
 	@Override
@@ -106,21 +133,55 @@ public Class<String> getInputType() {
 	/**
 	 * Converts {@code src} into an array of component type {@code componentType}
 	 * 
-	 * @param src the {@link String} to convert
+	 * @param tree the {@link String} to convert
 	 * @param componentType the component type of the output array
 	 * @return an array of {@code componentType} whose elements were created from
 	 *         {@code src}
 	 */
-	private Object convertToArray(String src, final Type componentType) {
-		List<String> elements = elements( src);
-		Class<?> componentClass = Types.raw(componentType);
-		final Object array = Array.newInstance(componentClass, elements.size());
-		for (int i = 0; i < elements.size(); i++)
-			Array.set(array, i, convertService.convert(elements.get(i),
-				componentClass));
+	private Object convertToArray(SyntaxTree tree, final Class<?> componentType) {
+		// Create the array
+		final Object array = Array.newInstance(componentType, tree.count());
+		// Set each element of the array
+		for (int i = 0; i < tree.count(); i++) {
+			SyntaxTree subTree = tree.child(i);
+			Object element;
+			// Case 1: Element is an array
+			if (componentType.isArray()) {
+				element = convertToArray(subTree, componentType.getComponentType());
+			}
+			// Case 2: Element is a single object
+			else {
+				element = convertService.convert(subTree.token(), componentType);
+			}
+			Array.set(array, i, element);
+		}
 		return array;
 	}
 
+	/**
+	 * Similar to {@link Class#getComponentType()}, but handles nested array types
+	 *
+	 * @param c the {@link Class} that may be an array class
+	 * @return the <em>unit</em> component type of {@link Class} {@code c}
+	 */
+	private Class<?> unitComponentType(Class<?> c) {
+		if (!c.isArray()) return c;
+		return unitComponentType(c.getComponentType());
+	}
+
+	/**
+	 * Traverses {@code tree} to find the first element
+	 * 
+	 * @param tree the {@link SyntaxTree} containing elements
+	 * @return the first {@link Object} in {@code tree}
+	 */
+	private Object firstElement(SyntaxTree tree) {
+		while (tree.count() > 0) {
+			tree = tree.child(0);
+		}
+		return tree.token();
+	}
+
 	/**
 	 * Gets the elements of {@code src}.
 	 * 
@@ -173,6 +234,7 @@ private List<String> splitByComma(String s) {
 
 	/**
 	 * Helper method used to filter and format the additions to {@code list}
+	 * 
 	 * @param list the {@link List} to add to
 	 * @param s the {@link String} to (potentially) be added.
 	 */

From 244348726da4796ada9e27e79439929a6a979372 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 18 Aug 2022 12:27:43 -0500
Subject: [PATCH 1035/1208] Clean up ModuleServiceTest

---
 .../org/scijava/module/ModuleServiceTest.java | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index dd9e15af8..f863fe2ab 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -29,7 +29,13 @@
 
 package org.scijava.module;
 
-import java.util.ArrayList;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,12 +47,6 @@
 import org.junit.Test;
 import org.scijava.Context;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Tests {@link ModuleService}.
  * 
@@ -164,19 +164,16 @@ public void testGetSingleInput() throws ModuleException {
 
 	@Test
 	public void testSaveAndLoad() {
-
-		List<Object[]> objects = new ArrayList<>();
-		objects.add(new Object[] { new double[] {} });
-		objects.add(new Object[] { new double[] { 1., 2., 3. } });
-		objects.add(new Object[] { new Double[] {} });
-		objects.add(new Object[] { new Double[] { 1., 2., 3. } });
-
-		for (Object[] params : objects) {
-			saveParam(params[0]);
-		}
+		List<Object> objects = Arrays.asList( //
+			new double[] {}, //
+			new double[] { 1., 2., 3. }, //
+			new Double[] {}, //
+			new Double[] { 1., 2., 3. } //
+		);
+		objects.forEach(this::assertParamSavedAndLoaded);
 	}
 
-	private <T> void saveParam(T object) {
+	private <T> void assertParamSavedAndLoaded(T object) {
 		@SuppressWarnings("unchecked")
 		Class<T> c = (Class<T>) object.getClass();
 		// Get a ModuleItem of the right type

From e17229dc0a8caf81b7c2d6481db2d0e45e98a1d5 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 18 Aug 2022 13:41:04 -0500
Subject: [PATCH 1036/1208] Test special conditions

---
 .../convert/ArrayToStringConverter.java       | 43 +++++++++++--
 .../convert/StringToArrayConverter.java       | 61 -------------------
 .../convert/StringToArrayConverterTest.java   | 36 ++++++++++-
 3 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index 922f2eac6..90f1e5ff2 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -31,8 +31,6 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import org.scijava.Priority;
@@ -67,13 +65,46 @@ public class ArrayToStringConverter extends AbstractConverter<Object, String> {
 		return convertService.supports(Array.get(src, 0), dest);
 	}
 
-	@Override public Object convert(Object src, Type dest) {
-		final String elementString = ArrayUtils.toCollection(src).stream() //
-				.map(object -> convertService.convert(object, String.class)) //
-				.collect(Collectors.joining(", "));
+	@Override
+	public Object convert(Object src, Type dest) {
+		// Preprocess the "string-likes"
+		if (src.getClass().equals(String[].class) || //
+			src.getClass().equals(Character[].class) || //
+			src.getClass().equals(char[].class)) //
+		{
+			src = preprocessCharacters(src);
+		}
+		// Convert each element to Strings
+		String elementString = ArrayUtils.toCollection(src).stream() //
+			.map(object -> convertService.convert(object, String.class)) //
+			.collect(Collectors.joining(", "));
 		return "{" + elementString + "}";
 	}
 
+	private String[] preprocessStrings(final Object src) {
+		int numElements = Array.getLength(src);
+		String[] processed = new String[numElements];
+		for (int i = 0; i < numElements; i++) {
+			processed[i] = preprocessString(Array.get(src, i));
+		}
+		return processed;
+	}
+
+	private String preprocessString(final Object o) {
+		String s = o.toString();
+		s = s.replace("\\", "\\\\");
+		s = s.replace("\"", "\\\"");
+		return "\"" + s + "\"";
+	}
+
+	private String[] preprocessCharacters(Object src) {
+		String[] processed = new String[Array.getLength(src)];
+		for (int i = 0; i < processed.length; i++) {
+			processed[i] = Array.get(src, i).toString();
+		}
+		return preprocessStrings(processed);
+	}
+
 	@SuppressWarnings("unchecked") @Override
 	public <T> T convert(Object src, Class<T> dest) {
 		return (T) convert(src, (Type) dest);
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 8bbbf54c3..64db2bb46 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -182,65 +182,4 @@ private Object firstElement(SyntaxTree tree) {
 		return tree.token();
 	}
 
-	/**
-	 * Gets the elements of {@code src}.
-	 * 
-	 * @param src a {@link String} consisting of:
-	 *          <ol>
-	 *          <li>A leading curly brace</li>
-	 *          <li>Some non-negative number of elements, can be a sublist.</li>
-	 *          <li>A trailing curly brace</li>
-	 *          </ol>
-	 * @return the elements of {@code src}
-	 */
-	private List<String> elements(String src) {
-		// trim off the leading curly brace
-		if (src.startsWith("{")) src = src.substring(1);
-		// trim off the ending curly brace
-		if (src.endsWith("}")) src = src.substring(0, src.length() - 1);
-		return splitByComma(src);
-	}
-
-	/**
-	 * Custom method for {@link String} splitting. Splits on TOP-LEVEL commas.
-	 * TODO: Is there a regex for which {@link String#split(String)} would work?
-	 * 
-	 * @param s the {@link String} to split
-	 * @return a {@link List} of substrings, split by a comma.
-	 */
-	private List<String> splitByComma(String s) {
-		int openBraces = 0;
-		List<String> arrayList = new ArrayList<>();
-		int start = 0;
-		for (int i = 0; i < s.length(); i++) {
-			switch (s.charAt(i)) {
-				case '{':
-					openBraces++;
-					break;
-				case '}':
-					openBraces--;
-					break;
-				case ',':
-					if (openBraces == 0) {
-						addString(arrayList, s.substring(start, i));
-						start = i + 1;
-					}
-			}
-		}
-		// Get the last substring
-		addString(arrayList, s.substring(start));
-		return arrayList;
-	}
-
-	/**
-	 * Helper method used to filter and format the additions to {@code list}
-	 * 
-	 * @param list the {@link List} to add to
-	 * @param s the {@link String} to (potentially) be added.
-	 */
-	private void addString(List<String> list, String s) {
-		s = s.trim();
-		if (!s.equals("")) list.add(s);
-	}
-
 }
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index f26bf804c..ef361b9e0 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -116,7 +116,6 @@ public void test2DArrayConversion() {
 		Assert.assertEquals(2, actual[1][0]);
 		Assert.assertEquals(3, actual[1][1]);
 	}
-
 	/**
 	 * Tests the ability of {@link StringToArrayConverter} in converting
 	 * 3-dimensional arrays
@@ -155,4 +154,39 @@ public void testInconvertibleArrayType() {
 		Assert.assertFalse(converter.canConvert(s, Converter[].class));
 	}
 
+	/**
+	 * Tests the special case of {@link String}s
+	 */
+	@Test
+	public void testStringArrayConversion() {
+		String[] expected = new String[] { //
+				"{foo", "bar}", //
+				"ha\nha", //
+				"foo,bar", //
+				"lol\"lol", //
+				"foo\\\"bar" //
+		};
+		String converted = convertService.convert(expected, String.class);
+		String[] actual = convertService.convert(converted, String[].class);
+		Assert.assertArrayEquals(expected, actual);
+	}
+
+	/**
+	 * Tests the special case of {@link Character}s
+	 */
+	@Test
+	public void testCharacterArrayConversion() {
+		Character[] expected = new Character[] { //
+				's', //
+				'\n', //
+				',', //
+				'{', //
+				'}' //
+		};
+		String converted = convertService.convert(expected, String.class);
+		Character[] actual = convertService.convert(converted, Character[].class);
+		Assert.assertArrayEquals(expected, actual);
+	}
+
+
 }

From 95189404f8e8e7416a284e2509d6b1ebf76b3f15 Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Thu, 25 Aug 2022 10:38:39 +0200
Subject: [PATCH 1037/1208] Adjust comment in NumberUtilsTest.java

---
 src/test/java/org/scijava/util/NumberUtilsTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/util/NumberUtilsTest.java b/src/test/java/org/scijava/util/NumberUtilsTest.java
index e175ab8e7..c838ccc89 100644
--- a/src/test/java/org/scijava/util/NumberUtilsTest.java
+++ b/src/test/java/org/scijava/util/NumberUtilsTest.java
@@ -64,7 +64,7 @@ public void testGetMaximumNumber() {
 		assertEquals(Long.MAX_VALUE, NumberUtils.getMaximumNumber(Long.class));
 		assertEquals(Float.MAX_VALUE, NumberUtils.getMaximumNumber(Float.class));
 		assertEquals(Double.MAX_VALUE, NumberUtils.getMaximumNumber(Double.class));
-		// Number's minimum value should be the smallest of all the above -> Double
+		// Number's maximum value should be the largest of all the above -> Double
 		assertEquals(Double.MAX_VALUE, NumberUtils.getMaximumNumber(Number.class));
 	}
 }

From a841ee2cdf128b827f83a0ab7df9def1724f3b45 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 29 Aug 2022 16:06:47 -0500
Subject: [PATCH 1038/1208] DefaultUIService: fix class name typo

The relevant class is GraphicsEnvironment, not GraphicsConfiguration.
---
 src/main/java/org/scijava/ui/DefaultUIService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 42899053b..d26cbd5d7 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -191,7 +191,7 @@ public void setHeadless(final boolean headless) {
 
 	@Override
 	public boolean isHeadless() {
-		// NB: We do not use java.awt.GraphicsConfiguration.isHeadless()
+		// NB: We do not use java.awt.GraphicsEnvironment.isHeadless()
 		// because scijava-common eschews java.awt.* classes when possible.
 		return forceHeadless || Boolean.getBoolean("java.awt.headless");
 	}

From 77758562d0a1526cbcf19f4980f42e93a44db264 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 17 Sep 2022 12:33:37 -0500
Subject: [PATCH 1039/1208] POM: update parent to pom-scijava 33.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0ed9c5fc3..8f538e5bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>32.0.0-beta-4</version>
+		<version>33.2.0</version>
 		<relativePath />
 	</parent>
 

From aa7fe2e241c9e5dcca2ffad7945475aca47dc72c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 17 Sep 2022 17:53:33 -0500
Subject: [PATCH 1040/1208] Fix bug where text formats claim all files

The file extension check was not being invoked,
due to multiple inheritance order of precedence.
---
 .../org/scijava/text/AbstractTextFormat.java  | 11 ++-
 .../java/org/scijava/text/TextFormat.java     |  1 +
 .../org/scijava/text/TextServiceTest.java     | 86 +++++++++++++++++++
 3 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/scijava/text/TextServiceTest.java

diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 202092996..72654f649 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -41,5 +41,14 @@
 public abstract class AbstractTextFormat extends AbstractHandlerPlugin<File>
 	implements TextFormat
 {
-	// NB: No implementation needed.
+	// -- Typed methods --
+
+	@Override
+	public boolean supports(final File data) {
+		// NB: This override is necessary, because the default super is
+		// AbstractHandlerPlugin->AbstractTypedPlugin->TypedPlugin->Typed,
+		// which fails to invoke the needed TextFormat.super.
+		// See fiji/fiji#303 and fiji/HDF5_Vibez#18.
+		return TextFormat.super.supports(data);
+	}
 }
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 40a314e8a..01002be53 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -63,6 +63,7 @@ public interface TextFormat extends HandlerPlugin<File> {
 
 	@Override
 	default boolean supports(final File file) {
+		if (!HandlerPlugin.super.supports(file)) return false;
 		for (final String ext : getExtensions()) {
 			if (FileUtils.getExtension(file).equalsIgnoreCase(ext)) return true;
 		}
diff --git a/src/test/java/org/scijava/text/TextServiceTest.java b/src/test/java/org/scijava/text/TextServiceTest.java
new file mode 100644
index 000000000..974e0cbac
--- /dev/null
+++ b/src/test/java/org/scijava/text/TextServiceTest.java
@@ -0,0 +1,86 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.text;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.plugin.Plugin;
+
+/** Tests {@link TextService}. */
+public class TextServiceTest {
+
+	private Context ctx;
+	private TextService textService;
+
+	@Before
+	public void setUp() {
+		ctx = new Context(TextService.class);
+		textService = ctx.service(TextService.class);
+	}
+
+	@After
+	public void tearDown() {
+		ctx.dispose();
+	}
+
+	@Test
+	public void testGetHandler() {
+		final TextFormat fooHandler = textService.getHandler(new File("data.foo"));
+		assertNotNull(fooHandler);
+		assertEquals(FooTextFormat.class, fooHandler.getClass());
+		System.out.println(fooHandler);
+
+		final TextFormat barHandler = textService.getHandler(new File("data.bar"));
+		assertNull(barHandler);
+	}
+
+	@Plugin(type = TextFormat.class)
+	public static class FooTextFormat extends AbstractTextFormat {
+
+		@Override
+		public List<String> getExtensions() {
+			return Arrays.asList("foo");
+		}
+
+		@Override
+		public String asHTML(final String text) {
+			return "[FOO]" + text + "[/FOO]";
+		}
+	}
+}

From 17da84f728d8a6abdf9be1da2362ee61b40cfbad Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Sep 2022 16:12:21 -0500
Subject: [PATCH 1041/1208] Remove unused imports and fields

---
 src/main/java/org/scijava/convert/StringToArrayConverter.java  | 3 ---
 src/main/java/org/scijava/util/ArrayUtils.java                 | 2 --
 .../java/org/scijava/convert/ArrayToStringConverterTest.java   | 2 --
 3 files changed, 7 deletions(-)

diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 64db2bb46..4882e747a 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -38,9 +38,6 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
 
 /**
  * A {@link Converter} that specializes in converting {@link String}s to
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 81b6cf28b..c6487c5cf 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -58,9 +58,7 @@
 
 package org.scijava.util;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 /**
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 9e1de8785..63a1f4ba9 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -46,14 +46,12 @@
 public class ArrayToStringConverterTest {
 
 	private final ArrayToStringConverter converter = new ArrayToStringConverter();
-	private ConvertService convertService;
 	private Context context;
 
 	@Before
 	public void setUp() {
 		context = new Context(ConvertService.class);
 		context.inject(converter);
-		convertService = context.getService(ConvertService.class);
 	}
 
 	@After

From 73239ad09c78170494b07f0a3e6ce1ad50207033 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 21 Sep 2022 16:55:56 -0500
Subject: [PATCH 1042/1208] Use ParseService

Thanks @ctrueden for the suggestion
---
 .../convert/StringToArrayConverter.java       | 27 +++++++++----------
 .../convert/ArrayToStringConverterTest.java   |  3 ++-
 .../convert/StringToArrayConverterTest.java   |  3 ++-
 .../org/scijava/module/ModuleServiceTest.java |  3 ++-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 4882e747a..e75415532 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -30,6 +30,8 @@
 package org.scijava.convert;
 
 import org.scijava.Priority;
+import org.scijava.parse.Items;
+import org.scijava.parse.ParseService;
 import org.scijava.parsington.ExpressionParser;
 import org.scijava.parsington.SyntaxTree;
 import org.scijava.plugin.Parameter;
@@ -53,6 +55,9 @@ public class StringToArrayConverter extends AbstractConverter<String, Object> {
 	@Parameter
 	private ConvertService convertService;
 
+	@Parameter
+	private ParseService parseService;
+
 	private final ExpressionParser parser = new ExpressionParser();
 
 	@Override
@@ -101,8 +106,9 @@ public Object convert(Object src, Type dest) {
 			throw new IllegalArgumentException(dest + " is not an array type!");
 		}
 		try {
-			SyntaxTree tree = parser.parseTree((String) src);
-			return convertToArray(tree, Types.raw(componentType));
+			return convertToArray( //
+				parseService.parse((String) src), //
+				Types.raw(componentType));
 		}
 		catch (IllegalArgumentException e) {
 			return null;
@@ -135,21 +141,12 @@ public Class<String> getInputType() {
 	 * @return an array of {@code componentType} whose elements were created from
 	 *         {@code src}
 	 */
-	private Object convertToArray(SyntaxTree tree, final Class<?> componentType) {
+	private Object convertToArray(Items tree, final Class<?> componentType) {
 		// Create the array
-		final Object array = Array.newInstance(componentType, tree.count());
+		final Object array = Array.newInstance(componentType, tree.size());
 		// Set each element of the array
-		for (int i = 0; i < tree.count(); i++) {
-			SyntaxTree subTree = tree.child(i);
-			Object element;
-			// Case 1: Element is an array
-			if (componentType.isArray()) {
-				element = convertToArray(subTree, componentType.getComponentType());
-			}
-			// Case 2: Element is a single object
-			else {
-				element = convertService.convert(subTree.token(), componentType);
-			}
+		for (int i = 0; i < tree.size(); i++) {
+			Object element = convertService.convert(tree.get(i).value(), componentType);
 			Array.set(array, i, element);
 		}
 		return array;
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 63a1f4ba9..7623017cb 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -37,6 +37,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.parse.ParseService;
 
 /**
  * Tests {@link ArrayToStringConverter}.
@@ -50,7 +51,7 @@ public class ArrayToStringConverterTest {
 
 	@Before
 	public void setUp() {
-		context = new Context(ConvertService.class);
+		context = new Context(ConvertService.class, ParseService.class);
 		context.inject(converter);
 	}
 
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index ef361b9e0..0c0dfdd67 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -34,6 +34,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.parse.ParseService;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -52,7 +53,7 @@ public class StringToArrayConverterTest {
 
 	@Before
 	public void setUp() {
-		context = new Context(ConvertService.class);
+		context = new Context(ParseService.class, ConvertService.class);
 		context.inject(converter);
 		convertService = context.getService(ConvertService.class);
 	}
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index f863fe2ab..2bd1fcb4b 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -46,6 +46,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
+import org.scijava.parse.ParseService;
 
 /**
  * Tests {@link ModuleService}.
@@ -58,7 +59,7 @@ public class ModuleServiceTest {
 
 	@Before
 	public void setUp() {
-		final Context context = new Context(ModuleService.class);
+		final Context context = new Context(ModuleService.class, ParseService.class);
 		moduleService = context.service(ModuleService.class);
 	}
 

From 4843209ea4e0413661d472530ef25c3a8b4231bf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2022 18:20:06 -0500
Subject: [PATCH 1043/1208] POM: update parent to pom-scijava 33.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b49783f68..97c05cd19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>32.0.0-beta-3</version>
+		<version>33.2.0</version>
 		<relativePath />
 	</parent>
 

From 1df50ddead3447bbf74315608997b45f79ae2eda Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2022 18:34:25 -0500
Subject: [PATCH 1044/1208] StringToArrayConverterTest: assert more thoroughly

We can also assert the converted string, before converting back.
---
 .../org/scijava/convert/StringToArrayConverterTest.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index 0c0dfdd67..dc1b87f18 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -168,6 +168,11 @@ public void testStringArrayConversion() {
 				"foo\\\"bar" //
 		};
 		String converted = convertService.convert(expected, String.class);
+		Assert.assertEquals("{\"{foo\", \"bar}\", " + //
+			"\"ha\nha\", " + //
+			"\"foo,bar\", " + //
+			"\"lol\\\"lol\", " + //
+			"\"foo\\\\\\\"bar\"}", converted);
 		String[] actual = convertService.convert(converted, String[].class);
 		Assert.assertArrayEquals(expected, actual);
 	}
@@ -185,6 +190,7 @@ public void testCharacterArrayConversion() {
 				'}' //
 		};
 		String converted = convertService.convert(expected, String.class);
+		Assert.assertEquals("{\"s\", \"\n\", \",\", \"{\", \"}\"}", converted);
 		Character[] actual = convertService.convert(converted, Character[].class);
 		Assert.assertArrayEquals(expected, actual);
 	}

From 14f4e47b38eb6f01b5acbe63a765c54a50c94745 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2022 18:45:34 -0500
Subject: [PATCH 1045/1208] Fix license header whitespace

The license-maven-plugin wants the extra trailing whitespace...
---
 src/main/java/org/scijava/convert/ArrayToStringConverter.java | 4 ++--
 src/main/java/org/scijava/convert/StringToArrayConverter.java | 4 ++--
 .../java/org/scijava/convert/ArrayToStringConverterTest.java  | 4 ++--
 .../java/org/scijava/convert/StringToArrayConverterTest.java  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index 90f1e5ff2..77850b481 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.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
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index e75415532..ef0b291c6 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.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
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 7623017cb..7f1f07b13 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.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
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index dc1b87f18..8234adae7 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.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

From 42db182fa90ebe4fc79163713b8cf5ac7ee9b143 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2022 18:51:36 -0500
Subject: [PATCH 1046/1208] Make services optional for array/string converters

Especially the ParseService, because otherwise, if you include the
ConvertService in your context without the ParseService, you'll see
warnings that the StringToArrayConverter plugin cannot be instantiated.
---
 .../java/org/scijava/convert/ArrayToStringConverter.java     | 4 +++-
 .../java/org/scijava/convert/StringToArrayConverter.java     | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index 77850b481..029f5c1dd 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -50,7 +50,8 @@
 @Plugin(type = Converter.class, priority = Priority.VERY_LOW)
 public class ArrayToStringConverter extends AbstractConverter<Object, String> {
 
-	@Parameter private ConvertService convertService;
+	@Parameter(required = false)
+	private ConvertService convertService;
 
 	@Override public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
@@ -60,6 +61,7 @@ public class ArrayToStringConverter extends AbstractConverter<Object, String> {
 	}
 
 	@Override public boolean canConvert(final Object src, final Class<?> dest) {
+		if (convertService == null) return false;
 		if (!canConvert(src.getClass(), dest)) return false;
 		if (Array.getLength(src) == 0) return true;
 		return convertService.supports(Array.get(src, 0), dest);
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index ef0b291c6..933561ef9 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -52,10 +52,10 @@
 @Plugin(type = Converter.class, priority = Priority.VERY_LOW)
 public class StringToArrayConverter extends AbstractConverter<String, Object> {
 
-	@Parameter
+	@Parameter(required = false)
 	private ConvertService convertService;
 
-	@Parameter
+	@Parameter(required = false)
 	private ParseService parseService;
 
 	private final ExpressionParser parser = new ExpressionParser();
@@ -75,6 +75,7 @@ public boolean canConvert(final Object src, final Type dest) {
 
 	@Override
 	public boolean canConvert(final Object src, final Class<?> dest) {
+		if (convertService == null || parseService == null) return false;
 
 		// First, ensure the base types conform
 		if (!canConvert(src.getClass(), dest)) return false;

From 497eff6eca3ee9687acddd9453859fef40071390 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 21 Sep 2022 19:03:08 -0500
Subject: [PATCH 1047/1208] StringToArrayConverter: purge Parsington usage

The "Use ParseService" commit (73239ad09c78170494b07f0a3e6ce1ad50207033)
was an incomplete update. This commit finishes the job, and fixes a bug
in the recursive canConvert logic for multidimensional arrays.
---
 .../convert/StringToArrayConverter.java       | 38 +++++--------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 933561ef9..c5a34abad 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -29,18 +29,16 @@
 
 package org.scijava.convert;
 
+import java.lang.reflect.Array;
+import java.lang.reflect.Type;
+
 import org.scijava.Priority;
 import org.scijava.parse.Items;
 import org.scijava.parse.ParseService;
-import org.scijava.parsington.ExpressionParser;
-import org.scijava.parsington.SyntaxTree;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.Types;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Type;
-
 /**
  * A {@link Converter} that specializes in converting {@link String}s to
  * n-dimensional arrays. This {@link Converter} can convert any array whose
@@ -58,8 +56,6 @@ public class StringToArrayConverter extends AbstractConverter<String, Object> {
 	@Parameter(required = false)
 	private ParseService parseService;
 
-	private final ExpressionParser parser = new ExpressionParser();
-
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
 		if (src == null) return false;
@@ -80,22 +76,22 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 		// First, ensure the base types conform
 		if (!canConvert(src.getClass(), dest)) return false;
 		// Then, ensure we can parse the string
-		SyntaxTree tree;
+		Items tree;
 		try {
-			tree = parser.parseTree((String) src);
+			tree = parseService.parse((String) src);
 		}
-		catch (IllegalArgumentException e) {
+		catch (final IllegalArgumentException e) {
 			return false;
 		}
 		// We can always convert empty arrays as we don't have to create Objects
-		if (tree.count() == 0) return true;
+		if (tree.size() == 0) return true;
 		// Finally, ensure that we can convert the elements of the array.
 		// NB this check is merely a heuristic. In the case of a heterogeneous
 		// array, canConvert may falsely return positive, if later elements in the
 		// string-ified array cannot be converted into Objects. We make this
 		// compromise in the interest of speed, however, as ensuring correctness
 		// would require a premature conversion of the entire array.
-		Object testSrc = firstElement(tree);
+		Object testSrc = tree.get(0).value();
 		Class<?> testDest = unitComponentType(dest);
 		return convertService.supports(testSrc, testDest);
 	}
@@ -111,7 +107,7 @@ public Object convert(Object src, Type dest) {
 				parseService.parse((String) src), //
 				Types.raw(componentType));
 		}
-		catch (IllegalArgumentException e) {
+		catch (final IllegalArgumentException e) {
 			return null;
 		}
 	}
@@ -161,20 +157,6 @@ private Object convertToArray(Items tree, final Class<?> componentType) {
 	 */
 	private Class<?> unitComponentType(Class<?> c) {
 		if (!c.isArray()) return c;
-		return unitComponentType(c.getComponentType());
+		return c.getComponentType();
 	}
-
-	/**
-	 * Traverses {@code tree} to find the first element
-	 * 
-	 * @param tree the {@link SyntaxTree} containing elements
-	 * @return the first {@link Object} in {@code tree}
-	 */
-	private Object firstElement(SyntaxTree tree) {
-		while (tree.count() > 0) {
-			tree = tree.child(0);
-		}
-		return tree.token();
-	}
-
 }

From 19637c4d2f1c4500a6c25882bb7c87dc65ab65a8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Sep 2022 10:41:03 -0500
Subject: [PATCH 1048/1208] Update some hyperlinks, and use HTTPS if possible

---
 NOTICE.txt                                                | 4 ++--
 README.md                                                 | 2 +-
 src/it/apt-test/pom.xml                                   | 2 +-
 src/main/java/org/scijava/app/App.java                    | 2 +-
 src/main/java/org/scijava/io/location/URILocation.java    | 2 +-
 src/main/java/org/scijava/io/nio/NIOService.java          | 4 ++--
 src/main/java/org/scijava/plugin/Parameter.java           | 2 +-
 src/main/java/org/scijava/plugin/PluginIndex.java         | 2 +-
 .../java/org/scijava/script/DefaultScriptInterpreter.java | 4 ++--
 src/main/java/org/scijava/text/DefaultTextService.java    | 2 +-
 src/main/java/org/scijava/util/AppUtils.java              | 4 ++--
 src/main/java/org/scijava/util/FileUtils.java             | 2 +-
 src/main/java/org/scijava/util/ListUtils.java             | 2 +-
 src/main/java/org/scijava/util/MirrorWebsite.java         | 2 +-
 src/main/java/org/scijava/util/POM.java                   | 2 +-
 src/main/java/org/scijava/util/Types.java                 | 4 +---
 src/test/java/org/scijava/util/FileUtilsTest.java         | 8 ++++----
 17 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 74385d300..78b8ce335 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -5,7 +5,7 @@ both of which are licensed under the Apache 2.0 license, as follows:
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -197,7 +197,7 @@ both of which are licensed under the Apache 2.0 license, as follows:
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/README.md b/README.md
index 42cba38b4..6a69bf198 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
+[![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
 [![](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml)
 [![developer chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://imagesc.zulipchat.com/#narrow/stream/327237-SciJava)
 
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 8bfa04980..93eab1f4c 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -31,7 +31,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-		http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>@project.groupId@</groupId>
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index ad603f17f..aaa359dd9 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -144,7 +144,7 @@ default void quit() {
 	/**
 	 * Gets the version of the application.
 	 * <p>
-	 * SciJava conforms to the <a href="http://semver.org/">Semantic
+	 * SciJava conforms to the <a href="https://semver.org/">Semantic
 	 * Versioning</a> specification.
 	 * </p>
 	 * 
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 3311412e0..7b58d6a39 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -112,7 +112,7 @@ private Map<String, String> decodeQuery(final String query) {
 	 * @see URLDecoder
 	 */
 	private String decode(final String s) {
-		// http://stackoverflow.com/a/6926987
+		// https://stackoverflow.com/a/6926987
 		try {
 			return URLDecoder.decode(s.replace("+", "%2B"), "UTF-8");
 		}
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index cbc8d681d..111ceb81c 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -60,8 +60,8 @@ public interface NIOService extends SciJavaService {
 	 *          buffer.
 	 * @param newSize The buffer size.
 	 * @return A newly allocated or mapped NIO byte buffer.
-	 * @see "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5092131"
-	 * @see "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6417205"
+	 * @see "https://bugs.java.com/bugdatabase/view_bug.do?bug_id=5092131"
+	 * @see "https://bugs.java.com/bugdatabase/view_bug.do?bug_id=6417205"
 	 * @throws IOException If there is an issue mapping, aligning or allocating
 	 *           the buffer.
 	 */
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index 0a41c094d..cddcad87b 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -71,7 +71,7 @@
 	 * </ul>
 	 */
 	// NB: We use the fully qualified name to work around a javac bug:
-	// http://bugs.sun.com/view_bug.do?bug_id=6512707
+	// https://bugs.java.com/view_bug.do?bug_id=6512707
 	// See:
 	// http://groups.google.com/group/project-lombok/browse_thread/thread/c5568eb659cab203
 	ItemIO type() default org.scijava.ItemIO.INPUT;
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 73763ef03..640b6d61b 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -88,7 +88,7 @@ public PluginIndex() {
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public PluginIndex(final PluginFinder pluginFinder) {
-		// NB: See: http://stackoverflow.com/questions/4765520/
+		// NB: See: https://stackoverflow.com/questions/4765520/
 		super((Class) PluginInfo.class);
 		this.pluginFinder = pluginFinder;
 	}
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 147c141af..2e51a6322 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -46,7 +46,7 @@
  * The default implementation of a {@link ScriptInterpreter}.
  * <p>
  * Credit to Jason Sachs for the multi-line evaluation (see
- * <a href="http://stackoverflow.com/a/5598207">his post on StackOverflow</a>).
+ * <a href="https://stackoverflow.com/a/5598207">his post on StackOverflow</a>).
  * </p>
  *  
  * @author Johannes Schindelin
@@ -174,7 +174,7 @@ public Object eval(final String command) throws ScriptException {
 	 * fact that there was a syntax error in the 2nd line.</li>
 	 * </ul>
 	 * <p>
-	 * For further details, see <a href="http://stackoverflow.com/a/5598207">SO
+	 * For further details, see <a href="https://stackoverflow.com/a/5598207">SO
 	 * #5584674</a>.
 	 * </p>
 	 */
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index dab8a2898..63c56cb9d 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -59,7 +59,7 @@ public final class DefaultTextService extends
 
 	@Override
 	public String open(final File file) throws IOException {
-		// This routine is from: http://stackoverflow.com/a/326440
+		// This routine is from: https://stackoverflow.com/a/326440
 		try (final FileInputStream stream = new FileInputStream(file)) {
 			final FileChannel fc = stream.getChannel();
 			final MappedByteBuffer bb =
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index e83e06798..31456cb10 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -130,7 +130,7 @@ public static File getBaseDirectory(final Class<?> c) {
 	public static File getBaseDirectory(final Class<?> c,
 		final String baseSubdirectory)
 	{
-		// see: http://stackoverflow.com/a/12733172/1207769
+		// see: https://stackoverflow.com/a/12733172/1207769
 
 		// step 1: convert Class to URL
 		final URL location = Types.location(c);
@@ -171,7 +171,7 @@ public static File getBaseDirectory(final Class<?> c,
 	 * this cache is located in {@code ~/.m2/repository}. The location will be
 	 * {@code groupId/artifactId/version/artifactId-version.jar} where
 	 * {@code groupId}, {@code artifactId} and {@code version} are the <a
-	 * href="http://maven.apache.org/pom.html#Maven_Coordinates">Maven GAV
+	 * href="https://maven.apache.org/pom.html#Maven_Coordinates">Maven GAV
 	 * coordinates</a>. Note that in this case, no base directory with respect to
 	 * the given class can be found, and this method will return null.</li>
 	 * <li><b>Within a JAR file beneath the base directory.</b> Common cases
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 4de14f37f..3a3efd896 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -28,7 +28,7 @@
  */
 
 // File path shortening code adapted from:
-// from: http://www.rgagnon.com/javadetails/java-0661.html
+// from: https://www.rgagnon.com/javadetails/java-0661.html
 
 package org.scijava.util;
 
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index 170124839..2d433e667 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -28,7 +28,7 @@
  */
 
 // File path shortening code adapted from:
-// from: http://www.rgagnon.com/javadetails/java-0661.html
+// from: https://www.rgagnon.com/javadetails/java-0661.html
 
 package org.scijava.util;
 
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index d8f076e40..5df62bb10 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -58,7 +58,7 @@
  * This program mirrors a given website.
  * <p>
  * Its primary purpose is to provide the code necessary to keep <a
- * href="http://mirror.imagej.net/">ImageJ Mirror</a> up-to-date.
+ * href="https://mirror.imagej.net/">ImageJ Mirror</a> up-to-date.
  * </p>
  * 
  * @author Johannes Schindelin
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 8de96e17f..2a9c979b7 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -335,7 +335,7 @@ public static List<POM> getAllPOMs() {
 	 * that one has a suffix beginning with a dash ({@code -}), the version with
 	 * suffix will be considered <em>less than</em> the one without a suffix. The
 	 * reason for this is to accommodate the <a
-	 * href="http://semver.org/">SemVer</a> versioning scheme's usage of
+	 * href="https://semver.org/">SemVer</a> versioning scheme's usage of
 	 * "prerelease" version suffixes. For example, {@code 2.0.0} will compare
 	 * greater than {@code 2.0.0-beta-1}, whereas {@code 2.0.0} will compare less
 	 * than {@code 2.0.0.1}.</li>
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 441516eaa..9ded87575 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -998,7 +998,7 @@ private static Class<?> arrayOrNull(final Class<?> componentType) {
 	 * (the "License"); you may not use this file except in compliance with
 	 * the License.  You may obtain a copy of the License at
 	 *
-	 *      http://www.apache.org/licenses/LICENSE-2.0
+	 *      https://www.apache.org/licenses/LICENSE-2.0
 	 *
 	 * Unless required by applicable law or agreed to in writing, software
 	 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -3485,8 +3485,6 @@ else if (type instanceof GenericArrayType) {
 		}
 
 		private static Type[] getArrayExactDirectSuperTypes(final Type arrayType) {
-			// see
-			// http://java.sun.com/docs/books/jls/third_edition/html/typesValues.html#4.10.3
 			final Type typeComponent = getArrayComponentType(arrayType);
 
 			Type[] result;
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index dab013e7a..51f6286af 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -157,8 +157,8 @@ public void testShortenPath() {
 			.shortenPath("\\\\server\\p1\\p2\\p3\\p4\\p5\\p6"));
 		assertEquals("\\\\server\\p1\\p2\\p3", FileUtils
 			.shortenPath("\\\\server\\p1\\p2\\p3"));
-		assertEquals("http://www.rgagnon.com/p1/p2/p3/.../pb.html", FileUtils
-			.shortenPath("http://www.rgagnon.com/p1/p2/p3/p4/p5/pb.html"));
+		assertEquals("https://www.rgagnon.com/p1/p2/p3/.../pb.html", FileUtils
+			.shortenPath("https://www.rgagnon.com/p1/p2/p3/p4/p5/pb.html"));
 	}
 
 	@Test
@@ -177,8 +177,8 @@ public void testLimitPath() {
 			"C:/1/2/3/4/5/test.txt", 15));
 		assertEquals("\\\\server\\p1\\p2\\...p6", FileUtils.limitPath(
 			"\\\\server\\p1\\p2\\p3\\p4\\p5\\p6", 20));
-		assertEquals("http://www...pb.html", FileUtils.limitPath(
-			"http://www.rgagnon.com/p1/p2/p3/p4/p5/pb.html", 20));
+		assertEquals("https://www...pb.html", FileUtils.limitPath(
+			"https://www.rgagnon.com/p1/p2/p3/p4/p5/pb.html", 21));
 	}
 
 	@Test

From 1b0498e6dd82f4b70b4c64c7636700705e657fc0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 22 Sep 2022 10:51:40 -0500
Subject: [PATCH 1049/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8f538e5bc..09c7f7863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.89.1-SNAPSHOT</version>
+	<version>2.89.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 20dcf5871915770584e7dc92d0d56e3c8179c6af Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Fri, 23 Sep 2022 11:13:42 -0500
Subject: [PATCH 1050/1208] ArrayToStringConverter: support {null} case

Avoid throwing an NPE if given a String[] containing a null value.

Closes #444
---
 .../scijava/convert/ArrayToStringConverter.java  | 14 ++++++++++----
 .../convert/ArrayToStringConverterTest.java      | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index 029f5c1dd..4000ab6d3 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -93,16 +93,22 @@ private String[] preprocessStrings(final Object src) {
 	}
 
 	private String preprocessString(final Object o) {
-		String s = o.toString();
-		s = s.replace("\\", "\\\\");
-		s = s.replace("\"", "\\\"");
+		String s;
+		if (o == null) {
+			return null;
+		} else {
+			s = o.toString();
+			s = s.replace("\\", "\\\\");
+			s = s.replace("\"", "\\\"");
+		}
 		return "\"" + s + "\"";
 	}
 
 	private String[] preprocessCharacters(Object src) {
 		String[] processed = new String[Array.getLength(src)];
 		for (int i = 0; i < processed.length; i++) {
-			processed[i] = Array.get(src, i).toString();
+			Object value = Array.get(src, i);
+			processed[i] = value == null ? null : value.toString();
 		}
 		return preprocessStrings(processed);
 	}
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 7f1f07b13..17ad68a4e 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -156,4 +156,20 @@ public void testCyclicConversion() {
 		Assert.assertArrayEquals(expected, actual);
 	}
 
+	@Test
+	public void testNullConversion() {
+		String[] s1 = {null};
+		String[] s2 = {"null"};
+		String[] expected = new String[] {null};
+		// Do the first conversion
+		ArrayToStringConverter c1 = new ArrayToStringConverter();
+		context.inject(c1);
+		String converted = c1.convert(expected, String.class);
+		// Try to convert back
+		StringToArrayConverter c2 = new StringToArrayConverter();
+		context.inject(c2);
+		String[] actual = c2.convert(converted, String[].class);
+		// NB: we cannot recreate the original {null} state
+		Assert.assertNull(actual);
+	}
 }

From 0835207eb8e0bce1180a4b89c94fa5a941e802f3 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Fri, 23 Sep 2022 11:17:30 -0500
Subject: [PATCH 1051/1208] Bump to next development cycle

Signed-off-by: hinerm <hinerm@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 09c7f7863..cad4cf5cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.89.2-SNAPSHOT</version>
+	<version>2.89.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From e2fd3b000fd75f7d90b6d97cb08fdb07a1108fb4 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 5 Oct 2022 14:15:01 -0500
Subject: [PATCH 1052/1208] Add converters for File <-> Path conversion

---
 .../scijava/convert/FileToPathConverter.java  | 33 +++++++++++
 .../scijava/convert/PathToFileConverter.java  | 33 +++++++++++
 .../convert/FileToPathConversionTest.java     | 57 +++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 src/main/java/org/scijava/convert/FileToPathConverter.java
 create mode 100644 src/main/java/org/scijava/convert/PathToFileConverter.java
 create mode 100644 src/test/java/org/scijava/convert/FileToPathConversionTest.java

diff --git a/src/main/java/org/scijava/convert/FileToPathConverter.java b/src/main/java/org/scijava/convert/FileToPathConverter.java
new file mode 100644
index 000000000..e2407d692
--- /dev/null
+++ b/src/main/java/org/scijava/convert/FileToPathConverter.java
@@ -0,0 +1,33 @@
+
+package org.scijava.convert;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import org.scijava.plugin.Plugin;
+
+/**
+ * A {@link Converter} used to convert {@link File}s into {@link Path}s.
+ * 
+ * @author Gabriel Selzer
+ */
+@Plugin(type = Converter.class)
+public class FileToPathConverter extends AbstractConverter<File, Path> {
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T convert(Object src, Class<T> dest) {
+		File f = (File) src;
+		return (T) f.toPath();
+	}
+
+	@Override
+	public Class<Path> getOutputType() {
+		return Path.class;
+	}
+
+	@Override
+	public Class<File> getInputType() {
+		return File.class;
+	}
+}
diff --git a/src/main/java/org/scijava/convert/PathToFileConverter.java b/src/main/java/org/scijava/convert/PathToFileConverter.java
new file mode 100644
index 000000000..908cff33f
--- /dev/null
+++ b/src/main/java/org/scijava/convert/PathToFileConverter.java
@@ -0,0 +1,33 @@
+
+package org.scijava.convert;
+
+import java.io.File;
+import java.nio.file.Path;
+
+import org.scijava.plugin.Plugin;
+
+/**
+ * A {@link Converter} used to convert {@link Path}s into {@link File}s.
+ * 
+ * @author Gabriel Selzer
+ */
+@Plugin(type = Converter.class)
+public class PathToFileConverter extends AbstractConverter<Path, File> {
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T convert(Object src, Class<T> dest) {
+		Path p = (Path) src;
+		return (T) p.toFile();
+	}
+
+	@Override
+	public Class<File> getOutputType() {
+		return File.class;
+	}
+
+	@Override
+	public Class<Path> getInputType() {
+		return Path.class;
+	}
+}
diff --git a/src/test/java/org/scijava/convert/FileToPathConversionTest.java b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
new file mode 100644
index 000000000..37f96f273
--- /dev/null
+++ b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
@@ -0,0 +1,57 @@
+
+package org.scijava.convert;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.parse.ParseService;
+
+/**
+ * Tests conversion between {@link File}s and {@link Path}s.
+ * 
+ * @author Gabriel Selzer
+ */
+public class FileToPathConversionTest {
+
+	private ConvertService convertService;
+	private Context context;
+
+	@Before
+	public void setUp() {
+		context = new Context(ParseService.class, ConvertService.class);
+		convertService = context.getService(ConvertService.class);
+	}
+
+	@After
+	public void tearDown() {
+		context.dispose();
+	}
+
+	/**
+	 * Tests the ability of to convert from {@link File} to {@link Path}.
+	 */
+	@Test
+	public void fileToPathConversion() {
+		File f = new File("tmp.java");
+		assertTrue(convertService.supports(f, Path.class));
+		Path p = convertService.convert(f, Path.class);
+		assertEquals(f.toPath(), p);
+	}
+
+	@Test
+	public void pathToFileConversion() {
+		Path p = Paths.get("tmp.java");
+		assertTrue(convertService.supports(p, File.class));
+		File f = convertService.convert(p, File.class);
+		assertEquals(f.toPath(), p);
+	}
+
+}

From 5c63181da57457ac63032597851174fc9017b743 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 14 Oct 2022 14:15:04 -0500
Subject: [PATCH 1053/1208] Add missing license blurbs

---
 .../scijava/convert/FileToPathConverter.java  | 28 +++++++++++++++++++
 .../scijava/convert/PathToFileConverter.java  | 28 +++++++++++++++++++
 .../convert/FileToPathConversionTest.java     | 28 +++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/src/main/java/org/scijava/convert/FileToPathConverter.java b/src/main/java/org/scijava/convert/FileToPathConverter.java
index e2407d692..551a0d395 100644
--- a/src/main/java/org/scijava/convert/FileToPathConverter.java
+++ b/src/main/java/org/scijava/convert/FileToPathConverter.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.convert;
 
diff --git a/src/main/java/org/scijava/convert/PathToFileConverter.java b/src/main/java/org/scijava/convert/PathToFileConverter.java
index 908cff33f..668f9425e 100644
--- a/src/main/java/org/scijava/convert/PathToFileConverter.java
+++ b/src/main/java/org/scijava/convert/PathToFileConverter.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.convert;
 
diff --git a/src/test/java/org/scijava/convert/FileToPathConversionTest.java b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
index 37f96f273..6dcd81d1b 100644
--- a/src/test/java/org/scijava/convert/FileToPathConversionTest.java
+++ b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
@@ -1,3 +1,31 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2022 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
 
 package org.scijava.convert;
 

From f1f666a8aded15e05660aece5707cd0f8b12521d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 14 Oct 2022 14:16:15 -0500
Subject: [PATCH 1054/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cad4cf5cb..a7fe0d700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.89.3-SNAPSHOT</version>
+	<version>2.90.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 918d91568b3d4c485cb343e9fd3795444505880e Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Mon, 12 Dec 2022 14:58:44 +0100
Subject: [PATCH 1055/1208] Fix priority of LoggerPreprocessor

Logger parameters should be processed before InitPreprocessor, so that plugins can use a Logger in their initializer.
---
 .../java/org/scijava/module/process/LoggerPreprocessor.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 6145337ac..ded3ac399 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -29,6 +29,7 @@
 
 package org.scijava.module.process;
 
+import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.log.Logger;
 import org.scijava.module.Module;
@@ -44,7 +45,7 @@
  *
  * @author Matthias Arzt
  */
-@Plugin(type = PreprocessorPlugin.class)
+@Plugin(type = PreprocessorPlugin.class, priority = Priority.VERY_HIGH)
 public class LoggerPreprocessor extends AbstractPreprocessorPlugin {
 
 	@Parameter(required = false)

From a639bccb316da32c7060ececfa916859fefcf87e Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Tue, 13 Dec 2022 14:38:22 -0600
Subject: [PATCH 1056/1208] Only convert to array types when it is possible

---
 .../java/org/scijava/convert/DefaultConverter.java   | 12 +++++++++++-
 .../java/org/scijava/convert/ConvertServiceTest.java |  5 +++--
 .../java/org/scijava/util/ConversionUtilsTest.java   |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index d2daea418..b399f7596 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -292,7 +292,17 @@ private Collection<Object> createCollection(final Class<?> type) {
 	public boolean canConvert(final Class<?> src, final Type dest) {
 
 		// Handle array types, including generic array types.
-		if (isArray(dest)) return true;
+		// The logic follows from the types that ArrayUtils.toCollection
+		// can convert
+		if (isArray(dest)){
+			// toCollection handles any type of Collection
+			if (Collection.class.isAssignableFrom(src)) return true;
+			// toCollection handles any type of array
+			if (src.isArray()) return true;
+			// toCollection can wrap objects into a Singleton list,
+			// but we only want to wrap up a T if the dest type is a T[].
+			return Types.isAssignable(src, Types.component(dest));
+		}
 
 		// Handle parameterized collection types.
 		if (dest instanceof ParameterizedType && isCollection(dest) &&
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index cca1b2acc..59aaa2835 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -457,7 +457,7 @@ class Struct {
 	/**
 	 * Tests setting an incompatible element value for a primitive array.
 	 */
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testBadPrimitiveArray() {
 		class Struct {
 
@@ -467,6 +467,7 @@ class Struct {
 		final Struct struct = new Struct();
 
 		setFieldValue(struct, "intArray", "not an int array");
+		assertEquals(null, struct.intArray);
 	}
 
 	/**
@@ -486,7 +487,7 @@ class Struct {
 
 		// Test abnormal behavior for an object array
 		setFieldValue(struct, "doubleArray", "not a double array");
-		assertEquals(null, struct.doubleArray[0]);
+		assertEquals(null, struct.doubleArray);
 
 		// Test abnormal behavior for a list
 		setFieldValue(struct, "nestedArray", "definitely not a set of char arrays");
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index d04118628..ac0abeaa9 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -237,7 +237,6 @@ class Struct {
 	/**
 	 * Tests setting an incompatible element value for a primitive array.
 	 */
-	@Test(expected = IllegalArgumentException.class)
 	public void testBadPrimitiveArray() {
 		class Struct {
 
@@ -247,6 +246,7 @@ class Struct {
 		final Struct struct = new Struct();
 
 		setFieldValue(struct, "intArray", "not an int array");
+		assertEquals(null, struct.intArray);
 	}
 
 	/**
@@ -266,7 +266,7 @@ class Struct {
 
 		// Test abnormal behavior for an object array
 		setFieldValue(struct, "doubleArray", "not a double array");
-		assertEquals(null, struct.doubleArray[0]);
+		assertEquals(null, struct.doubleArray);
 
 		// Test abnormal behavior for a list
 		setFieldValue(struct, "nestedArray", "definitely not a set of char arrays");

From 0a2b886f853fc4e68217fca668a9023115f5b3e4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jan 2023 09:02:45 -0600
Subject: [PATCH 1057/1208] Happy New Year 2023

---
 LICENSE.txt                                                     | 2 +-
 src/it/apt-test/pom.xml                                         | 2 +-
 src/it/apt-test/setup.bsh                                       | 2 +-
 .../src/main/java/org/scijava/annotation/its/Annotated.java     | 2 +-
 .../main/java/org/scijava/annotation/its/CustomAnnotation.java  | 2 +-
 src/it/apt-test/verify.bsh                                      | 2 +-
 src/it/settings.xml                                             | 2 +-
 src/main/java/org/scijava/AbstractBasicDetails.java             | 2 +-
 src/main/java/org/scijava/AbstractContextual.java               | 2 +-
 src/main/java/org/scijava/AbstractGateway.java                  | 2 +-
 src/main/java/org/scijava/AbstractUIDetails.java                | 2 +-
 src/main/java/org/scijava/BasicDetails.java                     | 2 +-
 src/main/java/org/scijava/Cancelable.java                       | 2 +-
 src/main/java/org/scijava/Context.java                          | 2 +-
 src/main/java/org/scijava/Contextual.java                       | 2 +-
 src/main/java/org/scijava/Disposable.java                       | 2 +-
 src/main/java/org/scijava/Gateway.java                          | 2 +-
 src/main/java/org/scijava/Identifiable.java                     | 2 +-
 src/main/java/org/scijava/Initializable.java                    | 2 +-
 src/main/java/org/scijava/Instantiable.java                     | 2 +-
 src/main/java/org/scijava/InstantiableException.java            | 2 +-
 src/main/java/org/scijava/ItemIO.java                           | 2 +-
 src/main/java/org/scijava/ItemVisibility.java                   | 2 +-
 src/main/java/org/scijava/Locatable.java                        | 2 +-
 src/main/java/org/scijava/MenuEntry.java                        | 2 +-
 src/main/java/org/scijava/MenuPath.java                         | 2 +-
 src/main/java/org/scijava/Named.java                            | 2 +-
 src/main/java/org/scijava/NoSuchServiceException.java           | 2 +-
 src/main/java/org/scijava/NullContextException.java             | 2 +-
 src/main/java/org/scijava/Optional.java                         | 2 +-
 src/main/java/org/scijava/Prioritized.java                      | 2 +-
 src/main/java/org/scijava/Priority.java                         | 2 +-
 src/main/java/org/scijava/SciJava.java                          | 2 +-
 src/main/java/org/scijava/Typed.java                            | 2 +-
 src/main/java/org/scijava/UIDetails.java                        | 2 +-
 src/main/java/org/scijava/Validated.java                        | 2 +-
 src/main/java/org/scijava/ValidityProblem.java                  | 2 +-
 src/main/java/org/scijava/Versioned.java                        | 2 +-
 src/main/java/org/scijava/annotations/AbstractIndexWriter.java  | 2 +-
 src/main/java/org/scijava/annotations/AnnotationCombiner.java   | 2 +-
 src/main/java/org/scijava/annotations/AnnotationProcessor.java  | 2 +-
 src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java     | 2 +-
 src/main/java/org/scijava/annotations/DirectoryIndexer.java     | 2 +-
 src/main/java/org/scijava/annotations/EclipseHelper.java        | 2 +-
 src/main/java/org/scijava/annotations/Index.java                | 2 +-
 src/main/java/org/scijava/annotations/IndexItem.java            | 2 +-
 src/main/java/org/scijava/annotations/IndexReader.java          | 2 +-
 src/main/java/org/scijava/annotations/Indexable.java            | 2 +-
 src/main/java/org/scijava/annotations/legacy/LegacyReader.java  | 2 +-
 src/main/java/org/scijava/app/AbstractApp.java                  | 2 +-
 src/main/java/org/scijava/app/App.java                          | 2 +-
 src/main/java/org/scijava/app/AppService.java                   | 2 +-
 src/main/java/org/scijava/app/DefaultAppService.java            | 2 +-
 src/main/java/org/scijava/app/DefaultStatusService.java         | 2 +-
 src/main/java/org/scijava/app/SciJavaApp.java                   | 2 +-
 src/main/java/org/scijava/app/StatusService.java                | 2 +-
 src/main/java/org/scijava/app/event/StatusEvent.java            | 2 +-
 src/main/java/org/scijava/cache/CacheService.java               | 2 +-
 src/main/java/org/scijava/cache/DefaultCacheService.java        | 2 +-
 src/main/java/org/scijava/command/Command.java                  | 2 +-
 src/main/java/org/scijava/command/CommandInfo.java              | 2 +-
 src/main/java/org/scijava/command/CommandModule.java            | 2 +-
 src/main/java/org/scijava/command/CommandModuleItem.java        | 2 +-
 src/main/java/org/scijava/command/CommandService.java           | 2 +-
 src/main/java/org/scijava/command/ContextCommand.java           | 2 +-
 src/main/java/org/scijava/command/DefaultCommandService.java    | 2 +-
 src/main/java/org/scijava/command/DynamicCommand.java           | 2 +-
 src/main/java/org/scijava/command/DynamicCommandInfo.java       | 2 +-
 src/main/java/org/scijava/command/Inputs.java                   | 2 +-
 src/main/java/org/scijava/command/Interactive.java              | 2 +-
 src/main/java/org/scijava/command/InteractiveCommand.java       | 2 +-
 src/main/java/org/scijava/command/ModuleCommand.java            | 2 +-
 src/main/java/org/scijava/command/Previewable.java              | 2 +-
 src/main/java/org/scijava/command/UnimplementedCommand.java     | 2 +-
 src/main/java/org/scijava/command/console/RunArgument.java      | 2 +-
 src/main/java/org/scijava/command/run/CommandCodeRunner.java    | 2 +-
 src/main/java/org/scijava/console/AbstractConsoleArgument.java  | 2 +-
 src/main/java/org/scijava/console/ConsoleArgument.java          | 2 +-
 src/main/java/org/scijava/console/ConsoleService.java           | 2 +-
 src/main/java/org/scijava/console/ConsoleUtils.java             | 2 +-
 src/main/java/org/scijava/console/DefaultConsoleService.java    | 2 +-
 src/main/java/org/scijava/console/MultiOutputStream.java        | 2 +-
 src/main/java/org/scijava/console/MultiPrintStream.java         | 2 +-
 src/main/java/org/scijava/console/OutputEvent.java              | 2 +-
 src/main/java/org/scijava/console/OutputListener.java           | 2 +-
 src/main/java/org/scijava/console/SystemPropertyArgument.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConvertService.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConverter.java        | 2 +-
 .../java/org/scijava/convert/AbstractDelegateConverter.java     | 2 +-
 src/main/java/org/scijava/convert/ArrayConverters.java          | 2 +-
 src/main/java/org/scijava/convert/ArrayToStringConverter.java   | 2 +-
 src/main/java/org/scijava/convert/CastingConverter.java         | 2 +-
 src/main/java/org/scijava/convert/ConversionRequest.java        | 2 +-
 src/main/java/org/scijava/convert/ConvertService.java           | 2 +-
 src/main/java/org/scijava/convert/Converter.java                | 2 +-
 src/main/java/org/scijava/convert/DefaultConvertService.java    | 2 +-
 src/main/java/org/scijava/convert/DefaultConverter.java         | 2 +-
 src/main/java/org/scijava/convert/FileListConverters.java       | 2 +-
 src/main/java/org/scijava/convert/FileToPathConverter.java      | 2 +-
 src/main/java/org/scijava/convert/NullConverter.java            | 2 +-
 src/main/java/org/scijava/convert/NumberConverters.java         | 2 +-
 .../java/org/scijava/convert/NumberToBigDecimalConverter.java   | 2 +-
 .../java/org/scijava/convert/NumberToBigIntegerConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToDoubleConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToFloatConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToIntegerConverter.java | 2 +-
 src/main/java/org/scijava/convert/NumberToLongConverter.java    | 2 +-
 src/main/java/org/scijava/convert/NumberToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToShortConverter.java   | 2 +-
 src/main/java/org/scijava/convert/PathToFileConverter.java      | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java  | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java    | 2 +-
 src/main/java/org/scijava/convert/StringToArrayConverter.java   | 2 +-
 src/main/java/org/scijava/convert/StringToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/display/AbstractDisplay.java          | 2 +-
 .../java/org/scijava/display/ActiveDisplayPreprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DefaultDisplay.java           | 2 +-
 src/main/java/org/scijava/display/DefaultDisplayService.java    | 2 +-
 src/main/java/org/scijava/display/DefaultTextDisplay.java       | 2 +-
 src/main/java/org/scijava/display/Display.java                  | 2 +-
 src/main/java/org/scijava/display/DisplayPostprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DisplayService.java           | 2 +-
 src/main/java/org/scijava/display/Displayable.java              | 2 +-
 src/main/java/org/scijava/display/TextDisplay.java              | 2 +-
 .../java/org/scijava/display/event/DisplayActivatedEvent.java   | 2 +-
 .../java/org/scijava/display/event/DisplayCreatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/DisplayDeletedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/DisplayEvent.java       | 2 +-
 .../java/org/scijava/display/event/DisplayUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/InputEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/KyPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/KyReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyTypedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsButtonEvent.java     | 2 +-
 .../java/org/scijava/display/event/input/MsClickedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsDraggedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsEnteredEvent.java    | 2 +-
 src/main/java/org/scijava/display/event/input/MsEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/MsExitedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/MsMovedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/MsWheelEvent.java | 2 +-
 .../org/scijava/display/event/window/WinActivatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinClosedEvent.java   | 2 +-
 .../java/org/scijava/display/event/window/WinClosingEvent.java  | 2 +-
 .../org/scijava/display/event/window/WinDeactivatedEvent.java   | 2 +-
 .../org/scijava/display/event/window/WinDeiconifiedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/window/WinEvent.java    | 2 +-
 .../org/scijava/display/event/window/WinIconifiedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinOpenedEvent.java   | 2 +-
 src/main/java/org/scijava/download/DefaultDownloadService.java  | 2 +-
 src/main/java/org/scijava/download/DiskLocationCache.java       | 2 +-
 src/main/java/org/scijava/download/Download.java                | 2 +-
 src/main/java/org/scijava/download/DownloadService.java         | 2 +-
 src/main/java/org/scijava/download/LocationCache.java           | 2 +-
 src/main/java/org/scijava/download/MultiWriteHandle.java        | 2 +-
 src/main/java/org/scijava/event/ContextDisposingEvent.java      | 2 +-
 src/main/java/org/scijava/event/DefaultEventBus.java            | 2 +-
 src/main/java/org/scijava/event/DefaultEventHistory.java        | 2 +-
 src/main/java/org/scijava/event/DefaultEventService.java        | 2 +-
 src/main/java/org/scijava/event/EventDetails.java               | 2 +-
 src/main/java/org/scijava/event/EventHandler.java               | 2 +-
 src/main/java/org/scijava/event/EventHistory.java               | 2 +-
 src/main/java/org/scijava/event/EventHistoryListener.java       | 2 +-
 src/main/java/org/scijava/event/EventService.java               | 2 +-
 src/main/java/org/scijava/event/EventSubscriber.java            | 2 +-
 src/main/java/org/scijava/event/SciJavaEvent.java               | 2 +-
 src/main/java/org/scijava/input/Accelerator.java                | 2 +-
 src/main/java/org/scijava/input/DefaultInputService.java        | 2 +-
 src/main/java/org/scijava/input/InputModifiers.java             | 2 +-
 src/main/java/org/scijava/input/InputService.java               | 2 +-
 src/main/java/org/scijava/input/KeyCode.java                    | 2 +-
 src/main/java/org/scijava/input/MouseCursor.java                | 2 +-
 src/main/java/org/scijava/io/AbstractIOPlugin.java              | 2 +-
 src/main/java/org/scijava/io/AbstractTypedIOService.java        | 2 +-
 src/main/java/org/scijava/io/ByteArrayByteBank.java             | 2 +-
 src/main/java/org/scijava/io/ByteBank.java                      | 2 +-
 src/main/java/org/scijava/io/DefaultIOService.java              | 2 +-
 src/main/java/org/scijava/io/DefaultRecentFileService.java      | 2 +-
 src/main/java/org/scijava/io/IOPlugin.java                      | 2 +-
 src/main/java/org/scijava/io/IOService.java                     | 2 +-
 src/main/java/org/scijava/io/RecentFileService.java             | 2 +-
 src/main/java/org/scijava/io/TypedIOService.java                | 2 +-
 src/main/java/org/scijava/io/console/OpenArgument.java          | 2 +-
 src/main/java/org/scijava/io/event/DataOpenedEvent.java         | 2 +-
 src/main/java/org/scijava/io/event/DataSavedEvent.java          | 2 +-
 src/main/java/org/scijava/io/event/IOEvent.java                 | 2 +-
 src/main/java/org/scijava/io/handle/AbstractDataHandle.java     | 2 +-
 .../java/org/scijava/io/handle/AbstractHigherOrderHandle.java   | 2 +-
 .../org/scijava/io/handle/AbstractSeekableStreamHandle.java     | 2 +-
 src/main/java/org/scijava/io/handle/AbstractStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/BytesHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/DataHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleInputStream.java  | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleOutputStream.java | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleService.java      | 2 +-
 src/main/java/org/scijava/io/handle/DataHandles.java            | 2 +-
 .../java/org/scijava/io/handle/DefaultDataHandleService.java    | 2 +-
 src/main/java/org/scijava/io/handle/DummyHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/FileHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/ResettableStreamHandle.java | 2 +-
 src/main/java/org/scijava/io/handle/SeekableStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/StreamHandle.java           | 2 +-
 src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java  | 2 +-
 src/main/java/org/scijava/io/location/AbstractLocation.java     | 2 +-
 .../java/org/scijava/io/location/AbstractLocationResolver.java  | 2 +-
 .../java/org/scijava/io/location/AbstractRemoteLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BrowsableLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BytesLocation.java        | 2 +-
 .../java/org/scijava/io/location/DefaultLocationService.java    | 2 +-
 src/main/java/org/scijava/io/location/DummyLocation.java        | 2 +-
 src/main/java/org/scijava/io/location/FileLocation.java         | 2 +-
 src/main/java/org/scijava/io/location/FileLocationResolver.java | 2 +-
 src/main/java/org/scijava/io/location/Location.java             | 2 +-
 src/main/java/org/scijava/io/location/LocationResolver.java     | 2 +-
 src/main/java/org/scijava/io/location/LocationService.java      | 2 +-
 src/main/java/org/scijava/io/location/RemoteLocation.java       | 2 +-
 src/main/java/org/scijava/io/location/URILocation.java          | 2 +-
 src/main/java/org/scijava/io/location/URLLocation.java          | 2 +-
 src/main/java/org/scijava/io/nio/ByteBufferByteBank.java        | 2 +-
 src/main/java/org/scijava/io/nio/DefaultNIOService.java         | 2 +-
 src/main/java/org/scijava/io/nio/NIOService.java                | 2 +-
 src/main/java/org/scijava/log/AbstractLogService.java           | 2 +-
 src/main/java/org/scijava/log/CallingClassUtils.java            | 2 +-
 src/main/java/org/scijava/log/DefaultLogger.java                | 2 +-
 .../java/org/scijava/log/DefaultUncaughtExceptionHandler.java   | 2 +-
 src/main/java/org/scijava/log/IgnoreAsCallingClass.java         | 2 +-
 src/main/java/org/scijava/log/LogLevel.java                     | 2 +-
 src/main/java/org/scijava/log/LogListener.java                  | 2 +-
 src/main/java/org/scijava/log/LogMessage.java                   | 2 +-
 src/main/java/org/scijava/log/LogService.java                   | 2 +-
 src/main/java/org/scijava/log/LogSource.java                    | 2 +-
 src/main/java/org/scijava/log/Logged.java                       | 2 +-
 src/main/java/org/scijava/log/Logger.java                       | 2 +-
 src/main/java/org/scijava/log/StderrLogService.java             | 2 +-
 src/main/java/org/scijava/main/DefaultMainService.java          | 2 +-
 src/main/java/org/scijava/main/MainService.java                 | 2 +-
 src/main/java/org/scijava/main/console/MainArgument.java        | 2 +-
 src/main/java/org/scijava/main/run/MainCodeRunner.java          | 2 +-
 src/main/java/org/scijava/menu/AbstractMenuCreator.java         | 2 +-
 src/main/java/org/scijava/menu/DefaultMenuService.java          | 2 +-
 src/main/java/org/scijava/menu/MenuConstants.java               | 2 +-
 src/main/java/org/scijava/menu/MenuCreator.java                 | 2 +-
 src/main/java/org/scijava/menu/MenuService.java                 | 2 +-
 src/main/java/org/scijava/menu/ShadowMenu.java                  | 2 +-
 src/main/java/org/scijava/menu/ShadowMenuIterator.java          | 2 +-
 src/main/java/org/scijava/menu/event/MenuEvent.java             | 2 +-
 src/main/java/org/scijava/menu/event/MenusAddedEvent.java       | 2 +-
 src/main/java/org/scijava/menu/event/MenusRemovedEvent.java     | 2 +-
 src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/module/AbstractModule.java            | 2 +-
 src/main/java/org/scijava/module/AbstractModuleInfo.java        | 2 +-
 src/main/java/org/scijava/module/AbstractModuleItem.java        | 2 +-
 src/main/java/org/scijava/module/DefaultModuleService.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModule.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleInfo.java  | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleItem.java  | 2 +-
 src/main/java/org/scijava/module/MethodCallException.java       | 2 +-
 src/main/java/org/scijava/module/MethodRef.java                 | 2 +-
 src/main/java/org/scijava/module/Module.java                    | 2 +-
 src/main/java/org/scijava/module/ModuleCanceledException.java   | 2 +-
 src/main/java/org/scijava/module/ModuleException.java           | 2 +-
 src/main/java/org/scijava/module/ModuleIndex.java               | 2 +-
 src/main/java/org/scijava/module/ModuleInfo.java                | 2 +-
 src/main/java/org/scijava/module/ModuleItem.java                | 2 +-
 src/main/java/org/scijava/module/ModuleRunner.java              | 2 +-
 src/main/java/org/scijava/module/ModuleService.java             | 2 +-
 src/main/java/org/scijava/module/MutableModule.java             | 2 +-
 src/main/java/org/scijava/module/MutableModuleInfo.java         | 2 +-
 src/main/java/org/scijava/module/MutableModuleItem.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleCanceledEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModuleEvent.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleExecutedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModuleExecutingEvent.java     | 2 +-
 .../java/org/scijava/module/event/ModuleExecutionEvent.java     | 2 +-
 src/main/java/org/scijava/module/event/ModuleFinishedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModulePostprocessEvent.java   | 2 +-
 .../java/org/scijava/module/event/ModulePreprocessEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModuleProcessEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleStartedEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModulesAddedEvent.java   | 2 +-
 src/main/java/org/scijava/module/event/ModulesListEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModulesRemovedEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java | 2 +-
 .../org/scijava/module/process/AbstractPostprocessorPlugin.java | 2 +-
 .../org/scijava/module/process/AbstractPreprocessorPlugin.java  | 2 +-
 .../scijava/module/process/AbstractSingleInputPreprocessor.java | 2 +-
 .../org/scijava/module/process/CheckInputsPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/DebugPostprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/DebugPreprocessor.java | 2 +-
 .../org/scijava/module/process/DefaultValuePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/GatewayPreprocessor.java    | 2 +-
 src/main/java/org/scijava/module/process/InitPreprocessor.java  | 2 +-
 .../java/org/scijava/module/process/LoadInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/ModulePostprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ModulePreprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/ModuleProcessor.java   | 2 +-
 .../java/org/scijava/module/process/PostprocessorPlugin.java    | 2 +-
 .../java/org/scijava/module/process/PreprocessorPlugin.java     | 2 +-
 .../java/org/scijava/module/process/SaveInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/ServicePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ValidityPreprocessor.java   | 2 +-
 src/main/java/org/scijava/module/run/ModuleCodeRunner.java      | 2 +-
 src/main/java/org/scijava/object/DefaultObjectService.java      | 2 +-
 src/main/java/org/scijava/object/LazyObjects.java               | 2 +-
 src/main/java/org/scijava/object/NamedObjectIndex.java          | 2 +-
 src/main/java/org/scijava/object/ObjectIndex.java               | 2 +-
 src/main/java/org/scijava/object/ObjectService.java             | 2 +-
 src/main/java/org/scijava/object/SortedObjectIndex.java         | 2 +-
 src/main/java/org/scijava/object/event/ListEvent.java           | 2 +-
 src/main/java/org/scijava/object/event/ObjectCreatedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectDeletedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectEvent.java         | 2 +-
 src/main/java/org/scijava/object/event/ObjectModifiedEvent.java | 2 +-
 src/main/java/org/scijava/object/event/ObjectsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/object/event/ObjectsListEvent.java    | 2 +-
 src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/options/DefaultOptionsService.java    | 2 +-
 src/main/java/org/scijava/options/OptionsPlugin.java            | 2 +-
 src/main/java/org/scijava/options/OptionsService.java           | 2 +-
 src/main/java/org/scijava/options/event/OptionsEvent.java       | 2 +-
 src/main/java/org/scijava/parse/DefaultParseService.java        | 2 +-
 src/main/java/org/scijava/parse/Item.java                       | 2 +-
 src/main/java/org/scijava/parse/Items.java                      | 2 +-
 src/main/java/org/scijava/parse/ParseService.java               | 2 +-
 src/main/java/org/scijava/platform/AbstractPlatform.java        | 2 +-
 src/main/java/org/scijava/platform/AppEventService.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultAppEventService.java  | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatform.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatformService.java  | 2 +-
 src/main/java/org/scijava/platform/Platform.java                | 2 +-
 src/main/java/org/scijava/platform/PlatformService.java         | 2 +-
 src/main/java/org/scijava/platform/event/AppAboutEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppFocusEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppMenusCreatedEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java | 2 +-
 .../java/org/scijava/platform/event/AppPreferencesEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppPrintEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppQuitEvent.java      | 2 +-
 src/main/java/org/scijava/platform/event/AppReOpenEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppScreenSleepEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppSleepEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppSystemSleepEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppUserSessionEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppVisibleEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/ApplicationEvent.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerService.java    | 2 +-
 src/main/java/org/scijava/plugin/AbstractPTService.java         | 2 +-
 src/main/java/org/scijava/plugin/AbstractRichPlugin.java        | 2 +-
 src/main/java/org/scijava/plugin/AbstractSingletonService.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedPlugin.java       | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedService.java      | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperService.java    | 2 +-
 src/main/java/org/scijava/plugin/Attr.java                      | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginFinder.java       | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginService.java      | 2 +-
 src/main/java/org/scijava/plugin/HandlerPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/HandlerService.java            | 2 +-
 src/main/java/org/scijava/plugin/HasPluginInfo.java             | 2 +-
 src/main/java/org/scijava/plugin/Menu.java                      | 2 +-
 src/main/java/org/scijava/plugin/PTService.java                 | 2 +-
 src/main/java/org/scijava/plugin/Parameter.java                 | 2 +-
 src/main/java/org/scijava/plugin/Plugin.java                    | 2 +-
 src/main/java/org/scijava/plugin/PluginFinder.java              | 2 +-
 src/main/java/org/scijava/plugin/PluginIndex.java               | 2 +-
 src/main/java/org/scijava/plugin/PluginInfo.java                | 2 +-
 src/main/java/org/scijava/plugin/PluginService.java             | 2 +-
 src/main/java/org/scijava/plugin/RichPlugin.java                | 2 +-
 src/main/java/org/scijava/plugin/SciJavaPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/SingletonPlugin.java           | 2 +-
 src/main/java/org/scijava/plugin/SingletonService.java          | 2 +-
 src/main/java/org/scijava/plugin/SortablePlugin.java            | 2 +-
 src/main/java/org/scijava/plugin/TypedPlugin.java               | 2 +-
 src/main/java/org/scijava/plugin/TypedService.java              | 2 +-
 src/main/java/org/scijava/plugin/WrapperPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/WrapperService.java            | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsListEvent.java    | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/prefs/AbstractPrefService.java        | 2 +-
 src/main/java/org/scijava/prefs/DefaultPrefService.java         | 2 +-
 src/main/java/org/scijava/prefs/PrefService.java                | 2 +-
 src/main/java/org/scijava/run/AbstractCodeRunner.java           | 2 +-
 src/main/java/org/scijava/run/CodeRunner.java                   | 2 +-
 src/main/java/org/scijava/run/DefaultRunService.java            | 2 +-
 src/main/java/org/scijava/run/RunService.java                   | 2 +-
 src/main/java/org/scijava/run/console/RunArgument.java          | 2 +-
 src/main/java/org/scijava/script/AbstractAutoCompleter.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptContext.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptEngine.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptHeader.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptLanguage.java    | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptEngine.java       | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptLanguage.java     | 2 +-
 src/main/java/org/scijava/script/AutoCompleter.java             | 2 +-
 src/main/java/org/scijava/script/AutoCompletionResult.java      | 2 +-
 src/main/java/org/scijava/script/CodeGenerator.java             | 2 +-
 src/main/java/org/scijava/script/CodeGeneratorJava.java         | 2 +-
 src/main/java/org/scijava/script/DefaultAutoCompleter.java      | 2 +-
 .../java/org/scijava/script/DefaultScriptHeaderService.java     | 2 +-
 src/main/java/org/scijava/script/DefaultScriptInterpreter.java  | 2 +-
 src/main/java/org/scijava/script/DefaultScriptService.java      | 2 +-
 src/main/java/org/scijava/script/InvocationObject.java          | 2 +-
 src/main/java/org/scijava/script/ParameterObject.java           | 2 +-
 src/main/java/org/scijava/script/ScriptFinder.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeader.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeaderService.java       | 2 +-
 src/main/java/org/scijava/script/ScriptInfo.java                | 2 +-
 src/main/java/org/scijava/script/ScriptInterpreter.java         | 2 +-
 src/main/java/org/scijava/script/ScriptLanguage.java            | 2 +-
 src/main/java/org/scijava/script/ScriptLanguageIndex.java       | 2 +-
 src/main/java/org/scijava/script/ScriptModule.java              | 2 +-
 src/main/java/org/scijava/script/ScriptREPL.java                | 2 +-
 src/main/java/org/scijava/script/ScriptService.java             | 2 +-
 src/main/java/org/scijava/script/console/RunScriptArgument.java | 2 +-
 src/main/java/org/scijava/script/io/ScriptIOPlugin.java         | 2 +-
 .../scijava/script/process/DefaultScriptProcessorService.java   | 2 +-
 .../org/scijava/script/process/DirectiveScriptProcessor.java    | 2 +-
 .../org/scijava/script/process/ParameterScriptProcessor.java    | 2 +-
 src/main/java/org/scijava/script/process/ScriptCallback.java    | 2 +-
 .../scijava/script/process/ScriptDirectiveScriptProcessor.java  | 2 +-
 src/main/java/org/scijava/script/process/ScriptProcessor.java   | 2 +-
 .../java/org/scijava/script/process/ScriptProcessorService.java | 2 +-
 .../java/org/scijava/script/process/ShebangScriptProcessor.java | 2 +-
 src/main/java/org/scijava/script/run/ScriptCodeRunner.java      | 2 +-
 src/main/java/org/scijava/service/AbstractService.java          | 2 +-
 src/main/java/org/scijava/service/SciJavaService.java           | 2 +-
 src/main/java/org/scijava/service/Service.java                  | 2 +-
 src/main/java/org/scijava/service/ServiceHelper.java            | 2 +-
 src/main/java/org/scijava/service/ServiceIndex.java             | 2 +-
 .../java/org/scijava/service/event/ServicesLoadedEvent.java     | 2 +-
 src/main/java/org/scijava/startup/DefaultStartupService.java    | 2 +-
 src/main/java/org/scijava/startup/StartupService.java           | 2 +-
 src/main/java/org/scijava/task/DefaultTask.java                 | 2 +-
 src/main/java/org/scijava/task/DefaultTaskService.java          | 2 +-
 src/main/java/org/scijava/task/Task.java                        | 2 +-
 src/main/java/org/scijava/task/TaskService.java                 | 2 +-
 src/main/java/org/scijava/task/event/TaskEvent.java             | 2 +-
 src/main/java/org/scijava/test/TestUtils.java                   | 2 +-
 src/main/java/org/scijava/text/AbstractTextFormat.java          | 2 +-
 src/main/java/org/scijava/text/DefaultTextService.java          | 2 +-
 src/main/java/org/scijava/text/TextFormat.java                  | 2 +-
 src/main/java/org/scijava/text/TextService.java                 | 2 +-
 src/main/java/org/scijava/text/io/DefaultTextIOService.java     | 2 +-
 src/main/java/org/scijava/text/io/TextIOPlugin.java             | 2 +-
 src/main/java/org/scijava/text/io/TextIOService.java            | 2 +-
 src/main/java/org/scijava/thread/DefaultThreadService.java      | 2 +-
 src/main/java/org/scijava/thread/ThreadService.java             | 2 +-
 src/main/java/org/scijava/tool/AbstractTool.java                | 2 +-
 src/main/java/org/scijava/tool/CustomDrawnTool.java             | 2 +-
 src/main/java/org/scijava/tool/DefaultToolService.java          | 2 +-
 src/main/java/org/scijava/tool/DummyTool.java                   | 2 +-
 src/main/java/org/scijava/tool/IconDrawer.java                  | 2 +-
 src/main/java/org/scijava/tool/IconService.java                 | 2 +-
 src/main/java/org/scijava/tool/Tool.java                        | 2 +-
 src/main/java/org/scijava/tool/ToolService.java                 | 2 +-
 src/main/java/org/scijava/tool/event/ToolActivatedEvent.java    | 2 +-
 src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java  | 2 +-
 src/main/java/org/scijava/tool/event/ToolEvent.java             | 2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java                     | 2 +-
 src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java  | 2 +-
 src/main/java/org/scijava/ui/AbstractUIInputWidget.java         | 2 +-
 src/main/java/org/scijava/ui/AbstractUserInterface.java         | 2 +-
 src/main/java/org/scijava/ui/ApplicationFrame.java              | 2 +-
 src/main/java/org/scijava/ui/Arrangeable.java                   | 2 +-
 src/main/java/org/scijava/ui/CloseConfirmable.java              | 2 +-
 src/main/java/org/scijava/ui/DefaultUIService.java              | 2 +-
 src/main/java/org/scijava/ui/Desktop.java                       | 2 +-
 src/main/java/org/scijava/ui/DialogPrompt.java                  | 2 +-
 src/main/java/org/scijava/ui/FileListPreprocessor.java          | 2 +-
 src/main/java/org/scijava/ui/FilePreprocessor.java              | 2 +-
 src/main/java/org/scijava/ui/StatusBar.java                     | 2 +-
 src/main/java/org/scijava/ui/SystemClipboard.java               | 2 +-
 src/main/java/org/scijava/ui/ToolBar.java                       | 2 +-
 src/main/java/org/scijava/ui/UIPreprocessor.java                | 2 +-
 src/main/java/org/scijava/ui/UIService.java                     | 2 +-
 src/main/java/org/scijava/ui/UserInterface.java                 | 2 +-
 src/main/java/org/scijava/ui/console/AbstractConsolePane.java   | 2 +-
 src/main/java/org/scijava/ui/console/ConsolePane.java           | 2 +-
 src/main/java/org/scijava/ui/console/HeadlessArgument.java      | 2 +-
 src/main/java/org/scijava/ui/console/ShowUIArgument.java        | 2 +-
 src/main/java/org/scijava/ui/console/UIArgument.java            | 2 +-
 src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java   | 2 +-
 .../java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java     | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropData.java           | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropService.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/MIMEType.java                  | 2 +-
 .../java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java   | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java      | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DropEvent.java           | 2 +-
 src/main/java/org/scijava/ui/event/UIEvent.java                 | 2 +-
 src/main/java/org/scijava/ui/event/UIShownEvent.java            | 2 +-
 .../java/org/scijava/ui/headless/HeadlessDisplayViewer.java     | 2 +-
 src/main/java/org/scijava/ui/headless/HeadlessUI.java           | 2 +-
 src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java         | 2 +-
 src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayPanel.java           | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayViewer.java          | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayWindow.java          | 2 +-
 .../org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java   | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java | 2 +-
 src/main/java/org/scijava/util/AbstractPrimitiveArray.java      | 2 +-
 src/main/java/org/scijava/util/AppUtils.java                    | 2 +-
 src/main/java/org/scijava/util/ArrayUtils.java                  | 2 +-
 src/main/java/org/scijava/util/BoolArray.java                   | 2 +-
 src/main/java/org/scijava/util/ByteArray.java                   | 2 +-
 src/main/java/org/scijava/util/Bytes.java                       | 2 +-
 src/main/java/org/scijava/util/CharArray.java                   | 2 +-
 src/main/java/org/scijava/util/CheckSezpoz.java                 | 2 +-
 src/main/java/org/scijava/util/ClassUtils.java                  | 2 +-
 src/main/java/org/scijava/util/ColorRGB.java                    | 2 +-
 src/main/java/org/scijava/util/ColorRGBA.java                   | 2 +-
 src/main/java/org/scijava/util/Colors.java                      | 2 +-
 src/main/java/org/scijava/util/CombineAnnotations.java          | 2 +-
 src/main/java/org/scijava/util/Combiner.java                    | 2 +-
 src/main/java/org/scijava/util/ConversionUtils.java             | 2 +-
 src/main/java/org/scijava/util/DebugUtils.java                  | 2 +-
 src/main/java/org/scijava/util/DefaultTreeNode.java             | 2 +-
 src/main/java/org/scijava/util/DigestUtils.java                 | 2 +-
 src/main/java/org/scijava/util/DoubleArray.java                 | 2 +-
 src/main/java/org/scijava/util/FileUtils.java                   | 2 +-
 src/main/java/org/scijava/util/FloatArray.java                  | 2 +-
 src/main/java/org/scijava/util/GenericUtils.java                | 2 +-
 src/main/java/org/scijava/util/IntArray.java                    | 2 +-
 src/main/java/org/scijava/util/IntCoords.java                   | 2 +-
 src/main/java/org/scijava/util/IntRect.java                     | 2 +-
 src/main/java/org/scijava/util/IteratorPlus.java                | 2 +-
 src/main/java/org/scijava/util/LastRecentlyUsed.java            | 2 +-
 src/main/java/org/scijava/util/LineOutputStream.java            | 2 +-
 src/main/java/org/scijava/util/ListUtils.java                   | 2 +-
 src/main/java/org/scijava/util/LongArray.java                   | 2 +-
 src/main/java/org/scijava/util/Manifest.java                    | 2 +-
 src/main/java/org/scijava/util/MersenneTwisterFast.java         | 2 +-
 src/main/java/org/scijava/util/MetaInfCombiner.java             | 2 +-
 src/main/java/org/scijava/util/MirrorWebsite.java               | 2 +-
 src/main/java/org/scijava/util/MiscUtils.java                   | 2 +-
 src/main/java/org/scijava/util/NumberUtils.java                 | 2 +-
 src/main/java/org/scijava/util/ObjectArray.java                 | 2 +-
 src/main/java/org/scijava/util/POM.java                         | 2 +-
 src/main/java/org/scijava/util/PlatformUtils.java               | 2 +-
 src/main/java/org/scijava/util/Prefs.java                       | 2 +-
 src/main/java/org/scijava/util/PrimitiveArray.java              | 2 +-
 src/main/java/org/scijava/util/ProcessUtils.java                | 2 +-
 src/main/java/org/scijava/util/Query.java                       | 2 +-
 src/main/java/org/scijava/util/ReadInto.java                    | 2 +-
 src/main/java/org/scijava/util/RealCoords.java                  | 2 +-
 src/main/java/org/scijava/util/RealRect.java                    | 2 +-
 src/main/java/org/scijava/util/ReflectException.java            | 2 +-
 src/main/java/org/scijava/util/ReflectedUniverse.java           | 2 +-
 src/main/java/org/scijava/util/ServiceCombiner.java             | 2 +-
 src/main/java/org/scijava/util/ShortArray.java                  | 2 +-
 src/main/java/org/scijava/util/Sizable.java                     | 2 +-
 src/main/java/org/scijava/util/SizableArrayList.java            | 2 +-
 src/main/java/org/scijava/util/StringMaker.java                 | 2 +-
 src/main/java/org/scijava/util/StringUtils.java                 | 2 +-
 src/main/java/org/scijava/util/Timing.java                      | 2 +-
 src/main/java/org/scijava/util/TreeNode.java                    | 2 +-
 src/main/java/org/scijava/util/TunePlayer.java                  | 2 +-
 src/main/java/org/scijava/util/Types.java                       | 2 +-
 src/main/java/org/scijava/util/UnitUtils.java                   | 2 +-
 src/main/java/org/scijava/util/VersionUtils.java                | 2 +-
 src/main/java/org/scijava/util/XML.java                         | 2 +-
 src/main/java/org/scijava/welcome/DefaultWelcomeService.java    | 2 +-
 src/main/java/org/scijava/welcome/WelcomeService.java           | 2 +-
 src/main/java/org/scijava/welcome/event/WelcomeEvent.java       | 2 +-
 src/main/java/org/scijava/widget/AbstractInputHarvester.java    | 2 +-
 src/main/java/org/scijava/widget/AbstractInputPanel.java        | 2 +-
 src/main/java/org/scijava/widget/AbstractInputWidget.java       | 2 +-
 src/main/java/org/scijava/widget/Button.java                    | 2 +-
 src/main/java/org/scijava/widget/ButtonWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ChoiceWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ColorWidget.java               | 2 +-
 src/main/java/org/scijava/widget/DateWidget.java                | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetModel.java        | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetService.java      | 2 +-
 src/main/java/org/scijava/widget/FileListWidget.java            | 2 +-
 src/main/java/org/scijava/widget/FileWidget.java                | 2 +-
 src/main/java/org/scijava/widget/InputHarvester.java            | 2 +-
 src/main/java/org/scijava/widget/InputPanel.java                | 2 +-
 src/main/java/org/scijava/widget/InputWidget.java               | 2 +-
 src/main/java/org/scijava/widget/MessageWidget.java             | 2 +-
 src/main/java/org/scijava/widget/NumberWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ObjectWidget.java              | 2 +-
 src/main/java/org/scijava/widget/TextWidget.java                | 2 +-
 src/main/java/org/scijava/widget/ToggleWidget.java              | 2 +-
 src/main/java/org/scijava/widget/UIComponent.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetModel.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetService.java             | 2 +-
 src/main/java/org/scijava/widget/WidgetStyle.java               | 2 +-
 src/test/java/org/scijava/ContextCreationTest.java              | 2 +-
 src/test/java/org/scijava/ContextInjectionTest.java             | 2 +-
 src/test/java/org/scijava/SciJavaTest.java                      | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedA.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedB.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedC.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedD.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedInnerClass.java  | 2 +-
 src/test/java/org/scijava/annotations/Complex.java              | 2 +-
 src/test/java/org/scijava/annotations/DirectoryIndexerTest.java | 2 +-
 src/test/java/org/scijava/annotations/EclipseHelperTest.java    | 2 +-
 src/test/java/org/scijava/annotations/Fruit.java                | 2 +-
 src/test/java/org/scijava/annotations/LegacyTest.java           | 2 +-
 src/test/java/org/scijava/annotations/Simple.java               | 2 +-
 src/test/java/org/scijava/app/StatusServiceTest.java            | 2 +-
 .../java/org/scijava/command/CommandArrayConverterTest.java     | 2 +-
 src/test/java/org/scijava/command/CommandInfoTest.java          | 2 +-
 src/test/java/org/scijava/command/CommandModuleTest.java        | 2 +-
 src/test/java/org/scijava/command/CommandServiceTest.java       | 2 +-
 src/test/java/org/scijava/command/InputsTest.java               | 2 +-
 src/test/java/org/scijava/command/InvalidCommandTest.java       | 2 +-
 .../java/org/scijava/command/run/CommandCodeRunnerTest.java     | 2 +-
 src/test/java/org/scijava/console/ConsoleServiceTest.java       | 2 +-
 .../java/org/scijava/console/SystemPropertyArgumentTest.java    | 2 +-
 .../java/org/scijava/convert/AbstractNumberConverterTests.java  | 2 +-
 .../java/org/scijava/convert/ArrayToStringConverterTest.java    | 2 +-
 .../scijava/convert/BigIntegerToBigDecimalConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ByteToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToBigIntegerConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToDoubleConverterTest.java     | 2 +-
 src/test/java/org/scijava/convert/ByteToFloatConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToIntegerConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/ByteToLongConverterTest.java  | 2 +-
 src/test/java/org/scijava/convert/ByteToShortConverterTest.java | 2 +-
 src/test/java/org/scijava/convert/ConvertServiceTest.java       | 2 +-
 src/test/java/org/scijava/convert/ConverterTest.java            | 2 +-
 src/test/java/org/scijava/convert/DelegateConverterTest.java    | 2 +-
 .../org/scijava/convert/DoubleToBigDecimalConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileListConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileToPathConversionTest.java | 2 +-
 .../org/scijava/convert/FloatToBigDecimalConverterTest.java     | 2 +-
 .../java/org/scijava/convert/FloatToDoubleConverterTest.java    | 2 +-
 .../org/scijava/convert/IntegerToBigDecimalConverterTest.java   | 2 +-
 .../org/scijava/convert/IntegerToBigIntegerConverterTest.java   | 2 +-
 .../java/org/scijava/convert/IntegerToDoubleConverterTest.java  | 2 +-
 .../java/org/scijava/convert/IntegerToLongConverterTest.java    | 2 +-
 .../java/org/scijava/convert/LongToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/LongToBigIntegerConverterTest.java | 2 +-
 .../org/scijava/convert/ShortToBigDecimalConverterTest.java     | 2 +-
 .../org/scijava/convert/ShortToBigIntegerConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToDoubleConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ShortToFloatConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToIntegerConverterTest.java   | 2 +-
 src/test/java/org/scijava/convert/ShortToLongConverterTest.java | 2 +-
 .../java/org/scijava/convert/StringToArrayConverterTest.java    | 2 +-
 .../java/org/scijava/convert/StringToNumberConverterTest.java   | 2 +-
 src/test/java/org/scijava/display/DisplayTest.java              | 2 +-
 src/test/java/org/scijava/download/DownloadServiceTest.java     | 2 +-
 src/test/java/org/scijava/event/EventServiceTest.java           | 2 +-
 src/test/java/org/scijava/io/ByteArrayByteBankTest.java         | 2 +-
 src/test/java/org/scijava/io/ByteBankTest.java                  | 2 +-
 src/test/java/org/scijava/io/IOServiceTest.java                 | 2 +-
 src/test/java/org/scijava/io/TypedIOServiceTest.java            | 2 +-
 src/test/java/org/scijava/io/event/DataEventTest.java           | 2 +-
 src/test/java/org/scijava/io/handle/BytesHandleTest.java        | 2 +-
 .../java/org/scijava/io/handle/DataHandleEdgeCaseTests.java     | 2 +-
 src/test/java/org/scijava/io/handle/DataHandleTest.java         | 2 +-
 src/test/java/org/scijava/io/handle/DataHandlesTest.java        | 2 +-
 src/test/java/org/scijava/io/handle/FileHandleTest.java         | 2 +-
 .../org/scijava/io/handle/ReadBufferDataHandleMockTest.java     | 2 +-
 .../java/org/scijava/io/handle/ReadBufferDataHandleTest.java    | 2 +-
 .../java/org/scijava/io/handle/WriteBufferDataHandleTest.java   | 2 +-
 src/test/java/org/scijava/io/location/BytesLocationTest.java    | 2 +-
 .../java/org/scijava/io/location/FileLocationResolverTest.java  | 2 +-
 src/test/java/org/scijava/io/location/FileLocationTest.java     | 2 +-
 src/test/java/org/scijava/io/location/LocationServiceTest.java  | 2 +-
 src/test/java/org/scijava/io/location/URILocationTest.java      | 2 +-
 src/test/java/org/scijava/io/location/URLLocationTest.java      | 2 +-
 src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java    | 2 +-
 src/test/java/org/scijava/log/CallingClassUtilsTest.java        | 2 +-
 src/test/java/org/scijava/log/DefaultLoggerTest.java            | 2 +-
 src/test/java/org/scijava/log/LogMessageTest.java               | 2 +-
 src/test/java/org/scijava/log/LogServiceTest.java               | 2 +-
 src/test/java/org/scijava/log/LogSourceTest.java                | 2 +-
 src/test/java/org/scijava/log/StderrLogServiceTest.java         | 2 +-
 src/test/java/org/scijava/log/TestLogListener.java              | 2 +-
 src/test/java/org/scijava/main/MainServiceTest.java             | 2 +-
 src/test/java/org/scijava/main/run/MainCodeRunnerTest.java      | 2 +-
 src/test/java/org/scijava/menu/MenuServiceTest.java             | 2 +-
 src/test/java/org/scijava/menu/ShadowMenuTest.java              | 2 +-
 src/test/java/org/scijava/module/ModuleServiceTest.java         | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessorTest.java | 2 +-
 src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java  | 2 +-
 src/test/java/org/scijava/object/NamedObjectIndexTest.java      | 2 +-
 src/test/java/org/scijava/object/ObjectIndexTest.java           | 2 +-
 src/test/java/org/scijava/object/ObjectServiceTest.java         | 2 +-
 src/test/java/org/scijava/object/SortedObjectIndexTest.java     | 2 +-
 src/test/java/org/scijava/options/OptionsTest.java              | 2 +-
 src/test/java/org/scijava/parse/ParseServiceTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginFinderTest.java          | 2 +-
 src/test/java/org/scijava/plugin/PluginIndexTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginInfoTest.java            | 2 +-
 src/test/java/org/scijava/plugin/SingletonServiceTest.java      | 2 +-
 src/test/java/org/scijava/prefs/PrefServiceTest.java            | 2 +-
 src/test/java/org/scijava/run/RunServiceTest.java               | 2 +-
 .../java/org/scijava/script/AbstractScriptLanguageTest.java     | 2 +-
 src/test/java/org/scijava/script/ScriptEngineTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptFinderTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptInfoTest.java            | 2 +-
 src/test/java/org/scijava/script/ScriptServiceTest.java         | 2 +-
 .../scijava/script/process/ParameterScriptProcessorTest.java    | 2 +-
 src/test/java/org/scijava/service/ServiceIndexTest.java         | 2 +-
 src/test/java/org/scijava/task/TaskEventTest.java               | 2 +-
 src/test/java/org/scijava/task/TaskServiceTest.java             | 2 +-
 src/test/java/org/scijava/test/AbstractSciJavaTest.java         | 2 +-
 src/test/java/org/scijava/test/TestUtilsTest.java               | 2 +-
 src/test/java/org/scijava/text/TextServiceTest.java             | 2 +-
 src/test/java/org/scijava/thread/ThreadServiceTest.java         | 2 +-
 src/test/java/org/scijava/ui/UIServiceTest.java                 | 2 +-
 src/test/java/org/scijava/util/AppUtilsTest.java                | 2 +-
 src/test/java/org/scijava/util/ArrayUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/BoolArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ByteArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/CharArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ClassUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/ColorRGBTest.java                | 2 +-
 src/test/java/org/scijava/util/ConversionUtilsTest.java         | 2 +-
 src/test/java/org/scijava/util/DigestUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/DoubleArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/FileUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/FloatArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/GenericArrayTypesTest.java       | 2 +-
 src/test/java/org/scijava/util/IntArrayTest.java                | 2 +-
 src/test/java/org/scijava/util/LastRecentlyUsedTest.java        | 2 +-
 src/test/java/org/scijava/util/LongArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/NumberUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/ObjectArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/POMTest.java                     | 2 +-
 src/test/java/org/scijava/util/PrimitiveArrayTest.java          | 2 +-
 src/test/java/org/scijava/util/ProcessUtilsTest.java            | 2 +-
 src/test/java/org/scijava/util/ShortArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/StringUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/TypesTest.java                   | 2 +-
 src/test/java/org/scijava/util/UnitUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/VersionUtilsTest.java            | 2 +-
 src/test/java/org/scijava/widget/WidgetStyleTest.java           | 2 +-
 750 files changed, 750 insertions(+), 750 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 5f08911f4..aaee970f7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2022, SciJava developers.
+Copyright (c) 2009 - 2023, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 93eab1f4c..514f2c7d7 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2022 SciJava developers.
+  Copyright (C) 2009 - 2023 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 1aa0b6938..245d04040 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index 1bda32ca5..0f899650e 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index 77e414da2..bad45ed0b 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index bf20d6cc0..399db31d8 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index be7d7b999..fb751e065 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2022 SciJava developers.
+  Copyright (C) 2009 - 2023 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index 96ba66746..f3b30998c 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index b8a074336..b550ae26f 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index c6be31959..9df93126c 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 0b887cafa..d6afda127 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index b3ab1e40f..e6c96fbf1 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 0b1098ca0..74aef720e 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index f93f22991..a6892d7bd 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index cd247a466..6862b19b8 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index cde51c0fc..6c1f51276 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 47b346156..3d5897528 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index 0774e0fb2..5d7b4301d 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index 149e8d503..b8c4bd430 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index 5be5d288d..f51ea2e32 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index bf31a522f..de5d6db8e 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index e9955fcaf..bb9b0be69 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index d69da15d2..764d67bac 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index e200df42e..ed9212310 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index ee0ac4b75..236cdbe35 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 508eec37b..cab9983d8 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index 2307e06f3..e0f508e94 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 498c0989f..24fb01c00 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index 7c13e82ba..f411e951d 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 8ce2fc46f..4433057a9 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index bb49dc76f..cc3e20661 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index a495ec026..65ce6c237 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index 3c1180e43..11f0d5743 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index a600d4718..f40ca469b 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 949cf24cb..07c444bbd 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index f3383a252..f90043370 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index 65cfa240c..82e8ac134 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index c12d5be9b..446e91cda 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 9132512e6..54cfac128 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 88f92ca9e..66c1d3566 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 03cc759b0..518e29d64 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 316ce2601..4de2c6e53 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 84a176e00..1af1b118d 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index d8b457f29..00a320e6a 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index e9fe9a5c4..98bcf4033 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index 3a3fc8b54..3cfa75dd7 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index 061226272..63ec749d3 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 31315dcf0..7b7f040a8 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 300a03da0..733a29125 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 3efbfc005..7901ee792 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index aaa359dd9..72990e5f9 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 876475de3..e15d3c869 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 26642e99b..12e203ab0 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index c622c12ea..44a871f9f 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 1c9679b06..d8f8a2d71 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index e2c64ebf0..82ef4b7f2 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index cb34e3f4e..7b57ce3e2 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index f91b37214..15b8d82f3 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 210ed2558..a150bf86b 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 420c5c2e9..fa462633b 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index cdde41992..b5aaba8d1 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index fc1e59469..702b1a561 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 38b52ac11..253c92332 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 6e777ea5b..10772f7f9 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index 86094df90..bc3b6e520 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index 64ee66b62..1ca12204e 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index 4d6f8e980..bda553db7 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index f45561e6b..d67417a04 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index 291f748cb..9c30dffaa 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index cb35b9314..a940e4257 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index 51e7b9ffa..ea3cce37b 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index 5cb014814..bfe715895 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 5115b88a1..3b9ea160c 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index f803e283c..cf1d828ee 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index d066e9d74..d0cea8435 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index ea493609c..2c1816b3c 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 88d64af7a..9ed6165a5 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index 2067aae10..d4bdec30a 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 97299556c..fdc600b31 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 80713b5bd..40de75132 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 9f474b2f7..74cce7d56 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index dc2a3ec62..02e4fb5ac 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 991f24710..3f0109138 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index ffacdfa07..843a6f20d 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index 1486f70f0..44000d87a 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index c6a053fbc..60f076798 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 89b883f63..e9cd189e7 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 9b2ae2cda..244ca88bc 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index 4e447eb79..df0853005 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 507ff693e..7f885d1ee 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index 4000ab6d3..820f818cf 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index d55b9663a..f1d67493e 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 36fc745a9..3f8c4d5cd 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index f82552970..9c5976521 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index bf63a19d8..2654216ee 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index bb5ec9d50..c642be048 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index b399f7596..5553fca8f 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index 5aad27fb1..7c65900b2 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileToPathConverter.java b/src/main/java/org/scijava/convert/FileToPathConverter.java
index 551a0d395..235c18661 100644
--- a/src/main/java/org/scijava/convert/FileToPathConverter.java
+++ b/src/main/java/org/scijava/convert/FileToPathConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 594468617..f375f99ea 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index d2d23e617..ed8481463 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index 1b646057d..73fffeecc 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index b2f29f89d..5dd8bdc71 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 79ca2723b..23c26b62b 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index 8c036173a..56620787b 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index cc1aad5d7..897fb807f 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index 834388f9c..1b2af346c 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index edbe1aeda..01d092acf 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 3c0666f2a..96c2fbc36 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PathToFileConverter.java b/src/main/java/org/scijava/convert/PathToFileConverter.java
index 668f9425e..d50b10a29 100644
--- a/src/main/java/org/scijava/convert/PathToFileConverter.java
+++ b/src/main/java/org/scijava/convert/PathToFileConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index c9e1a0412..ebc1a138a 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index 96fdd4211..33441c806 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index c5a34abad..8e6ab7aa9 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToNumberConverter.java b/src/main/java/org/scijava/convert/StringToNumberConverter.java
index 6376a6a70..6fbebd2cf 100644
--- a/src/main/java/org/scijava/convert/StringToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/StringToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index b3aa8cc47..c9ff7f702 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index b480f84d1..c0e26c205 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index 8813ccd1b..fb2f95d39 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index 836f105f5..946b63cc0 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index f9b0d3171..abdd3f960 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index 0662c15f6..3df3b4115 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 1f1db6ac0..1f654e213 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index cc4a96b89..2d09285e4 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index d079a4c96..f0afe8879 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 63f58eb36..4a4f72b41 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 715a4a291..8457a85aa 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index 9cca17b84..44e1736c3 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index a558604a7..3a866ec4d 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 8bdd74598..35cf6026e 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index ee62e8ad9..540812981 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index bae65d081..86008a0c6 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index c045d99d2..a8b6ae9b9 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index c8d73d8fb..d5456b715 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index ca7fdd18c..278c75e1d 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index f18264ef5..932e1ef9e 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index 51cf3adbb..34d49434b 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index b4af7b6b8..a6c4ba199 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index d02a8f9e9..ddf8fd2b8 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index 1fefc1f1c..7c65762d6 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index e2288e32e..ef6bca8dd 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index f47cda06f..fc6b542ba 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index c1c1030ce..25b18bf23 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index cebaebae1..38fbf57d9 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index d9b39fe7d..7f7a90e98 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 008b66c11..25e2c8fd5 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index 7220064e8..cefba6238 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index e8e470175..8767b0c3b 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index fa7b1bd79..402f42d01 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index 7d5e0b3e4..e1b136e70 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 2af77304f..beae46170 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index bfe00ebde..c1c50b74b 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 7d50a608b..3fb4e8f12 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index 3affb4051..f943b0f59 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index f87355f54..749c05497 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index 6442d9c27..1a957214b 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index 146c7eb96..2ca41a754 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index 94ed5ce53..3e9c8d2d3 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index 3f902f44e..1e961bf5a 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index eb9443133..8f565a3ff 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 77ef59e3d..cdd8a7814 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 7a7fd98bc..843bd92b2 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 57cab6bdc..3245d9014 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index d18b5c62e..fc5f6f3d6 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index b10ee4ff4..be0700965 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index ad94bda55..7547b3789 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index 3d0adfbad..de7d48be0 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index b06812dc0..5a8e4b139 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 96d35aba1..5c143e18d 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index 69725c846..f6e189035 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index 4adf94671..d6bdd2f39 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index 4615ffd21..200167c44 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index b31364f48..7a6ad862a 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index 51dca592c..6adec0eb7 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index 5966c06d7..92ce58ad5 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index e09a75dd5..9e817ad4b 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index e04d7d9da..76144f32f 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 787879832..f1d483810 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 4ca97bd1b..3160c4246 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index e3b833405..f74659702 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index c79cbd5d4..058a9cc40 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index b59d2113d..fd0d46c01 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 050b22e78..c2e0b94d7 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 118b693e2..fc797ee29 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 499e18ea5..9dc3c5364 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index 019d0a6a1..2f91937bb 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index 0439544e8..711026c5c 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index a198a946e..4e929d9c1 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index a13d20c18..c2d729e0f 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index 427da0e6a..de82a77ff 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index f3ff1652a..8b3c9fa4b 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index c9007e250..33a369a5c 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index fb191561c..c1276a092 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
index 838cc9229..542b29f2c 100644
--- a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
index 3c86730a8..463eefe59 100644
--- a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index c967b1380..4ab42965f 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 7be53f5bb..5497d97b8 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index 92e72dcab..bbf9bc183 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index 6b30e1c59..d1a8b4791 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index dfb5007f4..37a6e6cfa 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index 0ed55abc0..ff2928911 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index 1349653a6..cf7c8db92 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index a5b2754b9..ed53272ea 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index ad9822101..029447600 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index 1d26e20c0..ffbf10f41 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
index 17859653a..b5114ca29 100644
--- a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
index 1740b7b70..b57ef34d8 100644
--- a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
index 5a4169535..e2e683b08 100644
--- a/src/main/java/org/scijava/io/handle/StreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
index db400b26a..280457b21 100644
--- a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index a629c9b48..f1c01a2da 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
index 93616403e..0771e095a 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index c36f21bbf..ecd40cb78 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
index 312df412c..e3f03f912 100644
--- a/src/main/java/org/scijava/io/location/BrowsableLocation.java
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 0d6210d69..2ac731595 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index 92ba74047..5f010073b 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index 676bd87df..1a2058b42 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 03480c0ae..d86d0e6ae 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
index b8d642d3e..498ca6d37 100644
--- a/src/main/java/org/scijava/io/location/FileLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index 470c9cb22..74fd05a65 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
index 9dd2c650c..1759f180b 100644
--- a/src/main/java/org/scijava/io/location/LocationResolver.java
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 0d6104815..b06c6201f 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index f9bc1b608..6a1ca7bde 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 7b58d6a39..02c3e61d7 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index d7e4ed49e..e96afcb7d 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 8fb6b0c52..8e3d9afb9 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 8bff57a73..832ce5e06 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index 111ceb81c..b56330b00 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 5ae980645..74e620f2e 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index fc1250e78..4216120e7 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index f11ec5ae0..e8bbfdce6 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index d8d45c4d5..b866c447c 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index 775c7b4ff..fc0043dc8 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index 276970ae2..0b0211f3b 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index 8c4047849..502a54c8e 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 235de87f1..771fe28d9 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 4675e0eab..c4068d1ff 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index af8e6802e..30bdca5b5 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index 8e15caf9e..59c1f5c5a 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index eccb06796..4c066b310 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index f387991d2..e67c97132 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 81677d5c2..1be25c6bc 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index f1e76b85f..2230a6d4e 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 71a116fb6..e1548f46c 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index f1da7f002..bbf3cc36a 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index 8d076304c..8ad7ba7d4 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 287e28e5b..af6eee927 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index 24e27506b..f15311579 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index d5ddc13d9..0be942d50 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index 1a9a98a13..2625caee8 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index a364d827e..95bcd409a 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index 5c1471f7d..2d35a8d2b 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index 56a29995a..db950826c 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index 77b4626d4..7b2595af5 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index 717f4be7c..008d2784d 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index 781a6c998..ff0ea6cd6 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index e30a52a1c..4dbae4407 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 196b11ab5..9fed0102c 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index b96941e8d..3f8c7c09c 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 228cee0b1..12b2c19b4 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 29c28bdfb..3ab26d90f 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index a7b2c8de2..bdb3b0c4b 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index fc74b85d0..fc7cd35d0 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index 823220f4c..f42988331 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index 2761aaa25..b20c2d714 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 35ae5decd..9df7cfda9 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index df33ba8c9..85c20a202 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 59d490f17..5b9a3495d 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index f40875599..04f0d4de8 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index bcf7107f5..b7ae95bab 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index b226bcde0..1f1f39003 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 0a4cff44e..d5f61890a 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index ffcbb4d0d..f19ae1df3 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 294a7c66a..1624c726d 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index 976603838..ee7c00232 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index fc3dfa6a0..3ac251f50 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index eef9c42d1..d090600cb 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index f059dd3a9..ee5c721c1 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index f8b17ed12..66b8a8c29 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index e3ba97c10..d00bb48a4 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 3f6aa0c97..81ff94ee1 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index d72d0cd07..6c7c2d543 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 6402c8e1a..4587ba475 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index 0eedb7c05..e4f228907 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 8dba30973..6519874f4 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index cbe7f0518..aa31745a0 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index 8ef3dcf44..0b0844e94 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 7fba52f93..fb5fc5199 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index 87b43a956..00f2d276f 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index 610ad5a94..eb20e9431 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index 8242389bb..d7a025dd6 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index 93d3726a2..1824c8b39 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index 1fcdc7403..59b9b77a6 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index d5323ad2f..87526ac1a 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 1927c68aa..7fbfb10df 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index 69e9a0099..0cb62640c 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 7239743f9..272f8580d 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 86ad0eb5e..4d0a71616 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 2ca0e647b..629501688 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index 62b6ad5bd..773096c99 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index ded3ac399..439ae43e6 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index a64b52723..93a017750 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index 293610033..f0cbe88b9 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index c14c275b3..003d0b2c7 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index 07081b6c9..f60dc8cfc 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index 66b10b86a..357ca6612 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 1998a76d1..742cb870e 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 048f0da82..44f7060ac 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index ac86b2020..88c35a9d6 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 2ee78144c..4cafd1220 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 0b112b662..8063f9709 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 3fc476f79..12a53afc1 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index 9cd2aeae6..8e3712e4a 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index e97521043..10220b1f3 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 392e476d5..687fabdfe 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 77b231a0c..2a9f12e44 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index ecf3103e9..58ad375df 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index 7f0615f4c..597953762 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index 47fc3c88c..d033c7d5a 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index 80816a27b..17446edf9 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 966294653..8459e1a0d 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index 9da819a74..fb173a3a0 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index f9880b3e6..6039ba504 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 4a0872e99..2d6e3a997 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 7e44fb84a..9967aa887 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index bda0f4df2..1994745d8 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index 72ead76f2..d0e49bc8c 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index 48c53fffc..49d676898 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 53bdbe46a..1257be932 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index efb86a527..e531fad34 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index a54117481..9cc462972 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index de88860dd..2f8a5ed1a 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index 6c8cfa5bc..d192753f2 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index 26d2b4555..c8e51bf5d 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index 2101d8c04..ebc753143 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 6d61317fe..35c756bdc 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index 2a1c671ae..5dd7ffe6b 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 3a663bb85..fd3b71e6d 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 2f771bd35..99eaf6612 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 46eed9b31..1b1390e93 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 36d5605a0..5aafe2b91 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 1e9dd3f9e..5603e085d 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index 5b3bdcde1..aa33f9e15 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index 2b4883129..73a123737 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index 013a70e79..03be243a9 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index de8d9be40..f2398c75f 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index 907e83148..674f3b340 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index fcedfd3a3..a82b0c20a 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index 776b80fba..b70c05442 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index f7c426e3a..4cbfa99f3 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index e3ee34255..3a48d5a5e 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 307895791..e99c60d37 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 0b359cd46..e5af9d7bd 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 3187fcd23..91448fa9b 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index 4ede3e5aa..e17ba3be7 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 7d96d2770..76b268b65 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 2d53decac..4b61e1b9f 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index c54f26ee5..28885726a 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 8d9e4a1f3..cb479c299 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 17ea8f400..d2ab714a7 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index 26fcc5e47..d2324ccd3 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 516ad9d69..69fa49c20 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index d45a4f0b0..e828d2f2b 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 99fc8fd18..9b2041484 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 02b905f56..7e73d3e2c 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index b511aab11..b08fad223 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 1a2bfa119..8a5942493 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 19c3da732..971201198 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index 0c00e546b..3c3b0706a 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 4feb02532..ad63b6919 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index cddcad87b..f922c23c8 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index a1f7af866..d2aabba95 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 0b9ff441e..ccf96ee6a 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 640b6d61b..944133d38 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index a9e4b5e09..6629cdb80 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index 07f44a6ca..3b8ccea3e 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index d649eb5aa..29fc580af 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index ff4bd3c7a..bdbe7df70 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index b26ee37cc..28c9dbd60 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 07c2ff091..7f2363307 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index e3ab8e244..84da9b16c 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index 26ae5468e..1e583d42a 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 26f1c60bf..9629620e6 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index d867aeef8..bfb036898 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index 2377a9fef..c42d27caf 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index cae5e3792..ed682367c 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index 927d76bee..af1505342 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index f46d54bf9..a302db020 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 8fc849c20..084df69de 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 76a688924..dfc9b9fa8 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 9e787f436..c5761b178 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 37ebab4cb..4d7eb067a 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index 13062df91..06b626881 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index cb9a7249e..eab573481 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index e0f8de3bb..4d815098d 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index ba056a6e8..80b9cd073 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index b8368dbff..fe843eff8 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index abd258195..67c0d3fee 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index f306ee488..5826abf07 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 41b3185bc..8779ac1dc 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index 0f65a99c2..3ead99983 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index 39c8012a3..e08f84ff7 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index ad952d54d..b29910428 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index f56ec50fb..18783f1e3 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index 89ae99097..7a495fe7c 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index 7e95f1e78..16ee156d4 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 7f75c39fd..7f022c097 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index 95bcc94c0..f4fcf2f75 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index 39941978e..f81c1cdaa 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 2e51a6322..c365ae33f 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index 188123998..e7fcc6e73 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index a7f373a7c..e4de7ae54 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 184fb8209..6b883fe95 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 13f3fb37a..ea438791e 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index 57ca01749..3fef71dbf 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index 692869a8f..20ea362fa 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index 02b6c46cf..cd664397d 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index df59b6a36..098ca57c8 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index e8c1be0cc..5c532bd38 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 728c20831..05bdddadd 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index f05cbc7ed..da4b10d9c 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 9c5be1528..8c4944766 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 602883be0..f8764d7da 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index 8389d55f6..145ea53ea 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index da60b2357..208ac521d 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index 3ad01f908..ebdf8483b 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
index 231ef68c7..dfc68ca99 100644
--- a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index 70e696f16..446f633a2 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index 32ad3cebf..b458da421 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index cdf39b128..dc6ae85c1 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index e4d86a36e..36d053963 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 458613b45..1ce80c5af 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index 5951b6dbb..db05e71b9 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index ac6535c89..5c8e47659 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index 39062d6a8..bf20248a4 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index afcad184a..fc0e005b0 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index c11d3c2a8..f078de931 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 0e8db19d6..4f1031efa 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index 9632da00d..24d693aa9 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index 0a9e58c27..bb5fd2258 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index 4104c3d19..197cf4774 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
index 1dc08a2ee..0f100ff8a 100644
--- a/src/main/java/org/scijava/startup/StartupService.java
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 44f1c3b30..94d817c53 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
index 09375262a..f550585c9 100644
--- a/src/main/java/org/scijava/task/DefaultTaskService.java
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index 7e6b66062..be1197d77 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
index 887acf804..3cacfac9b 100644
--- a/src/main/java/org/scijava/task/TaskService.java
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
index 79d55f7d2..097c9346c 100644
--- a/src/main/java/org/scijava/task/event/TaskEvent.java
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 7f9c63075..54c3061e7 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 72654f649..55ab02b6b 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index 63c56cb9d..5836c4e19 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 01002be53..076039e9a 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 8f640ba5f..c8c2219a0 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
index b1c9ad530..cba64c9bf 100644
--- a/src/main/java/org/scijava/text/io/DefaultTextIOService.java
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 04018a44f..d5ce2850a 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
index 42e36e64a..12f629b91 100644
--- a/src/main/java/org/scijava/text/io/TextIOService.java
+++ b/src/main/java/org/scijava/text/io/TextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 3262ee21d..f46952d98 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index afddb6f8f..0d272b87d 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index 054fd1a8b..95f89ccc4 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 3a3905780..1ec0e78ff 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index d78e1a53a..4f2e8d168 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index baef6dfe3..d155ef30a 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index 0d1b45824..e3f108a4d 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index 43ac9f66f..67ddf9033 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index cadfcf115..e345c253f 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index a254a91e3..0a84ae96b 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 5142bbe18..9bdb75a60 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 7503eed17..a197eca41 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 6c6f1f185..c4c058393 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index 5d7678f61..4c9b60709 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index 9d12ab82f..f3db6253a 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index 394ec8829..a5e1ec829 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index 0c3e22da5..decf671af 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index dbda0cc80..f4ecf39ea 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index fb5a06dff..ad95bb784 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index 56450088f..c92b2a9f3 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index d26cbd5d7..7fdb36a70 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index bfca746d9..114b512cc 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index 26c0ede95..f21ab726e 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index 13d8feb68..a8feefe5d 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index d03e43bc4..44eff1194 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 9b6b71377..cfef18eff 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index 8eb4e8bf6..421aa24c6 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index 95a137aa5..c294cdb23 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index 87a755a14..b22a20a6f 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index d3111bb3e..20a9d8bfe 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 162532dac..a0588256c 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index db4817ceb..0512d725d 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index 7145ed54a..02e2b5b24 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index 3a10f459d..dca137c3b 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index 9d0c1161b..10fd2e6b7 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index 0deeba42b..05bee6855 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index 09e3efb79..e098a2367 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index 05d350bd7..d578688ad 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index 0529ea7c5..9634c477a 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index 524f5a887..3bc3de22e 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index d5924bbbc..a4cd7a258 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 4f7d47043..a81e25f6c 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index a7b394407..0d2b3ae38 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 11aa98108..e8f6090c2 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index 9ca0833ca..d36a10797 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index c5fd7ec61..037e3916a 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index a798ff7ec..af9f53015 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index 20c240ead..e460f58b7 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index f219555ab..3b85bb254 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index fbe9b6ce1..c51a4b3c4 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index f0376b017..4545f24e2 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index 0fd7677e6..49331480c 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index 0f4e3a9b0..d2b7fd7b8 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index d7b893f3c..23f55be2d 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index 3352913e3..df5e0cc93 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index c8aceb5ae..3f658df97 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 96f51ff72..257753e9d 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index 35cefdadc..ab552f6d0 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index f438822c0..0ab9b1df1 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index 657e860b5..d8ea0193a 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index d9d4945c4..55b3b842c 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index 2b6e93004..ac0c67d16 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 3f0ba3fec..683fdbd26 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 302a6f41a..517bdb9cf 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index 735f286b0..28bfefc67 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 31456cb10..48519a328 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index c6487c5cf..d25c2ffa0 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 72e192bbe..3edf088a8 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index f1e831c0e..07e724fb1 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index fbce5e167..ac6637797 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index bfe0ae73e..1550ec875 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index 459260f05..7f5643b76 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index d9d3b2f67..5543ce7bb 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 129eaf5f4..4e10cd8c4 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index b7c55622b..fb89ccb72 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index f32b4fad9..cc115dc75 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index 002659f4a..993a03445 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index e4babbe96..feb0b1774 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 99b30254c..8e762c083 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 4e88f180b..06c26b168 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
index db60c7673..1d1231702 100644
--- a/src/main/java/org/scijava/util/DefaultTreeNode.java
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index b78af02ae..92472445f 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index 928d62af6..bf76fdb7b 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 3a3efd896..e9424cef0 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index f232814d6..593d22131 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index fd5d3e9a7..978af3f54 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 6d0086a17..66de4c87e 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index 80d18eafc..bc689e341 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index 508fc5eeb..9791697e3 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index 990246fd9..da8bae3db 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 84ea1ecb8..5bbe3cacc 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index 38b014a14..c37318242 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index 2d433e667..f868a9af2 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index 61ffed4a9..f190a2049 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 807eaa05f..f57983e31 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 2abb4d206..bf176347b 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 745c39195..6380901ad 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index 5df62bb10..fff9366d3 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 492e2150e..3c0f5b0be 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 9b3ad2488..704e0bc8c 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index 2564da853..bb238b288 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 2a9c979b7..ea0feacbc 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index d1b82104d..21ffc6475 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index f946b587f..8519017c4 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 8e72eb8ec..addc4d016 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index 698b1ae78..cf8914033 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index 2973c004e..c8b6d525b 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 5e822926b..37daf4857 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index d55f0cdfe..dbb39a44e 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index c58fbb7a8..7f6867df6 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index 2096b73cf..701e8362e 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 53c0e0ab7..4c9fd953f 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index 65bf24190..e976f6846 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 50ca80a10..8a3985006 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index b4939d7c8..c1172b1dc 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index 163ae5939..b132a87f7 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 97af599da..ac4db3873 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 6516777b2..0fdba3900 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index d533840f6..1bf79ddd4 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
index a0ed8a293..833832642 100644
--- a/src/main/java/org/scijava/util/TreeNode.java
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index a59e2019b..f12969725 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 9ded87575..12f46115c 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 1d45f7aac..6f1848da9 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index 994a4aa71..2bbb2e25d 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index e1b570d37..aac4a396b 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 186b28260..bc7bdd726 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index c7a1ec948..68da22375 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index 8ea1f3424..90b70c8d6 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 1f65ae1d5..9a82ea33f 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index 2a8bb49a5..0efb95586 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index f527847b0..9c6aede1e 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index 286cd1fb4..e9e73f59a 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index c869fc13e..9c278c243 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index b900ac0ba..6ca640cb9 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 84284a9dd..17de750c9 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index d05049bf7..8a7db46cf 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 229195289..ea878b162 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 2606eed13..19111288c 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index d74ea12f5..f99c66ee2 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index dc70e0ce1..da4632c79 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 08b1a9fe3..25ce4c5e8 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 0813ee375..664ade0ab 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 43d931c01..bdcb27c2d 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 4092544eb..117b08aeb 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index 886d423ea..b6b81e6c9 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index 2870ff270..839b5272b 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index 384523125..34dd871bf 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index bdb87913a..829dd0c94 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 54e38acb9..943daa7ee 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 83e8a2f9f..97ccad278 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index ef74c794a..8f02d6603 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index ec5e1c466..9dedf5aaf 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index b00b19dfb..b177a75c7 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index b5b958a4e..bff5bf657 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
index 7e1f2866a..c8a0fd499 100644
--- a/src/test/java/org/scijava/SciJavaTest.java
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 1226a7e2b..9e1ca7982 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index 7993d867a..41047039a 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index 5e50040a2..b2221e5bd 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index 7049ea841..4c534202a 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 41e9a3849..c431acec2 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index 4d3b2ae4a..c5f1b24bb 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 894dc5aa7..6ba1f5cde 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index cffbc9228..9a809785b 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index 28f04a12c..547d39793 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index c12e8930c..47336653e 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index 2a0b751e3..9641955f1 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 5dde120ff..b1d4feb43 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
index 26dfebfc9..406f5f604 100644
--- a/src/test/java/org/scijava/command/CommandArrayConverterTest.java
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index d7830f59e..8de905e99 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 372ca5267..bbdb25270 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index a66fe78e3..e13622351 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index a5387d6b9..2c6556644 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 3d5e11649..b0d311083 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index afde6646f..557de6a28 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 9bdb66ba4..432feb8e0 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index 830ad7047..c7c0a9185 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 1ab9f17d4..7922b3cb6 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 17ad68a4e..36a78a824 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index a345e9cbd..ee40655af 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 28ea79d65..504165eca 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index fed7c84ce..5fe0aeda9 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index 3b33abecb..1e577f141 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 4395c5789..3f0c755de 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 61724ec62..890953eed 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 00866555b..0feab666a 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index 2c307dcce..cec43a6e4 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 59aaa2835..5c15ae934 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index dd96e6191..873be832a 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
index 045eabd6a..00bd9baae 100644
--- a/src/test/java/org/scijava/convert/DelegateConverterTest.java
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index ed092262e..57c4e8cba 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index 632e82f4a..cd6b011e6 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileToPathConversionTest.java b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
index 6dcd81d1b..3b6f554c1 100644
--- a/src/test/java/org/scijava/convert/FileToPathConversionTest.java
+++ b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index 0be67f354..db194c80b 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index 245ba6233..cbb142ed8 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index ffe7dc17b..4d59c5a23 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index 76690b449..e75975687 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 9f4555224..79f4e4b5f 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index 1552f8da7..bf8057129 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 929eb9bf7..3c3989bb8 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 69fcb27bc..3483ab5a3 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index fb8dfae28..cfc350b18 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index d0c4d67ee..ef713a05c 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index a7befa860..aadd59fbb 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index 2ce0c775b..0cbeb21fd 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index cb8505498..d74f7d81f 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index b9ca04268..8f8d6543e 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index 8234adae7..5e970dfb1 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
index b2778d128..879e9ffc8 100644
--- a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index bb862450c..c8502c237 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index adf5fad02..722a3325c 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index c1e6e74e3..7d80cd56d 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index e7ee584eb..a8c43184c 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index 2c69cd595..7861b3920 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index 68ceb121a..a109c85e8 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index 8e100352c..b17bca169 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index 477f6be79..6ceb42e2e 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index 9e023e1be..865cd327f 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
index abc9d99a8..7115af445 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index d62bdca7f..15730d404 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
index 7aa81bfb1..9a91d56c0 100644
--- a/src/test/java/org/scijava/io/handle/DataHandlesTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 8b405416c..d690ed710 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index 13a93571e..f7cb24182 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index bd1a9ed14..61c7c9b41 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index b9295187e..fd813e326 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index f7f26c67e..e2900a9c6 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
index f3326660a..62def039e 100644
--- a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index cb7562977..cf98dcfa1 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index feb628fa4..ade1122ba 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index 08c886467..6e23d6fd9 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index 9b939f4a1..3f15988c0 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 90919ed48..13c3c0a6b 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index a5893c905..e8b2d8ed5 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index 865e306aa..c8143017e 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 733e28ff5..20cbe8d76 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index fccbc18fb..9ab4f15bd 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index 848a5e17d..65d5813f4 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index 00d3a698b..b28503b32 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
index ef6224cfa..ef92de0d5 100644
--- a/src/test/java/org/scijava/log/TestLogListener.java
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index e96794ed8..8152f13c6 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index eaf05da9b..03872538f 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index d3c7428d5..604db06c3 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index f24093192..3c8ff6874 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index 2bd1fcb4b..b9e6ab4f5 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index a0dd141ff..40461b497 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index 3425c654b..b5db1288c 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
index ad5fd4aa7..0e8e510f8 100644
--- a/src/test/java/org/scijava/object/NamedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index e81c87e1f..00be93314 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
index 321a402cb..7e179c0bf 100644
--- a/src/test/java/org/scijava/object/ObjectServiceTest.java
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 61894ab78..86c38ecfd 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 3ed1d5f08..eb144eebc 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index a5053766c..f09d33308 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index 004165143..32514f731 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 485484287..6452fffba 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index c7e2fbea5..49c7fa8bf 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index a4eabeec7..ca6e5a331 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index 1f2ee361a..ff5de6fde 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index 5b0189b7b..f7e908154 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index 42d0a0707..9b8415054 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index 62914f64a..b10c6d3e8 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 5c77988a6..f3301fec1 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 53691a948..06231bb0e 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index f3dda2de3..b548ea74a 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
index 3256d6062..dbc1e0674 100644
--- a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index af260c4ca..44dc0c11e 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
index fadecc683..9360fc6ad 100644
--- a/src/test/java/org/scijava/task/TaskEventTest.java
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index 7f6705495..5f64642c0 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index ae0e45338..b11a6e1d6 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 31eee18d4..fd25f1cff 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/text/TextServiceTest.java b/src/test/java/org/scijava/text/TextServiceTest.java
index 974e0cbac..aa4b714c2 100644
--- a/src/test/java/org/scijava/text/TextServiceTest.java
+++ b/src/test/java/org/scijava/text/TextServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 0e92db904..918dc33ea 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 815b186d4..b68068186 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index ddf392bec..7018581b2 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index c31e809a1..befbf0697 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index 51c5f6b4c..c578dd824 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index 31287b2a6..f4fa06ec5 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 343a64b80..2063c0a88 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 35e9c134e..11b469757 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 4f3f68323..e461780a5 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index ac0abeaa9..ee5b548d9 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 657ee757d..8f145181a 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index 093adb0a8..8f8c4aece 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index 51f6286af..ebea6008c 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index b5bc6801e..cfa9d7f24 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/GenericArrayTypesTest.java b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
index 73e6046df..651b6b437 100644
--- a/src/test/java/org/scijava/util/GenericArrayTypesTest.java
+++ b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index 33b515224..449621017 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 2d17082ba..a543f9830 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index 81f41c692..04401d197 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/NumberUtilsTest.java b/src/test/java/org/scijava/util/NumberUtilsTest.java
index c838ccc89..2180767af 100644
--- a/src/test/java/org/scijava/util/NumberUtilsTest.java
+++ b/src/test/java/org/scijava/util/NumberUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index bb654fa0f..8bf3cae7e 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index dad7a7aa7..b24fee5dc 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index 747b0fdac..cb76fac7c 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index 2b717cb92..8b19a7cf7 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index e4d3f7ed6..cad66c41d 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 4fac7e5e7..30f99e02f 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 21fce520d..4edebf7ff 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index e095f60a0..bfc2aa681 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index 7b0844225..a924049f8 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
index 321342736..78f9c203d 100644
--- a/src/test/java/org/scijava/widget/WidgetStyleTest.java
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2022 SciJava developers.
+ * Copyright (C) 2009 - 2023 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From fe8297f49a35a286792a30519955acfa03882be2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 24 Jan 2023 09:03:59 -0600
Subject: [PATCH 1058/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a7fe0d700..0cb3c152b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.90.1-SNAPSHOT</version>
+	<version>2.90.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From e8f6a8eda29211cd2701ca60429a40b1c05951a1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 1 Feb 2023 10:29:28 -0600
Subject: [PATCH 1059/1208] Improve UIService headless mode and fix test

After much hand-wringing, @hinerm and I gave up and decided to call
java.awt.GraphicsEnvironment.isHeadless() to make sure the UIService
reports the correct headless status. Otherwise, testing becomes very
tricky with more edge cases, and more importantly, the
UIService.isHeadless() method does not behave as one might expect.
---
 .../java/org/scijava/ui/DefaultUIService.java |  7 ++--
 src/main/java/org/scijava/ui/UIService.java   | 10 ++++-
 .../java/org/scijava/ui/UIServiceTest.java    | 40 ++++++++++++++-----
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 7fdb36a70..4750f31ef 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -29,6 +29,7 @@
 
 package org.scijava.ui;
 
+import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
@@ -191,9 +192,9 @@ public void setHeadless(final boolean headless) {
 
 	@Override
 	public boolean isHeadless() {
-		// NB: We do not use java.awt.GraphicsEnvironment.isHeadless()
-		// because scijava-common eschews java.awt.* classes when possible.
-		return forceHeadless || Boolean.getBoolean("java.awt.headless");
+		return forceHeadless ||
+			Boolean.getBoolean("java.awt.headless") ||
+			GraphicsEnvironment.isHeadless();
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 20a9d8bfe..39563f8b4 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -119,7 +119,15 @@ public interface UIService extends SciJavaService {
 	 */
 	void setHeadless(boolean isHeadless);
 
-	/** Gets whether the UI is running in headless mode (no UI). */
+	/**
+	 * Gets whether the UI is running in headless mode (no UI).
+	 * <p>
+	 * More precisely: returns true when {@code java.awt.headless} system
+	 * property is set, and/or {@link java.awt.GraphicsEnvironment.isHeadless()}
+	 * returns true, and/or {@link #setHeadless(boolean)} was called with {@code
+	 * true} to force headless behavior in an otherwise headful environment.
+	 * </p>
+	 */
 	boolean isHeadless();
 
 	/**
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index b68068186..89def4290 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -31,6 +31,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
@@ -79,19 +80,40 @@ public void testAvailableUIs() {
 
 	@Test
 	public void testHeadlessUI() {
+		// If true here, before we messed with it, the assumption is that we are
+		// in a truly headless environment, not just forced via setHeadless(true).
+		boolean reallyHeadless = uiService.isHeadless();
+
 		final MockUserInterface mockUI = new MockUserInterface();
 		uiService.setDefaultUI(mockUI);
 
 		// test non-headless behavior
-		uiService.setHeadless(false);
-		assertFalse(uiService.isHeadless());
-		assertTrue(uiService.getDefaultUI() instanceof MockUserInterface);
-
-		// test headless behavior
-		uiService.setHeadless(true);
-		assertTrue(uiService.isHeadless());
-		assertTrue("UIService should return HeadlessUI when running \"headless\"",
-			uiService.getDefaultUI() instanceof HeadlessUI);
+		if (reallyHeadless) {
+			// This environment is truly headless, and
+			// we should not be able to override it.
+			uiService.setHeadless(false);
+			assertTrue(uiService.isHeadless());
+			assertTrue("UIService should return HeadlessUI when running \"headless\"",
+				uiService.getDefaultUI() instanceof HeadlessUI);
+		}
+		else {
+			// This environment is not headless! We can test more things.
+			assertSame("UIService default UI override failed",
+				mockUI, uiService.getDefaultUI());
+
+			// This environment isn't headless now;
+			// let's test overriding it to be so.
+			uiService.setHeadless(true);
+			assertTrue(uiService.isHeadless());
+			assertTrue("UIService should return HeadlessUI when running \"headless\"",
+				uiService.getDefaultUI() instanceof HeadlessUI);
+
+			// Now we put it back!
+			uiService.setHeadless(false);
+			assertFalse(uiService.isHeadless());
+			assertSame("UIService default UI override was not restored",
+				mockUI, uiService.getDefaultUI());
+		}
 	}
 
 	private static final class MockUserInterface extends AbstractUserInterface {

From e9a41a4c917dddf2e8d9fadc4c3dbed48dd91d76 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 1 Feb 2023 13:04:18 -0600
Subject: [PATCH 1060/1208] StringToArrayConverterTest: avoid needless objects

We can use the array classes directly, rather than reflectively
instantiating and then throwing away array instances.
---
 .../convert/StringToArrayConverterTest.java   | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index 5e970dfb1..6947a2976 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -69,32 +69,31 @@ public void tearDown() {
 	 */
 	@Test
 	public void testArrayConversion() {
-		// Component types for array conversions
+		// Array types for array conversions
 		List<Class<?>> classes = Arrays.asList( //
-			byte.class, //
-			Byte.class, //
-			short.class, //
-			Short.class, //
-			int.class, //
-			Integer.class, //
-			long.class, //
-			Long.class, //
-			float.class, //
-			Float.class, //
-			double.class, //
-			Double.class //
+			byte[].class, //
+			Byte[].class, //
+			short[].class, //
+			Short[].class, //
+			int[].class, //
+			Integer[].class, //
+			long[].class, //
+			Long[].class, //
+			float[].class, //
+			Float[].class, //
+			double[].class, //
+			Double[].class //
 		);
 		// String input
 		String s = "{0, 1, 2}";
-		for (Class<?> c : classes) {
-			// Make the array class
-			Class<?> arrayClass = Array.newInstance(c, 0).getClass();
+		for (Class<?> arrayClass : classes) {
 			// Ensure our Converter can do the conversion
 			Assert.assertTrue(converter.canConvert(s, arrayClass));
 			// Do the conversion
 			Object converted = converter.convert(s, arrayClass);
 			// Ensure the output is the expected type
 			Assert.assertEquals(arrayClass, converted.getClass());
+			Class<?> c = arrayClass.getComponentType();
 			for (int i = 0; i < 3; i++) {
 				// Ensure element correctness
 				Object expected = convertService.convert(i, c);

From 3be2646d6abf8bf0ac063dd3de4244c4bf814f34 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 1 Feb 2023 13:52:28 -0600
Subject: [PATCH 1061/1208] ConversionUtilsTest: rewrite testBadObjectElements

This test is no longer applicable, at least with the current conversion
logic that now handles arrays and collections as of #449 et al.

There is a substantial discrepancy right now between what
DefaultConverter reports as convertible via canConvert versus
what it actually *does* support converting via the convert methods.
But that's an issue for another day!
---
 .../org/scijava/util/ConversionUtilsTest.java | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index ee5b548d9..0549e637c 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -29,6 +29,7 @@
 
 package org.scijava.util;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -43,7 +44,6 @@
 import java.util.Set;
 
 import org.junit.Test;
-import org.scijava.util.Types;
 
 /**
  * Tests {@link ConversionUtils}.
@@ -254,23 +254,37 @@ class Struct {
 	 * and a collection.
 	 */
 	@Test
-	public void testBadObjectElements() {
+	public void testIncompatibleCollections() {
 		class Struct {
 
 			private Double[] doubleArray;
-			private List<String> stringList;
-			@SuppressWarnings("unused")
-			private Set<char[]> nestedArray;
+			private List<Number> numberList;
+			private Set<Integer[]> setOfIntegerArrays;
 		}
 		final Struct struct = new Struct();
 
-		// Test abnormal behavior for an object array
-		setFieldValue(struct, "doubleArray", "not a double array");
-		assertEquals(null, struct.doubleArray);
+		// NB: DefaultConverter converts non-collection/array objects to
+		// collection/array objects, even if some or all of the constituent elements
+		// cannot be converted to the array/collection component/element type.
 
-		// Test abnormal behavior for a list
-		setFieldValue(struct, "nestedArray", "definitely not a set of char arrays");
-		assertNull(struct.stringList);
+		// Test object to incompatible array type
+		setFieldValue(struct, "doubleArray", "not a double array");
+		assertArrayEquals(new Double[] {null}, struct.doubleArray);
+
+		// Test object to incompatible List type
+		setFieldValue(struct, "numberList", "not actually a list of numbers");
+		List<Number> expectedList = Arrays.asList((Number) null);
+		assertEquals(expectedList, struct.numberList);
+
+		// Test object to incompatible Set type
+		setFieldValue(struct, "setOfIntegerArrays", //
+			"definitely not a set of Integer[]");
+		assertNotNull(struct.setOfIntegerArrays);
+		assertEquals(1, struct.setOfIntegerArrays.size());
+		Integer[] singleton = struct.setOfIntegerArrays.iterator().next();
+		assertNotNull(singleton);
+		assertEquals(1, singleton.length);
+		assertNull(singleton[0]);
 	}
 
 	/**

From 4e40e04189cafcfad4c66357cbad17727dbf6325 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 1 Feb 2023 15:03:50 -0600
Subject: [PATCH 1062/1208] Add unit tests for DefaultConverter

Many do not pass yet, and are commented out.
But it's a start. See #450.
---
 .../scijava/convert/DefaultConverterTest.java | 268 ++++++++++++++++++
 1 file changed, 268 insertions(+)
 create mode 100644 src/test/java/org/scijava/convert/DefaultConverterTest.java

diff --git a/src/test/java/org/scijava/convert/DefaultConverterTest.java b/src/test/java/org/scijava/convert/DefaultConverterTest.java
new file mode 100644
index 000000000..599da290b
--- /dev/null
+++ b/src/test/java/org/scijava/convert/DefaultConverterTest.java
@@ -0,0 +1,268 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2023 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+package org.scijava.convert;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests {@link DefaultConverter}.
+ * 
+ * @author Curtis Rueden
+ * */
+public class DefaultConverterTest {
+	private DefaultConverter converter;
+
+	@Before
+	public void setUp() {
+		converter = new DefaultConverter();
+	}
+
+	// NB: The commented out tests do not currently pass, but many should.
+	// See: https://github.com/scijava/scijava-common/issues/450
+
+	@Test
+	public void testObjectToObjectArray() {
+		Object o = new Object();
+//		assertTrue(converter.canConvert(o, Object[].class));
+		Object[] result = converter.convert(o, Object[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+//		assertSame(o, result[0]);
+	}
+
+	@Test
+	public void testIntToObjectArray() {
+		int v = 1;
+//		assertTrue(converter.canConvert(v, Object[].class));
+		Object[] result = converter.convert(v, Object[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+//		assertSame(v, result[0]);
+	}
+
+	@Test
+	public void testIntToPrimitiveIntArray() {
+		int v = 2;
+//		assertTrue(converter.canConvert(v, int[].class));
+		int[] result = converter.convert(v, int[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+		assertSame(v, result[0]);
+	}
+
+	@Test
+	public void testIntToBoxedIntegerArray() {
+		int v = 3;
+//		assertTrue(converter.canConvert(v, Integer[].class));
+		Integer[] result = converter.convert(v, Integer[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+		assertSame(v, result[0]);
+	}
+
+	@Test
+	public void testByteToPrimitiveDoubleArray() {
+		byte v = 4;
+//		assertTrue(converter.canConvert(v, double[].class));
+		double[] result = converter.convert(v, double[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+		assertEquals(v, result[0], 0.0);
+	}
+
+	@Test
+	public void testByteToBoxedDoubleArray() {
+		byte v = 4;
+//		assertTrue(converter.canConvert(v, Double[].class));
+		Double[] result = converter.convert(v, Double[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+		assertEquals(v, result[0], 0.0);
+	}
+
+	@Test
+	public void testStringToObjectArray() {
+		String s = "Pumpernickel";
+//		assertTrue(converter.canConvert(s, Object[].class));
+		Object[] result = converter.convert(s, Object[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+//		assertSame(s, result[0]);
+	}
+
+	@Test
+	public void testStringToStringArray() {
+		String s = "smorgasbord";
+//		assertTrue(converter.canConvert(s, String[].class));
+		String[] result = converter.convert(s, String[].class);
+		assertNotNull(result);
+		assertEquals(1, result.length);
+		assertSame(s, result[0]);
+	}
+
+	@Test
+	public void testObjectToCollection() throws NoSuchFieldException {
+		class Struct {
+			private Collection<Object> collectionOfObjects;
+			private List<Object> listOfObjects;
+			private List<String> listOfStrings;
+			private List<Double> listOfDoubles;
+			private Set<Object> setOfObjects;
+		}
+		
+		Type collectionOfObjectsType = Struct.class.getDeclaredField("collectionOfObjects").getGenericType();
+		Type listOfObjectsType = Struct.class.getDeclaredField("listOfObjects").getGenericType();
+		Type listOfStringsType = Struct.class.getDeclaredField("listOfStrings").getGenericType();
+		Type listOfDoublesType = Struct.class.getDeclaredField("listOfDoubles").getGenericType();
+		Type setOfObjectsType = Struct.class.getDeclaredField("setOfObjects").getGenericType();
+
+		Object o = new Object();
+//		assertTrue(converter.canConvert(o, collectionOfObjectsType));
+		assertTrue(converter.canConvert(o, listOfObjectsType));
+		assertTrue(converter.canConvert(o, listOfStringsType));
+		assertTrue(converter.canConvert(o, listOfDoublesType));
+		assertTrue(converter.canConvert(o, setOfObjectsType));
+
+//		assertCollection(o, converter.convert(o, collectionOfObjectsType), Collection.class);
+//		assertCollection(o, converter.convert(o, listOfObjectsType), List.class);
+//		assertCollection(o, converter.convert(o, listOfStringsType), List.class);
+//		assertCollection(o, converter.convert(o, listOfDoublesType), List.class);
+//		assertCollection(o, converter.convert(o, setOfObjectsType), Set.class);
+
+		String s = "Thingamawhatsit";
+//		assertTrue(converter.canConvert(s, collectionOfObjectsType));
+		assertTrue(converter.canConvert(s, listOfObjectsType));
+		assertTrue(converter.canConvert(s, listOfStringsType));
+		assertTrue(converter.canConvert(s, listOfDoublesType));
+		assertTrue(converter.canConvert(s, setOfObjectsType));
+
+//		assertCollection(s, converter.convert(s, collectionOfObjectsType), Collection.class);
+//		assertCollection(s, converter.convert(s, listOfObjectsType), List.class);
+		assertCollection(s, converter.convert(s, listOfStringsType), List.class);
+//		assertCollection(s, converter.convert(s, listOfDoublesType), List.class);
+//		assertCollection(s, converter.convert(s, setOfObjectsType), Set.class);
+
+		// TODO: Test more things, covering the equivalent of all *To*Array above.
+	}
+
+	@Test
+	public void testNumberToNumber() {
+		double d = -5.6;
+		assertTrue(converter.canConvert(d, int.class));
+		assertEquals(-5, converter.convert(d, int.class), 0.0);
+		// TODO: Test many more combinations of numeric types.
+	}
+
+	@Test
+	public void testObjectToString() {
+		Object friendly = new Object() {
+			@Override
+			public String toString() { return "Hello"; }
+		};
+		assertTrue(converter.canConvert(friendly, String.class));
+		assertEquals("Hello", converter.convert(friendly, String.class));
+	}
+
+	@Test
+	public void testStringToCharacter() {
+		String plan = "Step 0: there is no plan";
+
+		assertTrue(converter.canConvert(plan, char.class));
+		assertEquals('S', (char) converter.convert(plan, char.class));
+
+		assertTrue(converter.canConvert(plan, Character.class));
+		assertEquals(new Character('S'), converter.convert(plan, Character.class));
+	}
+
+	@Test
+	public void testStringToCharacterArray() {
+		String plan = "Step 0: there is no plan";
+
+//		assertTrue(converter.canConvert(plan, char[].class));
+//		assertArrayEquals(plan.toCharArray(), converter.convert(plan, char[].class));
+		// TODO: Test Character[] also.
+	}
+
+	private enum Gem {
+		RUBY, DIAMOND, EMERALD;
+	}
+
+	@Test
+	public void testStringToEnum() {
+		assertTrue(converter.canConvert("RUBY", Gem.class));
+		assertTrue(converter.canConvert("DIAMOND", Gem.class));
+		assertTrue(converter.canConvert("EMERALD", Gem.class));
+		assertTrue(converter.canConvert("QUARTZ", Gem.class));
+		assertEquals(Gem.RUBY, converter.convert("RUBY", Gem.class));
+		assertEquals(Gem.DIAMOND, converter.convert("DIAMOND", Gem.class));
+		assertEquals(Gem.EMERALD, converter.convert("EMERALD", Gem.class));
+		assertNull(converter.convert("QUARTZ", Gem.class));
+	}
+
+	public static class StringWrapper {
+		public String s;
+		@SuppressWarnings("unused")
+		public StringWrapper(String s) { this.s = s; }
+	}
+
+	@Test
+	public void testConstructorConversion() {
+		String s = "Juggernaut";
+		assertTrue(converter.canConvert(s, StringWrapper.class));
+		assertFalse(converter.canConvert(7, StringWrapper.class));
+		StringWrapper sw = converter.convert(s, StringWrapper.class);
+		assertNotNull(sw);
+		assertSame(s, sw.s);
+	}
+
+	// -- Helper methods --
+
+	private static void assertCollection(Object o, Object collection,
+		Class<?> collectionClass)
+	{
+		assertNotNull(collection);
+		assertTrue(collectionClass.isInstance(collection));
+		assertEquals(1, ((Collection<?>) collection).size());
+		assertSame(o, ((Collection<?>) collection).iterator().next());
+	}
+
+}

From 8932051e3c276fc1811b62975d0f6d6934339dd1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 1 Feb 2023 15:40:33 -0600
Subject: [PATCH 1063/1208] ConversionUtilsTest: make comparison more granular

---
 src/test/java/org/scijava/util/ConversionUtilsTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 0549e637c..3df7223ee 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -29,7 +29,6 @@
 
 package org.scijava.util;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -269,7 +268,9 @@ class Struct {
 
 		// Test object to incompatible array type
 		setFieldValue(struct, "doubleArray", "not a double array");
-		assertArrayEquals(new Double[] {null}, struct.doubleArray);
+		assertNotNull(struct.doubleArray);
+		assertEquals(1, struct.doubleArray.length);
+		assertNull(struct.doubleArray[0]);
 
 		// Test object to incompatible List type
 		setFieldValue(struct, "numberList", "not actually a list of numbers");

From 9934d04b5186445a676fe3378eb1c2c3c6747be5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Feb 2023 14:47:01 -0600
Subject: [PATCH 1064/1208] DefaultConverter: fix null primitive values bug

If the destination type is a primitive, we cannot return null.
We must return the designated null-like value for that type instead.
---
 src/main/java/org/scijava/convert/DefaultConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 5553fca8f..001948004 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -185,7 +185,7 @@ public <T> T convert(final Object src, final Class<T> dest) {
 		catch (final Exception exc) {
 			// TODO: Best not to catch blanket Exceptions here.
 			// no known way to convert
-			return null;
+			return Types.nullValue(dest);
 		}
 	}
 

From aa38136478f611f554a4babc8aead007df483813 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Feb 2023 14:50:21 -0600
Subject: [PATCH 1065/1208] Rewrite the *other* testBadObjectElements

Hooray for copy-pasted code.

See 3be2646d6abf8bf0ac063dd3de4244c4bf814f34.
---
 .../scijava/convert/ConvertServiceTest.java   | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 5c15ae934..7e214a00c 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -37,10 +37,10 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -68,7 +68,6 @@
 import org.scijava.util.ClassUtils;
 import org.scijava.util.DoubleArray;
 import org.scijava.util.FloatArray;
-import org.scijava.util.GenericUtils;
 import org.scijava.util.IntArray;
 import org.scijava.util.LongArray;
 import org.scijava.util.PrimitiveArray;
@@ -467,7 +466,9 @@ class Struct {
 		final Struct struct = new Struct();
 
 		setFieldValue(struct, "intArray", "not an int array");
-		assertEquals(null, struct.intArray);
+		assertNotNull(struct.intArray);
+		assertEquals(1, struct.intArray.length);
+		assertSame(0, struct.intArray[0]);
 	}
 
 	/**
@@ -475,23 +476,39 @@ class Struct {
 	 * and a collection.
 	 */
 	@Test
-	public void testBadObjectElements() {
+	public void testIncompatibleCollections() {
 		class Struct {
 
 			private Double[] doubleArray;
-			private List<String> stringList;
-			@SuppressWarnings("unused")
-			private Set<char[]> nestedArray;
+			private List<Number> numberList;
+			private Set<Integer[]> setOfIntegerArrays;
 		}
 		final Struct struct = new Struct();
 
-		// Test abnormal behavior for an object array
-		setFieldValue(struct, "doubleArray", "not a double array");
-		assertEquals(null, struct.doubleArray);
+		// NB: DefaultConverter converts non-collection/array objects to
+		// collection/array objects, even if some or all of the constituent elements
+		// cannot be converted to the array/collection component/element type.
 
-		// Test abnormal behavior for a list
-		setFieldValue(struct, "nestedArray", "definitely not a set of char arrays");
-		assertNull(struct.stringList);
+		// Test object to incompatible array type
+		setFieldValue(struct, "doubleArray", "not a double array");
+		assertNotNull(struct.doubleArray);
+		assertEquals(1, struct.doubleArray.length);
+		assertNull(struct.doubleArray[0]);
+
+		// Test object to incompatible List type
+		setFieldValue(struct, "numberList", "not actually a list of numbers");
+		List<Number> expectedList = Arrays.asList((Number) null);
+		assertEquals(expectedList, struct.numberList);
+
+		// Test object to incompatible Set type
+		setFieldValue(struct, "setOfIntegerArrays", //
+			"definitely not a set of Integer[]");
+		assertNotNull(struct.setOfIntegerArrays);
+		assertEquals(1, struct.setOfIntegerArrays.size());
+		Integer[] singleton = struct.setOfIntegerArrays.iterator().next();
+		assertNotNull(singleton);
+		assertEquals(1, singleton.length);
+		assertNull(singleton[0]);
 	}
 
 	/**

From b483075adc2e6fcfbb5d849cc5c03c4f7a36db68 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Feb 2023 14:51:16 -0600
Subject: [PATCH 1066/1208] ConversionUtils: remove unused import

---
 src/main/java/org/scijava/util/ConversionUtils.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 8e762c083..9d8dd1083 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -35,7 +35,6 @@
 import org.scijava.convert.ConvertService;
 import org.scijava.convert.Converter;
 import org.scijava.convert.DefaultConverter;
-import org.scijava.util.Types;
 
 /** @deprecated use {@link ConvertService} and {@link Types} */
 @Deprecated

From 30e52caf05b4e17adf9053a7fc3f3a6f32800b8c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Feb 2023 14:51:22 -0600
Subject: [PATCH 1067/1208] Stop assigning ConversionUtils delegates

This logic is inherently unsound, because it pollutes static state.
It changes the behavior of the ConversionUtils methods depending on
whether a SciJava Context with a ConvertService has ever been
instantiated, and depending on the available Converter plugins.

With this logic removed, all tests now pass, and pass more consistently,
wheras before, the ConversionUtilsTest would have all passing tests when
run standalone, and failing test(s) when run as part of the suite.

I'm aware that this change may break some things downstream. But because
no unit tests exist here in scijava-common to catch those theoretical
cases, we will just have to give it a try by making a release, and then
address any issues arising afterward.
---
 .../scijava/convert/AbstractConvertService.java | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index e9cd189e7..748c0c1a1 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -36,16 +36,16 @@
 import java.util.Set;
 
 import org.scijava.plugin.AbstractHandlerService;
-import org.scijava.util.ConversionUtils;
 
 /**
- * Abstract superclass for {@link ConvertService} implementations. Sets this
- * service as the active delegate service in {@link ConversionUtils}.
+ * Abstract superclass for {@link ConvertService} implementations.
  *
  * @author Mark Hiner
  */
-public abstract class AbstractConvertService extends AbstractHandlerService<ConversionRequest, Converter<?, ?>>
-		implements ConvertService {
+public abstract class AbstractConvertService //
+	extends AbstractHandlerService<ConversionRequest, Converter<?, ?>> //
+	implements ConvertService
+{
 
 	// -- ConversionService methods --
 	@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -159,13 +159,6 @@ public Collection<Class<?>> getCompatibleOutputClasses(final Class<?> source) {
 		return compatibleClasses;
 	}
 
-	// -- Service methods --
-
-	@Override
-	public void initialize() {
-		ConversionUtils.setDelegateService(this, getPriority());
-	}
-
 	// -- Helper methods --
 
 	/**

From 3cfcbb71f12741a560c8b58ec8b6172ad1a28459 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Feb 2023 15:00:29 -0600
Subject: [PATCH 1068/1208] UIService: fix javadoc syntax error

---
 src/main/java/org/scijava/ui/UIService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 39563f8b4..53debcf43 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -106,7 +106,7 @@ public interface UIService extends SciJavaService {
 	 * <p>
 	 * Note that if the system itself is headless&mdash;which can be detected via
 	 * the {@code java.awt.headless} system property or by calling
-	 * {@code java.awt.GraphicsEnvironment.isHeadless()}&mdash;then calling
+	 * {@link java.awt.GraphicsEnvironment#isHeadless()}&mdash;then calling
 	 * {@code setHeadless(false)} will have no effect; the system will still be
 	 * headless, and {@link #isHeadless()} will still return true.
 	 * </p>
@@ -123,7 +123,7 @@ public interface UIService extends SciJavaService {
 	 * Gets whether the UI is running in headless mode (no UI).
 	 * <p>
 	 * More precisely: returns true when {@code java.awt.headless} system
-	 * property is set, and/or {@link java.awt.GraphicsEnvironment.isHeadless()}
+	 * property is set, and/or {@link java.awt.GraphicsEnvironment#isHeadless()}
 	 * returns true, and/or {@link #setHeadless(boolean)} was called with {@code
 	 * true} to force headless behavior in an otherwise headful environment.
 	 * </p>

From 0a7ad5ad3619cf7c82e25494c0f4e52b85c18806 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Feb 2023 15:06:57 -0600
Subject: [PATCH 1069/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0cb3c152b..e1829da67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.90.2-SNAPSHOT</version>
+	<version>2.90.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 10d8be7ecb76fd4e4fd4b601a9609ed4faf30d44 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 15 Feb 2023 11:19:35 -0600
Subject: [PATCH 1070/1208] ScriptModule: guard against null conditions

If a language isn't available to run the given script, say so.
---
 src/main/java/org/scijava/script/ScriptModule.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index da4b10d9c..824e47e67 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -102,7 +102,16 @@ public void setErrorWriter(final Writer error) {
 	/** Gets the script engine used to execute the script. */
 	public ScriptEngine getEngine() {
 		if (scriptEngine == null) {
-			scriptEngine = getInfo().getLanguage().getScriptEngine();
+			final ScriptInfo scriptInfo = getInfo();
+			if (scriptInfo == null) {
+				throw new IllegalArgumentException("Invalid script");
+			}
+			final ScriptLanguage scriptLang = scriptInfo.getLanguage();
+			if (scriptLang == null) {
+				throw new IllegalArgumentException(
+					"No compatible script language available");
+			}
+			scriptEngine = scriptLang.getScriptEngine();
 		}
 		return scriptEngine;
 	}

From bdd6b1a9dec8cc2f8b39fa21dd14b417f5a11b73 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 15 Feb 2023 11:29:26 -0600
Subject: [PATCH 1071/1208] Add a CLI entry point for SciJava scripts

See #451.
---
 .../java/org/scijava/script/ScriptCLI.java    | 169 ++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 src/main/java/org/scijava/script/ScriptCLI.java

diff --git a/src/main/java/org/scijava/script/ScriptCLI.java b/src/main/java/org/scijava/script/ScriptCLI.java
new file mode 100644
index 000000000..ab6383b19
--- /dev/null
+++ b/src/main/java/org/scijava/script/ScriptCLI.java
@@ -0,0 +1,169 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2023 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.script;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.scijava.Context;
+import org.scijava.log.LogLevel;
+import org.scijava.log.LogService;
+import org.scijava.module.Module;
+
+/**
+ * A command-line entry point for running SciJava scripts.
+ *
+ * @author Curtis Rueden
+ */
+public class ScriptCLI {
+
+	private static final String USAGE = "" + //
+		"Usage: " + ScriptCLI.class.getSimpleName() + //
+		" [-d] [-h] [-l language] [-o] [-r] /path/to/script [script-args]\n" + //
+		"\n" + //
+		"Options:\n" + //
+		"  -d, --debug              : enable debug-level log output\n" + //
+		"  -h, --help               : display this help message\n" + //
+		"  -l, --language           : specify language of script to execute\n" + //
+		"                             otherwise, inferred from script extension\n" + //
+		"  -o, --print-outputs      : print output values\n" + //
+		"  -r, --print-return-value : print return value\n" + //
+		"\n" + //
+		"To read from stdin, use a dash (-) symbol for the script path.\n" + //
+		"\n" + //
+		"For script-args, give space-separated key=value pairs,\n" + //
+		"while will be passed in as SciJava script arguments.";
+	
+	public static void main(String... args) throws Exception {
+		final Map<String, Object> inputs = new HashMap<>();
+		File file = null;
+		String language = null;
+		boolean printOutputs = false;
+		boolean printReturnValue = false;
+		boolean parsingOptions = true;
+		try (final Context context = new Context()) {
+			// Parse command-line arguments.
+			if (args.length == 0) args = new String[] {"-h"};
+			for (int i = 0; i < args.length; i++) {
+				if (parsingOptions) {
+					// Parse options and filename.
+					if (args[i].equals("-d") || args[i].equals("--debug")) {
+						final LogService log = context.getService(LogService.class);
+						if (log != null) log.setLevel(LogLevel.DEBUG);
+					}
+					else if (args[i].equals("-h") || args[i].equals("--help")) {
+						System.err.println(USAGE);
+						System.exit(1);
+					}
+					else if (i < args.length - 1 && //
+						args[i].equals("-l") || args[i].equals("--language"))
+					{
+						language = args[++i];
+					}
+					else if (args[i].equals("-o") || args[i].equals("--print-outputs")) {
+						printOutputs = true;
+					}
+					else if (args[i].equals("-r") || args[i].equals("--print-return-value")) {
+						printReturnValue = true;
+					}
+					else if (args[i].equals("-")) {
+						// read from stdin
+						parsingOptions = false;
+					}
+					else if (i < args.length - 1 && args[i].equals("--")) {
+						// argument after the -- separator must be the filename.
+						file = new File(args[++i]);
+						parsingOptions = false;
+					}
+					else if (new File(args[i]).exists()) {
+						file = new File(args[i]);
+						parsingOptions = false;
+					}
+					else {
+						System.err.println("Invalid argument: " + args[i]);
+						System.exit(2);
+					}
+				}
+				else {
+					// Parse script arguments.
+					final int equals = args[i].indexOf("=");
+					if (equals < 0) {
+						System.err.println("Invalid argument: " + args[i]);
+						System.exit(3);
+					}
+					final String key = args[i].substring(0, equals);
+					final String val = args[i].substring(equals + 1);
+					inputs.put(key, val);
+				}
+			}
+
+			final ScriptService ss = context.getService(ScriptService.class);
+			if (ss == null) {
+				System.err.println("Error: No script service available.");
+				System.exit(4);
+			}
+			if (file == null && language == null) {
+				System.err.println("Error: Must specify language when using stdin.");
+				System.exit(5);
+			}
+
+			final Module m;
+			if (language == null) {
+				m = ss.run(file, true, inputs).get();
+			}
+			else {
+				ScriptLanguage lang = ss.getLanguageByName(language);
+				if (lang == null) lang = ss.getLanguageByExtension(language);
+				if (lang == null) {
+					System.err.println("Error: Unsupported language: " + language);
+					System.exit(6);
+				}
+				final Reader reader = file == null ? //
+					new InputStreamReader(System.in) : //
+					new FileReader(file);
+				m = ss.run("." + language, reader, true, inputs).get();
+			}
+			if (printOutputs) {
+				for (Entry<String, Object> output : m.getOutputs().entrySet()) {
+					System.out.println(output.getKey() + " = " + output.getValue());
+				}
+			}
+			if (printReturnValue && m instanceof ScriptModule) {
+				System.out.println(((ScriptModule) m).getReturnValue());
+			}
+		}
+		System.exit(0);
+	}
+}

From fae4829ccdf9f5c3a83cf82029b5347de2aa1e69 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 22 Feb 2023 14:00:34 -0600
Subject: [PATCH 1072/1208] LastRecentlyUsed: fix bug in replace function

Closes #453.
---
 src/main/java/org/scijava/util/LastRecentlyUsed.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 5bbe3cacc..2e485bf22 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -143,7 +143,7 @@ public boolean replace(final int index, T newValue) {
 			throw new IllegalArgumentException("No current entry at position " +
 				index);
 		}
-		if (newValue.equals(previous)) return false;
+		if (newValue.equals(previousValue)) return false;
 		map.remove(previousValue);
 		map.put(newValue, index);
 		entries[index] = newValue;

From f6856fd34f8d77ac26293b874db5b788af62d8d5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 23 Feb 2023 15:23:30 -0600
Subject: [PATCH 1073/1208] POM: bump minor version digit

The ScriptCLI class is new public API.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e1829da67..ba2c4afa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.90.3-SNAPSHOT</version>
+	<version>2.91.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From a23583a92e8fd460c8f39f91a295ea421b2d0230 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 28 Feb 2023 15:06:44 -0600
Subject: [PATCH 1074/1208] Fix many conversion-related issues

* Refactor DefaultConverter, fixing many bugs,
  and updating unit tests accordingly.

* Uncomment tests in DefaultConverterTest, which now pass.

* Undeprecate canConvert methods with Class src. There is no
  replacement when an object of the source type is not available.

* Make ConversionUtils better match ConvertService.
  It now uses the list of built-in converters that are part of SciJava
  Common, in the same order they are used as Converter plugins.

* Clean up conversion-related classes:
  * Add missing final keywords, fix warnings, and clean up style.
  * Update javadoc comments to be more accurate in more places.
  * Fix NullConverter to take precedence iff src and/or dest is null.
---
 .../convert/ArrayToStringConverter.java       |  67 +++---
 .../org/scijava/convert/CastingConverter.java |  28 +--
 .../convert/DefaultConvertService.java        |   2 +-
 .../org/scijava/convert/DefaultConverter.java | 219 +++++++-----------
 .../scijava/convert/FileListConverters.java   |   9 +-
 .../scijava/convert/FileToPathConverter.java  |   2 +-
 .../org/scijava/convert/NullConverter.java    |  33 +--
 .../convert/NumberToNumberConverter.java      |  10 +-
 .../scijava/convert/PathToFileConverter.java  |   4 +-
 .../convert/PrimitiveArrayUnwrapper.java      |   2 +-
 .../java/org/scijava/util/ArrayUtils.java     |   2 +-
 .../org/scijava/util/ConversionUtils.java     |  80 +++++--
 .../java/org/scijava/util/ObjectArray.java    |   2 -
 .../scijava/convert/ConvertServiceTest.java   |  51 ++--
 .../org/scijava/convert/ConverterTest.java    |   3 +-
 .../scijava/convert/DefaultConverterTest.java |  81 ++++---
 .../org/scijava/util/ConversionUtilsTest.java |  27 ++-
 17 files changed, 310 insertions(+), 312 deletions(-)

diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index 820f818cf..c9dc10014 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -37,12 +37,11 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
-import org.scijava.util.Types;
 
 /**
- * A {@link Converter} that specializes in converting
- * n-dimensional arrays into {@link String}s. This {@link Converter} can convert any array whose
- * component types can be converted into {@link String}s. By default, this
+ * A {@link Converter} that specializes in converting n-dimensional arrays into
+ * {@link String}s. This {@link Converter} can convert any array whose component
+ * types can be converted into {@link String}s. By default, this
  * {@link Converter} delimits the array elements with commas.
  * 
  * @author Gabriel Selzer
@@ -53,39 +52,39 @@ public class ArrayToStringConverter extends AbstractConverter<Object, String> {
 	@Parameter(required = false)
 	private ConvertService convertService;
 
-	@Override public boolean canConvert(final Class<?> src, final Class<?> dest) {
-		if (src == null) return false;
-		final Class<?> saneSrc = Types.box(src);
-		final Class<?> saneDest = Types.box(dest);
-		return saneSrc.isArray() && saneDest == String.class;
+	@Override
+	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		return src != null && src.isArray() && dest == String.class;
 	}
 
-	@Override public boolean canConvert(final Object src, final Class<?> dest) {
-		if (convertService == null) return false;
+	@Override
+	public boolean canConvert(final Object src, final Class<?> dest) {
+		if (convertService == null || src == null) return false;
 		if (!canConvert(src.getClass(), dest)) return false;
 		if (Array.getLength(src) == 0) return true;
 		return convertService.supports(Array.get(src, 0), dest);
 	}
 
 	@Override
-	public Object convert(Object src, Type dest) {
+	public Object convert(Object src, final Type dest) {
 		// Preprocess the "string-likes"
-		if (src.getClass().equals(String[].class) || //
-			src.getClass().equals(Character[].class) || //
-			src.getClass().equals(char[].class)) //
+		final Class<?> srcClass = src.getClass();
+		if (srcClass == String[].class || //
+			srcClass == Character[].class || //
+			srcClass == char[].class) //
 		{
 			src = preprocessCharacters(src);
 		}
 		// Convert each element to Strings
-		String elementString = ArrayUtils.toCollection(src).stream() //
+		final String elementString = ArrayUtils.toCollection(src).stream() //
 			.map(object -> convertService.convert(object, String.class)) //
 			.collect(Collectors.joining(", "));
 		return "{" + elementString + "}";
 	}
 
 	private String[] preprocessStrings(final Object src) {
-		int numElements = Array.getLength(src);
-		String[] processed = new String[numElements];
+		final int numElements = Array.getLength(src);
+		final String[] processed = new String[numElements];
 		for (int i = 0; i < numElements; i++) {
 			processed[i] = preprocessString(Array.get(src, i));
 		}
@@ -93,37 +92,37 @@ private String[] preprocessStrings(final Object src) {
 	}
 
 	private String preprocessString(final Object o) {
-		String s;
-		if (o == null) {
-			return null;
-		} else {
-			s = o.toString();
-			s = s.replace("\\", "\\\\");
-			s = s.replace("\"", "\\\"");
-		}
+		if (o == null) return null;
+		String s = o.toString();
+		s = s.replace("\\", "\\\\");
+		s = s.replace("\"", "\\\"");
 		return "\"" + s + "\"";
 	}
 
 	private String[] preprocessCharacters(Object src) {
-		String[] processed = new String[Array.getLength(src)];
+		final String[] processed = new String[Array.getLength(src)];
 		for (int i = 0; i < processed.length; i++) {
-			Object value = Array.get(src, i);
+			final Object value = Array.get(src, i);
 			processed[i] = value == null ? null : value.toString();
 		}
 		return preprocessStrings(processed);
 	}
 
-	@SuppressWarnings("unchecked") @Override
-	public <T> T convert(Object src, Class<T> dest) {
-		return (T) convert(src, (Type) dest);
+	@Override
+	public <T> T convert(final Object src, final Class<T> dest) {
+		final Type destType = dest;
+		@SuppressWarnings("unchecked")
+		final T converted = (T) convert(src, destType);
+		return converted;
 	}
 
-	@Override public Class<String> getOutputType() {
+	@Override
+	public Class<String> getOutputType() {
 		return String.class;
 	}
 
-	@Override public Class<Object> getInputType() {
+	@Override
+	public Class<Object> getInputType() {
 		return Object.class;
 	}
-
 }
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index f1d67493e..fbd62a7bc 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -28,6 +28,8 @@
  */
 package org.scijava.convert;
 
+import java.lang.reflect.Type;
+
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.Types;
@@ -37,7 +39,7 @@
  *
  * @author Mark Hiner
  */
-@Plugin(type = Converter.class, priority = Priority.EXTREMELY_HIGH)
+@Plugin(type = Converter.class, priority = Priority.EXTREMELY_HIGH - 1)
 public class CastingConverter extends AbstractConverter<Object, Object> {
 
 	@Override
@@ -46,25 +48,23 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 	}
 
 	@Override
-	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+	public boolean canConvert(final Class<?> src, final Type dest) {
 		// OK if the existing object can be casted
 		return dest != null && Types.isAssignable(src, dest);
 	}
 
-	@SuppressWarnings("unchecked")
+	@Override
+	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		// NB: Invert functional flow from Converter interface:
+		// Converter: canConvert(Class, Type) -> canConvert(Class, Class)
+		// becomes: canConvert(Class, Class) -> canConvert(Class, Type)
+		final Type destType = dest;
+		return canConvert(src, destType);
+	}
+
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
-		// NB: Regardless of whether the destination type is an array or
-		// collection, we still want to cast directly if doing so is possible.
-		// But note that in general, this check does not detect cases of
-		// incompatible generic parameter types. If this limitation becomes a
-		// problem in the future we can extend the logic here to provide
-		// additional signatures of canCast which operate on Types in general
-		// rather than only Classes. However, the logic could become complex
-		// very quickly in various subclassing cases, generic parameters
-		// resolved vs. propagated, etc.
-		final Class<?> c = Types.raw(dest);
-		return (T) Types.cast(src, c);
+		return Types.cast(src, dest);
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index c642be048..f36d9fd9e 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -40,5 +40,5 @@
 @Plugin(type = Service.class)
 public class DefaultConvertService extends AbstractConvertService
 {
-	// Trivial implementation
+	// NB: No implementation needed.
 }
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 001948004..00d4e1a50 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -31,19 +31,21 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.Deque;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Queue;
 import java.util.Set;
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.ArrayUtils;
-import org.scijava.util.ConversionUtils;
 import org.scijava.util.Types;
 
 /**
@@ -73,6 +75,11 @@ public class DefaultConverter extends AbstractConverter<Object, Object> {
 
 	@Override
 	public Object convert(final Object src, final Type dest) {
+		// special case: CharSequence -> char[]
+		// otherwise, String -> char[] ends up length 1 with first char only
+		if (src instanceof CharSequence && dest == char[].class) {
+			return ((CharSequence) src).toString().toCharArray();
+		}
 
 		// Handle array types, including generic array types.
 		final Type componentType = Types.component(dest);
@@ -81,66 +88,34 @@ public Object convert(final Object src, final Type dest) {
 			return convertToArray(src, Types.raw(componentType));
 		}
 
-		// Handle parameterized collection types.
-		if (dest instanceof ParameterizedType && isCollection(dest)) {
-			return convertToCollection(src, (ParameterizedType) dest);
+		// Handle collection types, either raw or parameterized.
+		Class<?> cClass = collectionClass(dest);
+		if (cClass != null) {
+			Type elementType = Types.param(dest, Collection.class, 0);
+			if (elementType == null) elementType = Object.class; // raw collection
+			final Object collection = convertToCollection(src, cClass, elementType);
+			if (collection != null) return collection;
+			// NB: If this conversion failed, it might still succeed later
+			// when looking for a wrapping constructor. So let's keep going.
+			// In particular, see ConvertServiceTest#testConvertSubclass().
 		}
 
-		// This wasn't a collection or array, so convert it as a single element.
-		return convert(src, Types.raw(dest));
-	}
+		// Ensure type is a well-behaved class, rather than a primitive type.
+		final Class<?> destClass = Types.raw(dest);
+		final Class<?> saneDest = Types.box(destClass);
 
-	@Override
-	public <T> T convert(final Object src, final Class<T> dest) {
-		// ensure type is well-behaved, rather than a primitive type
-		final Class<T> saneDest = Types.box(dest);
-
-		// Handle array types
-		if (isArray(dest)) {
-			@SuppressWarnings("unchecked")
-			T array = (T) convertToArray(src, Types.raw(Types.component(dest)));
-			return array;
-		}
+		// Object is already the requested type.
+		if (Types.isInstance(src, saneDest)) return src;
 
 		// special case for conversion from number to number
 		if (src instanceof Number) {
 			final Number number = (Number) src;
-			if (saneDest == Byte.class) {
-				final Byte result = number.byteValue();
-				@SuppressWarnings("unchecked")
-				final T typedResult = (T) result;
-				return typedResult;
-			}
-			if (saneDest == Double.class) {
-				final Double result = number.doubleValue();
-				@SuppressWarnings("unchecked")
-				final T typedResult = (T) result;
-				return typedResult;
-			}
-			if (saneDest == Float.class) {
-				final Float result = number.floatValue();
-				@SuppressWarnings("unchecked")
-				final T typedResult = (T) result;
-				return typedResult;
-			}
-			if (saneDest == Integer.class) {
-				final Integer result = number.intValue();
-				@SuppressWarnings("unchecked")
-				final T typedResult = (T) result;
-				return typedResult;
-			}
-			if (saneDest == Long.class) {
-				final Long result = number.longValue();
-				@SuppressWarnings("unchecked")
-				final T typedResult = (T) result;
-				return typedResult;
-			}
-			if (saneDest == Short.class) {
-				final Short result = number.shortValue();
-				@SuppressWarnings("unchecked")
-				final T typedResult = (T) result;
-				return typedResult;
-			}
+			if (saneDest == Byte.class) return number.byteValue();
+			if (saneDest == Double.class) return number.doubleValue();
+			if (saneDest == Float.class) return number.floatValue();
+			if (saneDest == Integer.class) return number.intValue();
+			if (saneDest == Long.class) return number.longValue();
+			if (saneDest == Short.class) return number.shortValue();
 		}
 
 		// special cases for strings
@@ -149,46 +124,55 @@ public <T> T convert(final Object src, final Class<T> dest) {
 			final String s = (String) src;
 			if (s.isEmpty()) {
 				// return null for empty strings
-				return Types.nullValue(dest);
+				return Types.nullValue(saneDest);
 			}
 
 			// use first character when converting to Character
 			if (saneDest == Character.class) {
-				final Character c = new Character(s.charAt(0));
-				@SuppressWarnings("unchecked")
-				final T result = (T) c;
-				return result;
+				return new Character(s.charAt(0));
 			}
 
 			// special case for conversion to enum
-			if (dest.isEnum()) {
-				final T result = ConversionUtils.convertToEnum(s, dest);
-				if (result != null) return result;
+			if (saneDest.isEnum()) {
+				try {
+					return Types.enumValue(s, saneDest);
+				}
+				catch (final IllegalArgumentException exc) {
+					// NB: No action needed.
+				}
 			}
 		}
+
 		if (saneDest == String.class) {
 			// destination type is String; use Object.toString() method
-			final String sValue = src.toString();
-			@SuppressWarnings("unchecked")
-			final T result = (T) sValue;
-			return result;
+			return src.toString();
 		}
 
 		// wrap the original object with one of the new type, using a constructor
 		try {
 			final Constructor<?> ctor = getConstructor(saneDest, src.getClass());
 			if (ctor == null) return null;
-			@SuppressWarnings("unchecked")
-			final T instance = (T) ctor.newInstance(src);
-			return instance;
+			return ctor.newInstance(src);
 		}
-		catch (final Exception exc) {
-			// TODO: Best not to catch blanket Exceptions here.
+		catch (final InstantiationException | IllegalAccessException
+				| IllegalArgumentException | InvocationTargetException exc)
+		{
 			// no known way to convert
-			return Types.nullValue(dest);
+			return Types.nullValue(destClass);
 		}
 	}
 
+	@Override
+	public <T> T convert(final Object src, final Class<T> dest) {
+		// NB: Invert functional flow from Converter interface:
+		// Converter: convert(Class, Type) calling convert(Class, Class)
+		// becomes: convert(Class, Class) calling convert(Class, Type)
+		final Type destType = dest;
+		@SuppressWarnings("unchecked")
+		final T result = (T) convert(src, destType);
+		return result;
+	}
+
 	@Override
 	public Class<Object> getOutputType() {
 		return Object.class;
@@ -219,8 +203,10 @@ private boolean isArray(final Type type) {
 		return Types.component(type) != null;
 	}
 
-	private boolean isCollection(final Type type) {
-		return Types.isAssignable(Types.raw(type), Collection.class);
+	private Class<?> collectionClass(final Type type) {
+		return Types.raws(type).stream() //
+			.filter(t -> Types.isAssignable(t, Collection.class)) //
+			.findFirst().orElse(null);
 	}
 
 	private Object
@@ -244,34 +230,32 @@ private boolean isCollection(final Type type) {
 	}
 
 	private Object convertToCollection(final Object value,
-		final ParameterizedType pType)
+		final Class<?> collectionType, final Type elementType)
 	{
-		final Collection<Object> collection = createCollection(Types.raw(pType));
+		final Collection<Object> collection = createCollection(collectionType);
 		if (collection == null) return null;
 
 		// Populate the collection.
 		final Collection<?> items = ArrayUtils.toCollection(value);
-		// TODO: The following can fail; e.g. "Foo extends ArrayList<String>"
-		final Type collectionType = pType.getActualTypeArguments()[0];
 		for (final Object item : items) {
-			collection.add(convert(item, collectionType));
+			collection.add(convert(item, elementType));
 		}
 
 		return collection;
 	}
 
-	private Collection<Object> createCollection(final Class<?> type) {
-		// If we were given an interface or abstract class, and not a concrete
-		// class, we attempt to make default implementations.
-		if (type.isInterface() || Modifier.isAbstract(type.getModifiers())) {
-			// We don't have a concrete class. If it's a set or a list, we use
-			// the typical default implementation. Otherwise we won't convert.
-			if (Types.isAssignable(type, List.class)) return new ArrayList<>();
-			if (Types.isAssignable(type, Set.class)) return new HashSet<>();
+	private Collection<Object> createCollection(Class<?> type) {
+		// Support conversion to common collection interface types.
+		if (type == Queue.class || type == Deque.class) type = ArrayDeque.class;
+		else if (type == Set.class) type = LinkedHashSet.class;
+		else if (type == List.class || type == Collection.class) type = ArrayList.class;
+		else if (type.isInterface() || Modifier.isAbstract(type.getModifiers())) {
+			// We were given an interface or abstract class, and not a concrete
+			// class, and we don't know what default implementation to use.
 			return null;
 		}
 
-		// Got a concrete type. Instantiate it.
+		// We now have a concrete type. Instantiate it.
 		try {
 			@SuppressWarnings("unchecked")
 			final Collection<Object> c = (Collection<Object>) type.newInstance();
@@ -288,66 +272,37 @@ private Collection<Object> createCollection(final Class<?> type) {
 	// -- Deprecated API --
 
 	@Override
-	@Deprecated
-	public boolean canConvert(final Class<?> src, final Type dest) {
-
-		// Handle array types, including generic array types.
-		// The logic follows from the types that ArrayUtils.toCollection
-		// can convert
-		if (isArray(dest)){
-			// toCollection handles any type of Collection
-			if (Collection.class.isAssignableFrom(src)) return true;
-			// toCollection handles any type of array
-			if (src.isArray()) return true;
-			// toCollection can wrap objects into a Singleton list,
-			// but we only want to wrap up a T if the dest type is a T[].
-			return Types.isAssignable(src, Types.component(dest));
-		}
-
-		// Handle parameterized collection types.
-		if (dest instanceof ParameterizedType && isCollection(dest) &&
-			createCollection(Types.raw(dest)) != null)
-		{
-			return true;
-		}
-		
-		return super.canConvert(src, dest);
-	}
-
-	@Override
-	@Deprecated
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		// OK for array and collection types.
+		if (isArray(dest)) return true;
+		Class<?> cClass = collectionClass(dest);
+		if (cClass != null && createCollection(cClass) != null) return true;
+
 		// ensure type is well-behaved, rather than a primitive type
 		final Class<?> saneDest = Types.box(dest);
 
 		// OK for numerical conversions
 		if (Types.isAssignable(Types.box(src), Number.class) && //
-			(Types.isByte(dest) || Types.isDouble(dest) || Types.isFloat(dest) ||
-				Types.isInteger(dest) || Types.isLong(dest) || Types.isShort(dest)))
+			(Types.isByte(saneDest) || Types.isDouble(saneDest) || //
+				Types.isFloat(saneDest) || Types.isInteger(saneDest) || //
+				Types.isLong(saneDest) || Types.isShort(saneDest)))
 		{
 			return true;
 		}
-		
+
 		// OK if string
 		if (saneDest == String.class) return true;
-		
+
 		if (Types.isAssignable(src, String.class)) {
 			// OK if source type is string and destination type is character
 			// (in this case, the first character of the string would be used)
 			if (saneDest == Character.class) return true;
-			
+
 			// OK if source type is string and destination type is an enum
 			if (dest.isEnum()) return true;
 		}
-		
+
 		// OK if appropriate wrapper constructor exists
-		try {
-			return getConstructor(saneDest, src) != null;
-		}
-		catch (final Exception exc) {
-			// TODO: Best not to catch blanket Exceptions here.
-			// no known way to convert
-			return false;
-		}
+		return getConstructor(saneDest, src) != null;
 	}
 }
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index 7c65900b2..d9cc1173f 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -35,7 +35,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.StringUtils;
 
@@ -49,7 +48,7 @@
 public class FileListConverters {
 	// -- String to File (list) converters --
 
-	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	@Plugin(type = Converter.class)
 	public static class StringToFileConverter extends
 		AbstractConverter<String, File>
 	{
@@ -72,7 +71,7 @@ public Class<String> getInputType() {
 
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	@Plugin(type = Converter.class)
 	public static class StringToFileArrayConverter extends
 		AbstractConverter<String, File[]>
 	{
@@ -104,7 +103,7 @@ public Class<String> getInputType() {
 
 	// -- File (list) to String converters --
 
-	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	@Plugin(type = Converter.class)
 	public static class FileToStringConverter extends
 		AbstractConverter<File, String>
 	{
@@ -127,7 +126,7 @@ public Class<File> getInputType() {
 
 	}
 
-	@Plugin(type = Converter.class, priority = Priority.NORMAL)
+	@Plugin(type = Converter.class)
 	public static class FileArrayToStringConverter extends
 		AbstractConverter<File[], String>
 	{
diff --git a/src/main/java/org/scijava/convert/FileToPathConverter.java b/src/main/java/org/scijava/convert/FileToPathConverter.java
index 235c18661..70a295bdb 100644
--- a/src/main/java/org/scijava/convert/FileToPathConverter.java
+++ b/src/main/java/org/scijava/convert/FileToPathConverter.java
@@ -44,7 +44,7 @@ public class FileToPathConverter extends AbstractConverter<File, Path> {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public <T> T convert(Object src, Class<T> dest) {
+	public <T> T convert(final Object src, final Class<T> dest) {
 		File f = (File) src;
 		return (T) f.toPath();
 	}
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index f375f99ea..0ea6e9f97 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -36,54 +36,44 @@
 import org.scijava.util.Types;
 
 /**
- * {@link Converter} implementation for handling {@code null} values. Performs
- * basic casting when given a {@code null} source and returns {@code null}
- * directly when given a {@code null} destination.
+ * {@link Converter} implementation for handling {@code null} values. Returns
+ * {@code null} when given a {@code null} source or {@code null} destination.
  * <p>
- * By running at {@link Priority#FIRST}, other converters should
- * not need to worry about {@code null} source or destination parameters.
- * </p>
- * <p>
- * NB: if a {@link Class} source is queried for the {@link #canConvert},
- * this converter will always return false (as there is no way of knowing
- * if the source object will be null or not).
+ * By running at {@link Priority#EXTREMELY_HIGH}, other converters should not
+ * need to worry about {@code null} source or destination parameters.
  * </p>
  *
  * @author Mark Hiner
  */
-@Plugin(type = Converter.class, priority = Priority.FIRST)
+@Plugin(type = Converter.class, priority = Priority.EXTREMELY_HIGH)
 public class NullConverter extends AbstractConverter<Object, Object> {
 
 	@Override
-	public boolean canConvert(final ConversionRequest request) {
-		if (request == null) return false;
-		return (request.destType() == null && request.destClass() == null) ||
-			(request.sourceObject() == null && request.sourceClass() == null);
+	public boolean canConvert(final Object src, final Type dest) {
+		return src == null || dest == null;
 	}
 
 	@Override
-	public boolean canConvert(final Object src, final Type dest) {
+	public boolean canConvert(final Object src, final Class<?> dest) {
 		return src == null || dest == null;
 	}
 
 	@Override
-	public boolean canConvert(final Object src, final Class<?> dest) {
+	public boolean canConvert(final Class<?> src, final Type dest) {
 		return src == null || dest == null;
 	}
 
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
-		if (src == null) return false;
-		return dest == null;
+		return src == null || dest == null;
 	}
 
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
 		if (dest == null) return null;
 		if (src == null) return Types.nullValue(dest);
-
 		throw new IllegalArgumentException("Attempting non-null conversion: " +
-			src + " > " + dest + " using NullConverter.");
+			src + " -> " + dest + " using NullConverter.");
 	}
 
 	@Override
@@ -95,5 +85,4 @@ public Class<Object> getOutputType() {
 	public Class<Object> getInputType() {
 		return Object.class;
 	}
-
 }
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index 01d092acf..f99af2e1a 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -43,11 +43,11 @@ public abstract class NumberToNumberConverter<I extends Number, O extends Number
 
 	@Override
 	public <T> T convert(final Object src, final Class<T> dest) {
-		if (src == null || dest == null) throw new IllegalArgumentException(
-			"Null input");
+		if (src == null || dest == null) //
+			throw new IllegalArgumentException("Null input");
 		if (!getInputType().isInstance(src)) {
 			throw new IllegalArgumentException("Expected input of type " +
-				getInputType().getSimpleName() + ", but got " +
+				getInputType().getSimpleName() + ", but got " + //
 				src.getClass().getSimpleName());
 		}
 		if (Types.box(dest) != getOutputType()) {
@@ -55,7 +55,9 @@ public <T> T convert(final Object src, final Class<T> dest) {
 				"Expected output class of " + getOutputType().getSimpleName() +
 				", but got " + dest.getSimpleName());
 		}
-		return (T) convert((Number) src);
+		@SuppressWarnings("unchecked")
+		final T result = (T) convert((Number) src);
+		return result;
 	}
 
 	public abstract O convert(Number n);
diff --git a/src/main/java/org/scijava/convert/PathToFileConverter.java b/src/main/java/org/scijava/convert/PathToFileConverter.java
index d50b10a29..3b793ae8e 100644
--- a/src/main/java/org/scijava/convert/PathToFileConverter.java
+++ b/src/main/java/org/scijava/convert/PathToFileConverter.java
@@ -44,8 +44,8 @@ public class PathToFileConverter extends AbstractConverter<Path, File> {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public <T> T convert(Object src, Class<T> dest) {
-		Path p = (Path) src;
+	public <T> T convert(final Object src, final Class<T> dest) {
+		final Path p = (Path) src;
 		return (T) p.toFile();
 	}
 
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index ebc1a138a..5fb595290 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -41,7 +41,7 @@ public abstract class PrimitiveArrayUnwrapper<I, O, W extends PrimitiveArray<I,
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public <T> T convert(Object src, Class<T> dest) {
+	public <T> T convert(final Object src, final Class<T> dest) {
 		final W primitiveArray = (W) src;
 		return (T) primitiveArray.getArray();
 
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index d25c2ffa0..6ce46c43e 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -88,7 +88,7 @@ public static <T> T[] array(final T... values) {
 	 * object is an array type, a {@link PrimitiveArray} wrapper will be created.
 	 */
 	public static Collection<?> toCollection(final Object value) {
-		// If the value is null or we we have a collection, just return it
+		// If the value is null or we have a collection, just return it
 		if (value == null || Collection.class.isAssignableFrom(value.getClass())) {
 			return (Collection<?>) value;
 		}
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 9d8dd1083..b3662eaa2 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -30,21 +30,66 @@
 package org.scijava.util;
 
 import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.List;
 
 import org.scijava.convert.ConversionRequest;
 import org.scijava.convert.ConvertService;
 import org.scijava.convert.Converter;
-import org.scijava.convert.DefaultConverter;
 
 /** @deprecated use {@link ConvertService} and {@link Types} */
 @Deprecated
 public class ConversionUtils {
 
-	private static ConvertService convertService;
-
-	private static Converter<?, ?> converterNoContext;
-
-	private static double servicePriority = 0.0;
+	private static List<Converter<?, ?>> converters = Arrays.asList(
+		new org.scijava.convert.NullConverter(),
+		new org.scijava.convert.CastingConverter(),
+		new org.scijava.convert.ArrayConverters.BoolArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.BoolArrayWrapper(),
+		new org.scijava.convert.ArrayConverters.ByteArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.ByteArrayWrapper(),
+		new org.scijava.convert.ArrayConverters.CharArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.CharArrayWrapper(),
+		new org.scijava.convert.ArrayConverters.DoubleArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.DoubleArrayWrapper(),
+		new org.scijava.convert.ArrayConverters.FloatArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.FloatArrayWrapper(),
+		new org.scijava.convert.ArrayConverters.IntArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.IntArrayWrapper(),
+		new org.scijava.convert.ArrayConverters.LongArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.LongArrayWrapper(),
+		new org.scijava.convert.ArrayConverters.ShortArrayUnwrapper(),
+		new org.scijava.convert.ArrayConverters.ShortArrayWrapper(),
+		new org.scijava.convert.FileListConverters.FileArrayToStringConverter(),
+		new org.scijava.convert.FileListConverters.FileToStringConverter(),
+		new org.scijava.convert.FileListConverters.StringToFileArrayConverter(),
+		new org.scijava.convert.FileListConverters.StringToFileConverter(),
+		new org.scijava.convert.NumberConverters.BigIntegerToBigDecimalConverter(),
+		new org.scijava.convert.NumberConverters.ByteToBigDecimalConverter(),
+		new org.scijava.convert.NumberConverters.ByteToBigIntegerConverter(),
+		new org.scijava.convert.NumberConverters.ByteToDoubleConverter(),
+		new org.scijava.convert.NumberConverters.ByteToFloatConverter(),
+		new org.scijava.convert.NumberConverters.ByteToIntegerConverter(),
+		new org.scijava.convert.NumberConverters.ByteToLongConverter(),
+		new org.scijava.convert.NumberConverters.ByteToShortConverter(),
+		new org.scijava.convert.NumberConverters.DoubleToBigDecimalConverter(),
+		new org.scijava.convert.NumberConverters.FloatToBigDecimalConverter(),
+		new org.scijava.convert.NumberConverters.FloatToDoubleConverter(),
+		new org.scijava.convert.NumberConverters.IntegerToBigDecimalConverter(),
+		new org.scijava.convert.NumberConverters.IntegerToBigIntegerConverter(),
+		new org.scijava.convert.NumberConverters.IntegerToDoubleConverter(),
+		new org.scijava.convert.NumberConverters.IntegerToLongConverter(),
+		new org.scijava.convert.NumberConverters.LongToBigDecimalConverter(),
+		new org.scijava.convert.NumberConverters.LongToBigIntegerConverter(),
+		new org.scijava.convert.NumberConverters.ShortToBigDecimalConverter(),
+		new org.scijava.convert.NumberConverters.ShortToBigIntegerConverter(),
+		new org.scijava.convert.NumberConverters.ShortToDoubleConverter(),
+		new org.scijava.convert.NumberConverters.ShortToFloatConverter(),
+		new org.scijava.convert.NumberConverters.ShortToIntegerConverter(),
+		new org.scijava.convert.NumberConverters.ShortToLongConverter(),
+		new org.scijava.convert.StringToNumberConverter(),
+		new org.scijava.convert.DefaultConverter()
+	);
 
 	private ConversionUtils() {
 		// prevent instantiation of utility class
@@ -52,18 +97,13 @@ private ConversionUtils() {
 
 	// -- ConvertService setter --
 
-	/**
-	 * Sets the {@link ConvertService} to use for handling conversion requests.
-	 */
+	/** @deprecated This method should not be used anymore. */
+	@Deprecated
+	@SuppressWarnings("unused")
 	public static void setDelegateService(final ConvertService convertService,
 		final double priority)
 	{
-		if (ConversionUtils.convertService == null || Double.compare(priority,
-			servicePriority) > 0)
-		{
-			ConversionUtils.convertService = convertService;
-			servicePriority = priority;
-		}
+		// NB: This method is now a no-op.
 	}
 
 	// -- Deprecated methods --
@@ -208,17 +248,11 @@ public static <T> T getNullValue(final Class<T> type) {
 	// -- Helper methods --
 
 	/**
-	 * Gets the {@link Converter} to use for the given conversion request. If the
-	 * delegate {@link ConvertService} has not been explicitly set, then a
-	 * {@link DefaultConverter} will be used.
+	 * Gets the {@link Converter} to use for the given conversion request.
 	 *
 	 * @return The {@link Converter} to use for handling the given request.
 	 */
 	private static Converter<?, ?> handler(final ConversionRequest data) {
-		if (convertService != null) return convertService.getHandler(data);
-
-		if (converterNoContext == null) converterNoContext = new DefaultConverter();
-
-		return converterNoContext;
+		return converters.stream().filter(c -> c.supports(data)).findFirst().orElse(null);
 	}
 }
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index bb238b288..44e4dfce3 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -32,8 +32,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.scijava.util.Types;
-
 /**
  * An extensible, generic array of {@code Object} elements. Note that this class
  * is a {@link PrimitiveArray} but of course Objects are not primitives.
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 7e214a00c..e870723e8 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -35,7 +35,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
@@ -86,6 +85,7 @@ public class ConvertServiceTest {
 
 	@Before
 	public void setUp() {
+		@SuppressWarnings("resource")
 		final Context context = new Context(ConvertService.class);
 		convertService = context.getService(ConvertService.class);
 	}
@@ -154,8 +154,14 @@ public void testArrays() {
 		testIntechangeable(char[].class, CharArray.class);
 		testIntechangeable(boolean[].class, BoolArray.class);
 
-		// Test that primitive [] can not be converted to mismatched PrimitiveArray
-		assertFalse(convertService.supports(int[].class, LongArray.class));
+		// Test that primitive [] can be cross-converted to mismatched PrimitiveArray
+		assertTrue(convertService.supports(int[].class, LongArray.class));
+		final LongArray crossConverted = //
+			convertService.convert(new int[] {2, 3, 5}, LongArray.class);
+		assertEquals(3, crossConverted.size());
+		assertEquals(2L, (long) crossConverted.get(0));
+		assertEquals(3L, (long) crossConverted.get(1));
+		assertEquals(5L, (long) crossConverted.get(2));
 
 		// Test that lists can be converted to any primitive []
 		final List<Integer> list = new ArrayList<>();
@@ -219,8 +225,10 @@ public void testCanConvert() {
 		assertTrue(convertService.supports(HashSet.class, ArrayList.class));
 		assertTrue(convertService.supports(long.class, Date.class));
 
+		// check conversion to collection type
+		assertTrue(convertService.supports(Collection.class, List.class));
+
 		// check lack of conversion of various types w/o appropriate constructor
-		assertFalse(convertService.supports(Collection.class, List.class));
 		assertFalse(convertService.supports(int.class, Date.class));
 	}
 
@@ -334,19 +342,11 @@ public void testConvertSubclass() {
 		assertEquals("Bar", objectToHisList.get(1));
 
 		// ArrayList<String> subclass to ArrayList<Number> subclass
-		// This surprisingly works due to type erasure... dangerous stuff.
 		final NumberList hisToNumberList =
 			convertService.convert(hisList, NumberList.class);
 		assertEquals(2, hisToNumberList.size());
-		assertEquals("Foo", hisToNumberList.get(0));
-		assertEquals("Bar", hisToNumberList.get(1));
-		try {
-			final Number n0 = hisToNumberList.get(0);
-			fail("expected ClassCastException but got: " + n0);
-		}
-		catch (final ClassCastException exc) {
-			// NB: Exception expected.
-		}
+		assertNull(hisToNumberList.get(0));
+		assertNull(hisToNumberList.get(1));
 	}
 
 	/**
@@ -397,11 +397,15 @@ class Struct {
 		assertEquals(123456789012.0, struct.myDoubles.get(0), 0.0);
 		assertEquals(987654321098.0, struct.myDoubles.get(1), 0.0);
 
-		// Conversion to a list of strings (with no generic parameter) fails.
+		// Conversion to a list of strings (with no generic parameter) succeeds.
 
 		setFieldValue(struct, "myStrings", longArray);
 
-		assertNull(struct.myStrings);
+		assertNotNull(struct.myStrings);
+		System.out.println(struct.myStrings);
+		assertEquals(2, struct.myStrings.size());
+		assertEquals("123456789012", struct.myStrings.get(0));
+		assertEquals("987654321098", struct.myStrings.get(1));
 	}
 
 	/**
@@ -460,7 +464,6 @@ class Struct {
 	public void testBadPrimitiveArray() {
 		class Struct {
 
-			@SuppressWarnings("unused")
 			private int[] intArray;
 		}
 		final Struct struct = new Struct();
@@ -741,11 +744,8 @@ private <T> List<T> getValueList(final T... values) {
 	 * Helper class for testing conversion of one {@link ArrayList} subclass to
 	 * another.
 	 */
-	public static class HisList extends ArrayList<String> {
-		public HisList() {
-			super();
-		}
-		public HisList(final Collection<? extends String> c) {
+	public static class HerList extends ArrayList<String> {
+		public HerList(final Collection<? extends String> c) {
 			super(c);
 		}
 	}
@@ -754,8 +754,11 @@ public HisList(final Collection<? extends String> c) {
 	 * Helper class for testing conversion of one {@link ArrayList} subclass to
 	 * another.
 	 */
-	public static class HerList extends ArrayList<String> {
-		public HerList(final Collection<? extends String> c) {
+	public static class HisList extends ArrayList<String> {
+		public HisList() {
+			super();
+		}
+		public HisList(final Collection<? extends String> c) {
 			super(c);
 		}
 	}
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 873be832a..27ae140b3 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -57,13 +57,12 @@ public class ConverterTest {
 	/**
 	 * Test case for the {@link NullConverter}
 	 */
-	@SuppressWarnings("deprecation")
 	@Test
 	public void testNullConverter() {
 		final NullConverter nc = new NullConverter();
 		assertFalse(nc.canConvert(Object.class, Object.class));
 		assertFalse(nc.canConvert(Object.class, (Type) Object.class));
-		assertFalse(nc.canConvert((Class<?>) null, Object.class));
+		assertTrue(nc.canConvert((Class<?>) null, Object.class));
 		assertTrue(nc.canConvert((Object) null, Object.class));
 		assertTrue(nc.canConvert((ConverterTest) null, ArrayList.class));
 		assertNull(nc.convert((Object) null, Object.class));
diff --git a/src/test/java/org/scijava/convert/DefaultConverterTest.java b/src/test/java/org/scijava/convert/DefaultConverterTest.java
index 599da290b..06394fafe 100644
--- a/src/test/java/org/scijava/convert/DefaultConverterTest.java
+++ b/src/test/java/org/scijava/convert/DefaultConverterTest.java
@@ -28,6 +28,7 @@
  */
 package org.scijava.convert;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -56,33 +57,31 @@ public void setUp() {
 		converter = new DefaultConverter();
 	}
 
-	// NB: The commented out tests do not currently pass, but many should.
-	// See: https://github.com/scijava/scijava-common/issues/450
-
 	@Test
 	public void testObjectToObjectArray() {
 		Object o = new Object();
-//		assertTrue(converter.canConvert(o, Object[].class));
+		assertTrue(converter.canConvert(o, Object[].class));
 		Object[] result = converter.convert(o, Object[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
-//		assertSame(o, result[0]);
+		assertSame(o, result[0]);
 	}
 
 	@Test
 	public void testIntToObjectArray() {
 		int v = 1;
-//		assertTrue(converter.canConvert(v, Object[].class));
+		assertTrue(converter.canConvert(v, Object[].class));
 		Object[] result = converter.convert(v, Object[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
-//		assertSame(v, result[0]);
+		assertSame(v, result[0]);
 	}
 
 	@Test
 	public void testIntToPrimitiveIntArray() {
 		int v = 2;
-//		assertTrue(converter.canConvert(v, int[].class));
+		assertTrue(converter.supports(new ConversionRequest(v, int[].class)));
+		assertTrue(converter.canConvert(v, int[].class));
 		int[] result = converter.convert(v, int[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
@@ -92,7 +91,7 @@ public void testIntToPrimitiveIntArray() {
 	@Test
 	public void testIntToBoxedIntegerArray() {
 		int v = 3;
-//		assertTrue(converter.canConvert(v, Integer[].class));
+		assertTrue(converter.canConvert(v, Integer[].class));
 		Integer[] result = converter.convert(v, Integer[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
@@ -102,7 +101,7 @@ public void testIntToBoxedIntegerArray() {
 	@Test
 	public void testByteToPrimitiveDoubleArray() {
 		byte v = 4;
-//		assertTrue(converter.canConvert(v, double[].class));
+		assertTrue(converter.canConvert(v, double[].class));
 		double[] result = converter.convert(v, double[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
@@ -112,7 +111,7 @@ public void testByteToPrimitiveDoubleArray() {
 	@Test
 	public void testByteToBoxedDoubleArray() {
 		byte v = 4;
-//		assertTrue(converter.canConvert(v, Double[].class));
+		assertTrue(converter.canConvert(v, Double[].class));
 		Double[] result = converter.convert(v, Double[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
@@ -122,17 +121,17 @@ public void testByteToBoxedDoubleArray() {
 	@Test
 	public void testStringToObjectArray() {
 		String s = "Pumpernickel";
-//		assertTrue(converter.canConvert(s, Object[].class));
+		assertTrue(converter.canConvert(s, Object[].class));
 		Object[] result = converter.convert(s, Object[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
-//		assertSame(s, result[0]);
+		assertSame(s, result[0]);
 	}
 
 	@Test
 	public void testStringToStringArray() {
 		String s = "smorgasbord";
-//		assertTrue(converter.canConvert(s, String[].class));
+		assertTrue(converter.canConvert(s, String[].class));
 		String[] result = converter.convert(s, String[].class);
 		assertNotNull(result);
 		assertEquals(1, result.length);
@@ -141,6 +140,7 @@ public void testStringToStringArray() {
 
 	@Test
 	public void testObjectToCollection() throws NoSuchFieldException {
+		@SuppressWarnings("unused")
 		class Struct {
 			private Collection<Object> collectionOfObjects;
 			private List<Object> listOfObjects;
@@ -148,7 +148,7 @@ class Struct {
 			private List<Double> listOfDoubles;
 			private Set<Object> setOfObjects;
 		}
-		
+
 		Type collectionOfObjectsType = Struct.class.getDeclaredField("collectionOfObjects").getGenericType();
 		Type listOfObjectsType = Struct.class.getDeclaredField("listOfObjects").getGenericType();
 		Type listOfStringsType = Struct.class.getDeclaredField("listOfStrings").getGenericType();
@@ -156,30 +156,39 @@ class Struct {
 		Type setOfObjectsType = Struct.class.getDeclaredField("setOfObjects").getGenericType();
 
 		Object o = new Object();
-//		assertTrue(converter.canConvert(o, collectionOfObjectsType));
+
+		assertTrue(converter.canConvert(o, Collection.class));
+		assertTrue(converter.canConvert(o, List.class));
+		assertTrue(converter.canConvert(o, Set.class));
+
+		assertCollection(o, o, converter.convert(o, Collection.class), Collection.class);
+		assertCollection(o, o, converter.convert(o, List.class), List.class);
+		assertCollection(o, o, converter.convert(o, Set.class), Set.class);
+
+		assertTrue(converter.canConvert(o, collectionOfObjectsType));
 		assertTrue(converter.canConvert(o, listOfObjectsType));
 		assertTrue(converter.canConvert(o, listOfStringsType));
 		assertTrue(converter.canConvert(o, listOfDoublesType));
 		assertTrue(converter.canConvert(o, setOfObjectsType));
 
-//		assertCollection(o, converter.convert(o, collectionOfObjectsType), Collection.class);
-//		assertCollection(o, converter.convert(o, listOfObjectsType), List.class);
-//		assertCollection(o, converter.convert(o, listOfStringsType), List.class);
-//		assertCollection(o, converter.convert(o, listOfDoublesType), List.class);
-//		assertCollection(o, converter.convert(o, setOfObjectsType), Set.class);
+		assertCollection(o, o, converter.convert(o, collectionOfObjectsType), Collection.class);
+		assertCollection(o, o, converter.convert(o, listOfObjectsType), List.class);
+		assertCollection(o, o.toString(), converter.convert(o, listOfStringsType), List.class);
+		assertCollection(o, null, converter.convert(o, listOfDoublesType), List.class);
+		assertCollection(o, o, converter.convert(o, setOfObjectsType), Set.class);
 
 		String s = "Thingamawhatsit";
-//		assertTrue(converter.canConvert(s, collectionOfObjectsType));
+		assertTrue(converter.canConvert(s, collectionOfObjectsType));
 		assertTrue(converter.canConvert(s, listOfObjectsType));
 		assertTrue(converter.canConvert(s, listOfStringsType));
 		assertTrue(converter.canConvert(s, listOfDoublesType));
 		assertTrue(converter.canConvert(s, setOfObjectsType));
 
-//		assertCollection(s, converter.convert(s, collectionOfObjectsType), Collection.class);
-//		assertCollection(s, converter.convert(s, listOfObjectsType), List.class);
-		assertCollection(s, converter.convert(s, listOfStringsType), List.class);
-//		assertCollection(s, converter.convert(s, listOfDoublesType), List.class);
-//		assertCollection(s, converter.convert(s, setOfObjectsType), Set.class);
+		assertCollection(s, s, converter.convert(s, collectionOfObjectsType), Collection.class);
+		assertCollection(s, s, converter.convert(s, listOfObjectsType), List.class);
+		assertCollection(s, s, converter.convert(s, listOfStringsType), List.class);
+		assertCollection(s, null, converter.convert(s, listOfDoublesType), List.class);
+		assertCollection(s, s, converter.convert(s, setOfObjectsType), Set.class);
 
 		// TODO: Test more things, covering the equivalent of all *To*Array above.
 	}
@@ -217,9 +226,11 @@ public void testStringToCharacter() {
 	public void testStringToCharacterArray() {
 		String plan = "Step 0: there is no plan";
 
-//		assertTrue(converter.canConvert(plan, char[].class));
-//		assertArrayEquals(plan.toCharArray(), converter.convert(plan, char[].class));
-		// TODO: Test Character[] also.
+		assertTrue(converter.canConvert(plan, char[].class));
+		final char[] converted = converter.convert(plan, char[].class);
+		assertArrayEquals(plan.toCharArray(), converted);
+
+		// NB: Conversion to Character[] does not work the same way.
 	}
 
 	private enum Gem {
@@ -240,7 +251,6 @@ public void testStringToEnum() {
 
 	public static class StringWrapper {
 		public String s;
-		@SuppressWarnings("unused")
 		public StringWrapper(String s) { this.s = s; }
 	}
 
@@ -256,13 +266,14 @@ public void testConstructorConversion() {
 
 	// -- Helper methods --
 
-	private static void assertCollection(Object o, Object collection,
-		Class<?> collectionClass)
+	private static void assertCollection(Object o, Object expected,
+		Object collection, Class<?> collectionClass)
 	{
 		assertNotNull(collection);
 		assertTrue(collectionClass.isInstance(collection));
 		assertEquals(1, ((Collection<?>) collection).size());
-		assertSame(o, ((Collection<?>) collection).iterator().next());
+		Object actual = ((Collection<?>) collection).iterator().next();
+		if (o == expected) assertSame(expected, actual);
+		else assertEquals(expected, actual); // o was converted to element type
 	}
-
 }
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 3df7223ee..a6a49d3b3 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -177,11 +177,14 @@ class Struct {
 		assertEquals(123456789012.0, struct.myDoubles.get(0), 0.0);
 		assertEquals(987654321098.0, struct.myDoubles.get(1), 0.0);
 
-		// Conversion to a list of strings (with no generic parameter) fails.
+		// Conversion to a list of strings (with no generic parameter) succeeds.
 
 		setFieldValue(struct, "myStrings", longArray);
 
-		assertNull(struct.myStrings);
+		assertNotNull(struct.myStrings);
+		assertEquals(2, struct.myStrings.size());
+		assertEquals("123456789012", struct.myStrings.get(0));
+		assertEquals("987654321098", struct.myStrings.get(1));
 	}
 
 	/**
@@ -239,7 +242,6 @@ class Struct {
 	public void testBadPrimitiveArray() {
 		class Struct {
 
-			@SuppressWarnings("unused")
 			private int[] intArray;
 		}
 		final Struct struct = new Struct();
@@ -256,7 +258,8 @@ class Struct {
 	public void testIncompatibleCollections() {
 		class Struct {
 
-			private Double[] doubleArray;
+			private double[] primitiveDoubleArray;
+			private Double[] boxedDoubleArray;
 			private List<Number> numberList;
 			private Set<Integer[]> setOfIntegerArrays;
 		}
@@ -266,11 +269,17 @@ class Struct {
 		// collection/array objects, even if some or all of the constituent elements
 		// cannot be converted to the array/collection component/element type.
 
-		// Test object to incompatible array type
-		setFieldValue(struct, "doubleArray", "not a double array");
-		assertNotNull(struct.doubleArray);
-		assertEquals(1, struct.doubleArray.length);
-		assertNull(struct.doubleArray[0]);
+		// Test object to incompatible primitive array type
+		setFieldValue(struct, "primitiveDoubleArray", "not a double array");
+		assertNotNull(struct.primitiveDoubleArray);
+		assertEquals(1, struct.primitiveDoubleArray.length);
+		assertEquals(0.0, struct.primitiveDoubleArray[0], 0.0);
+
+		// Test object to incompatible non-primitive array type
+		setFieldValue(struct, "boxedDoubleArray", "not a double array");
+		assertNotNull(struct.boxedDoubleArray);
+		assertEquals(1, struct.boxedDoubleArray.length);
+		assertNull(struct.boxedDoubleArray[0]);
 
 		// Test object to incompatible List type
 		setFieldValue(struct, "numberList", "not actually a list of numbers");

From 279415d7295c2518b4158316ab1d5d5591c0fbb2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 28 Feb 2023 15:11:55 -0600
Subject: [PATCH 1075/1208] Push abstract class methods up to default methods

Move abstract method implementations from AbstractConverter to
Converter, and from AbstractConvertService to ConvertService.
---
 .../convert/AbstractConvertService.java       | 130 +---------------
 .../scijava/convert/AbstractConverter.java    |  92 +----------
 .../org/scijava/convert/ConvertService.java   | 146 +++++++++++++-----
 .../java/org/scijava/convert/Converter.java   | 146 ++++++++++++------
 4 files changed, 213 insertions(+), 301 deletions(-)

diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 748c0c1a1..15f7812c8 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -29,12 +29,6 @@
 
 package org.scijava.convert;
 
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 import org.scijava.plugin.AbstractHandlerService;
 
 /**
@@ -46,127 +40,5 @@ public abstract class AbstractConvertService //
 	extends AbstractHandlerService<ConversionRequest, Converter<?, ?>> //
 	implements ConvertService
 {
-
-	// -- ConversionService methods --
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public Class<Converter<?, ?>> getPluginType() {
-		return (Class) Converter.class;
-	}
-
-	@Override
-	public Class<ConversionRequest> getType() {
-		return ConversionRequest.class;
-	}
-
-	@Override
-	public Converter<?, ?> getHandler(final Object src, final Class<?> dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Converter<?, ?> getHandler(final Class<?> src, final Class<?> dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Converter<?, ?> getHandler(final Object src, final Type dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Converter<?, ?> getHandler(final Class<?> src, final Type dest) {
-		return getHandler(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Object src, final Class<?> dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Class<?> src, final Class<?> dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Object src, final Type dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public boolean supports(final Class<?> src, final Type dest) {
-		return supports(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public Collection<Object> getCompatibleInputs(final Class<?> dest) {
-		final Set<Object> objects = new LinkedHashSet<>();
-
-		for (final Converter<?, ?> c : getInstances()) {
-			if (dest.isAssignableFrom(c.getOutputType())) {
-				c.populateInputCandidates(objects);
-			}
-		}
-
-		return objects;
-	}
-
-	@Override
-	public Object convert(final Object src, final Type dest) {
-		return convert(new ConversionRequest(src, dest));
-	}
-
-	@Override
-	public <T> T convert(final Object src, final Class<T> dest) {
-		// NB: repeated code with convert(ConversionRequest), because the
-		// handler's convert method respects the T provided
-		final Converter<?, ?> handler = getHandler(src, dest);
-		return handler == null ? null : handler.convert(src, dest);
-	}
-
-	@Override
-	public Object convert(final ConversionRequest request) {
-		final Converter<?, ?> handler = getHandler(request);
-		return handler == null ? null : handler.convert(request);
-	}
-
-	@Override
-	public Collection<Class<?>> getCompatibleInputClasses(final Class<?> dest) {
-		final Set<Class<?>> compatibleClasses = new HashSet<>();
-
-		for (final Converter<?, ?> converter : getInstances()) {
-			addIfMatches(dest, converter.getOutputType(), converter.getInputType(), compatibleClasses);
-		}
-
-		return compatibleClasses;
-	}
-
-	@Override
-	public Collection<Class<?>> getCompatibleOutputClasses(final Class<?> source) {
-		final Set<Class<?>> compatibleClasses = new HashSet<>();
-
-		for (final Converter<?, ?> converter : getInstances()) {
-			try {
-				addIfMatches(source, converter.getInputType(), converter.getOutputType(), compatibleClasses);
-			}
-			catch (final Throwable t) {
-				log().error("Malfunctioning converter plugin: " + //
-					converter.getClass().getName(), t);
-			}
-		}
-
-		return compatibleClasses;
-	}
-
-	// -- Helper methods --
-
-	/**
-	 * Test two classes; if they match, a third class is added to the provided
-	 * set of classes.
-	 */
-	private void addIfMatches(final Class<?> c1, final Class<?> c2, final Class<?> toAdd, final Set<Class<?>> classes) {
-		if (c1 == c2)
-			classes.add(toAdd);
-	}
+	// NB: This layer remains merely for backwards compatibility.
 }
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 244ca88bc..7a7a429f6 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -29,37 +29,17 @@
 
 package org.scijava.convert;
 
-import java.lang.reflect.Type;
 import java.util.Collection;
 
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.AbstractHandlerPlugin;
 import org.scijava.plugin.Parameter;
-import org.scijava.util.Types;
 
 /**
  * Abstract superclass for {@link Converter} plugins. Performs appropriate
  * dispatching of {@link #canConvert(ConversionRequest)} and
  * {@link #convert(ConversionRequest)} calls based on the actual state of the
  * given {@link ConversionRequest}.
- * <p>
- * Note that the {@link #supports(ConversionRequest)} method is overridden as
- * well, to delegate to the appropriate {@link #canConvert}.
- * </p>
- * <p>
- * NB: by default, the {@link #populateInputCandidates(Collection)} method has a
- * dummy implementation. Effectively, this is opt-in behavior. If a converter
- * implementation would like to suggest candidates for conversion, this method
- * can be overridden.
- * </p>
- * <p>
- * NB: by default, the provied {@link #canConvert} methods will return
- * {@code false} if the input is {@code null}. This allows {@link Converter}
- * implementors to assume any input is non-{@code null} - but this behavior is
- * overridden. Casting {@code null Object} inputs is handled by the
- * {@link NullConverter}, while {@code null class} inputs are handled by the
- * {@link DefaultConverter}.
- * </p>
  *
  * @author Mark Hiner
  */
@@ -72,59 +52,7 @@ public abstract class AbstractConverter<I, O> extends
 	@Parameter(required = false)
 	private ObjectService objectService;
 
-	// -- ConversionHandler methods --
-
-	@Override
-	public boolean canConvert(final ConversionRequest request) {
-		Object src = request.sourceObject();
-		if (src == null) {
-			Class<?> srcClass = request.sourceClass();
-			if (request.destType() != null) return canConvert(srcClass, request.destType());
-			return canConvert(srcClass, request.destClass());
-		}
-
-		if (request.destType() != null) return canConvert(src, request.destType());
-		return canConvert(src, request.destClass());
-	}
-
-	@Override
-	public boolean canConvert(final Object src, final Type dest) {
-		if (src == null) return false;
-		final Class<?> srcClass = src.getClass();
-		return canConvert(srcClass, dest);
-	}
-
-	@Override
-	public boolean canConvert(final Object src, final Class<?> dest) {
-		if (src == null) return false;
-		final Class<?> srcClass = src.getClass();
-
-		return canConvert(srcClass, dest);
-	}
-
-	@Override
-	public boolean canConvert(final Class<?> src, final Class<?> dest) {
-		if (src == null) return false;
-		final Class<?> saneSrc = Types.box(src);
-		final Class<?> saneDest = Types.box(dest);
-		return Types.isAssignable(saneSrc, getInputType()) &&
-			Types.isAssignable(getOutputType(), saneDest);
-	}
-
-	@Override
-	public Object convert(final Object src, final Type dest) {
-		final Class<?> destClass = Types.raw(dest);
-		return convert(src, destClass);
-	}
-
-	@Override
-	public Object convert(final ConversionRequest request) {
-		if (request.destType() != null) {
-			return convert(request.sourceObject(), request.destType());
-		}
-		
-		return convert(request.sourceObject(), request.destClass());
-	}
+	// -- Converter methods --
 
 	@Override
 	public void populateInputCandidates(final Collection<Object> objects) {
@@ -138,20 +66,8 @@ public void populateInputCandidates(final Collection<Object> objects) {
 
 	@Override
 	public boolean supports(final ConversionRequest request) {
-		return canConvert(request);
-	}
-
-	@Override
-	public Class<ConversionRequest> getType() {
-		return ConversionRequest.class;
-	}
-
-	// -- Deprecated API --
-
-	@Override
-	@Deprecated
-	public boolean canConvert(final Class<?> src, final Type dest) {
-		final Class<?> destClass = Types.raw(dest);
-		return canConvert(src, destClass);
+		// NB: Overridden just for backwards compatibility, so that
+		// downstream classes which call super.supports do the right thing.
+		return Converter.super.supports(request);
 	}
 }
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 9c5976521..6bce9a48b 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -31,14 +31,17 @@
 
 import java.lang.reflect.Type;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
 
 /**
- * Service for converting between types using an extensible plugin:
- * {@link Converter}. Contains convenience signatures for the
- * {@link #getHandler} and {@link #supports} methods to avoid the need to create
+ * Service for converting between types using an {@link Converter} plugins.
+ * Contains convenience signatures for the {@link #getHandler} and
+ * {@link #supports} methods to avoid the need to create
  * {@link ConversionRequest} objects.
  *
  * @see ConversionRequest
@@ -51,83 +54,148 @@ public interface ConvertService extends
 	/**
 	 * @see Converter#convert(Object, Type)
 	 */
-	Object convert(Object src, Type dest);
+	default Object convert(final Object src, final Type dest) {
+		return convert(new ConversionRequest(src, dest));
+	}
 
 	/**
 	 * @see Converter#convert(Object, Class)
 	 */
-	<T> T convert(Object src, Class<T> dest);
+	default <T> T convert(final Object src, final Class<T> dest) {
+		// NB: repeated code with convert(ConversionRequest), because the
+		// handler's convert method respects the T provided
+		final Converter<?, ?> handler = getHandler(src, dest);
+		return handler == null ? null : handler.convert(src, dest);
+	}
 
 	/**
 	 * @see Converter#convert(ConversionRequest)
 	 */
-	Object convert(ConversionRequest request);
+	default Object convert(final ConversionRequest request) {
+		final Converter<?, ?> handler = getHandler(request);
+		return handler == null ? null : handler.convert(request);
+	}
 
 	/**
 	 * @see HandlerService#supports(Object)
 	 */
-	Converter<?, ?> getHandler(Object src, Class<?> dest);
+	default Converter<?, ?> getHandler(final Object src, final Type dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
 
 	/**
 	 * @see HandlerService#supports(Object)
 	 */
-	Converter<?, ?> getHandler(Object src, Type dest);
+	default Converter<?, ?> getHandler(final Object src, final Class<?> dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
 
 	/**
-	 * @see HandlerService#supports(Object)
+	 * @see HandlerService#getHandler(Object)
 	 */
-	boolean supports(Object src, Class<?> dest);
+	default Converter<?, ?> getHandler(final Class<?> src, final Type dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
 
 	/**
-	 * @see HandlerService#supports(Object)
+	 * @see HandlerService#getHandler(Object)
 	 */
-	boolean supports(Object src, Type dest);
+	default Converter<?, ?> getHandler(final Class<?> src, final Class<?> dest) {
+		return getHandler(new ConversionRequest(src, dest));
+	}
 
 	/**
-	 * @return A collection of instances that could be converted to the
-	 *         specified class.
+	 * @see HandlerService#supports(Object)
 	 */
-	Collection<Object> getCompatibleInputs(Class<?> dest);
+	default boolean supports(final Object src, final Type dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
 
 	/**
-	 * @return A collection of all classes that could potentially be converted
-	 *         <b>to</b> the specified class.
+	 * @see HandlerService#supports(Object)
 	 */
-	Collection<Class<?>> getCompatibleInputClasses(Class<?> dest);
+	default boolean supports(final Object src, final Class<?> dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
 
 	/**
-	 * @return A collection of all classes that could potentially be converted
-	 *         <b>from</b> the specified class.
+	 * @see HandlerService#supports(Object)
 	 */
-	Collection<Class<?>> getCompatibleOutputClasses(Class<?> dest);
-
-	// -- Deprecated API --
+	default boolean supports(final Class<?> src, final Type dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
 
 	/**
-	 * @see HandlerService#getHandler(Object)
-	 * @deprecated Use {@link #getHandler(Object, Class)}
+	 * @see HandlerService#supports(Object)
 	 */
-	@Deprecated
-	Converter<?, ?> getHandler(Class<?> src, Class<?> dest);
+	default boolean supports(final Class<?> src, final Class<?> dest) {
+		return supports(new ConversionRequest(src, dest));
+	}
 
 	/**
-	 * @see HandlerService#getHandler(Object)
-	 * @deprecated Use {@link #getHandler(Object, Type)}
+	 * @return A collection of instances that could be converted to the
+	 *         specified class.
 	 */
-	@Deprecated
-	Converter<?, ?> getHandler(Class<?> src, Type dest);
+	default Collection<Object> getCompatibleInputs(final Class<?> dest) {
+		final Set<Object> objects = new LinkedHashSet<>();
+
+		for (final Converter<?, ?> c : getInstances()) {
+			if (dest.isAssignableFrom(c.getOutputType())) {
+				c.populateInputCandidates(objects);
+			}
+		}
+
+		return objects;
+	}
 
 	/**
-	 * @see HandlerService#supports(Object)
-	 * @deprecated Use {@link #supports(Object, Class)}
+	 * @return A collection of all classes that could potentially be converted
+	 *         <b>to</b> the specified class.
 	 */
-	@Deprecated
-	boolean supports(Class<?> src, Class<?> dest);
+	default Collection<Class<?>> getCompatibleInputClasses(final Class<?> dest) {
+		final Set<Class<?>> compatibleClasses = new HashSet<>();
+
+		for (final Converter<?, ?> converter : getInstances()) {
+			if (dest == converter.getOutputType()) //
+				compatibleClasses.add(converter.getInputType());
+		}
+
+		return compatibleClasses;
+	}
 
 	/**
-	 * @see HandlerService#supports(Object)
-	 * @deprecated Use {@link #supports(Object, Type)}
+	 * @return A collection of all classes that could potentially be converted
+	 *         <b>from</b> the specified class.
 	 */
-	@Deprecated
-	boolean supports(Class<?> src, Type dest);
+	default Collection<Class<?>> getCompatibleOutputClasses(final Class<?> source) {
+		final Set<Class<?>> compatibleClasses = new HashSet<>();
+
+		for (final Converter<?, ?> converter : getInstances()) {
+			try {
+				if (source == converter.getInputType()) //
+					compatibleClasses.add(converter.getOutputType());
+			}
+			catch (final Throwable t) {
+				log().error("Malfunctioning converter plugin: " + //
+					converter.getClass().getName(), t);
+			}
+		}
+
+		return compatibleClasses;
+	}
+
+	// -- PTService methods --
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	default Class<Converter<?, ?>> getPluginType() {
+		return (Class) Converter.class;
+	}
+
+	// -- Typed methods --
+
+	@Override
+	default Class<ConversionRequest> getType() {
+		return ConversionRequest.class;
+	}
 }
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 2654216ee..4280789ff 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -32,15 +32,24 @@
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.List;
+import java.util.Queue;
 import java.util.Set;
 
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
+import org.scijava.util.Types;
 
 /**
  * Extensible conversion {@link Plugin} for converting between classes and
  * types.
+ * <p>
+ * NB: by default, the provided {@link #canConvert} methods will return
+ * {@code false} if the input is {@code null}. This allows {@link Converter}
+ * implementors to assume any input is non-{@code null}. Casting
+ * {@code null Object} inputs is handled by the {@link NullConverter}, while
+ * {@code null} class inputs are handled by the {@link DefaultConverter}.
+ * </p>
  *
  * @see ConversionRequest
  * @author Mark Hiner
@@ -55,41 +64,107 @@ public interface Converter<I, O> extends HandlerPlugin<ConversionRequest> {
 	 *
 	 * @see #convert(ConversionRequest)
 	 */
-	boolean canConvert(ConversionRequest request);
+	default boolean canConvert(final ConversionRequest request) {
+		if (request == null) return false;
+		final Object src = request.sourceObject();
+		final Type destType = request.destType();
+		if (src != null && destType != null) {
+			return canConvert(src, destType);
+		}
+		if (src != null) {
+			return canConvert(src, request.destClass());
+		}
+		if (destType != null) {
+			return canConvert(request.sourceClass(), destType);
+		}
+		return canConvert(request.sourceClass(), request.destClass());
+	}
 
 	/**
 	 * Checks whether the given object's type can be converted to the specified
 	 * type.
+	 *
+	 * @see #convert(Object, Type)
+	 */
+	default boolean canConvert(final Object src, final Type dest) {
+		if (src == null || dest == null) return false;
+		return canConvert(src.getClass(), dest);
+	}
+
+	/**
+	 * Checks whether the given object's type can be converted to the specified
+	 * type.
+	 *
+	 * @see #convert(Object, Class)
+	 */
+	default boolean canConvert(final Object src, final Class<?> dest) {
+		if (src == null) return false;
+		Class<?> srcClass = src.getClass();
+		return canConvert(srcClass, dest);
+	}
+
+	/**
+	 * Checks whether objects of the given class can be converted to the specified
+	 * type.
 	 * <p>
 	 * Note that this does <em>not</em> necessarily entail that
-	 * {@link #convert(Object, Type)} on that specific object will succeed. For
-	 * example: {@code canConvert("5.1", int.class)} will return {@code true}
-	 * because a {@link String} can in general be converted to an {@code int}, but
-	 * calling {@code convert("5.1", int.class)} will throw a
+	 * {@link #convert(Object, Type)} on a specific object of the given source
+	 * class will succeed. For example:
+	 * {@code canConvert(String.class, List<Integer>)} will return {@code true}
+	 * because a {@link String} can in general be converted to an {@code Integer}
+	 * and then wrapped into a {@code List}, but calling
+	 * {@code convert("5.1", List<Integer>)} will throw a
 	 * {@link NumberFormatException} when the conversion is actually attempted via
 	 * the {@link Integer#Integer(String)} constructor.
 	 * </p>
-	 *
+	 * 
 	 * @see #convert(Object, Type)
 	 */
-	boolean canConvert(Object src, Type dest);
+	default boolean canConvert(final Class<?> src, final Type dest) {
+		final Class<?> destClass = Types.raw(dest);
+		return canConvert(src, destClass);
+	}
 
 	/**
-	 * Checks whether the given object's type can be converted to the specified
+	 * Checks whether objects of the given class can be converted to the specified
 	 * type.
 	 * <p>
 	 * Note that this does <em>not</em> necessarily entail that
-	 * {@link #convert(Object, Class)} on that specific object will succeed. For
-	 * example: {@code canConvert("5.1", int.class)} will return {@code true}
+	 * {@link #convert(Object, Class)} on a specific object of the given source
+	 * class will succeed. For example:
+	 * {@code canConvert(String.class, int.class)} will return {@code true}
 	 * because a {@link String} can in general be converted to an {@code int}, but
 	 * calling {@code convert("5.1", int.class)} will throw a
 	 * {@link NumberFormatException} when the conversion is actually attempted via
 	 * the {@link Integer#Integer(String)} constructor.
 	 * </p>
+	 * 
+	 * @see #convert(Object, Class)
+	 */
+	default boolean canConvert(final Class<?> src, final Class<?> dest) {
+		if (src == null) return false;
+		final Class<?> saneSrc = Types.box(src);
+		final Class<?> saneDest = Types.box(dest);
+		return Types.isAssignable(saneSrc, getInputType()) && //
+			Types.isAssignable(getOutputType(), saneDest);
+	}
+
+	/**
+	 * Converts the given {@link ConversionRequest#sourceObject()} to the
+	 * specified {@link ConversionRequest#destClass()} or
+	 * {@link ConversionRequest#destType()}.
 	 *
 	 * @see #convert(Object, Class)
+	 * @see #convert(Object, Type)
+	 * @param request {@link ConversionRequest} to process.
+	 * @return The conversion output
 	 */
-	boolean canConvert(Object src, Class<?> dest);
+	default Object convert(final ConversionRequest request) {
+		if (request.destType() != null) {
+			return convert(request.sourceObject(), request.destType());
+		}
+		return convert(request.sourceObject(), request.destClass());
+	}
 
 	/**
 	 * As {@link #convert(Object, Class)} but capable of creating and populating
@@ -102,14 +177,17 @@ public interface Converter<I, O> extends HandlerPlugin<ConversionRequest> {
 	 * <p>
 	 * NB: This method should be capable of creating any array type, but if a
 	 * {@link Collection} interface or abstract class is provided we can only make
-	 * a best guess as to what container type to instantiate. Defaults are
-	 * provided for {@link Set} and {@link List} subclasses.
+	 * a best guess as to what container type to instantiate; defaults are
+	 * provided for {@link Set}, {@link Queue}, and {@link List}.
 	 * </p>
 	 *
 	 * @param src The object to convert.
 	 * @param dest Type to which the object should be converted.
 	 */
-	Object convert(Object src, Type dest);
+	default Object convert(final Object src, final Type dest) {
+		final Class<?> destClass = Types.raw(dest);
+		return convert(src, destClass);
+	}
 
 	/**
 	 * Converts the given object to an object of the specified type. The object is
@@ -126,18 +204,6 @@ public interface Converter<I, O> extends HandlerPlugin<ConversionRequest> {
 	 */
 	<T> T convert(Object src, Class<T> dest);
 
-	/**
-	 * Converts the given {@link ConversionRequest#sourceObject()} to the
-	 * specified {@link ConversionRequest#destClass()} or
-	 * {@link ConversionRequest#destType()}.
-	 *
-	 * @see #convert(Object, Class)
-	 * @see #convert(Object, Type)
-	 * @param request {@link ConversionRequest} to process.
-	 * @return The conversion output
-	 */
-	Object convert(ConversionRequest request);
-
 	/**
 	 * Populates the given collection with objects which are known to exist, and
 	 * which are usable as inputs for this converter.
@@ -170,25 +236,15 @@ public interface Converter<I, O> extends HandlerPlugin<ConversionRequest> {
 	 */
 	Class<I> getInputType();
 
-	// -- Deprecated API --
+	// -- Typed methods --
 
-	/**
-	 * Checks whether objects of the given class can be converted to the specified
-	 * type.
-	 *
-	 * @see #convert(Object, Type)
-	 * @deprecated Use {@link #canConvert(Object, Type)}
-	 */
-	@Deprecated
-	boolean canConvert(Class<?> src, Type dest);
+	@Override
+	default boolean supports(final ConversionRequest request) {
+		return canConvert(request);
+	}
 
-	/**
-	 * Checks whether objects of the given class can be converted to the specified
-	 * type.
-	 *
-	 * @see #convert(Object, Class)
-	 * @deprecated Use {@link #canConvert(Object, Class)}
-	 */
-	@Deprecated
-	boolean canConvert(Class<?> src, Class<?> dest);
+	@Override
+	default Class<ConversionRequest> getType() {
+		return ConversionRequest.class;
+	}
 }

From ce135b7c9e3197a87423e9ef0e8fc58f5d400387 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 28 Feb 2023 15:06:44 -0600
Subject: [PATCH 1076/1208] StringToArrayConverter: fix decoding of parse tree

And add test cases to StringToArrayConverterTest.
This test now exercises all scenarios described in #450,
validating the behavior we want the library to have.

Closes #450.
---
 .../convert/StringToArrayConverter.java       | 102 +++++++++--------
 .../convert/ArrayToStringConverterTest.java   |  34 +++---
 .../convert/StringToArrayConverterTest.java   | 103 +++++++++++++++---
 3 files changed, 162 insertions(+), 77 deletions(-)

diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 8e6ab7aa9..18c581b32 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -31,10 +31,15 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import org.scijava.Priority;
+import org.scijava.parse.Item;
 import org.scijava.parse.Items;
 import org.scijava.parse.ParseService;
+import org.scijava.parsington.Token;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.Types;
@@ -56,14 +61,6 @@ public class StringToArrayConverter extends AbstractConverter<String, Object> {
 	@Parameter(required = false)
 	private ParseService parseService;
 
-	@Override
-	public boolean canConvert(final Class<?> src, final Class<?> dest) {
-		if (src == null) return false;
-		final Class<?> saneSrc = Types.box(src);
-		final Class<?> saneDest = Types.box(dest);
-		return saneSrc == String.class && saneDest.isArray();
-	}
-
 	@Override
 	public boolean canConvert(final Object src, final Type dest) {
 		return canConvert(src, Types.raw(dest));
@@ -76,46 +73,39 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 		// First, ensure the base types conform
 		if (!canConvert(src.getClass(), dest)) return false;
 		// Then, ensure we can parse the string
-		Items tree;
 		try {
-			tree = parseService.parse((String) src);
+			parseService.parse((String) src, false);
 		}
 		catch (final IllegalArgumentException e) {
 			return false;
 		}
-		// We can always convert empty arrays as we don't have to create Objects
-		if (tree.size() == 0) return true;
-		// Finally, ensure that we can convert the elements of the array.
-		// NB this check is merely a heuristic. In the case of a heterogeneous
-		// array, canConvert may falsely return positive, if later elements in the
-		// string-ified array cannot be converted into Objects. We make this
-		// compromise in the interest of speed, however, as ensuring correctness
-		// would require a premature conversion of the entire array.
-		Object testSrc = tree.get(0).value();
-		Class<?> testDest = unitComponentType(dest);
-		return convertService.supports(testSrc, testDest);
+		return true;
 	}
 
 	@Override
-	public Object convert(Object src, Type dest) {
+	public boolean canConvert(final Class<?> src, final Class<?> dest) {
+		return src == String.class && dest.isArray();
+	}
+
+	@Override
+	public Object convert(final Object src, final Type dest) {
 		final Type componentType = Types.component(dest);
 		if (componentType == null) {
 			throw new IllegalArgumentException(dest + " is not an array type!");
 		}
-		try {
-			return convertToArray( //
-				parseService.parse((String) src), //
-				Types.raw(componentType));
-		}
-		catch (final IllegalArgumentException e) {
-			return null;
-		}
+		final List<?> items = parse((String) src);
+		return convertToArray(items, Types.raw(componentType));
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
-	public <T> T convert(Object src, Class<T> dest) {
-		return (T) convert(src, (Type) dest);
+	public <T> T convert(final Object src, final Class<T> dest) {
+		// NB: Invert functional flow from Converter interface:
+		// Converter: convert(Object, Type) calling convert(Object, Class)
+		// becomes: convert(Object, Class) calling convert(Object, Type)
+		final Type destType = dest;
+		@SuppressWarnings("unchecked")
+		T result = (T) convert(src, destType);
+		return result;
 	}
 
 	@Override
@@ -128,35 +118,53 @@ public Class<String> getInputType() {
 		return String.class;
 	}
 
-	// -- HELPER METHODS -- //
+	// -- Helper methods --
 
 	/**
-	 * Converts {@code src} into an array of component type {@code componentType}
+	 * Converts {@code src} into an array of component type {@code componentType}.
 	 * 
 	 * @param tree the {@link String} to convert
 	 * @param componentType the component type of the output array
 	 * @return an array of {@code componentType} whose elements were created from
 	 *         {@code src}
 	 */
-	private Object convertToArray(Items tree, final Class<?> componentType) {
+	private Object convertToArray(final List<?> tree,
+		final Class<?> componentType)
+	{
 		// Create the array
 		final Object array = Array.newInstance(componentType, tree.size());
 		// Set each element of the array
 		for (int i = 0; i < tree.size(); i++) {
-			Object element = convertService.convert(tree.get(i).value(), componentType);
-			Array.set(array, i, element);
+			Object element = tree.get(i);
+			final Object converted = convertService.convert(element, componentType);
+			Array.set(array, i, converted);
 		}
 		return array;
 	}
 
-	/**
-	 * Similar to {@link Class#getComponentType()}, but handles nested array types
-	 *
-	 * @param c the {@link Class} that may be an array class
-	 * @return the <em>unit</em> component type of {@link Class} {@code c}
-	 */
-	private Class<?> unitComponentType(Class<?> c) {
-		if (!c.isArray()) return c;
-		return c.getComponentType();
+	/** Parses a string to a list, using the {@link ParseService}. */
+	private List<?> parse(final String s) {
+		try {
+			Items items = parseService.parse(s, false);
+			return (List<?>) unwrap(items);
+		}
+		catch (final IllegalArgumentException e) {
+			return null;
+		}
+	}
+
+	private Object unwrap(final Object o) {
+		if (o instanceof Collection) {
+			return ((Collection<?>) o).stream() //
+				.map(item -> unwrap(item)) //
+				.collect(Collectors.toList());
+		}
+		if (o instanceof Item) {
+			return unwrap(((Item) o).value());
+		}
+		if (o instanceof Token) {
+			return ((Token) o).getToken();
+		}
+		return o;
 	}
 }
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 36a78a824..17ec928f5 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -29,11 +29,15 @@
 
 package org.scijava.convert;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.scijava.Context;
@@ -86,11 +90,11 @@ public void testArrayConversion() {
 		String sFloat = "{1.0, 2.0, 3.0}";
 		for (Object array : arrays) {
 			// Ensure our Converter can do the conversion
-			Assert.assertTrue(converter.canConvert(array, String.class));
+			assertTrue(converter.canConvert(array, String.class));
 			// Do the conversion
 			String converted = converter.convert(array, String.class);
 			// Ensure correctness
-			Assert.assertTrue(converted.equals(sInt) || converted.equals(sFloat));
+			assertTrue(converted.equals(sInt) || converted.equals(sFloat));
 		}
 	}
 
@@ -101,10 +105,10 @@ public void testArrayConversion() {
 	@Test
 	public void test2DArrayConversion() {
 		byte[][] arr = new byte[][] { new byte[] { 0, 1 }, new byte[] { 2, 3 } };
-		Assert.assertTrue(converter.canConvert(arr, String.class));
+		assertTrue(converter.canConvert(arr, String.class));
 		String actual = converter.convert(arr, String.class);
 		String expected = "{{0, 1}, {2, 3}}";
-		Assert.assertEquals(expected, actual);
+		assertEquals(expected, actual);
 	}
 
 	/**
@@ -119,10 +123,10 @@ public void test3DArrayConversion() {
 				for (int k = 0; k < 2; k++)
 					arr[i][j][k] = (byte) (i + j + k);
 
-		Assert.assertTrue(converter.canConvert(arr, String.class));
+		assertTrue(converter.canConvert(arr, String.class));
 		String actual = converter.convert(arr, String.class);
 		String expected = "{{{0, 1}, {1, 2}}, {{1, 2}, {2, 3}}}";
-		Assert.assertEquals(expected, actual);
+		assertEquals(expected, actual);
 	}
 
 	/**
@@ -132,10 +136,10 @@ public void test3DArrayConversion() {
 	@Test
 	public void testEmptyArrayConversion() {
 		byte[] arr = new byte[0];
-		Assert.assertTrue(converter.canConvert(arr, String.class));
+		assertTrue(converter.canConvert(arr, String.class));
 		String actual = converter.convert(arr, String.class);
 		String expected = "{}";
-		Assert.assertEquals(expected, actual);
+		assertEquals(expected, actual);
 	}
 
 	/**
@@ -153,23 +157,21 @@ public void testCyclicConversion() {
 		StringToArrayConverter c2 = new StringToArrayConverter();
 		context.inject(c2);
 		byte[] actual = c2.convert(converted, byte[].class);
-		Assert.assertArrayEquals(expected, actual);
+		assertArrayEquals(expected, actual);
 	}
 
 	@Test
 	public void testNullConversion() {
-		String[] s1 = {null};
-		String[] s2 = {"null"};
-		String[] expected = new String[] {null};
 		// Do the first conversion
 		ArrayToStringConverter c1 = new ArrayToStringConverter();
 		context.inject(c1);
-		String converted = c1.convert(expected, String.class);
+		String converted = c1.convert(new String[] {null}, String.class);
 		// Try to convert back
 		StringToArrayConverter c2 = new StringToArrayConverter();
 		context.inject(c2);
 		String[] actual = c2.convert(converted, String[].class);
-		// NB: we cannot recreate the original {null} state
-		Assert.assertNull(actual);
+		assertNotNull(actual);
+		assertEquals(1, actual.length);
+		assertEquals("null", actual[0]);
 	}
 }
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index 6947a2976..d9d912451 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -29,6 +29,13 @@
 
 package org.scijava.convert;
 
+import static org.junit.Assert.assertArrayEquals;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -36,10 +43,6 @@
 import org.scijava.Context;
 import org.scijava.parse.ParseService;
 
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Tests {@link StringToArrayConverter}.
  * 
@@ -144,16 +147,6 @@ public void testEmptyArrayConversion() {
 		Assert.assertEquals(0, actual.length);
 	}
 
-	/**
-	 * Tests the ability of {@link StringToArrayConverter} in converting only
-	 * arrays whose elements can be converted
-	 */
-	@Test
-	public void testInconvertibleArrayType() {
-		String s = "{ConverterA}";
-		Assert.assertFalse(converter.canConvert(s, Converter[].class));
-	}
-
 	/**
 	 * Tests the special case of {@link String}s
 	 */
@@ -194,5 +187,87 @@ public void testCharacterArrayConversion() {
 		Assert.assertArrayEquals(expected, actual);
 	}
 
+	@Test
+	public void testStringToDoubleArraySingleValue() {
+		assertArrayEquals(new double[] {5},
+			converter.convert("5", double[].class), 0);
+		assertArrayEquals(new Double[] {6d},
+			converter.convert("6", Double[].class));
+		assertArrayEquals(new double[][] {{7}},
+			converter.convert("7", double[][].class));
+		assertArrayEquals(new Double[][] {{8d}},
+			converter.convert("8", Double[][].class));
 
+		assertArrayEquals(new double[] {0},
+			converter.convert("spinach", double[].class), 0);
+		assertArrayEquals(new Double[] {null},
+			converter.convert("kale", Double[].class));
+		assertArrayEquals(new double[][] {{0}},
+			converter.convert("broccoli", double[][].class));
+		assertArrayEquals(new Double[][] {{null}},
+			converter.convert("lettuce", Double[][].class));
+	}
+
+	@Test
+	public void testStringToDoubleArray1D() {
+		// all numbers
+		assertArrayEquals(new double[] {0, 1, 2, 3},
+			converter.convert("{0, 1, 2, 3}", double[].class), 0);
+		assertArrayEquals(new Double[] {7d, 11d},
+			converter.convert("{7, 11}", Double[].class));
+		assertArrayEquals(new Double[] {0d, 1d, 2d, 3d},
+			converter.convert("{0, 1, 2, 3}", Double[].class));
+
+		// mixed numbers/non-numbers
+		assertArrayEquals(new double[] {0, 1, 0, 3},
+			converter.convert("{0, 1, kumquat, 3}", double[].class), 0);
+		assertArrayEquals(new Double[] {4d, null, 5d},
+			converter.convert("{4, eggplant, 5}", Double[].class));
+
+		// all non-numbers
+		assertArrayEquals(new double[] {0, 0, 0},
+			converter.convert("{uno, dos, tres}", double[].class), 0);
+		assertArrayEquals(new Double[] {null, null, null, null},
+			converter.convert("{cuatro, cinco, seis, siete}", Double[].class));
+	}
+
+	@Test
+	public void testStringToDoubleArray2D() {
+		// all numbers
+		assertArrayEquals(new double[][] {{0, 1}, {2, 3, 4}},
+			converter.convert("{{0, 1}, {2, 3, 4}}", double[][].class));
+		assertArrayEquals(new Double[][] {{7d, 11d}, {13d, 17d, 19d}},
+			converter.convert("{{7, 11}, {13, 17, 19}}", Double[][].class));
+		assertArrayEquals(new Double[][] {{0d, 1d}, {2d, 3d}},
+			converter.convert("{{0, 1}, {2, 3}}", Double[][].class));
+
+		// mixed numbers/non-numbers
+		assertArrayEquals(new double[][] {{0, 1}, {0, 3}},
+			converter.convert("{{0, 1}, {kumquat, 3}}", double[][].class));
+		assertArrayEquals(new Double[][] {{4d}, {null, 5d}, {null}},
+			converter.convert("{{4}, {eggplant, 5}, {squash}}", Double[][].class));
+
+		// all non-numbers
+		assertArrayEquals(new double[][] {{0}, {0, 0}},
+			converter.convert("{{uno}, {dos, tres}}", double[][].class));
+		assertArrayEquals(new Double[][] {{null, null}, {null, null}},
+			converter.convert("{{cuatro, cinco}, {seis, siete}}", Double[][].class));
+	}
+
+	@Test
+	public void testStringToDoubleArray3D() {
+		final Random r = new Random(0xDA7ABA5E);
+		final double[][][] ds = new double[r.nextInt(10)][][];
+		for (int i=0; i<ds.length; i++) {
+			ds[i] = new double[r.nextInt(10)][];
+			for (int j=0; j<ds[i].length; j++) {
+				ds[i][j] = new double[r.nextInt(10)];
+				for (int k=0; k<ds[i][j].length; k++) {
+					ds[i][j][k] = 10000 * r.nextDouble();
+				}
+			}
+		}
+		String ss = Arrays.deepToString(ds).replace('[', '{').replace(']', '}');
+		assertArrayEquals(ds, converter.convert(ss, double[][][].class));
+	}
 }

From 687bd28e37a609a9ba2bc1f97fe0a9edbd333379 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 1 Mar 2023 21:27:52 -0600
Subject: [PATCH 1077/1208] Be more permissive with CastingConverter casts

---
 .../org/scijava/convert/CastingConverter.java | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index fbd62a7bc..e9455c214 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -49,17 +49,30 @@ public boolean canConvert(final Object src, final Class<?> dest) {
 
 	@Override
 	public boolean canConvert(final Class<?> src, final Type dest) {
-		// OK if the existing object can be casted
-		return dest != null && Types.isAssignable(src, dest);
+		// NB: You might think we want to use Types.isAssignable(src, dest)
+		// directly here. And you might be right. However, assignment involving
+		// generic types gets very tricky. If dest is e.g. a wildcard type such as
+		// "? extends Object", or a type variable such as "C extends Object", then
+		// no specific class will be assignable to it, because for that ? or C we
+		// do not know anything about the bound type other than that it's something
+		// that extends Object, so it could be anything, including things that
+		// aren't assignable from whatever src is.
+		//
+		// Unfortunately, when this casting conversion code was originally written,
+		// it did not have generics in mind, and calling code will pass in capture
+		// types (e.g. Type objects gleaned via ModuleItem#getGenericType())
+		// expecting them to be convertible as long as dest's raw type(s) are
+		// compatible targets for src.
+		//
+		// And so for backwards compatibility, we continue to behave that way here.
+
+		return dest != null && //
+			Types.raws(dest).stream().allMatch(c -> c.isAssignableFrom(src));
 	}
 
 	@Override
 	public boolean canConvert(final Class<?> src, final Class<?> dest) {
-		// NB: Invert functional flow from Converter interface:
-		// Converter: canConvert(Class, Type) -> canConvert(Class, Class)
-		// becomes: canConvert(Class, Class) -> canConvert(Class, Type)
-		final Type destType = dest;
-		return canConvert(src, destType);
+		return dest != null && dest.isAssignableFrom(src);
 	}
 
 	@Override

From 3e0afe10014db09bd891c4290d994fbdf68f792f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 2 Mar 2023 14:22:44 -0600
Subject: [PATCH 1078/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ba2c4afa9..d76854b60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.91.0-SNAPSHOT</version>
+	<version>2.91.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 9bcf5279c1d4b2e48649d9c59210996f21a65da2 Mon Sep 17 00:00:00 2001
From: Elliott Magnuson <elliottmagnuson34@gmail.com>
Date: Mon, 13 Mar 2023 21:00:32 -0500
Subject: [PATCH 1079/1208] DefaultIOService: Add concrete methods to resolve
 Location

---
 .../java/org/scijava/io/DefaultIOService.java | 19 +++++++++++++++++++
 src/main/java/org/scijava/io/IOService.java   |  9 ++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index fd0d46c01..32f5e5b27 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -61,6 +61,24 @@ public final class DefaultIOService
 
 	@Parameter
 	private LocationService locationService;
+	
+	@Override
+	public IOPlugin<?> getOpener(final String source) throws IOException {
+		try {
+			return getOpener(locationService.resolve(source));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
+
+	@Override
+	public <D> IOPlugin<D> getSaver(D data, String destination) throws IOException {
+		try {
+			return getSaver(data, locationService.resolve(destination));
+		} catch (URISyntaxException e) {
+			throw new IOException(e);
+		}
+	}
 
 	@Override
 	public Object open(final String source) throws IOException {
@@ -112,4 +130,5 @@ public void save(final Object data, final Location destination)
 			log.error("No Saver IOPlugin found for " + data.toString() + ".");
 		}
 	}
+	
 }
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 9dc3c5364..72655ab39 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -31,7 +31,6 @@
 
 import java.io.IOException;
 
-import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
@@ -49,9 +48,7 @@ public interface IOService extends HandlerService<Location, IOPlugin<?>>,
 	 * Gets the most appropriate {@link IOPlugin} for opening data from the given
 	 * location.
 	 */
-	default IOPlugin<?> getOpener(final String source) {
-		return getOpener(new FileLocation(source));
-	}
+	IOPlugin<?> getOpener(final String source) throws IOException;
 
 	/**
 	 * Gets the most appropriate {@link IOPlugin} for opening data from the given
@@ -68,9 +65,7 @@ default IOPlugin<?> getOpener(Location source) {
 	 * Gets the most appropriate {@link IOPlugin} for saving data to the given
 	 * location.
 	 */
-	default <D> IOPlugin<D> getSaver(final D data, final String destination) {
-		return getSaver(data, new FileLocation(destination));
-	}
+	<D> IOPlugin<D> getSaver(final D data, final String destination) throws IOException;
 
 	/**
 	 * Gets the most appropriate {@link IOPlugin} for saving data to the given

From ccf35cdbc8d795c097e554febfeb22a5520a2287 Mon Sep 17 00:00:00 2001
From: Elliott Magnuson <elliottmagnuson34@gmail.com>
Date: Thu, 23 Mar 2023 12:43:08 -0500
Subject: [PATCH 1080/1208] Gateway: add LocationService getter

---
 src/main/java/org/scijava/AbstractGateway.java | 6 ++++++
 src/main/java/org/scijava/Gateway.java         | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 9df93126c..766597967 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -42,6 +42,7 @@
 import org.scijava.input.InputService;
 import org.scijava.io.IOService;
 import org.scijava.io.RecentFileService;
+import org.scijava.io.location.LocationService;
 import org.scijava.log.LogService;
 import org.scijava.main.MainService;
 import org.scijava.menu.MenuService;
@@ -190,6 +191,11 @@ public InputService input() {
 	public IOService io() {
 		return get(IOService.class);
 	}
+	
+	@Override
+	public LocationService location() {
+		return get(LocationService.class);
+	}
 
 	@Override
 	public LogService log() {
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 3d5897528..657a7faa4 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -40,6 +40,7 @@
 import org.scijava.input.InputService;
 import org.scijava.io.IOService;
 import org.scijava.io.RecentFileService;
+import org.scijava.io.location.LocationService;
 import org.scijava.log.LogService;
 import org.scijava.main.MainService;
 import org.scijava.menu.MenuService;
@@ -238,6 +239,13 @@ public interface Gateway extends RichPlugin, Disposable {
 	 */
 	IOService io();
 
+	/**
+	 * Gets this application context's {@link LocationService}.
+	 * 
+	 * @return The {@link LocationService} of this application context.
+	 */
+	LocationService location();
+	
 	/**
 	 * Gets this application context's {@link LogService}.
 	 *

From af02774ab5b146827551d99d45a8a7e94c495aee Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 30 Mar 2023 19:46:32 -0500
Subject: [PATCH 1081/1208] SystemPropertyArgument: allow any string for keys

The previous regex was not allowing colons, which Java definitely
allows. But after briefly trying to research what's allowed and
what's not, I decided it doesn't really matter, and we should just
try setting whatever the user is trying to set, and if it fails with
an exception on the Java side, so be it -- but that's no reason not
to eagerly reject the expression in this ConsoleArgument plugin.
---
 src/main/java/org/scijava/console/SystemPropertyArgument.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index 60f076798..39c100c92 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -44,7 +44,7 @@
 @Plugin(type = ConsoleArgument.class)
 public class SystemPropertyArgument extends AbstractConsoleArgument {
 
-	private static final String SYS_PROP_REGEX = "-D([\\w\\._-]+)(=(.*))?";
+	private static final String SYS_PROP_REGEX = "-D([^=]+)(=(.*))?";
 	private static final Pattern SYS_PROP_PAT = Pattern.compile(SYS_PROP_REGEX);
 
 	// -- Constructor --

From 9db423586112dc287da9b7eae3710b25b694c92f Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Wed, 12 Apr 2023 11:52:03 -0500
Subject: [PATCH 1082/1208] POM: update parent to pom-scijava 34.1.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d76854b60..d1cbbefa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>33.2.0</version>
+		<version>34.1.0</version>
 		<relativePath />
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.91.1-SNAPSHOT</version>
+	<version>2.92.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 5f690ceb3532758cb6dffb08da9a8af55725b509 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Wed, 12 Apr 2023 11:53:10 -0500
Subject: [PATCH 1083/1208] Bump to next development cycle

Signed-off-by: hinerm <hinerm@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d1cbbefa6..ad42e0867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.92.0-SNAPSHOT</version>
+	<version>2.92.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 545caf0ab167268201fb5a58c6a06902aa951707 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 19 Apr 2023 12:34:15 -0500
Subject: [PATCH 1084/1208] Do not hardcode String-to-FileLocation conversions

That's what LocationService.resolve is for.
---
 src/main/java/org/scijava/io/IOPlugin.java    | 34 ++++++++++++++-----
 .../java/org/scijava/io/TypedIOService.java   | 16 +++++++--
 .../org/scijava/io/event/DataOpenedEvent.java | 10 ++----
 .../org/scijava/io/event/DataSavedEvent.java  |  9 ++---
 .../java/org/scijava/io/event/IOEvent.java    | 29 ++++++++++++----
 5 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index fc797ee29..766f2e55b 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -30,9 +30,11 @@
 package org.scijava.io;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
 
@@ -58,22 +60,32 @@ public interface IOPlugin<D> extends HandlerPlugin<Location> {
 	/** Checks whether the I/O plugin can open data from the given source. */
 	@SuppressWarnings("unused")
 	default boolean supportsOpen(final String source) {
-		return supportsOpen(new FileLocation(source));
+		try {
+			return supportsOpen(context().service(LocationService.class).resolve(source));
+		}
+		catch (final URISyntaxException exc) {
+			return false;
+		}
 	}
 
 	/** Checks whether the I/O plugin can open data from the given location. */
-	default boolean supportsOpen(Location source) {
+	default boolean supportsOpen(final Location source) {
 		return false;
 	}
 
 	/** Checks whether the I/O plugin can save data to the given destination. */
 	@SuppressWarnings("unused")
 	default boolean supportsSave(final String destination) {
-		return supportsSave(new FileLocation(destination));
+		try {
+			return supportsSave(context().service(LocationService.class).resolve(destination));
+		}
+		catch (final URISyntaxException exc) {
+			return false;
+		}
 	}
 
 	/** Checks whether the I/O plugin can save data to the given location. */
-	default boolean supportsSave(Location destination) {
+	default boolean supportsSave(final Location destination) {
 		return false;
 	}
 
@@ -85,7 +97,7 @@ default boolean supportsSave(final Object data, final String destination) {
 		return supportsSave(destination) && getDataType().isInstance(data);
 	}
 
-	default boolean supportsSave(Object data, Location destination) {
+	default boolean supportsSave(final Object data, final Location destination) {
 		return supportsSave(destination) && getDataType().isInstance(data);
 	}
 
@@ -96,17 +108,23 @@ default D open(final String source) throws IOException {
 	}
 
 	/** Opens data from the given location. */
-	default D open(Location source) throws IOException {
+	default D open(final Location source) throws IOException {
 		throw new UnsupportedOperationException();
 	}
+
 	/** Saves the given data to the specified destination. */
 	@SuppressWarnings("unused")
 	default void save(final D data, final String destination) throws IOException {
-		save(data, new FileLocation(destination));
+		try {
+			save(data, context().service(LocationService.class).resolve(destination));
+		}
+		catch (final URISyntaxException exc) {
+			throw new UnsupportedOperationException(exc);
+		}
 	}
 
 	/** Saves the given data to the specified location. */
-	default void save(D data, Location destination) throws IOException {
+	default void save(final D data, final Location destination) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index 711026c5c..5664ec3bb 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -30,9 +30,11 @@
 package org.scijava.io;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
 
@@ -51,7 +53,12 @@ public interface TypedIOService<D> extends HandlerService<Location, IOPlugin<D>>
 	 * location.
 	 */
 	default IOPlugin<D> getOpener(final String source) {
-		return getOpener(new FileLocation(source));
+		try {
+			return getOpener(context().service(LocationService.class).resolve(source));
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
 	}
 
 	/**
@@ -70,7 +77,12 @@ default IOPlugin<D> getOpener(Location source) {
 	 * location.
 	 */
 	default IOPlugin<D> getSaver(final D data, final String destination) {
-		return getSaver(data, new FileLocation(destination));
+		try {
+			return getSaver(data, context().service(LocationService.class).resolve(destination));
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
 	}
 
 	/**
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index c2d729e0f..22f9fd4d0 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -49,7 +49,7 @@ public DataOpenedEvent(final Location location, final Object data) {
 	 */
 	@Deprecated
 	public DataOpenedEvent(final String source, final Object data) {
-		this(new FileLocation(source), data);
+		super(source, data);
 	}
 
 	/**
@@ -57,12 +57,6 @@ public DataOpenedEvent(final String source, final Object data) {
 	 */
 	@Deprecated
 	public String getSource() {
-		try {
-			FileLocation fileLocation = (FileLocation) getLocation();
-			return fileLocation.getFile().getAbsolutePath();
-		} catch(ClassCastException e) {
-			return getLocation().getURI().toString();
-		}
+		return getDescriptor();
 	}
-
 }
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index de82a77ff..67a8b21ad 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -49,7 +49,7 @@ public DataSavedEvent(final Location destination, final Object data) {
 	 */
 	@Deprecated
 	public DataSavedEvent(final String destination, final Object data) {
-		this(new FileLocation(destination), data);
+		super(destination, data);
 	}
 
 	/**
@@ -57,11 +57,6 @@ public DataSavedEvent(final String destination, final Object data) {
 	 */
 	@Deprecated
 	public String getDestination() {
-		try {
-			FileLocation fileLocation = (FileLocation) getLocation();
-			return fileLocation.getFile().getAbsolutePath();
-		} catch(ClassCastException e) {
-			return getLocation().getURI().toString();
-		}
+		return getDescriptor();
 	}
 }
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 8b3c9fa4b..1147039b3 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -29,9 +29,12 @@
 
 package org.scijava.io.event;
 
+import java.net.URISyntaxException;
+
 import org.scijava.event.SciJavaEvent;
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 
 /**
  * An event indicating that I/O (e.g., opening or saving) has occurred.
@@ -43,6 +46,10 @@ public abstract class IOEvent extends SciJavaEvent {
 	/** The data location (source or destination). */
 	private final Location location;
 
+	/** @deprecated use {@link #location} instead */
+	@Deprecated
+	private final String descriptor;
+
 	/** The data for which I/O took place. */
 	private final Object data;
 
@@ -51,17 +58,26 @@ public abstract class IOEvent extends SciJavaEvent {
 	 */
 	@Deprecated
 	public IOEvent(final String descriptor, final Object data) {
-		this(new FileLocation(descriptor), data);
+		this.location = null;
+		this.descriptor = descriptor;
+		this.data = data;
 	}
 
 	public IOEvent(final Location location, final Object data) {
 		this.location = location;
+		this.descriptor = null;
 		this.data = data;
 	}
 
 	/** Gets the data location (source or destination). */
 	public Location getLocation() {
-		return location;
+		if (location != null) return location;
+		try {
+			return context().service(LocationService.class).resolve(descriptor);
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
 	}
 
 	/** Gets the data for which I/O took place. */
@@ -82,12 +98,11 @@ public String toString() {
 	 */
 	@Deprecated
 	public String getDescriptor() {
-		try {
-			FileLocation fileLocation = (FileLocation) getLocation();
+		if (descriptor != null) return descriptor;
+		if (location instanceof FileLocation) {
+			final FileLocation fileLocation = (FileLocation) location;
 			return fileLocation.getFile().getAbsolutePath();
-		} catch(ClassCastException e) {
-			return getLocation().getURI().toString();
 		}
+		return location.getURI().toString();
 	}
-
 }

From 50daafb3b863fbe52b84340ea9af10bb287067f8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 11:31:49 -0500
Subject: [PATCH 1085/1208] Allow contexts to be disposed more than once

Subsequent disposals are no-ops, rather than throwing an exception.
---
 src/main/java/org/scijava/Context.java        | 35 +++++++++----
 .../java/org/scijava/ContextDisposalTest.java | 51 +++++++++++++++++++
 2 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 src/test/java/org/scijava/ContextDisposalTest.java

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index a6892d7bd..7e42f2df2 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -97,6 +97,12 @@ public class Context implements Disposable, AutoCloseable {
 	 */
 	private boolean strict;
 
+	/**
+	 * False if the context is currently active; true if the context
+	 * has already been disposed, or is in the process of being disposed.
+	 */
+	private boolean disposed;
+
 	/**
 	 * Creates a new SciJava application context with all available services.
 	 *
@@ -418,16 +424,8 @@ public boolean isInjectable(final Class<?> type) {
 
 	@Override
 	public void dispose() {
-		final EventService eventService = getService(EventService.class);
-		if (eventService != null) eventService.publish(new ContextDisposingEvent());
-
-		// NB: Dispose services in reverse order.
-		// This may or may not actually be necessary, but seems safer, since
-		// dependent services will be disposed *before* their dependencies.
-		final List<Service> services = serviceIndex.getAll();
-		for (int s = services.size() - 1; s >= 0; s--) {
-			services.get(s).dispose();
-		}
+		if (disposed) return;
+		doDispose(true);
 	}
 
 	// -- AutoCloseable methods --
@@ -580,6 +578,23 @@ private String createMissingServiceMessage(
 		return msg.toString();
 	}
 
+	private synchronized void doDispose(final boolean announce) {
+		if (disposed) return;
+		disposed = true;
+		if (announce) {
+			final EventService eventService = getService(EventService.class);
+			if (eventService != null) eventService.publish(new ContextDisposingEvent());
+		}
+
+		// NB: Dispose services in reverse order.
+		// This may or may not actually be necessary, but seems safer, since
+		// dependent services will be disposed *before* their dependencies.
+		final List<Service> services = serviceIndex.getAll();
+		for (int s = services.size() - 1; s >= 0; s--) {
+			services.get(s).dispose();
+		}
+	}
+
 	private static PluginIndex plugins(final boolean empty) {
 		return empty ? new PluginIndex(null) : null;
 	}
diff --git a/src/test/java/org/scijava/ContextDisposalTest.java b/src/test/java/org/scijava/ContextDisposalTest.java
new file mode 100644
index 000000000..e47fcbc7b
--- /dev/null
+++ b/src/test/java/org/scijava/ContextDisposalTest.java
@@ -0,0 +1,51 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2023 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava;
+
+import org.junit.Test;
+
+/**
+ * Tests disposal of {@link Context}s.
+ * 
+ * @author Curtis Rueden
+ */
+public class ContextDisposalTest {
+
+	/**
+	 * Tests that a {@link Context} can be disposed more than once without
+	 * throwing an exception.
+	 */
+	@Test
+	public void testDoubleDisposal() {
+		final Context context = new Context();
+		context.dispose();
+		context.dispose();
+	}
+}

From 7daf667d6fc2d357c30d9c3ef4ea57ca8024a29a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 11:32:23 -0500
Subject: [PATCH 1086/1208] Automatically dispose the context on JVM shutdown

And make the ThreadService's threads into daemon threads.

The danger is that the such threads won't complete pending work. But
with the JVM shutdown hook now attempting to dispose the context at
that point, the ExecutorService will have a chance to shutdown cleanly.
---
 src/main/java/org/scijava/Context.java                   | 3 +++
 .../java/org/scijava/thread/DefaultThreadService.java    | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 7e42f2df2..63ade880d 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -290,6 +290,9 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 				new ServiceHelper(this, serviceClasses, strict);
 			serviceHelper.loadServices();
 		}
+
+		// If JVM shuts down with context still active, clean up after ourselves.
+		Runtime.getRuntime().addShutdownHook(new Thread(() -> doDispose(false)));
 	}
 
 	// -- Context methods --
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index f46952d98..e19f41c5f 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -173,7 +173,14 @@ public synchronized void dispose() {
 	@Override
 	public Thread newThread(final Runnable r) {
 		final String threadName = contextThreadPrefix() + nextThread++;
-		return new Thread(r, threadName);
+		final Thread thread = new Thread(r, threadName);
+		// NB: Use daemon threads for the thread pool, so that idling threads do
+		// not prevent the JVM shutdown sequence from starting. The application
+		// context, and therefore the thread service, will try to dispose itself
+		// upon JVM shutdown, which will invoke executor.shutdown(), so there
+		// will be a chance for these threads to complete any pending work.
+		thread.setDaemon(true);
+		return thread;
 	}
 
 	// -- Helper methods --

From 0f6f9164eee16923b98cebf143727138281b829c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 11:44:27 -0500
Subject: [PATCH 1087/1208] DefaultThreadService: let running tasks finish

We wait up to 5 seconds for them to terminate.

I don't really have a good idea whether this is a good amount of time,
but it should be more than enough for common scenarios.

At some point, the ThreadService interface could gain methods to
override this value, but for now, we hardcode it.
---
 .../org/scijava/thread/DefaultThreadService.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index e19f41c5f..8d0e552bd 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -39,6 +39,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -58,6 +59,8 @@ public final class DefaultThreadService extends AbstractService implements
 
 	private static final String SCIJAVA_THREAD_PREFIX = "SciJava-";
 
+	private static final long SHUTDOWN_TIMEOUT = 5000;
+
 	private static WeakHashMap<Thread, Thread> parents =
 		new WeakHashMap<>();
 
@@ -159,11 +162,23 @@ public synchronized void dispose() {
 		disposed = true;
 		if (executor != null) {
 			executor.shutdown();
+			try {
+				executor.awaitTermination(SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
+			}
+			catch (final InterruptedException exc) {
+				log.debug(exc);
+			}
 			executor = null;
 		}
 		if (queues != null) {
 			for (final ExecutorService queue : queues.values()) {
 				queue.shutdown();
+				try {
+					queue.awaitTermination(SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
+				}
+				catch (final InterruptedException exc) {
+					log.debug(exc);
+				}
 			}
 		}
 	}

From 74518c56bc1ae89b184b6d9678f2ec3cd1bb0f5b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 11:47:23 -0500
Subject: [PATCH 1088/1208] DefaultThreadService: fix comment

---
 src/main/java/org/scijava/thread/DefaultThreadService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 8d0e552bd..168f9a991 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -192,8 +192,8 @@ public Thread newThread(final Runnable r) {
 		// NB: Use daemon threads for the thread pool, so that idling threads do
 		// not prevent the JVM shutdown sequence from starting. The application
 		// context, and therefore the thread service, will try to dispose itself
-		// upon JVM shutdown, which will invoke executor.shutdown(), so there
-		// will be a chance for these threads to complete any pending work.
+		// upon JVM shutdown, which will invoke executor.awaitTermination(), so
+		// there will be a chance for these threads to complete any pending work.
 		thread.setDaemon(true);
 		return thread;
 	}

From 5e7cdbd1216a372dfc0179183013916896b55839 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 27 Apr 2023 12:58:19 -0500
Subject: [PATCH 1089/1208] Add ModuleErroredEvent to convey thrown exceptions

---
 pom.xml                                       |   2 +-
 .../java/org/scijava/module/ModuleRunner.java |  73 ++++++-----
 .../module/event/ModuleErroredEvent.java      |  52 ++++++++
 .../module/event/ModuleErroredEventTest.java  | 114 ++++++++++++++++++
 4 files changed, 212 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/org/scijava/module/event/ModuleErroredEvent.java
 create mode 100644 src/test/java/org/scijava/module/event/ModuleErroredEventTest.java

diff --git a/pom.xml b/pom.xml
index ad42e0867..6307a4ead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.92.1-SNAPSHOT</version>
+	<version>2.93.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index d5f61890a..4553c83ae 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -39,6 +39,7 @@
 import org.scijava.event.EventService;
 import org.scijava.log.LogService;
 import org.scijava.module.event.ModuleCanceledEvent;
+import org.scijava.module.event.ModuleErroredEvent;
 import org.scijava.module.event.ModuleExecutedEvent;
 import org.scijava.module.event.ModuleExecutingEvent;
 import org.scijava.module.event.ModuleFinishedEvent;
@@ -144,36 +145,42 @@ public void run() {
 
 		final String title = module.getInfo().getTitle();
 
-		// announce start of execution process
-		if (ss != null) ss.showStatus("Running command: " + title);
-		if (es != null) es.publish(new ModuleStartedEvent(module));
-
-		// execute preprocessors
-		final ModulePreprocessor canceler = preProcess();
-		if (canceler != null) {
-			// module execution was canceled by preprocessor
-			final String reason = canceler.getCancelReason();
-			cancel(reason);
-			cleanupAndBroadcastCancelation(title, reason);
-			return;
+		try {
+			// announce start of execution process
+			if (ss != null) ss.showStatus("Running command: " + title);
+			if (es != null) es.publish(new ModuleStartedEvent(module));
+
+			// execute preprocessors
+			final ModulePreprocessor canceler = preProcess();
+			if (canceler != null) {
+				// module execution was canceled by preprocessor
+				final String reason = canceler.getCancelReason();
+				cancel(reason);
+				cleanupAndBroadcastCancelation(title, reason);
+				return;
+			}
+
+			// execute module
+			if (es != null) es.publish(new ModuleExecutingEvent(module));
+			module.run();
+			if (isCanceled()) {
+				// module execution was canceled by the module itself
+				cleanupAndBroadcastCancelation(title, getCancelReason());
+				return;
+			}
+			if (es != null) es.publish(new ModuleExecutedEvent(module));
+
+			// execute postprocessors
+			postProcess();
+
+			// announce completion of execution process
+			if (es != null) es.publish(new ModuleFinishedEvent(module));
+			if (ss != null) ss.showStatus("Command finished: " + title);
 		}
-
-		// execute module
-		if (es != null) es.publish(new ModuleExecutingEvent(module));
-		module.run();
-		if (isCanceled()) {
-			// module execution was canceled by the module itself
-			cleanupAndBroadcastCancelation(title, getCancelReason());
-			return;
+		catch (final Throwable t) {
+			cleanupAndBroadcastException(title, t);
+			throw t;
 		}
-		if (es != null) es.publish(new ModuleExecutedEvent(module));
-
-		// execute postprocessors
-		postProcess();
-
-		// announce completion of execution process
-		if (es != null) es.publish(new ModuleFinishedEvent(module));
-		if (ss != null) ss.showStatus("Command finished: " + title);
 	}
 
 	// -- Helper methods --
@@ -190,6 +197,16 @@ private void cleanupAndBroadcastCancelation(final String title,
 		}
 	}
 
+	private void cleanupAndBroadcastException(final String title,
+		final Throwable t)
+	{
+		if (es != null) es.publish(new ModuleErroredEvent(module, t));
+		if (ss != null) {
+			ss.showStatus("Module errored: " + title);
+			if (t != null) ss.warn(t.getMessage());
+		}
+	}
+
 	private boolean isCanceled() {
 		return module instanceof Cancelable && ((Cancelable) module).isCanceled();
 	}
diff --git a/src/main/java/org/scijava/module/event/ModuleErroredEvent.java b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
new file mode 100644
index 000000000..9fe97438c
--- /dev/null
+++ b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2023 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.event;
+
+import org.scijava.module.Module;
+
+/**
+ * An event indicating a module execution has thrown an exception.
+ *
+ * @author Gabriel Selzer
+ */
+public class ModuleErroredEvent extends ModuleExecutionEvent {
+
+	private final Throwable exc;
+
+	public ModuleErroredEvent(final Module module, final Throwable exc) {
+		super(module);
+		this.exc = exc;
+	}
+
+	public Throwable getException() {
+		return exc;
+	}
+
+}
diff --git a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
new file mode 100644
index 000000000..d818a921b
--- /dev/null
+++ b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
@@ -0,0 +1,114 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2023 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.module.event;
+
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.scijava.Context;
+import org.scijava.event.EventHandler;
+import org.scijava.event.EventService;
+import org.scijava.module.AbstractModule;
+import org.scijava.module.AbstractModuleInfo;
+import org.scijava.module.Module;
+import org.scijava.module.ModuleException;
+import org.scijava.module.ModuleInfo;
+import org.scijava.module.ModuleService;
+
+/**
+ * Tests {@link ModuleErroredEvent} behavior.
+ *
+ * @author Gabriel Selzer
+ */
+public class ModuleErroredEventTest {
+
+	private EventService es;
+	private ModuleService module;
+
+	@Before
+	public void setUp() {
+		Context ctx = new Context();
+		es = ctx.getService(EventService.class);
+		module = ctx.getService(ModuleService.class);
+	}
+
+	@Test
+	public void testModuleErroredEvent() {
+
+		// Must be a final boolean array to be included in the below closure
+		final boolean[] caughtException = { false };
+
+		// Add a new EventHandler to change our state
+		es.subscribe(new Object() {
+
+			@EventHandler
+			void onEvent(final ModuleErroredEvent e) {
+				caughtException[0] = true;
+			}
+		});
+
+		// Run the module, ensure we get the exception
+		assertThrows(Exception.class, //
+			() -> module.run(new TestModuleInfo(), false).get());
+		assertTrue(caughtException[0]);
+	}
+
+	static class TestModuleInfo extends AbstractModuleInfo {
+
+		@Override
+		public String getDelegateClassName() {
+			return this.getClass().getName();
+		}
+
+		@Override
+		public Class<?> loadDelegateClass() throws ClassNotFoundException {
+			return this.getClass();
+		}
+
+		@Override
+		public Module createModule() throws ModuleException {
+			ModuleInfo thisInfo = this;
+			return new AbstractModule() {
+
+				@Override
+				public ModuleInfo getInfo() {
+					return thisInfo;
+				}
+
+				@Override
+				public void run() {
+					throw new RuntimeException("Yay!");
+				}
+			};
+		}
+	}
+}

From f1e90a40497406a3f80f52f0cd4c0bb52afba284 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 16:34:30 -0500
Subject: [PATCH 1090/1208] ModuleErroredEventTest: save ref to subscriber

So that it cannot be garbage collected too early.
---
 .../org/scijava/module/event/ModuleErroredEventTest.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
index d818a921b..33fe004c3 100644
--- a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
+++ b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
@@ -68,13 +68,14 @@ public void testModuleErroredEvent() {
 		final boolean[] caughtException = { false };
 
 		// Add a new EventHandler to change our state
-		es.subscribe(new Object() {
+		final Object interestedParty = new Object() {
 
 			@EventHandler
 			void onEvent(final ModuleErroredEvent e) {
 				caughtException[0] = true;
 			}
-		});
+		};
+		es.subscribe(interestedParty);
 
 		// Run the module, ensure we get the exception
 		assertThrows(Exception.class, //

From d8b0318c35345d9afab5f2a4be363d52df9959d5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 16:35:13 -0500
Subject: [PATCH 1091/1208] ModuleErroredEventTest: assert correct exception

---
 .../scijava/module/event/ModuleErroredEventTest.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
index 33fe004c3..340d6e73d 100644
--- a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
+++ b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
@@ -29,8 +29,9 @@
 
 package org.scijava.module.event;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -48,6 +49,7 @@
  * Tests {@link ModuleErroredEvent} behavior.
  *
  * @author Gabriel Selzer
+ * @author Curtis Rueden
  */
 public class ModuleErroredEventTest {
 
@@ -65,14 +67,14 @@ public void setUp() {
 	public void testModuleErroredEvent() {
 
 		// Must be a final boolean array to be included in the below closure
-		final boolean[] caughtException = { false };
+		final Throwable[] caughtException = { null };
 
 		// Add a new EventHandler to change our state
 		final Object interestedParty = new Object() {
 
 			@EventHandler
 			void onEvent(final ModuleErroredEvent e) {
-				caughtException[0] = true;
+				caughtException[0] = e.getException();
 			}
 		};
 		es.subscribe(interestedParty);
@@ -80,7 +82,8 @@ void onEvent(final ModuleErroredEvent e) {
 		// Run the module, ensure we get the exception
 		assertThrows(Exception.class, //
 			() -> module.run(new TestModuleInfo(), false).get());
-		assertTrue(caughtException[0]);
+		assertNotNull(caughtException[0]);
+		assertEquals("Yay!", caughtException[0].getMessage());
 	}
 
 	static class TestModuleInfo extends AbstractModuleInfo {

From 5f5d3f7285e05c6616569cc2b44d634986d1313d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 16:40:11 -0500
Subject: [PATCH 1092/1208] ModuleRunner: make vocabulary consistent

Yes, it might not be a Command plugin. But the other messages all
use the term "Command" rather than "Module". Let's stay consistent.
---
 src/main/java/org/scijava/module/ModuleRunner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 4553c83ae..4831aa6da 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -202,7 +202,7 @@ private void cleanupAndBroadcastException(final String title,
 	{
 		if (es != null) es.publish(new ModuleErroredEvent(module, t));
 		if (ss != null) {
-			ss.showStatus("Module errored: " + title);
+			ss.showStatus("Command errored: " + title);
 			if (t != null) ss.warn(t.getMessage());
 		}
 	}

From 0b249a401c7ffb89e194cbbefe554fb5f4c89b1b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 3 May 2023 16:41:18 -0500
Subject: [PATCH 1093/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6307a4ead..59ba9d45b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.93.0-SNAPSHOT</version>
+	<version>2.93.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 3b6c40a303020460350cdbe757dc14f9ef20ed33 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 11 May 2023 15:06:47 -0500
Subject: [PATCH 1094/1208] ModuleRunner: use the log, not status, upon error

The log is for exceptional conditions, whereas
the status reporting mechanism is for normal ones.
---
 src/main/java/org/scijava/module/ModuleRunner.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 4831aa6da..d9f25bb65 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -201,10 +201,7 @@ private void cleanupAndBroadcastException(final String title,
 		final Throwable t)
 	{
 		if (es != null) es.publish(new ModuleErroredEvent(module, t));
-		if (ss != null) {
-			ss.showStatus("Command errored: " + title);
-			if (t != null) ss.warn(t.getMessage());
-		}
+		if (log != null) log.error("Command errored: " + title, t);
 	}
 
 	private boolean isCanceled() {

From 113c61730b13877beea3a0ea283392557a0ef7a6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 11 May 2023 15:14:53 -0500
Subject: [PATCH 1095/1208] ModuleRunner: only log unhandled errors

If someone wants to subscribe to ModuleErroredEvent and handle it,
they can now consume the event to prevent it from being logged.
---
 src/main/java/org/scijava/module/ModuleRunner.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index d9f25bb65..8fa173225 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -200,8 +200,12 @@ private void cleanupAndBroadcastCancelation(final String title,
 	private void cleanupAndBroadcastException(final String title,
 		final Throwable t)
 	{
-		if (es != null) es.publish(new ModuleErroredEvent(module, t));
-		if (log != null) log.error("Command errored: " + title, t);
+		final ModuleErroredEvent evt = new ModuleErroredEvent(module, t);
+		if (es != null) es.publish(evt);
+		if (log != null && !evt.isConsumed()) {
+			// Nothing else handled the error, so log it.
+			log.error("Command errored: " + title, t);
+		}
 	}
 
 	private boolean isCanceled() {

From f8068747370945591f60b83ee4a8fcfc4b735b54 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Thu, 11 May 2023 16:18:02 -0500
Subject: [PATCH 1096/1208] Choose UserInterfaces intelligently

---
 .../java/org/scijava/ui/DefaultUIService.java | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 4750f31ef..60fc08693 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -244,17 +244,17 @@ public List<PluginInfo<DisplayViewer<?>>> getViewerPlugins() {
 
 	@Override
 	public void show(final Object o) {
-		getDefaultUI().show(o);
+		getVisibleUI(true).show(o);
 	}
 
 	@Override
 	public void show(final String name, final Object o) {
-		getDefaultUI().show(name, o);
+		getVisibleUI(true).show(name, o);
 	}
 
 	@Override
 	public void show(final Display<?> display) {
-		getDefaultUI().show(display);
+		getVisibleUI(true).show(display);
 	}
 
 	@Override
@@ -309,16 +309,15 @@ public DialogPrompt.Result showDialog(final String message,
 		final String title, final DialogPrompt.MessageType messageType,
 		final DialogPrompt.OptionType optionType)
 	{
-		final UserInterface ui = getDefaultUI();
+		UserInterface ui = getVisibleUI(false);
 		if (ui == null) return null;
-		final DialogPrompt dialogPrompt =
-			ui.dialogPrompt(message, title, messageType, optionType);
+		final DialogPrompt dialogPrompt = ui.dialogPrompt(message, title, messageType, optionType);
 		return dialogPrompt == null ? null : dialogPrompt.prompt();
 	}
 
 	@Override
 	public File chooseFile(final File file, final String style) {
-		final UserInterface ui = getDefaultUI();
+		final UserInterface ui = getVisibleUI(true);
 		return ui == null ? null : ui.chooseFile(file, style);
 	}
 
@@ -326,19 +325,19 @@ public File chooseFile(final File file, final String style) {
 	public File
 		chooseFile(final String title, final File file, final String style)
 	{
-		final UserInterface ui = getDefaultUI();
+		final UserInterface ui = getVisibleUI(true);
 		return ui == null ? null : ui.chooseFile(title, file, style);
 	}
 
 	@Override
 	public File[] chooseFiles(File parent, File[] files, FileFilter filter, String style) {
-		final UserInterface ui = getDefaultUI();
+		final UserInterface ui = getVisibleUI(true);
 		return ui == null ? null : ui.chooseFiles(parent, files, filter, style);
 	}
 	
 	@Override
 	public List<File> chooseFiles(File parent, List<File> fileList, FileFilter filter, String style) {
-		final UserInterface ui = getDefaultUI();
+		final UserInterface ui = getVisibleUI(true);
 		return ui == null ? null : ui.chooseFiles(parent, fileList, filter, style);
 	}
 
@@ -346,7 +345,7 @@ public List<File> chooseFiles(File parent, List<File> fileList, FileFilter filte
 	public void showContextMenu(final String menuRoot, final Display<?> display,
 		final int x, final int y)
 	{
-		final UserInterface ui = getDefaultUI();
+		final UserInterface ui = getVisibleUI(true);
 		if (ui != null) ui.showContextMenu(menuRoot, display, x, y);
 	}
 
@@ -542,4 +541,21 @@ private void addUserInterface(final String name, final UserInterface ui) {
 	private String getTitle() {
 		return appService.getApp().getTitle();
 	}
+
+	private UserInterface getVisibleUI(final boolean forceShow) {
+		// finds the first (highest priority) VISIBLE UserInterface
+		// if none are visible, then we show default UI if the caller indicated so.
+		UserInterface defaultUI = getDefaultUI();
+		if (defaultUI == null) return null;
+		if (defaultUI.isVisible()) return defaultUI;
+		else if(getVisibleUIs().size() > 0) {
+			return getVisibleUIs().get(0);
+		}
+
+		if (forceShow) {
+			showUI(defaultUI);
+			return defaultUI;
+		}
+		return null;
+	}
 }

From ffbf376d55eba2c059f373f2257db56afff11262 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 13 May 2023 09:18:45 -0500
Subject: [PATCH 1097/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 59ba9d45b..5c21533fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.93.1-SNAPSHOT</version>
+	<version>2.93.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From c5202ada23bb107f13ab01be48673024d197951b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 11:26:40 -0500
Subject: [PATCH 1098/1208] IOPlugin: fix warnings

---
 src/main/java/org/scijava/io/IOPlugin.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 766f2e55b..a6c2536a4 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -32,7 +32,6 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
 import org.scijava.io.location.LocationService;
 import org.scijava.plugin.HandlerPlugin;
@@ -58,7 +57,6 @@ public interface IOPlugin<D> extends HandlerPlugin<Location> {
 	Class<D> getDataType();
 
 	/** Checks whether the I/O plugin can open data from the given source. */
-	@SuppressWarnings("unused")
 	default boolean supportsOpen(final String source) {
 		try {
 			return supportsOpen(context().service(LocationService.class).resolve(source));
@@ -69,12 +67,12 @@ default boolean supportsOpen(final String source) {
 	}
 
 	/** Checks whether the I/O plugin can open data from the given location. */
+	@SuppressWarnings("unused")
 	default boolean supportsOpen(final Location source) {
 		return false;
 	}
 
 	/** Checks whether the I/O plugin can save data to the given destination. */
-	@SuppressWarnings("unused")
 	default boolean supportsSave(final String destination) {
 		try {
 			return supportsSave(context().service(LocationService.class).resolve(destination));
@@ -85,6 +83,7 @@ default boolean supportsSave(final String destination) {
 	}
 
 	/** Checks whether the I/O plugin can save data to the given location. */
+	@SuppressWarnings("unused")
 	default boolean supportsSave(final Location destination) {
 		return false;
 	}
@@ -108,12 +107,12 @@ default D open(final String source) throws IOException {
 	}
 
 	/** Opens data from the given location. */
+	@SuppressWarnings("unused")
 	default D open(final Location source) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 
 	/** Saves the given data to the specified destination. */
-	@SuppressWarnings("unused")
 	default void save(final D data, final String destination) throws IOException {
 		try {
 			save(data, context().service(LocationService.class).resolve(destination));
@@ -124,6 +123,7 @@ default void save(final D data, final String destination) throws IOException {
 	}
 
 	/** Saves the given data to the specified location. */
+	@SuppressWarnings("unused")
 	default void save(final D data, final Location destination) throws IOException {
 		throw new UnsupportedOperationException();
 	}

From 02998eedceb1fc893222f87a30bcc514351527d3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 11:33:12 -0500
Subject: [PATCH 1099/1208] Vendor the org.bushe:eventbus library

We need to fix a bug, but the upstream library is not actively
maintained anymore. Including the code in scijava-common makes
it easier to make changes to the codebase directly.
---
 pom.xml                                       |   10 +-
 .../org/scijava/event/DefaultEventBus.java    |   10 +-
 .../scijava/event/DefaultEventService.java    |    8 +-
 .../java/org/scijava/event/EventHandler.java  |    4 +-
 .../org/scijava/event/EventSubscriber.java    |    2 +-
 .../bushe/AbstractEventServiceEvent.java      |   56 +
 .../org/scijava/event/bushe/CleanupEvent.java |   62 +
 .../bushe/ContainerEventServiceAction.java    |   71 +
 .../bushe/ContainerEventServiceFinder.java    |   84 +
 .../bushe/ContainerEventServiceRegistrar.java |  248 ++
 .../bushe/ContainerEventServiceSupplier.java  |   42 +
 .../org/scijava/event/bushe/EventBus.java     |  423 ++++
 .../scijava/event/bushe/EventBusAction.java   |   41 +
 .../org/scijava/event/bushe/EventService.java |  932 +++++++
 .../event/bushe/EventServiceAction.java       |  214 ++
 .../event/bushe/EventServiceEvent.java        |   30 +
 .../bushe/EventServiceExistsException.java    |    8 +
 .../event/bushe/EventServiceLocator.java      |  174 ++
 .../scijava/event/bushe/EventSubscriber.java  |   35 +
 .../event/bushe/EventTopicSubscriber.java     |   38 +
 .../java/org/scijava/event/bushe/Logger.java  |  218 ++
 .../org/scijava/event/bushe/ObjectEvent.java  |   42 +
 .../org/scijava/event/bushe/Prioritized.java  |   14 +
 .../bushe/PrioritizedEventSubscriber.java     |    8 +
 .../PrioritizedEventTopicSubscriber.java      |    8 +
 .../scijava/event/bushe/ProxySubscriber.java  |   45 +
 .../event/bushe/PublicationStatus.java        |   30 +
 .../event/bushe/PublicationStatusTracker.java |   24 +
 .../event/bushe/SubscriberTimingEvent.java    |  116 +
 .../event/bushe/SwingEventService.java        |   93 +
 .../event/bushe/ThreadSafeEventService.java   | 2216 +++++++++++++++++
 .../event/bushe/VetoEventListener.java        |   38 +
 .../event/bushe/VetoTopicEventListener.java   |   25 +
 .../annotation/AbstractProxySubscriber.java   |  169 ++
 .../bushe/annotation/AnnotationProcessor.java |  562 +++++
 .../bushe/annotation/BaseProxySubscriber.java |  133 +
 .../bushe/annotation/EventSubscriber.java     |  110 +
 .../EventTopicPatternSubscriber.java          |   35 +
 .../annotation/EventTopicSubscriber.java      |  108 +
 .../ProxyTopicPatternSubscriber.java          |   88 +
 .../annotation/ProxyTopicSubscriber.java      |  147 ++
 .../bushe/annotation/ReferenceStrength.java   |   11 +
 .../RuntimeTopicEventSubscriber.java          |   38 +
 .../RuntimeTopicPatternEventSubscriber.java   |   38 +
 ...heClassOfTheAnnotatedMethodsParameter.java |   15 +
 .../VetoRuntimeTopicPatternSubscriber.java    |   38 +
 .../VetoRuntimeTopicSubscriber.java           |   38 +
 .../bushe/annotation/VetoSubscriber.java      |   69 +
 .../VetoTopicPatternSubscriber.java           |   66 +
 .../bushe/annotation/VetoTopicSubscriber.java |   66 +
 .../event/bushe/exception/SwingException.java |  128 +
 .../event/bushe/generics/TypeReference.java   |   52 +
 .../scijava/event/bushe/BadEventService.java  |   10 +
 .../scijava/event/bushe/EBTestCounter.java    |   10 +
 .../java/org/scijava/event/bushe/EDTUtil.java |   36 +
 .../bushe/EventServiceLocatorTestCase.java    |   32 +
 .../event/bushe/SubscriberForTest.java        |   43 +
 .../bushe/TestContainerEventService.java      |  218 ++
 .../event/bushe/TestDefaultEventService.java  | 1397 +++++++++++
 .../scijava/event/bushe/TestEventAction.java  |  181 ++
 .../org/scijava/event/bushe/TestEventBus.java |  570 +++++
 .../event/bushe/TestEventBusServiceClass.java |   32 +
 .../TestEventBusServiceClassBadType.java      |   30 +
 .../event/bushe/TestEventBusTiming.java       |  107 +
 .../event/bushe/TestEventServiceLocator.java  |   50 +
 .../event/bushe/TestEventServiceLocator2.java |   46 +
 .../event/bushe/TestEventServiceLocator3.java |   44 +
 .../event/bushe/TestEventServiceLocator4.java |   44 +
 .../event/bushe/TestEventServiceLocator5.java |   43 +
 .../event/bushe/TestEventServiceLocator6.java |   44 +
 .../event/bushe/TestEventServiceLocator7.java |   49 +
 .../TestEventServiceLocatorConfiguration.java |   28 +
 ...TestEventServiceLocatorConfiguration2.java |   28 +
 ...TestEventServiceLocatorConfiguration3.java |   28 +
 ...TestEventServiceLocatorConfiguration4.java |   27 +
 .../scijava/event/bushe/TestPerformance.java  |   75 +
 .../bushe/TestPrioritizedSubscribers.java     |  593 +++++
 .../event/bushe/TestPublicationStates.java    |   67 +
 .../event/bushe/TopicSubscriberForTest.java   |   35 +
 .../event/bushe/VetoEventListenerForTest.java |   24 +
 .../bushe/VetoTopicEventListenerForTest.java  |   24 +
 .../bushe/annotation/AbstractSubscriber.java  |   27 +
 .../annotation/AnnotatedEventSubscriber.java  |   90 +
 .../annotation/AnnotatedVetoSubscriber.java   |   85 +
 .../AnotherAnnotatedEventSubscriber.java      |   48 +
 ...AnotherDoubleAnnotatedEventSubscriber.java |   23 +
 .../bushe/annotation/ConcreteSubscriber.java  |   17 +
 .../DoubleAnnotatedEventSubscriber.java       |   35 +
 .../bushe/annotation/Issue15Subscriber.java   |   73 +
 .../bushe/annotation/Issue15Subscriber2.java  |   69 +
 .../event/bushe/annotation/MyData.java        |   17 +
 .../StrongAnnotatedEventSubscriber.java       |   30 +
 .../StrongClassAnnotatedEventSubscriber.java  |   24 +
 .../TestAnnotationInAbstractClass.java        |   20 +
 .../annotation/TestSubscriberAnnotation.java  |  366 +++
 .../TestSubscriberAnnotationMemoryLeaks.java  |  336 +++
 .../WeakClassAnnotatedEventSubscriber.java    |   24 +
 .../bushe/annotation/runtime/Factory.java     |   12 +
 .../RuntimeTopicPatternSubscriber.java        |   35 +
 .../runtime/RuntimeTopicSubscriber.java       |   34 +
 .../runtime/SubscriberForTesting.java         |    5 +
 .../bushe/generics/DataRequestEvent.java      |    9 +
 .../bushe/generics/GenericReflection.java     |  125 +
 103 files changed, 12679 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
 create mode 100644 src/main/java/org/scijava/event/bushe/CleanupEvent.java
 create mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
 create mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
 create mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
 create mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventBus.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventBusAction.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventService.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventServiceAction.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventServiceEvent.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventServiceLocator.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/Logger.java
 create mode 100644 src/main/java/org/scijava/event/bushe/ObjectEvent.java
 create mode 100644 src/main/java/org/scijava/event/bushe/Prioritized.java
 create mode 100644 src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/ProxySubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/PublicationStatus.java
 create mode 100644 src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java
 create mode 100644 src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
 create mode 100644 src/main/java/org/scijava/event/bushe/SwingEventService.java
 create mode 100644 src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
 create mode 100644 src/main/java/org/scijava/event/bushe/VetoEventListener.java
 create mode 100644 src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/EventTopicPatternSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/ProxyTopicPatternSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/ProxyTopicSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/ReferenceStrength.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicEventSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicPatternEventSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/UseTheClassOfTheAnnotatedMethodsParameter.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicPatternSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/VetoSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/VetoTopicPatternSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/annotation/VetoTopicSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/exception/SwingException.java
 create mode 100644 src/main/java/org/scijava/event/bushe/generics/TypeReference.java
 create mode 100644 src/test/java/org/scijava/event/bushe/BadEventService.java
 create mode 100644 src/test/java/org/scijava/event/bushe/EBTestCounter.java
 create mode 100644 src/test/java/org/scijava/event/bushe/EDTUtil.java
 create mode 100644 src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java
 create mode 100644 src/test/java/org/scijava/event/bushe/SubscriberForTest.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestContainerEventService.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventAction.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventBus.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestPerformance.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TestPublicationStates.java
 create mode 100644 src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
 create mode 100644 src/test/java/org/scijava/event/bushe/VetoEventListenerForTest.java
 create mode 100644 src/test/java/org/scijava/event/bushe/VetoTopicEventListenerForTest.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/AbstractSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/AnnotatedEventSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/AnnotatedVetoSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/AnotherAnnotatedEventSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/AnotherDoubleAnnotatedEventSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/ConcreteSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/DoubleAnnotatedEventSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber2.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/MyData.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/StrongAnnotatedEventSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/StrongClassAnnotatedEventSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/TestAnnotationInAbstractClass.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/WeakClassAnnotatedEventSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/runtime/Factory.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicPatternSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicSubscriber.java
 create mode 100644 src/test/java/org/scijava/event/bushe/annotation/runtime/SubscriberForTesting.java
 create mode 100644 src/test/java/org/scijava/event/bushe/generics/DataRequestEvent.java
 create mode 100644 src/test/java/org/scijava/event/bushe/generics/GenericReflection.java

diff --git a/pom.xml b/pom.xml
index 5c21533fc..d2abba36d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,6 +167,7 @@
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
+		<license.excludes>**/bushe/**</license.excludes>
 	</properties>
 
 	<dependencies>
@@ -176,13 +177,6 @@
 			<artifactId>parsington</artifactId>
 		</dependency>
 
-		<!-- Third-party dependencies -->
-		<dependency>
-			<groupId>org.bushe</groupId>
-			<artifactId>eventbus</artifactId>
-			<version>1.4</version>
-		</dependency>
-
 		<!-- Test scope dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -193,7 +187,7 @@
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
-			</dependency>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 843bd92b2..a85989de8 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -34,18 +34,18 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.bushe.swing.event.CleanupEvent;
-import org.bushe.swing.event.ThreadSafeEventService;
+import org.scijava.event.bushe.CleanupEvent;
+import org.scijava.event.bushe.ThreadSafeEventService;
 import org.scijava.log.LogService;
 import org.scijava.service.Service;
 import org.scijava.thread.ThreadService;
 
 /**
- * An {@link org.bushe.swing.event.EventService} implementation for SciJava.
+ * An {@link org.scijava.event.bushe.EventService} implementation for SciJava.
  * <p>
  * It is called "DefaultEventBus" rather than "DefaultEventService" to avoid a
  * name clash with {@link DefaultEventService}, which is not an
- * {@link org.bushe.swing.event.EventService} but rather a SciJava
+ * {@link org.scijava.event.bushe.EventService} but rather a SciJava
  * {@link Service} implementation.
  * </p>
  * 
@@ -112,7 +112,7 @@ public void publishLater(final String topicName, final Object eventObj) {
 			getVetoEventListeners(topicName), null);
 	}
 
-	// -- org.bushe.swing.event.EventService methods --
+	// -- org.scijava.event.bushe.EventService methods --
 
 	@Override
 	public void publish(final Object event) {
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index fc5f6f3d6..e82d844a5 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -40,9 +40,9 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.bushe.swing.event.annotation.AbstractProxySubscriber;
-import org.bushe.swing.event.annotation.BaseProxySubscriber;
-import org.bushe.swing.event.annotation.ReferenceStrength;
+import org.scijava.event.bushe.annotation.AbstractProxySubscriber;
+import org.scijava.event.bushe.annotation.BaseProxySubscriber;
+import org.scijava.event.bushe.annotation.ReferenceStrength;
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -263,7 +263,7 @@ private synchronized void keepIt(final Object o, final ProxySubscriber<?> subscr
 	 * Helper class used by {@link #subscribe(Object)}.
 	 * <p>
 	 * Recapitulates some logic from {@link BaseProxySubscriber}, because that
-	 * class implements {@link org.bushe.swing.event.EventSubscriber} as a raw
+	 * class implements {@link org.scijava.event.bushe.EventSubscriber} as a raw
 	 * type, which is incompatible with this class implementing SciJava's
 	 * {@link EventSubscriber} as a typed interface; it becomes impossible to
 	 * implement both {@code onEvent(Object)} and {@code onEvent(E)}.
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 7547b3789..27e0d7bbc 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -40,10 +40,10 @@
  * handling methods and annotating each with @{@link EventHandler}.
  * <p>
  * Note to developers: This annotation serves exactly the same purpose as
- * EventBus's {@link org.bushe.swing.event.annotation.EventSubscriber}
+ * EventBus's {@link org.scijava.event.bushe.annotation.EventSubscriber}
  * annotation, recapitulating a subset of the same functionality. We do this to
  * avoid third party code depending directly on EventBus. That is, we do not
- * wish to require SciJava developers to {@code import org.bushe.swing.event.*}
+ * wish to require SciJava developers to {@code import org.scijava.event.bushe.*}
  * or similar. In this way, EventBus is isolated as only a transitive dependency
  * of downstream code, rather than a direct dependency. Unfortunately, because
  * Java annotation interfaces cannot utilize inheritance, we have to
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index f6e189035..a36181639 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -44,7 +44,7 @@
  * @param <E> Type of event for which to listen
  */
 public interface EventSubscriber<E extends SciJavaEvent> extends
-	org.bushe.swing.event.EventSubscriber<E>
+	org.scijava.event.bushe.EventSubscriber<E>
 {
 
 	@Override
diff --git a/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java b/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
new file mode 100644
index 000000000..3c4b84b5c
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Convenience base class for EventServiceEvents in the application. Provides the convenience of
+ * holding the event source publication and event status.  It is not necessary to use this event class when 
+ * using an EventService.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {
+
+   private Object source = null;
+   protected final Object stateLock = new Object();
+   private PublicationStatus publicationStatus = PublicationStatus.Unpublished;
+
+   /**
+    * Default constructor
+    *
+    * @param source the source of the event
+    */
+   public AbstractEventServiceEvent(Object source) {
+      this.source = source;
+   }
+
+   /** @return the source of this event */
+   public Object getSource() {
+      return source;
+   }
+
+   public PublicationStatus getPublicationStatus() {
+      synchronized (stateLock) {
+         return publicationStatus;
+      }
+   }
+
+   public void setPublicationStatus(PublicationStatus status) {
+      synchronized (stateLock) {
+         publicationStatus = status;
+      }
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/CleanupEvent.java b/src/main/java/org/scijava/event/bushe/CleanupEvent.java
new file mode 100644
index 000000000..c233e1dc0
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/CleanupEvent.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2007 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Published when the ThreadSafeEventService cleans up stale subscribers.
+ * @author Michael Bushe
+ */
+public class CleanupEvent {
+
+   /** The status of the cleanup.*/
+   public enum Status {
+      /** Timer has started the cleanup task. Will be followed by at least one more CleanupEvent.*/
+      STARTING,
+      /** Task has determined there's cleanup to do.*/
+      OVER_STOP_THRESHOLD_CLEANING_BEGUN, 
+      /** Task has determined there's no cleanup to do.*/
+      UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, 
+      /** Finished cleaning up task.*/
+      FINISHED_CLEANING;
+   }
+   
+   private Status status;
+   private int totalWeakRefsAndProxies;
+   private Integer numStaleSubscribersCleaned;
+   
+   public CleanupEvent(Status status, int totalWeakRefsAndProxies, Integer numStaleSubscribersCleaned) {
+      this.status = status;
+      this.totalWeakRefsAndProxies = totalWeakRefsAndProxies;
+      this.numStaleSubscribersCleaned = numStaleSubscribersCleaned;
+   }
+
+   public Status getStatus() {
+      return status;
+   }
+
+   /** Total weak refs and ProxySubscribers subscribed. */
+   public int getTotalWeakRefsAndProxies() {
+      return totalWeakRefsAndProxies;
+   }
+
+   /**
+    * Null unless status is FINISHED_CLEANING.
+    * @return the number of stale subscribers cleaned during the cleanup run.
+    */
+   public Integer getNumStaleSubscribersCleaned() {
+      return numStaleSubscribersCleaned;
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
new file mode 100644
index 000000000..8e71a5a69
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import javax.swing.ImageIcon;
+
+/**
+ * When fired, this action publishes an ActionEvent on a Container EventService.
+ * See {@link EventServiceAction} for more information.
+ * <p/>
+ * By default, the Container EventService is found by asking the ContainerEventServiceFinder to find the EventService
+ * for the source of the fired ActionEvent, which must be a java.awt.Component and contained in a hierarchy (the source
+ * must have been added to another Swing container).  If the action was on a button, this means the container hierarchy
+ * of the button is walked (up) until a ContainerEventServiceSupplier is found or until the top of the hierarchy is
+ * reached, at which point a ContainerEventService is created automatically on the fly via the top container's
+ * putClientProperty() method using the key {@link ContainerEventServiceFinder#CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE}.
+ * If the event is from a JPopupMenu then the popup menu's invoker's hierarchy is walked.
+ * <p/>
+ * To exhibit other behavior, override the getSwingEventService() to return another EventService. For example, the
+ * creator of a popup menu may pass itself to the ContainerEventServiceFinder to return a parent's EventService.
+ * <p/>
+ *
+ * @author Michael Bushe michael@bushe.com
+ * @see EventServiceAction for further documentation
+ * @see ContainerEventServiceFinder on how the service is found
+ */
+public class ContainerEventServiceAction extends EventServiceAction {
+   public ContainerEventServiceAction() {
+   }
+
+   public ContainerEventServiceAction(String actionName, ImageIcon icon) {
+      super(actionName, icon);
+   }
+
+   protected EventService getEventService(ActionEvent event) {
+      Component comp = null;
+      try {
+         if (event.getSource() instanceof Component) {
+            comp = (Component) event.getSource();
+         }
+         if (comp == null) {
+            if (getThrowsExceptionOnNullEventService()) {
+               throw new RuntimeException("ActionEvent source was null, could not find event bus, must override getContainerEventService in action with id:" + getName());
+            }
+         } else {
+            return ContainerEventServiceFinder.getEventService(comp);
+         }
+      } catch (ClassCastException ex) {
+         if (getThrowsExceptionOnNullEventService()) {
+            throw new RuntimeException("ActionEvent source was not a component (" + (comp == null ? "null" : comp.getClass() + "") + "), must override getContainerEventService in action with id:" + getName(), ex);
+         }
+      }
+      return null;
+   }
+}
+
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
new file mode 100644
index 000000000..b62cc874f
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.awt.Component;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import javax.swing.RootPaneContainer;
+
+/**
+ * This class finds a component's container event service, and creates one if necessary and possible.
+ * <p/>
+ * A Container EventService is, unlike the EventBus, an EventService that is container specific, in other words, it is
+ * shared only amongst components within a container.  For example, a Form component can supply an EventService used
+ * only by components in the form.  The Form's components can publish value change events on their Container's Event
+ * Service.  The Form's Model and Validator may listen to these events to collect data and show errors, respectively.
+ * <p/>
+ * Most importantly, Container EventService's cuts down event traffic, avoid naming and listener clashes, promotes
+ * componentization, and splits events usage into logical subsets.
+ * <p/>
+ * The finder will walk up a component's hierarchy searching for a parent that implements ContainerEventServiceSupplier.
+ * If it find one, it returns it.  If it doesn't find one, the top level JComponent (specifically, the highest parent in
+ * the hierarchy, typically a JRootPane) has a client property added to it (if not already set) that has the value of a
+ * new SwingEventService, which is then returned.  The EventBus is never returned.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public class ContainerEventServiceFinder {
+   /** The client property used to put a new SwingEventService on top-level components. */
+   public static final String CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE = "ContainerEventServiceFinder.createdService";
+
+   /**
+    * Walks the component's parents until it find an ContainerEventServiceSupplier and returns the supplier's
+    * EventService.  If the component in the tree is a JPopupMenu, then the menu's invoker is walked.
+    *
+    * @param component any component
+    *
+    * @return the ContainerEventService of the nearest parent
+    */
+   public static EventService getEventService(Component component) {
+      while (component != null) {
+         if (component instanceof ContainerEventServiceSupplier) {
+            return ((ContainerEventServiceSupplier) component).getContainerEventService();
+         }
+         if (component instanceof JPopupMenu) {
+            component = ((JPopupMenu) component).getInvoker();
+         } else {
+            if (component.getParent() == null) {
+               //There is no supplier.  Instead of returning null, make an event service
+               //and stick it in the client properties of the top level container.
+               if (component instanceof RootPaneContainer) {
+                  component = ((RootPaneContainer) component).getRootPane();
+               }
+               if (!(component instanceof JComponent)) {
+                  return null;
+               }
+               JComponent jComp = ((JComponent) component);
+               SwingEventService eventService = (SwingEventService) jComp.getClientProperty(CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE);
+               if (eventService == null) {
+                  eventService = new SwingEventService();
+                  jComp.putClientProperty(CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE, eventService);
+               }
+               return eventService;
+            } else {
+               component = component.getParent();
+            }
+         }
+      }
+      return null;
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
new file mode 100644
index 000000000..5825dd664
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
@@ -0,0 +1,248 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import javax.swing.JComponent;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
+import java.awt.event.ContainerEvent;
+import java.awt.event.ContainerListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+
+
+/**
+ * Registers a component with it's Container's EventService while keeping track of the component's container.
+ * <p/>
+ * Registering with a component's ContainerEventService is tricky since components may not be in their hierarchy when
+ * they want to register with it, or components may move (though rarely).  This class subscribes a component with it's
+ * container event service.  If it is unavailable, the registrar waits until the component's Container becomes available
+ * and subscribes at that time.  If the component changes Containers, the registrar unsubscribes the component from its
+ * old container and subscribes it to the new one.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public class ContainerEventServiceRegistrar {
+   private JComponent jComp;
+   private EventSubscriber eventSubscriber;
+   private VetoEventListener vetoSubscriber;
+   private Class[] eventClasses;
+   private EventTopicSubscriber eventTopicSubscriber;
+   private VetoTopicEventListener vetoTopicSubscriber;
+   private String[] topics;
+   private EventService containerEventService;
+
+   /**
+    * Create a registrar that will keep track of the container event service, typically used in the publish-only cases
+    * where the getContainerEventServer() call will be made before publication.
+    *
+    * @param jComp the component whose container to monitor
+    */
+   public ContainerEventServiceRegistrar(JComponent jComp) {
+      this(jComp, null, null, null, null, null, null);
+   }
+
+   /**
+    * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the
+    * eventClass when the ContainerEventService is available and when it changes.
+    *
+    * @param jComp the component whose container to monitor
+    * @param eventSubscriber the subscriber to register to the Container EventServer
+    * @param eventClasses the class(es) to register for
+    */
+   public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, Class... eventClasses) {
+      this(jComp, eventSubscriber, null, eventClasses, null, null, null);
+   }
+
+   /**
+    * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the topic
+    * when the ContainerEventService is available and when it changes.
+    *
+    * @param jComp the component whose container to monitor
+    * @param eventTopicSubscriber the topic subscriber to register to the Container EventServer
+    * @param topics the event topic name to register for
+    */
+   public ContainerEventServiceRegistrar(JComponent jComp, EventTopicSubscriber eventTopicSubscriber, String... topics) {
+      this(jComp, null, null, null, eventTopicSubscriber, null, topics);
+   }
+
+    /**
+     * Create a registrar that will keep track of the container event service, and subscribeStrongly the veto subscriber
+     * to the topics when the ContainerEventService is available and when it changes.
+     *
+     * @param jComp the component whose container to monitor
+     * @param vetoSubscriber the veto subscriber to register to the Container EventServer
+     * @param eventClasses the classes of event to register for
+     */
+    public ContainerEventServiceRegistrar(JComponent jComp, VetoEventListener vetoSubscriber, Class... eventClasses) {
+       this(jComp, null, vetoSubscriber, eventClasses, null, null, null);
+    }
+
+    /**
+     * Create a registrar that will keep track of the container event service, and subscribeStrongly the veto subscriber
+     * to the topics when the ContainerEventService is available and when it changes.
+     *
+     * @param jComp the component whose container to monitor
+     * @param vetoTopicSubscriber the veto subscriber to register to the Container EventServer
+     * @param topics the event topic(s) to register for
+     */
+    public ContainerEventServiceRegistrar(JComponent jComp, VetoTopicEventListener vetoTopicSubscriber, String... topics) {
+       this(jComp, null, null, null, null, vetoTopicSubscriber, topics);
+    }
+
+    /**
+     * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the topics
+     * and the event classes when the ContainerEventService is available and when it changes.
+     *
+     * @param jComp the component whose container to monitor
+     * @param eventSubscriber the subscriber to register to the Container EventServer
+     * @param eventClasses the classes of event to register for
+     * @param eventTopicSubscriber the topic subscriber to keep registered to the topic(s)
+     * @param topics the event topic names to register for
+     */
+    public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, Class[] eventClasses,
+            EventTopicSubscriber eventTopicSubscriber, String[] topics) {
+        this(jComp, eventSubscriber, null, eventClasses, eventTopicSubscriber, null, topics);
+    }
+
+   /**
+    * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the topics
+    * and the event classes when the ContainerEventService is available and when it changes.
+    *
+    * @param jComp the component whose container to monitor
+    * @param eventSubscriber the subscriber to register to the Container EventServer
+    * @param vetoSubscriber a veto subscriber for the eventClasses
+    * @param eventClasses the classes of event to register for
+    * @param eventTopicSubscriber the topic subscriber to keep registered to the topic(s)
+    * @param vetoTopicSubscriber a veto subscriber for the topics
+    * @param topics the event topic names to register for
+    */
+   public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, VetoEventListener vetoSubscriber,
+           Class[] eventClasses, EventTopicSubscriber eventTopicSubscriber, VetoTopicEventListener vetoTopicSubscriber,
+           String[] topics) {
+      this.jComp = jComp;
+      this.eventSubscriber = eventSubscriber;
+      this.vetoSubscriber = vetoSubscriber;
+      this.eventClasses = eventClasses;
+      this.eventTopicSubscriber = eventTopicSubscriber;
+      this.vetoTopicSubscriber = vetoTopicSubscriber;
+      this.topics = topics;
+
+      if (jComp == null) {
+         throw new NullPointerException("JComponent is null");
+      }
+      updateContainerEventService();
+      jComp.addHierarchyListener(new HierarchyListener() {
+         public void hierarchyChanged(HierarchyEvent e) {
+            updateContainerEventService();
+         }
+      });
+      jComp.addContainerListener(new ContainerListener() {
+         public void componentAdded(ContainerEvent e) {
+            updateContainerEventService();
+         }
+
+         public void componentRemoved(ContainerEvent e) {
+            updateContainerEventService();
+         }
+      });
+      jComp.addAncestorListener(new AncestorListener() {
+         public void ancestorAdded(AncestorEvent event) {
+            updateContainerEventService();
+         }
+
+         public void ancestorMoved(AncestorEvent event) {
+             //ignore - not necessary to keep track of movement
+         }
+
+         public void ancestorRemoved(AncestorEvent event) {
+            updateContainerEventService();
+         }
+      });
+   }
+
+   /**
+    * Called by this class when the container may have changed.
+    * <p/>
+    * Override this method and call super if your class wants to be notified when the container changes (compare the
+    * references of getContainerEventService() around the calls to super.updateContainerEventService()).
+    */
+   protected void updateContainerEventService() {
+      if (containerEventService != null) {
+         if (eventClasses != null) {
+            for (int i = 0; i < eventClasses.length; i++) {
+               Class eventClass = eventClasses[i];
+               if (eventSubscriber != null) {
+                  containerEventService.unsubscribe(eventClass, eventSubscriber);
+               }
+               if (vetoSubscriber != null) {
+                  containerEventService.unsubscribeVeto(eventClass, vetoSubscriber);
+               }
+            }
+         }
+         if (topics != null) {
+            for (int i = 0; i < topics.length; i++) {
+               String topic = topics[i];
+               if (eventTopicSubscriber != null) {
+                  containerEventService.unsubscribe(topic, eventTopicSubscriber);
+               }
+               if (vetoTopicSubscriber != null) {
+                  containerEventService.unsubscribeVeto(topic, vetoTopicSubscriber);
+               }
+            }
+         }
+      }
+
+      containerEventService = ContainerEventServiceFinder.getEventService(jComp);
+      if (containerEventService != null) {
+         if (eventClasses != null) {
+            for (int i = 0; i < eventClasses.length; i++) {
+               Class eventClass = eventClasses[i];
+                if (eventSubscriber != null) {
+                    containerEventService.subscribe(eventClass, eventSubscriber);
+                }
+                if (vetoSubscriber != null) {
+                    containerEventService.subscribeVetoListener(eventClass, vetoSubscriber);
+                }
+            }
+         }
+         if (topics != null) {
+            for (int i = 0; i < topics.length; i++) {
+               String topic = topics[i];
+                if (eventTopicSubscriber != null) {
+                    containerEventService.subscribe(topic, eventTopicSubscriber);
+                }
+                if (vetoTopicSubscriber != null) {
+                    containerEventService.subscribeVetoListener(topic, vetoTopicSubscriber);
+                }
+            }
+         }
+      }
+   }
+
+   /**
+    * @return the container event service, if null, it tries to find it, but it still may be null if this object is not
+    *         in a container.
+    */
+   public EventService getContainerEventService() {
+      if (containerEventService != null) {
+         return containerEventService;
+      } else {
+         updateContainerEventService();
+         return containerEventService;
+      }
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
new file mode 100644
index 000000000..70985d749
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * A interface implemented by a Swing Container to supply an EventService local to it's child components.
+ * <p/>
+ * A Container EventService is an {@link EventService} which, unlike the {@link EventBus}, is specific to a container,
+ * in other words, it is shared only among components within a Swing Container.  The only difference between a Container
+ * EventService and any other EventService is that it's found and used by the children of a container.  The API and
+ * available implementations all work the same as any other EventService.
+ * <p/>
+ * A good candidate for a ContainerEventServiceSupplier is a Form class.  The components that the Form contains can
+ * publish objects when they they change state - for example when their values change or when they become invalid or
+ * valid.  The Form may have a model that collects the user's entries by subscribing to events published on the Form's
+ * EventService. A FormValidator may also listen to publications on the Form's EventService to subscribe to validation
+ * errors.  The Form's components don't have to know about the form, or the model or the validator.  They just publish
+ * events on their Container's EventService, which they can find by using a {@link ContainerEventServiceFinder}.
+ * <p/>
+ * This class does not ever have to be implemented or used directly.  The ContainerEventServiceFinder will create a
+ * ContainerEventService on JRootPanes by default on demand.  Hence, each dialog and Frame will have their own
+ * automatically as needed.  You only want to implement this interface when you want to limit events to subscribers
+ * in containers smaller than a JRootPane, such as a Form's JPanel.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface ContainerEventServiceSupplier {
+   public EventService getContainerEventService();
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventBus.java b/src/main/java/org/scijava/event/bushe/EventBus.java
new file mode 100644
index 000000000..846d96820
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventBus.java
@@ -0,0 +1,423 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.util.List;
+import java.util.regex.Pattern;
+import java.lang.reflect.Type;
+
+/**
+ * The EventBus provides event publication and subscription services.  It is a simple static wrapper around a
+ * global instance of an {@link EventService}, specifically a {@link SwingEventService} by default.
+ * <p/>
+ * For Swing Applications the EventBus is nearly all you need, besides some of your own Event classes (if so desired).
+ * <p/>
+ * The EventBus is really just a convenience class that provides a static wrapper around a global {@link
+ * EventService} instance.  This class exists solely for simplicity.  Calling
+ * <code>EventBus.subscribeXXX/publishXXX</code> is equivalent to
+ * <code>EventServiceLocator.getEventBusService().subscribeXXX/publishXXX</code>,
+ * it is just shorter to type.  See {@link org.scijava.event.bushe.EventServiceLocator} for details on how to customize
+ * the global EventService in place of the default SwingEventService. 
+ *
+ * @author Michael Bushe michael@bushe.com
+ * @see EventService
+ * @see SwingEventService
+ * @see ThreadSafeEventService See package JavaDoc for more information
+ */
+public class EventBus {
+
+  /**
+    * The EventBus uses a global static EventService.  This method is not necessary in usual usage, use the other static
+    * methods instead.  It is used to expose any other functionality and for framework classes (EventBusAction)
+    *
+    * @return the global static EventService
+    */
+   public static EventService getGlobalEventService() {
+      return EventServiceLocator.getEventBusService();
+   }
+
+   /** @see EventService#publish(Object) */
+   public static void publish(Object event) {
+      if (event == null) {
+         throw new IllegalArgumentException("Can't publish null.");
+      }
+      EventServiceLocator.getEventBusService().publish(event);
+   }
+
+   /** @see EventService#publish(String,Object) */
+   public static void publish(String topic, Object o) {
+      if (topic == null) {
+         throw new IllegalArgumentException("Can't publish to null topic.");
+      }
+      EventServiceLocator.getEventBusService().publish(topic, o);
+   }
+
+   /** @see EventService#publish(java.lang.reflect.Type, Object)  */
+   public static void publish(Type genericType, Object o) {
+      if (genericType == null) {
+         throw new IllegalArgumentException("Can't publish to null type.");
+      }
+      EventServiceLocator.getEventBusService().publish(genericType, o);
+   }
+
+
+   /** @see EventService#subscribe(Class,EventSubscriber) */
+   public static boolean subscribe(Class eventClass, EventSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribe(eventClass, subscriber);
+   }
+
+   /** @see EventService#subscribe(java.lang.reflect.Type, EventSubscriber)  */
+   public static boolean subscribe(Type genericType, EventSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribe(genericType, subscriber);
+   }
+
+   /** @see EventService#subscribeExactly(Class,EventSubscriber) */
+   public static boolean subscribeExactly(Class eventClass, EventSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribeExactly(eventClass, subscriber);
+   }
+
+   /** @see EventService#subscribe(String,EventTopicSubscriber) */
+   public static boolean subscribe(String topic, EventTopicSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribe(topic, subscriber);
+   }
+
+   /** @see EventService#subscribe(Pattern,EventTopicSubscriber) */
+   public static boolean subscribe(Pattern topicPattern, EventTopicSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribe(topicPattern, subscriber);
+   }
+
+   /** @see EventService#subscribeStrongly(Class,EventSubscriber) */
+   public static boolean subscribeStrongly(Class eventClass, EventSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribeStrongly(eventClass, subscriber);
+   }
+
+   /** @see EventService#subscribeExactlyStrongly(Class,EventSubscriber) */
+   public static boolean subscribeExactlyStrongly(Class eventClass, EventSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribeExactlyStrongly(eventClass, subscriber);
+   }
+
+   /** @see EventService#subscribeStrongly(String,EventTopicSubscriber) */
+   public static boolean subscribeStrongly(String topic, EventTopicSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribeStrongly(topic, subscriber);
+   }
+
+   /** @see EventService#subscribeStrongly(Pattern,EventTopicSubscriber) */
+   public static boolean subscribeStrongly(Pattern topicPattern, EventTopicSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().subscribeStrongly(topicPattern, subscriber);
+   }
+
+   /** @see EventService#unsubscribe(Class,EventSubscriber) */
+   public static boolean unsubscribe(Class eventClass, EventSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().unsubscribe(eventClass, subscriber);
+   }
+
+   /** @see EventService#unsubscribeExactly(Class,EventSubscriber) */
+   public static boolean unsubscribeExactly(Class eventClass, EventSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().unsubscribeExactly(eventClass, subscriber);
+   }
+
+   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
+   public static boolean unsubscribe(String topic, EventTopicSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().unsubscribe(topic, subscriber);
+   }
+
+   /** @see EventService#unsubscribe(Pattern,EventTopicSubscriber) */
+   public static boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber subscriber) {
+      return EventServiceLocator.getEventBusService().unsubscribe(topicPattern, subscriber);
+   }
+
+   /**
+    * For usage with annotations.
+    *
+    * @see EventService#unsubscribe(Class,Object)
+    */
+   public static boolean unsubscribe(Class eventClass, Object object) {
+      return EventServiceLocator.getEventBusService().unsubscribe(eventClass, object);
+   }
+
+   /**
+    * For usage with annotations.
+    *
+    * @see EventService#unsubscribeExactly(Class,Object)
+    */
+   public static boolean unsubscribeExactly(Class eventClass, Object subscriber) {
+      return EventServiceLocator.getEventBusService().unsubscribeExactly(eventClass, subscriber);
+   }
+
+   /**
+    * For usage with annotations.
+    *
+    * @see EventService#unsubscribe(String,Object)
+    */
+   public static boolean unsubscribe(String topic, Object subscriber) {
+      return EventServiceLocator.getEventBusService().unsubscribe(topic, subscriber);
+   }
+
+   /**
+    * For usage with annotations.
+    *
+    * @see EventService#unsubscribe(Pattern,Object)
+    */
+   public static boolean unsubscribe(Pattern topicPattern, Object subscriber) {
+      return EventServiceLocator.getEventBusService().unsubscribe(topicPattern, subscriber);
+   }
+
+   /** @see EventService#subscribeVetoListener(Class,VetoEventListener) */
+   public static boolean subscribeVetoListener(Class eventClass, VetoEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListener(eventClass, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListener(Class,VetoEventListener) */
+   public static boolean subscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListenerExactly(eventClass, vetoListener);
+   }
+
+
+   /** @see EventService#subscribeVetoListener(String,VetoTopicEventListener) */
+   public static boolean subscribeVetoListener(String topic, VetoTopicEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListener(topic, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListener(Pattern,VetoTopicEventListener) */
+   public static boolean subscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListener(topicPattern, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListenerStrongly(Class,VetoEventListener) */
+   public static boolean subscribeVetoListenerStrongly(Class eventClass, VetoEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListenerStrongly(eventClass, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListenerExactlyStrongly(Class,VetoEventListener) */
+   public static boolean subscribeVetoListenerExactlyStrongly(Class eventClass, VetoEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListenerExactlyStrongly(eventClass, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListenerStrongly(String,VetoTopicEventListener) */
+   public static boolean subscribeVetoListenerStrongly(String topic, VetoTopicEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListenerStrongly(topic, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListener(String,VetoTopicEventListener) */
+   public static boolean subscribeVetoListenerStrongly(Pattern topicPattern, VetoTopicEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().subscribeVetoListenerStrongly(topicPattern, vetoListener);
+   }
+
+   /** @see EventService#unsubscribeVetoListener(Class,VetoEventListener) */
+   public static boolean unsubscribeVetoListener(Class eventClass, VetoEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().unsubscribeVetoListener(eventClass, vetoListener);
+   }
+
+   /** @see EventService#unsubscribeVetoListenerExactly(Class,VetoEventListener) */
+   public static boolean unsubscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().unsubscribeVetoListenerExactly(eventClass, vetoListener);
+   }
+
+   /** @see EventService#unsubscribeVetoListener(String,VetoTopicEventListener) */
+   public static boolean unsubscribeVetoListener(String topic, VetoTopicEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().unsubscribeVetoListener(topic, vetoListener);
+   }
+
+   /** @see EventService#unsubscribeVetoListener(Pattern,VetoTopicEventListener) */
+   public static boolean unsubscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener) {
+      return EventServiceLocator.getEventBusService().unsubscribeVetoListener(topicPattern, vetoListener);
+   }
+
+   /** @see EventService#getSubscribers(Class) */
+   public static <T> List<T> getSubscribers(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getSubscribers(eventClass);
+   }   
+
+   /** @see EventService#getSubscribersToClass(Class) */
+   public static <T> List<T> getSubscribersToClass(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getSubscribersToClass(eventClass);
+   }
+
+   /** @see EventService#getSubscribersToExactClass(Class) */
+   public static <T> List<T> getSubscribersToExactClass(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getSubscribersToExactClass(eventClass);
+   }
+
+   /** @see EventService#getSubscribers(Type) */
+   public static <T> List<T> getSubscribers(Type type) {
+      return EventServiceLocator.getEventBusService().getSubscribers(type);
+   }
+
+   /** @see EventService#getSubscribers(String) */
+   public static <T> List<T> getSubscribers(String topic) {
+      return EventServiceLocator.getEventBusService().getSubscribers(topic);
+   }
+
+   /** @see EventService#getSubscribersToTopic(String) */
+   public static <T> List<T> getSubscribersToTopic(String topic) {
+      return EventServiceLocator.getEventBusService().getSubscribersToTopic(topic);
+   }
+
+   /** @see EventService#getSubscribers(Pattern) */
+   public static <T> List<T> getSubscribers(Pattern pattern) {
+      return EventServiceLocator.getEventBusService().getSubscribers(pattern);
+   }
+
+   /** @see EventService#getSubscribersByPattern(String) */
+   public static <T> List<T> getSubscribersByPattern(String topic) {
+      return EventServiceLocator.getEventBusService().getSubscribersByPattern(topic);
+   }
+
+   /** @see EventService#getSubscribers(Class) */
+   public static <T> List<T> getVetoSubscribers(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getVetoSubscribers(eventClass);
+   }
+
+   /** @see EventService#getVetoSubscribersToClass(Class) */
+   public static <T> List<T> getVetoSubscribersToClass(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getVetoSubscribersToClass(eventClass);
+   }
+
+   /** @see EventService#getVetoSubscribersToExactClass(Class) */
+   public static <T> List<T> getVetoSubscribersToExactClass(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getVetoSubscribersToExactClass(eventClass);
+   }
+
+   /** @see EventService#getVetoSubscribers(Class)
+    *  @deprecated use getVetoSubscribersToTopic instead for direct replacement,
+    *             or use getVetoEventListeners to get topic and pattern matchers.
+    *             In EventBus 2.0 this name will replace getVetoEventListeners()
+    *             and have it's union functionality
+    */
+   public static <T> List<T> getVetoSubscribers(String topic) {
+      return EventServiceLocator.getEventBusService().getVetoSubscribers(topic);
+   }
+
+   /** @see EventService#getVetoEventListeners(String) */
+   public static <T> List<T> getVetoEventListeners(String topic) {
+      return EventServiceLocator.getEventBusService().getVetoEventListeners(topic);
+   }
+
+   /** @see EventService#getVetoSubscribers(Pattern) */
+   public static <T> List<T> getVetoSubscribers(Pattern pattern) {
+      return EventServiceLocator.getEventBusService().getVetoSubscribers(pattern);
+   }
+
+   /** @see EventService#getVetoSubscribersToTopic(String) */
+   public static <T> List<T> getVetoSubscribersToTopic(String topic) {
+      return EventServiceLocator.getEventBusService().getVetoSubscribersToTopic(topic);
+   }
+
+   /** @see EventService#getVetoSubscribersByPattern(String) */
+   public static <T> List<T> getVetoSubscribersByPattern(String topic) {
+      return EventServiceLocator.getEventBusService().getVetoSubscribersByPattern(topic);
+   }
+
+   /** @see EventService#unsubscribeVeto(Class, Object) */
+   public static boolean unsubscribeVeto(Class eventClass, Object subscribedByProxy) {
+      return EventServiceLocator.getEventBusService().unsubscribeVeto(eventClass, subscribedByProxy);
+   }
+
+   /** @see EventService#unsubscribeVetoExactly(Class, Object) */
+   public static boolean unsubscribeVetoExactly(Class eventClass, Object subscribedByProxy) {
+      return EventServiceLocator.getEventBusService().unsubscribeVetoExactly(eventClass, subscribedByProxy);
+   }
+
+   /** @see EventService#unsubscribeVeto(String, Object) */
+   public static boolean unsubscribeVeto(String topic, Object subscribedByProxy) {
+      return EventServiceLocator.getEventBusService().unsubscribeVeto(topic, subscribedByProxy);
+   }
+
+   /** @see EventService#unsubscribeVeto(Pattern, Object) */
+   public static boolean unsubscribeVeto(Pattern pattern, Object subscribedByProxy) {
+      return EventServiceLocator.getEventBusService().unsubscribeVeto(pattern, subscribedByProxy);
+   }
+
+   /** @see EventService#clearAllSubscribers() */
+   public static void clearAllSubscribers() {
+      EventServiceLocator.getEventBusService().clearAllSubscribers();
+   }
+
+   /** @see EventService#setDefaultCacheSizePerClassOrTopic(int) */
+   public static void setDefaultCacheSizePerClassOrTopic(int defaultCacheSizePerClassOrTopic) {
+      EventServiceLocator.getEventBusService().setDefaultCacheSizePerClassOrTopic(defaultCacheSizePerClassOrTopic);
+   }
+
+   /** @see org.scijava.event.bushe.EventService#getDefaultCacheSizePerClassOrTopic() */
+   public static int getDefaultCacheSizePerClassOrTopic() {
+      return EventServiceLocator.getEventBusService().getDefaultCacheSizePerClassOrTopic();
+   }
+
+   /** @see EventService#setCacheSizeForEventClass(Class,int) */
+   public static void setCacheSizeForEventClass(Class eventClass, int cacheSize) {
+      EventServiceLocator.getEventBusService().setCacheSizeForEventClass(eventClass, cacheSize);
+   }
+
+   /** @see EventService#getCacheSizeForEventClass(Class) */
+   public static int getCacheSizeForEventClass(Class eventClass) {
+      return EventServiceLocator.getEventBusService().getCacheSizeForEventClass(eventClass);
+   }
+
+   /** @see EventService#setCacheSizeForTopic(String,int) */
+   public static void setCacheSizeForTopic(String topicName, int cacheSize) {
+      EventServiceLocator.getEventBusService().setCacheSizeForTopic(topicName, cacheSize);
+   }
+
+   /** @see EventService#setCacheSizeForTopic(java.util.regex.Pattern,int) */
+   public static void setCacheSizeForTopic(Pattern pattern, int cacheSize) {
+      EventServiceLocator.getEventBusService().setCacheSizeForTopic(pattern, cacheSize);
+   }
+
+   /** @see EventService#getCacheSizeForTopic(String) */
+   public static int getCacheSizeForTopic(String topic) {
+      return EventServiceLocator.getEventBusService().getCacheSizeForTopic(topic);
+   }
+
+   /** @see EventService#getLastEvent(Class) */
+   public static <T> T getLastEvent(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getLastEvent(eventClass);
+   }
+
+   /** @see EventService#getCachedEvents(Class) */
+   public static <T> List<T> getCachedEvents(Class<T> eventClass) {
+      return EventServiceLocator.getEventBusService().getCachedEvents(eventClass);
+   }
+
+   /** @see EventService#getLastTopicData(String) */
+   public static Object getLastTopicData(String topic) {
+      return EventServiceLocator.getEventBusService().getLastTopicData(topic);
+   }
+
+   /** @see EventService#getCachedTopicData(String) */
+   public static List getCachedTopicData(String topic) {
+      return EventServiceLocator.getEventBusService().getCachedTopicData(topic);
+   }
+
+   /** @see EventService#clearCache(Class) */
+   public static void clearCache(Class eventClass) {
+      EventServiceLocator.getEventBusService().clearCache(eventClass);
+   }
+
+   /** @see EventService#clearCache(String) */
+   public static void clearCache(String topic) {
+      EventServiceLocator.getEventBusService().clearCache(topic);
+   }
+
+   /** @see EventService#clearCache(java.util.regex.Pattern) */
+   public static void clearCache(Pattern pattern) {
+      EventServiceLocator.getEventBusService().clearCache(pattern);
+   }
+
+   /** @see org.scijava.event.bushe.EventService#clearCache() */
+   public static void clearCache() {
+      EventServiceLocator.getEventBusService().clearCache();
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventBusAction.java b/src/main/java/org/scijava/event/bushe/EventBusAction.java
new file mode 100644
index 000000000..a320bde9a
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventBusAction.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.awt.event.ActionEvent;
+import javax.swing.ImageIcon;
+
+/**
+ * When fired, this action publishes events on the EventBus.
+ * <p/>
+ *
+ * @author Michael Bushe michael@bushe.com
+ * @see EventServiceAction
+ */
+public class EventBusAction extends EventServiceAction {
+   public EventBusAction() {
+      this(null, null);
+   }
+
+   public EventBusAction(String actionName, ImageIcon icon) {
+      super(actionName, icon);
+   }
+
+   protected EventService getEventService(ActionEvent event) {
+      return EventBus.getGlobalEventService();
+   }
+}
+
diff --git a/src/main/java/org/scijava/event/bushe/EventService.java b/src/main/java/org/scijava/event/bushe/EventService.java
new file mode 100644
index 000000000..8bbc69fa3
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventService.java
@@ -0,0 +1,932 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.util.List;
+import java.util.regex.Pattern;
+import java.lang.reflect.Type;
+
+/**
+ * The core interface.  An EventService provides publish/subscribe services to a single JVM using Class-based and
+ * String-based (i.e. "topic") publications and subscriptions.
+ * <p/>
+ * In class-based pub/sub, {@link EventSubscriber}s subscribe to a type on an {@link EventService}, such
+ * as the {@link org.scijava.event.bushe.EventBus}, by providing a class, interface or generic type.  The EventService
+ * notifies subscribers when objects are published on the EventService with a matching type.  Full class semantics are
+ * respected.  That is, if a subscriber subscribes to a class, the subscriber is notified if an object of
+ * that class is publish or if an object of a subclass of that class is published. Likewise if a subscriber subscribes
+ * to an interface, it will be notified if any object that implements that interface is published.  Subscribers can
+ * subscribe "exactly" using  {@link #subscribeExactly(Class, EventSubscriber)} so that they are notified only if an
+ * object of the exact class is published (and will not be notified if subclasses are published, since this would not
+ * be "exact")
+ * <p/>
+ * In topic-based pub/sub, an object "payload" is published on a topic name (String).  {@link EventTopicSubscriber}s subscribe
+ * to either the exact name of the topic or they may subscribe using a Regular Expression that is used to match topic
+ * names.
+ * <p/>
+ * See the <a href="../../../../overview-summary.html#overview_description">overview</a> for an general introduction
+ * and <a href="package-summary.html">package documentation</a> for usage details and examples.
+ * <p/>
+ * A single subscriber cannot subscribe more than once to an event or topic name.  EventService implementations should
+ * handle double-subscription requests by returning false on subscribe().  A single EventSubscriber can subscribe to more
+ * than one event class, and a single EventTopicSubscriber can subscribe to more than one topic name or pattern. A
+ * single object may implement both EventSubscriber and EventTopicSubscriber interfaces.  Subscribers are guaranteed to
+ * only be called for the classes and/or topic names they subscribe to.  If a subscriber subscribes to a topic and to a
+ * regular expression that matches the topic name, this is considered two different subscriptions and the subscriber
+ * will be called twice for the publication on the topic.  Similarly, if a subscriber subscribes to a class and its
+ * subclasses using subscribe() and again to a class of the same type using subscribeExactly(), this is considered two
+ * different subscriptions and the subscriber will be called twice for the publication for a single event of the exact
+ * type.
+ * <p/>
+ * By default the EventService only holds WeakReferences to subscribers.  If a subscriber has no references to it, then
+ * it can be garbage collected.  This avoids memory leaks in exchange for the risk of accidentally adding a listener and
+ * have it disappear unexpectedly.  If you want to subscribe a subscriber that will have no other reference to it, then
+ * use one of the subscribeStrongly() methods, which will prevent garbage collection.
+ * <p/>
+ * Unless garbage collected, EventSubscribers will remain subscribed until they are passed to one of the unsubscribe()
+ * methods with the event class or topic name to which there are subscribed.
+ * <p/>
+ * Subscribers are called in the order in which they are subscribed by default (FIFO), unless subscribers implement
+ * {@link Prioritized}.  Those subscribers that implement Prioritized and return a negative priority are moved to the
+ * front of the list (the more negative, the more to the front).  Those subscribers that implement Prioritized and return
+ * a positive priority are moved to the end of the list (the more positive, the more to the back).  The FIFO guarantee
+ * is only valid for the same subscribe() call.  That is, the order of two subscribers, one to List.class and the other
+ * to ArrayList.class is not guaranteed to be in the order of subscription when an ArrayList is published.  The same is
+ * true for topic subscribers when using RegEx expressions - when "Foo" is published, the order of subscribers that are
+ * subscribed to "Foo", "Fo*" and "F*" are not guaranteed, though the second "Fo*" subscriber will never be called
+ * before the first "Fo*" subscriber (ditto List and ArrayList). Prioritized subscribers are always guaranteed to be in
+ * the order of priority, no matter the call or the resulting mix of subscribers.  All ordering rules apply to all
+ * types subscribers: class, topic, pattern, veto, etc.  For Swing users, note that FIFO is
+ * the opposite of Swing, where event listeners are called in the reverse order of when they were subscribed (FILO).    
+ * <p/>
+ * Publication on a class or topic name can be vetoed by a {@link VetoEventListener}. All VetoEventListeners are checked
+ * before any EventSubscribers or EventTopicSubscribers are called. This is unlike the JavaBean's
+ * VetoPropertyEventListener which can leave side effects and half-propogated events. VetoEventListeners are subscribed
+ * in the same manner as EventSubscribers and EventTopicSubscribers.
+ * <p/>
+ * The state of a published event can be tracked if an event or a topic's payload object implements the
+ * {@link org.scijava.event.bushe.PublicationStatus} interface.  EventServices are required to set such objects'
+ * {@link org.scijava.event.bushe.PublicationStatus} at the appropriate times during publication.
+ * <p/>
+ * This simple example prints "Hello World"
+ * <pre>
+ * EventService eventService = new ThreadSafeEventService();
+ * //Create a subscriber
+ * EventTopicSubscriber subscriber = new EventTopicSubscriber() {
+ *    public void onEvent(String topic, Object event) {
+ *        System.out.println(topic+" "+event);
+ *    }
+ * });
+ * eventService.subscribe("Hello", subscriber);
+ * eventService.publish("Hello", "World");
+ * System.out.println(subscriber + " Since the reference is used after it is subscribed, it doesn't get garbage collected, this is not necessary if you use subscribeStrongly()");
+ * </pre>
+ * <p/>
+ * Events and/or topic data can be cached, but are not by default.  To cache events or topic data, call
+ * {@link #setDefaultCacheSizePerClassOrTopic(int)}, {@link #setCacheSizeForEventClass(Class, int)}, or
+ * {@link #setCacheSizeForTopic(String, int)}, {@link #setCacheSizeForTopic(Pattern, int)}.  Retrieve cached values
+ * with {@link #getLastEvent(Class)}, {@link #getLastTopicData(String)}, {@link #getCachedEvents(Class)}, or
+ * {@link #getCachedTopicData(String)}.  Using caching while subscribing is most likely to make sense only if you
+ * subscribe and publish on the same thread (so caching is very useful for Swing applications since both happen on
+ * the EDT in a single-threaded manner). In multithreaded applications, you never know if your subscriber has handled
+ * an event while it was being subscribed (before the subscribe() method returned) that is newer or older than the
+ * retrieved cached value (taken before or after subscribe() respectively).
+ * <p/>
+ * There is nothing special about the term "Event," this could just as easily be called a "Message" Service, this term
+ * is already taken by the JMS, which is similar, but is used across processes and networks.
+ *
+ * @author Michael Bushe michael@bushe.com
+ * @see {@link ThreadSafeEventService} for the default implementation
+ * @see {@link SwingEventService} for the Swing-safe implementation
+ * @see {@link EventBus} for simple access to the Swing-safe implementation
+ * @see {@link org.scijava.event.bushe.annotation.EventSubscriber} for subscription annotations
+ * @see {@link org.scijava.event.bushe.annotation.EventTopicSubscriber} for subscription annotations
+ */
+public interface EventService {
+
+   /**
+    * Publishes an object so that subscribers will be notified if they subscribed to the object's class, one of its
+    * subclasses, or to one of the interfaces it implements.
+    *
+    * @param event the object to publish
+    */
+   public void publish(Object event);
+
+   /**
+    * Use this method to publish generified objects to subscribers of Types, i.e. subscribers that use
+    * {@link #subscribe(Type, EventSubscriber)}, and to publish to subscribers of the non-generic type.
+    * <p>
+    * Due to generic type erasure, the type must be supplied by the caller.  You can get a declared object's
+    * type by using the {@link org.scijava.event.bushe.generics.TypeReference} class.  For Example:
+    * <pre>
+    * TypeReference&#60;List&#60;Trade&#62;&#62; subscribingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
+    * EventBus.subscribe(subscribingTypeReference.getType(), mySubscriber);
+    * EventBus.subscribe(List.class, thisSubscriberWillGetCalledToo);
+    * ...
+    * //Likely in some other class
+    * TypeReference&#60;List&#60;Trade&#62;&#62; publishingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
+    * List&#60;Trade&#62; trades = new ArrayList&#60;Trade&#62;();
+    * EventBus.publish(publishingTypeReference.getType(), trades);
+    * trades.add(trade);
+    * EventBus.publish(publishingTypeReference.getType(), trades);
+    * </pre>
+    * <p>
+    * @param genericType the generified type of the published object.  
+    * @param event The event that occurred
+    */
+   public void publish(Type genericType, Object event);
+
+   /**
+    * Publishes an object on a topic name so that all subscribers to that name or a Regular Expression that matches
+    * the topic name will be notified.
+    *
+    * @param topic The name of the topic subscribed to
+    * @param o the object to publish
+    */
+   public void publish(String topic, Object o);
+
+   /**
+    * Subscribes an EventSubscriber to the publication of objects matching a type.  Only a <b>WeakReference</b> to
+    * the subscriber is held by the EventService.
+    * <p/>
+    * Subscribing to a class means the subscriber will be called when objects of that class are published, when
+    * objects of subclasses of the class are published, when objects implementing any of the interfaces of the
+    * class are published, or when generic types are published with the class' raw type.
+    * <p/>
+    * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
+    * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
+    * the subscriber has not been garbage collected, then onEvent(Object) will be called normally.  If the hard
+    * reference has been garbage collected, the service will unsubscribe it's WeakReference.
+    * <p/>
+    * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
+    * immediately.
+    * <p/>
+    * The service will create the WeakReference on behalf of the caller.
+    *
+    * @param eventClass the class of published objects to subscriber listen to
+    * @param subscriber The subscriber that will accept the events of the event class when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribe(Class eventClass, EventSubscriber subscriber);
+
+  /** 
+   * Subscribe an EventSubscriber to publication of generic Types.
+   * Subscribers will only be notified for publications using  {@link #publish(java.lang.reflect.Type, Object)}.
+   * <p>
+   * Due to generic type erasure, the type must be supplied by the publisher.  You can get a declared object's
+   * type by using the {@link org.scijava.event.bushe.generics.TypeReference} class.  For Example:
+   * <pre>
+   * TypeReference&#60;List&#60;Trade&#62;&#62; subscribingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
+   * EventBus.subscribe(subscribingTypeReference.getType(), mySubscriber);
+   * EventBus.subscribe(List.class, thisSubscriberWillGetCalledToo);
+   * ...
+   * //Likely in some other class
+   * TypeReference&#60;List&#60;Trade&#62;&#62; publishingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
+   * List&#60;Trade&#62; trades = new ArrayList&#60;Trade&#62;();
+   * EventBus.publish(publishingTypeReference.getType(), trades);
+   * trades.add(trade);
+   * EventBus.publish(publishingTypeReference.getType(), trades);
+   * </pre>
+   * <p>
+   * @param type the generic type to subscribe to
+   * @param subscriber the subscriber to the type
+   * @return true if a new subscription is made, false if it already existed
+   */
+   public boolean subscribe(Type type, EventSubscriber subscriber);
+
+   /**
+    * Subscribes an EventSubscriber to the publication of objects exactly matching a type.  Only a <b>WeakReference</b>
+    * to the subscriber is held by the EventService.
+    * <p/>
+    * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
+    * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
+    * the subscriber has not been garbage collected, then the onEvent will be called normally.  If the hard reference
+    * has been garbage collected, the service will unsubscribe it's WeakReference.
+    * <p/>
+    * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
+    * immediately.
+    * <p/>
+    * The service will create the WeakReference on behalf of the caller.
+    *
+    * @param eventClass the class of published objects to listen to
+    * @param subscriber The subscriber that will accept the events when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribeExactly(Class eventClass, EventSubscriber subscriber);
+
+   /**
+    * Subscribes an EventTopicSubscriber to the publication of a topic name.  Only a <b>WeakReference</b>
+    * to the subscriber is held by the EventService.
+    * <p/>
+    * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
+    * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
+    * the subscriber has not been garbage collected, then the onEvent will be called normally.  If the hard reference
+    * has been garbage collected, the service will unsubscribe it's WeakReference.
+    * <p/>
+    * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
+    * immediately.
+    * <p/>
+    *
+    * @param topic the name of the topic listened to
+    * @param subscriber The topic subscriber that will accept the events when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribe(String topic, EventTopicSubscriber subscriber);
+
+   /**
+    * Subscribes an EventSubscriber to the publication of all the topic names that match a RegEx Pattern.  Only a
+    * <b>WeakReference</b> to the subscriber is held by the EventService.
+    * <p/>
+    * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
+    * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
+    * the subscriber has not been garbage collected, then the onEvent will be called normally.  If the hard reference
+    * has been garbage collected, the service will unsubscribe it's WeakReference.
+    * <p/>
+    * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
+    * immediately.
+    * <p/>
+    *
+    * @param topicPattern pattern that matches to the name of the topic published to
+    * @param subscriber The topic subscriber that will accept the events when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribe(Pattern topicPattern, EventTopicSubscriber subscriber);
+
+   /**
+    * Subscribes an EventSubscriber to the publication of objects matching a type.
+    * <p/>
+    * The semantics are the same as {@link #subscribe(Class, EventSubscriber)}, except that the EventService holds
+    * a regularly reference, not a WeakReference.
+    * <p/>
+    * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
+    *
+    * @param eventClass the class of published objects to listen to
+    * @param subscriber The subscriber that will accept the events when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribeStrongly(Class eventClass, EventSubscriber subscriber);
+
+   /**
+    * Subscribes an EventSubscriber to the publication of objects matching a type exactly.
+    * <p/>
+    * The semantics are the same as {@link #subscribeExactly(Class, EventSubscriber)}, except that the EventService
+    * holds a regularly reference, not a WeakReference.
+    * <p/>
+    * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
+    *
+    * @param eventClass the class of published objects to listen to
+    * @param subscriber The subscriber that will accept the events when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribeExactlyStrongly(Class eventClass, EventSubscriber subscriber);
+
+   /**
+    * Subscribes a subscriber to an event topic name.
+    * <p/>
+    * The semantics are the same as {@link #subscribe(String, EventTopicSubscriber)}, except that the EventService
+    * holds a regularly reference, not a WeakReference.
+    * <p/>
+    * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
+    *
+    * @param topic the name of the topic listened to
+    * @param subscriber The topic subscriber that will accept the events when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribeStrongly(String topic, EventTopicSubscriber subscriber);
+
+   /**
+    * Subscribes a subscriber to all the event topic names that match a RegEx expression.
+    * <p/>
+    * The semantics are the same as {@link #subscribe(java.util.regex.Pattern, EventTopicSubscriber)}, except that the
+    * EventService holds a regularly reference, not a WeakReference.
+    * <p/>
+    * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
+    *
+    * @param topicPattern the name of the topic listened to
+    * @param subscriber The topic subscriber that will accept the events when published.
+    *
+    * @return true if the subscriber was subscribed successfully, false otherwise
+    */
+   public boolean subscribeStrongly(Pattern topicPattern, EventTopicSubscriber subscriber);
+
+   /**
+    * Stop the subscription for a subscriber that is subscribed to a class.
+    *
+    * @param eventClass the class of published objects to listen to
+    * @param subscriber The subscriber that is subscribed to the event.  The same reference as the one subscribed.
+    *
+    * @return true if the subscriber was subscribed to the event, false if it wasn't
+    */
+   public boolean unsubscribe(Class eventClass, EventSubscriber subscriber);
+
+   /**
+    * Stop the subscription for a subscriber that is subscribed to an exact class.
+    *
+    * @param eventClass the class of published objects to listen to
+    * @param subscriber The subscriber that is subscribed to the event.  The same reference as the one subscribed.
+    *
+    * @return true if the subscriber was subscribed to the event, false if it wasn't
+    */
+   public boolean unsubscribeExactly(Class eventClass, EventSubscriber subscriber);
+
+   /**
+    * Stop the subscription for a subscriber that is subscribed to an event topic.
+    *
+    * @param topic the topic listened to
+    * @param subscriber The subscriber that is subscribed to the topic. The same reference as the one subscribed.
+    *
+    * @return true if the subscriber was subscribed to the event, false if it wasn't
+    */
+   public boolean unsubscribe(String topic, EventTopicSubscriber subscriber);
+
+   /**
+    * Stop the subscription for a subscriber that is subscribed to event topics via a Pattern.
+    *
+    * @param topicPattern the regex expression matching topics listened to
+    * @param subscriber The subscriber that is subscribed to the topic. The same reference as the one subscribed.
+    *
+    * @return true if the subscriber was subscribed to the event, false if it wasn't
+    */
+   public boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber subscriber);
+
+   /**
+    * Subscribes a VetoEventListener to publication of event matching a class.  Only a <b>WeakReference</b> to the 
+    * VetoEventListener is held by the EventService.
+    * <p/>
+    * Use this method to avoid having to call unsubscribe(), though with care since garbage collection semantics is
+    * indeterminate.  The service will respect the WeakReference semantics.  In other words, if the vetoListener has not
+    * been garbage collected, then the onEvent will be called normally.  If the hard reference has been garbage
+    * collected, the service will unsubscribe it's WeakReference.
+    * <p/>
+    * It's allowable to call unsubscribe() with the same VetoEventListener hard reference to stop a subscription
+    * immediately.
+    * <p/>
+    * The service will create the WeakReference on behalf of the caller.
+    *
+    * @param eventClass the class of published objects that can be vetoed
+    * @param vetoListener The VetoEventListener that can determine whether an event is published.
+    *
+    * @return true if the VetoEventListener was subscribed successfully, false otherwise
+    */
+   public boolean subscribeVetoListener(Class eventClass, VetoEventListener vetoListener);
+
+   /**
+    * Subscribes a VetoEventListener to publication of an exact event class.  Only a <b>WeakReference</b> to the 
+    * VetoEventListener is held by the EventService.
+    * <p/>
+    * Use this method to avoid having to call unsubscribe(), though with care since garbage collection semantics is
+    * indeterminate.  The service will respect the WeakReference semantics.  In other words, if the vetoListener has not
+    * been garbage collected, then the onEvent will be called normally.  If the hard reference has been garbage
+    * collected, the service will unsubscribe it's WeakReference.
+    * <p/>
+    * It's allowable to call unsubscribe() with the same VetoEventListener hard reference to stop a subscription
+    * immediately.
+    * <p/>
+    * The service will create the WeakReference on behalf of the caller.
+    *
+    * @param eventClass the class of published objects that can be vetoed
+    * @param vetoListener The vetoListener that can determine whether an event is published.
+    *
+    * @return true if the vetoListener was subscribed successfully, false otherwise
+    */
+   public boolean subscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener);
+
+   /**
+    * Subscribes a VetoTopicEventListener to a topic name.  Only a <b>WeakReference</b> to the
+    * VetoEventListener is held by the EventService.
+    *
+    * @param topic the name of the topic listened to
+    * @param vetoListener The vetoListener that can determine whether an event is published.
+    *
+    * @return true if the vetoListener was subscribed successfully, false otherwise
+    */
+   public boolean subscribeVetoListener(String topic, VetoTopicEventListener vetoListener);
+
+   /**
+    * Subscribes an VetoTopicEventListener to all the topic names that match the RegEx Pattern.  Only a
+    * <b>WeakReference</b> to the VetoEventListener is held by the EventService.  
+    *
+    * @param topicPattern the RegEx pattern to match topics with
+    * @param vetoListener The vetoListener that can determine whether an event is published.
+    *
+    * @return true if the vetoListener was subscribed successfully, false otherwise
+    */
+   public boolean subscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener);
+
+   /**
+    * Subscribes a VetoEventListener for an event class and its subclasses.  Only a <b>WeakReference</b> to the
+    * VetoEventListener is held by the EventService.
+    * <p/>
+    * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(Class,VetoEventListener)} is
+    * called.
+    *
+    * @param eventClass the class of published objects to listen to
+    * @param vetoListener The vetoListener that will accept the events when published.
+    *
+    * @return true if the vetoListener was subscribed successfully, false otherwise
+    */
+   public boolean subscribeVetoListenerStrongly(Class eventClass, VetoEventListener vetoListener);
+
+   /**
+    * Subscribes a VetoEventListener for an event class (but not its subclasses).
+    * <p/>
+    * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(Class,VetoEventListener)} is
+    * called.
+    *
+    * @param eventClass the class of published objects to listen to
+    * @param vetoListener The vetoListener that will accept the events when published.
+    *
+    * @return true if the vetoListener was subscribed successfully, false otherwise
+    */
+   public boolean subscribeVetoListenerExactlyStrongly(Class eventClass, VetoEventListener vetoListener);
+
+   /**
+    * Subscribes a VetoEventListener to a topic name.
+    * <p/>
+    * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(String,VetoTopicEventListener)} is
+    * called.
+    *
+    * @param topic the name of the topic listened to
+    * @param vetoListener The topic vetoListener that will accept or reject publication.
+    *
+    * @return true if the vetoListener was subscribed successfully, false otherwise
+    *
+    * @see #subscribeVetoListenerStrongly(Class,VetoEventListener)
+    */
+   public boolean subscribeVetoListenerStrongly(String topic, VetoTopicEventListener vetoListener);
+
+   /**
+    * Subscribes a VetoTopicEventListener to a set of topics that match a RegEx expression.
+    * <p/>
+    * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(Pattern,VetoTopicEventListener)} is
+    * called.
+    *
+    * @param topicPattern the RegEx pattern that matches the name of the topics listened to
+    * @param vetoListener The topic vetoListener that will accept or reject publication.
+    *
+    * @return true if the vetoListener was subscribed successfully, false otherwise
+    *
+    * @see #subscribeVetoListenerStrongly(Pattern,VetoTopicEventListener)
+    */
+   public boolean subscribeVetoListenerStrongly(Pattern topicPattern, VetoTopicEventListener vetoListener);
+
+   /**
+    * Stop the subscription for a vetoListener that is subscribed to an event class and its subclasses.
+    *
+    * @param eventClass the class of published objects that can be vetoed
+    * @param vetoListener The vetoListener that will accept or reject publication of an event.
+    *
+    * @return true if the vetoListener was subscribed to the event, false if it wasn't
+    */
+   public boolean unsubscribeVetoListener(Class eventClass, VetoEventListener vetoListener);
+
+   /**
+    * Stop the subscription for a vetoListener that is subscribed to an event class (but not its subclasses).
+    *
+    * @param eventClass the class of published objects that can be vetoed
+    * @param vetoListener The vetoListener that will accept or reject publication of an event.
+    *
+    * @return true if the vetoListener was subscribed to the event, false if it wasn't
+    */
+   public boolean unsubscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener);
+
+   /**
+    * Stop the subscription for a VetoTopicEventListener that is subscribed to an event topic name.
+    *
+    * @param topic the name of the topic that is listened to
+    * @param vetoListener The vetoListener that can determine whether an event is published on that topic
+    *
+    * @return true if the vetoListener was subscribed to the topic, false if it wasn't
+    */
+   public boolean unsubscribeVetoListener(String topic, VetoTopicEventListener vetoListener);
+
+   /**
+    * Stop the subscription for a VetoTopicEventListener that is subscribed to an event topic RegEx pattern.
+    *
+    * @param topicPattern the RegEx pattern matching the name of the topics listened to
+    * @param vetoListener The vetoListener that can determine whether an event is published on that topic
+    *
+    * @return true if the vetoListener was subscribed to the topicPattern, false if it wasn't
+    */
+   public boolean unsubscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener);
+
+   /**
+    * Union of getSubscribersToClass(Class) and getSubscribersToExactClass(Class)
+    *
+    * @param eventClass the eventClass of interest
+    *
+    * @return the subscribers that will be called when an event of eventClass is published, this includes those
+    *         subscribed that match by exact class and those that match to a class and its supertypes
+    */
+   public <T> List<T> getSubscribers(Class<T> eventClass);
+
+   /**
+    * Gets subscribers that subscribed with the given a class, but not those subscribed exactly to the class.
+    * @param eventClass the eventClass of interest
+    *
+    * @return the subscribers that are subscribed to match to a class and its supertypes, but not those subscribed by
+    *         exact class
+    */
+   public <T> List<T> getSubscribersToClass(Class<T> eventClass);
+
+   /**
+    * Gets subscribers that are subscribed exactly to a class, but not those subscribed non-exactly to a class.
+    * @param eventClass the eventClass of interest
+    *
+    * @return the subscribers that are subscribed by exact class but not those subscribed to match to a class and its
+    *         supertypes
+    */
+   public <T> List<T> getSubscribersToExactClass(Class<T> eventClass);
+
+   /**
+    * Gets the subscribers that subscribed to a generic type.
+    *
+    * @param type the type of interest
+    *
+    * @return the subscribers that will be called when an event of eventClass is published, this includes those
+    *         subscribed that match by exact class and those that match to a class and its supertypes
+    */
+   public <T> List<T> getSubscribers(Type type);
+
+   /**
+    * Union of getSubscribersByPattern(String) and geSubscribersToTopic(String)
+    *
+    * @param topic the topic of interest
+    *
+    * @return the subscribers that will be called when an event is published on the topic.  This includes subscribers
+    *         subscribed to match the exact topic name and those subscribed by a RegEx Pattern that matches the topic
+    *         name.
+    */
+   public <T> List<T> getSubscribers(String topic);
+
+   /**
+    * Get the subscribers that subscribed to a topic.
+    * @param topic the topic of interest
+    *
+    * @return the subscribers that subscribed to the exact topic name.
+    */
+   public <T> List<T>  getSubscribersToTopic(String topic);
+
+   /**
+    * Gets the subscribers that subscribed to a regular expression.
+    * @param pattern the RegEx pattern that was subscribed to
+    *
+    * @return the subscribers that were subscribed to this pattern.
+    */
+   public <T> List<T> getSubscribers(Pattern pattern);
+
+   /**
+    * Gets the subscribers that subscribed with a Pattern that matches the given topic.
+    * @param topic a topic to match Patterns against
+    *
+    * @return the subscribers that subscribed by a RegEx Pattern that matches the topic name.
+    */
+   public <T> List<T> getSubscribersByPattern(String topic);
+
+   /**
+    * Gets veto subscribers that subscribed to a given class.
+    * @param eventClass the eventClass of interest
+    *
+    * @return the veto subscribers that will be called when an event of eventClass or its subclasses is published.
+    */
+   public <T> List<T>  getVetoSubscribers(Class<T> eventClass);
+
+   /**
+    * Get veto subscribers that subscribed to a given class exactly.
+    * @param eventClass the eventClass of interest
+    *
+    * @return the veto subscribers that will be called when an event of eventClass (but not its subclasses) is
+    *         published.
+    */
+   public <T> List<T> getVetoSubscribersToExactClass(Class<T> eventClass);
+
+   /**
+    * Gets the veto subscribers that subscribed to a class.
+    * @param eventClass the eventClass of interest
+    *
+    * @return the veto subscribers that are subscribed to the eventClass and its subclasses
+    */
+   public <T> List<T> getVetoSubscribersToClass(Class<T> eventClass);
+
+   /**
+    * Union of {@link #getVetoSubscribersToTopic(String)} and {@link #getVetoSubscribersByPattern(String)}
+    * Misnamed method, should be called {@link #getVetoSubscribers(String)}. Will be deprecated in 1.5.
+    *
+    * @param topicOrPattern the topic or pattern of interest
+    *
+    * @return the veto subscribers that will be called when an event is published on the topic.
+    */
+   public <T> List<T> getVetoEventListeners(String topicOrPattern);
+
+   /**
+    * Gets the veto subscribers that subscribed to a topic.
+    * @param topic the topic of interest
+    *
+    * @return the veto subscribers that will be called when an event is published on the topic.
+    */
+   public <T> List<T> getVetoSubscribersToTopic(String topic);
+
+   /**
+    * Gets the veto subscribers that subscribed to a regular expression.
+    * @param pattern the RegEx pattern for the topic of interest
+    *
+    * @return the veto subscribers that were subscribed to this pattern.
+    */
+   public <T> List<T> getVetoSubscribers(Pattern pattern);
+
+   /**
+    * Gets the veto subscribers that are subscribed by pattern that match the topic.
+    * @param topic the topic to match the pattern string subscribed to
+    *
+    * @return the veto subscribers that subscribed by pattern that will be called when an event is published on the topic.
+    */
+   public <T> List<T> getVetoSubscribersByPattern(String topic);
+
+   /**
+    * Misnamed method for backwards compatibility.
+    * Duplicate of {@link #getVetoSubscribersToTopic(String)}.
+    * Out of sync with {@link #getSubscribers(String)}.
+    * @param topic the topic exactly subscribed to
+    *
+    * @return the veto subscribers that are subscribed to the topic.
+    * @deprecated use getVetoSubscribersToTopic instead for direct replacement,
+    *             or use getVetoEventListeners to get topic and pattern matchers.
+    *             In EventBus 2.0 this name will replace getVetoEventListeners()
+    *             and have it's union functionality
+    */
+   public <T> List<T> getVetoSubscribers(String topic);
+      
+   /** Clears all current subscribers and veto subscribers */
+   public void clearAllSubscribers();
+
+   /**
+    * Sets the default cache size for each kind of event, default is 0 (no caching).
+    * <p/>
+    * If this value is set to a positive number, then when an event is published, the EventService caches the event or
+    * topic payload data for later retrieval.  This allows subscribers to find out what has most recently happened
+    * before they subscribed.  The cached event(s) are returned from #getLastEvent(Class), #getLastTopicData(String),
+    * #getCachedEvents(Class), or #getCachedTopicData(String)
+    * <p/>
+    * The default can be overridden on a by-event-class or by-topic basis.
+    *
+    * @param defaultCacheSizePerClassOrTopic the cache size per event
+    */
+   public void setDefaultCacheSizePerClassOrTopic(int defaultCacheSizePerClassOrTopic);
+
+   /**
+    * The default number of events or payloads kept per event class or topic
+    * @return the default number of event payloads kept per event class or topic
+    */
+   public int getDefaultCacheSizePerClassOrTopic();
+
+   /**
+    * Set the number of events cached for a particular class of event.  By default, no events are cached.
+    * <p/>
+    * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
+    * <p/>
+    * Class hierarchy semantics are respected.  That is, if there are three events, A, X and Y, and X and Y are both
+    * derived from A, then setting the cache size for A applies the cache size for all three.  Setting the cache size
+    * for X applies to X and leaves the settings for A and Y in tact.  Interfaces can be passed to this method, but they
+    * only take effect if the cache size of a class or it's superclasses has been set. Just like Class.getInterfaces(),
+    * if multiple cache sizes are set, the interface names declared earliest in the implements clause of the eventClass
+    * takes effect.
+    * <p/>
+    * The cache for an event is not adjusted until the next event of that class is published.
+    *
+    * @param eventClass the class of event
+    * @param cacheSize the number of published events to cache for this event
+    */
+   public void setCacheSizeForEventClass(Class eventClass, int cacheSize);
+
+   /**
+    * Returns the number of events cached for a particular class of event.  By default, no events are cached.
+    * <p/>
+    * This result is computed for a particular class from the values passed to #setCacheSizeForEventClass(Class, int),
+    * and respects the class hierarchy.
+    *
+    * @param eventClass the class of event
+    *
+    * @return the maximum size of the event cache for the given event class
+    *
+    * @see #setCacheSizeForEventClass(Class,int)
+    */
+   public int getCacheSizeForEventClass(Class eventClass);
+
+   /**
+    * Set the number of published data objects cached for a particular event topic.  By default, no data are cached.
+    * <p/>
+    * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
+    * <p/>
+    * Exact topic names take precedence over pattern matching.
+    * <p/>
+    * The cache for a topic is not adjusted until the next publication on that topic.
+    *
+    * @param topicName the topic name
+    * @param cacheSize the number of published data Objects to cache for this topic
+    */
+   public void setCacheSizeForTopic(String topicName, int cacheSize);
+
+   /**
+    * Set the number of published data objects cached for a topics matching a pattern.  By default, no data are cached.
+    * <p/>
+    * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
+    * <p/>
+    * Exact topic names take precedence over pattern matching.
+    * <p/>
+    * The cache for a topic is not adjusted until the next publication on that topic.
+    *
+    * @param pattern the pattern matching topic names
+    * @param cacheSize the number of data Objects to cache for this topic
+    */
+   public void setCacheSizeForTopic(Pattern pattern, int cacheSize);
+
+   /**
+    * Returns the number of cached data objects published on a particular topic.
+    * <p/>
+    * This result is computed for a particular class from the values passed to #setCacheSizeForEventClass(Class, int),
+    * and respects the class hierarchy.
+    *
+    * @param topic the topic name
+    *
+    * @return the maximum size of the data Object cache for the given topic
+    *
+    * @see #setCacheSizeForTopic(String,int)
+    * @see #setCacheSizeForTopic(java.util.regex.Pattern,int)
+    */
+   public int getCacheSizeForTopic(String topic);
+
+   /**
+    * When caching, returns the last event publish for the type supplied.
+    * @param eventClass an index into the cache
+    *
+    * @return the last event published for this event class, or null if caching is turned off (the default)
+    */
+   public <T> T getLastEvent(Class<T> eventClass);
+
+   /**
+    * When caching, returns the last set of event published for the type supplied.
+    * @param eventClass an index into the cache
+    *
+    * @return the last events published for this event class, or null if caching is turned off (the default)
+    */
+   public <T> List<T> getCachedEvents(Class<T> eventClass);
+
+   /**
+    * When caching, returns the last payload published on the topic name supplied.
+    * @param topic an index into the cache
+    *
+    * @return the last data Object published on this topic, or null if caching is turned off (the default)
+    */
+   public Object getLastTopicData(String topic);
+
+   /**
+    * When caching, returns the last set of payload objects published on the topic name supplied.
+    * @param topic an index into the cache
+    *
+    * @return the last data Objects published on this topic, or null if caching is turned off (the default)
+    */
+   public List getCachedTopicData(String topic);
+
+   /**
+    * Clears the event cache for a specific event class or interface and it's any of it's subclasses or implementing
+    * classes.
+    *
+    * @param eventClass the event class to clear the cache for
+    */
+   public void clearCache(Class eventClass);
+
+   /**
+    * Clears the topic data cache for a specific topic name.
+    *
+    * @param topic the topic name to clear the cache for
+    */
+   public void clearCache(String topic);
+
+   /**
+    * Clears the topic data cache for all topics that match a particular pattern.
+    *
+    * @param pattern the pattern to match topic caches to
+    */
+   public void clearCache(Pattern pattern);
+
+   /** Clear all event caches for all topics and event. */
+   public void clearCache();
+
+   /**
+    * Stop a subscription for an object that is subscribed with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param eventClass class this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribe(Class eventClass, Object subscribedByProxy);
+
+   /**
+    * Stop a subscription for an object that is subscribed exactly with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param eventClass class this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribeExactly(Class eventClass, Object subscribedByProxy);
+
+   /**
+    * Stop a subscription for an object that is subscribed to a topic with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param topic the topic this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribe(String topic, Object subscribedByProxy);
+
+   /**
+    * When using annotations, an object may be subscribed by proxy.  This unsubscribe method will unsubscribe an object
+    * that is subscribed with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param pattern the RegEx expression this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribe(Pattern pattern, Object subscribedByProxy);
+
+   /**
+    * Stop a veto subscription for an object that is subscribed with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements VetoSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param eventClass class this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribeVeto(Class eventClass, Object subscribedByProxy);
+
+   /**
+    * Stop a veto subscription for an object that is subscribed exactly with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements VetoSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param eventClass class this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribeVetoExactly(Class eventClass, Object subscribedByProxy);
+
+   /**
+    * Stop a veto subscription for an object that is subscribed to a topic with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param topic the topic this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribeVeto(String topic, Object subscribedByProxy);
+
+   /**
+    * When using annotations, an object may be subscribed by proxy.  This unsubscribe method will unsubscribe an object
+    * that is subscribed with a ProxySubscriber.
+    * <p/>
+    * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
+    * still unsubscribe the object.
+    *
+    * @param pattern the RegEx expression this object is subscribed to by proxy
+    * @param subscribedByProxy object subscribed by proxy
+    * @return true if the subscription was cancelled, false if it never existed
+    */
+   boolean unsubscribeVeto(Pattern pattern, Object subscribedByProxy);
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceAction.java b/src/main/java/org/scijava/event/bushe/EventServiceAction.java
new file mode 100644
index 000000000..bf304b091
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventServiceAction.java
@@ -0,0 +1,214 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ImageIcon;
+
+/**
+ * Abstract class that publishes a Swing ActionEvent (or another object) to an {@link EventService}.
+ * <p/>
+ * This abstract class ties the Swing Actions with the Event Bus.  When fired, an ActionEvent is published on an
+ * EventService - either the global EventBus or a Container EventService.
+ * <p/>
+ * There are two derivatives of this class: The EventBusAction, which publishes the ActionEvent on the global EventBus,
+ * and the ContainerEventServiceAction, which publishes the ActionEvent on the a local ContainerEventService.
+ * <p/>
+ * By default the ActionEvent is published on an EventService topic corresponding to this action's
+ * Action.ACTION_COMMAND_KEY. Though this behavior is highly configurable.  See {@link #getTopicName(ActionEvent)} and
+ * {@link #setTopicName(String)} for ways to customize the topic used.  Override {@link #getTopicValue(ActionEvent)} to
+ * publish an object other than the ActionEvent.
+ * <p/>
+ * Instead of publishing on a topic, the ActionEvent can be published using class-based publication, use {@link
+ * #setPublishesOnTopic(boolean)} to set this behavior.  When using class-based publication, the ActionEvent is published
+ * by default.  Override {@link #getEventServiceEvent(ActionEvent)} to publish an object other than the ActionEvent.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public abstract class EventServiceAction extends AbstractAction {
+   public static final String EVENT_SERVICE_TOPIC_NAME = "event-service-topic";
+
+   private boolean throwsExceptionOnNullEventService = true;
+   public static final String EVENT_BUS_EVENT_CLASS_NAME = "eventBus.eventClassName";
+
+   private String topicName;
+   private boolean publishesOnTopic = true;
+
+   public EventServiceAction() {
+   }
+
+   public EventServiceAction(String actionName, ImageIcon icon) {
+      super(actionName, icon);
+   }
+
+
+   /**
+    * Override to return the EventService on which to publish.
+    *
+    * @param event the event passed to #execute(ActionEvent)
+    *
+    * @return the event service to publish on, if null and 
+    * getThrowsExceptionOnNullEventService() is true (default) an exception is thrown
+    *
+    * @see EventBusAction
+    * @see ContainerEventServiceAction
+    */
+   protected abstract EventService getEventService(ActionEvent event);
+
+   /** @return true if this action publishes on a topic, false if it uses class-based publication. */
+   public boolean isPublishesOnTopic() {
+      return publishesOnTopic;
+   }
+
+   /**
+    * Sets whether this action publishes on a topic or uses class-based publication.
+    *
+    * @param onTopic true if publishes on topic (the default), false if using class-based publication.
+    */
+   public void setPublishesOnTopic(boolean onTopic) {
+      this.publishesOnTopic = onTopic;
+   }
+
+   /**
+    * Explicitly sets the topic name this action publishes on.
+    * <p/>
+    * A topic name does not need to be explicitly set.  See {@link #getTopicName(ActionEvent)} to understand how the
+    * topic name is determined implicitly.
+    */
+   public void setTopicName(String topicName) {
+      this.topicName = topicName;
+   }
+
+   /**
+    * The topic name is the first non-null value out of: <ol> <li>A topic name explicitly set via {@link
+    * #setTopicName(String)} <li>the action's getValue("event-service-topic")  {@link #EVENT_SERVICE_TOPIC_NAME} <li>the
+    * action's getValue("ID") (for compatibility with the SAM ActionManager's ID) <li>the action's {@link
+    * javax.swing.Action#ACTION_COMMAND_KEY} <li>the action event's {@link javax.swing.Action#ACTION_COMMAND_KEY}
+    * <li>the action's {@link javax.swing.Action#NAME} the value is used (if the value is not a String, the value's
+    * toString() is used). 
+    * <p/>
+    * To use a different name, override this method.
+    *
+    * @param event the event passed to #execute(ActionEvent)
+    *
+    * @return the topic name to publish on, getId() by default
+    */
+   public String getTopicName(ActionEvent event) {
+      if (topicName != null) {
+         return topicName;
+      }
+      Object topic = getValue(EVENT_SERVICE_TOPIC_NAME);
+      if (topic != null) {
+         return topic + "";
+      } else {
+         topic = getValue("ID");
+         if (topic != null) {
+            return topic + "";
+         } else {
+            topic = getValue(Action.ACTION_COMMAND_KEY);
+            if (topic != null) {
+               return topic + "";
+            } else {
+               topic = event.getActionCommand();
+               if (topic != null) {
+                  return topic + "";
+               } else {
+                  return (String) getName();
+               }
+            }
+         }
+      }
+   }
+
+   /**
+    * By default, the ActionEvent is the object published on the topic.  Override this method to publish another
+    * object.
+    *
+    * @param event the event passed to #execute(ActionEvent)
+    *
+    * @return the topic value to publish, getId() by default
+    */
+   protected Object getTopicValue(ActionEvent event) {
+      return event;
+   }
+
+   /** @return the name of the action (javax.swing.Action#NAME) */
+   public Object getName() {
+      return getValue(Action.NAME);
+   }
+
+   /**
+    * If isPublishesOnTopic() returns false (i.e., when using class-based rather than topic-based publication), then
+    * override this method to publish an on object other than the ActionEvent.
+    *
+    * @return the Object to publish, cannot be null
+    */
+   protected Object getEventServiceEvent(ActionEvent event) {
+      return event;
+   }
+
+   /**
+    * Publishes the event on the EventService returned by getEventService(event)
+    * <p/>
+    * Gets the EventService from {@link #getEventService(java.awt.event.ActionEvent)}. Checks isPublishesOnTopic().  If true,
+    * gets the topic name from {@link #getTopicName(java.awt.event.ActionEvent)} and the topic value from {@link
+    * #getTopicValue(ActionEvent)}, and publishes the value on the topic on the EventService.  If false, gets event from
+    * {@link #getEventServiceEvent(java.awt.event.ActionEvent)}, and publishes the event on the EventService.
+    * <p/>
+    *
+    * @param event the action event to publish.
+    *
+    * @throws RuntimeException if getThrowsExceptionOnNullEventService() &&  getEventService(event) == null
+    */
+   public void actionPerformed(ActionEvent event) {
+      EventService eventService = getEventService(event);
+      if (eventService == null) {
+         if (getThrowsExceptionOnNullEventService()) {
+            throw new RuntimeException("Null EventService supplied to EventServiceAction with name:" + getName());
+         } else {
+            return;
+         }
+      }
+      if (isPublishesOnTopic()) {
+         String topic = getTopicName(event);
+         Object topicValue = getTopicValue(event);
+         eventService.publish(topic, topicValue);
+      } else {
+         Object esEvent = getEventServiceEvent(event);
+         eventService.publish(esEvent);
+      }
+   }
+
+   /**
+    * By default, exceptions are throw if getEventService() returns null.
+    *
+    * @return false to suppress this behavior
+    */
+   public boolean getThrowsExceptionOnNullEventService() {
+      return throwsExceptionOnNullEventService;
+   }
+
+   /**
+    * By default, exceptions are thrown if getEventService() returns null.
+    *
+    * @param throwsExceptionOnNullEventService true to suppress the exception when there is no event service
+    */
+   public void setThrowsExceptionOnNullEventService(boolean throwsExceptionOnNullEventService) {
+      this.throwsExceptionOnNullEventService = throwsExceptionOnNullEventService;
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceEvent.java b/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
new file mode 100644
index 000000000..11a6e6edd
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Convenience interface for events that get processed by the EventService, its usage is not required in any way.  Any
+ * object can be published on an EventService or on the EventBus.
+ * <p/>
+ * It is a good practice to specify the source of the event when using pub/sub, especially in Swing applications.
+ *
+ * @author Michael Bushe michael@bushe.com
+ * @see AbstractEventServiceEvent for a simple base class
+ */
+public interface EventServiceEvent {
+   /** @return The issuer of the event. */
+   Object getSource();
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java b/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
new file mode 100644
index 000000000..4e1cb6f1f
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
@@ -0,0 +1,8 @@
+package org.scijava.event.bushe;
+
+/** Exception thrown by the EventServiceLocator when an EventService already is registered for a name. */
+public class EventServiceExistsException extends Exception {
+   public EventServiceExistsException(String msg) {
+      super(msg);
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceLocator.java b/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
new file mode 100644
index 000000000..9d631196e
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A central registry of EventServices.  Used by the {@link EventBus}.
+ * <p/>
+ * By default will lazily hold a SwingEventService, which is mapped to {@link #SERVICE_NAME_SWING_EVENT_SERVICE} and
+ * returned by {@link #getSwingEventService()}.  Also by default this same instance is returned by {@link #getEventBusService()},
+ * is mapped to {@link #SERVICE_NAME_EVENT_BUS} and wrapped by the EventBus.
+ * <p/>
+ * Since the default EventService implementation is thread safe, and since it's not good to have lots of events on the
+ * EventDispatchThread you may want multiple EventServices running on multiple threads, perhaps pulling events from a
+ * server and coalescing them into one or more events that are pushed onto the EDT.
+ * <p/>
+ * To change the default implementation class for the EventBus' EventService, use the API:
+ * <pre>
+ * EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, new SomeEventServiceImpl());
+ * </pre>
+ * Or use system properties by:
+ * <pre>
+ * System.setProperty(EventServiceLocator.SERVICE_NAME_EVENT_BUS, YourEventServiceImpl.class.getName());
+ * </pre>
+ * Likewise, you can set this on the command line via -Dorg.scijava.event.bushe.swingEventServiceClass=foo.YourEventServiceImpl
+ * <p/>
+ * To change the default implementation class for the SwingEventService, use the API:
+ * <pre>
+ * EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, new SomeSwingEventServiceImpl());
+ * </pre>
+ * Or use system properties by:
+ * <pre>
+ * System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, YourEventServiceImpl.class.getName());
+ * </pre>
+ * Likewise, you can set this on the command line via -Dorg.scijava.event.bushe.swingEventServiceClass=foo.YourEventServiceImpl
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public class EventServiceLocator {
+   /** The name "EventBus" is reserved for the service that the EventBus wraps and is returned by {@link #getEventBusService}.*/
+   public static final String SERVICE_NAME_EVENT_BUS = "EventBus";
+   /** The name "SwingEventService" is reserved for the service that is returned by {@link #getSwingEventService}. */
+   public static final String SERVICE_NAME_SWING_EVENT_SERVICE = "SwingEventService";
+   
+   /**
+    * Set this Java property to a Class that implements EventService to use an instance of that class instead of
+    * the instance returned by {@link #getSwingEventService}.  Must be set before {@link #getEventBusService()} is called.
+    */
+   public static final String EVENT_BUS_CLASS = "org.scijava.event.bushe.eventBusClass";
+   /**
+    * Set this Java property to a Class that implements EventService to use an instance of that class instead of
+    * {@link SwingEventService} as service returned by {@link #getSwingEventService}.  Must be set on startup or
+    * before the method {@link #getSwingEventService}is called.
+    */
+   public static final String SWING_EVENT_SERVICE_CLASS = "org.scijava.event.bushe.swingEventServiceClass";
+
+   private static EventService EVENT_BUS_SERVICE;
+   private static EventService SWING_EVENT_SERVICE;
+
+   private static final Map EVENT_SERVICES = new HashMap();
+
+   /** @return the singleton instance of the EventService used by the EventBus */
+   public static synchronized EventService getEventBusService() {
+      if (EVENT_BUS_SERVICE == null) {
+         EVENT_BUS_SERVICE = getEventService(EVENT_BUS_CLASS, getSwingEventService());
+         EVENT_SERVICES.put(SERVICE_NAME_EVENT_BUS, EVENT_BUS_SERVICE);
+      }
+      return EVENT_BUS_SERVICE;
+   }
+
+   /** @return the singleton instance of a SwingEventService */
+   public static synchronized EventService getSwingEventService() {
+      if (SWING_EVENT_SERVICE == null) {
+         SWING_EVENT_SERVICE = getEventService(SWING_EVENT_SERVICE_CLASS, new SwingEventService());
+         EVENT_SERVICES.put(SERVICE_NAME_SWING_EVENT_SERVICE, SWING_EVENT_SERVICE);
+      }
+      return SWING_EVENT_SERVICE;
+   }
+
+   /**
+    * @param serviceName the service name of the EventService, as registered by #setEventService(String, EventService),
+    * or {@link #SERVICE_NAME_EVENT_BUS} or {@link #SERVICE_NAME_SWING_EVENT_SERVICE} .
+    *
+    * @return a named event service instance
+    */
+   public static synchronized EventService getEventService(String serviceName) {
+      EventService es = (EventService) EVENT_SERVICES.get(serviceName);
+      if (es == null) {
+         if (SERVICE_NAME_EVENT_BUS.equals(serviceName)) {
+            es = getEventBusService();
+         } else if (SERVICE_NAME_SWING_EVENT_SERVICE.equals(serviceName)) {
+            es = getSwingEventService();
+         }
+      }
+      return es;
+   }
+
+   /**
+    * Registers a named EventService to the locator.  Can be used to change the default EventBus implementation.
+    * 
+    * @param serviceName a named event service instance
+    * @param es the EventService to attach to the service name
+    *
+    * @throws EventServiceExistsException if a service by this name already exists and the new service is non-null
+    */
+   public static synchronized void setEventService(String serviceName, EventService es) throws EventServiceExistsException {
+      if (EVENT_SERVICES.get(serviceName) != null && es != null) {
+         throw new EventServiceExistsException("An event service by the name " + serviceName + "already exists.  Perhaps multiple threads tried to create a service about the same time?");
+      } else {
+         EVENT_SERVICES.put(serviceName, es);
+         if (SERVICE_NAME_EVENT_BUS.equals(serviceName)) {
+            EVENT_BUS_SERVICE = es;
+         } else if (SERVICE_NAME_SWING_EVENT_SERVICE.equals(serviceName)) {
+            SWING_EVENT_SERVICE = es;
+         }
+      }
+   }
+
+   /**
+    * Use this carefully.  Clears all the event services, including the SwingEventService (used by EventBus).
+    * <p>
+    * Callers may want to resubscribe existing subscribers.
+    */
+   static synchronized void clearAll() {
+         EVENT_SERVICES.clear();
+         EVENT_BUS_SERVICE = null;
+         SWING_EVENT_SERVICE = null;
+   }
+
+   private static synchronized EventService getEventService(String eventServiceClassPropertyName, EventService defaultService) {
+      EventService result;
+      String eventServiceClassName = System.getProperty(eventServiceClassPropertyName);
+      if (eventServiceClassName != null) {
+         Class sesClass;
+         try {
+            sesClass = Class.forName(eventServiceClassName);
+         } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Could not find class specified in the property " + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, e);
+         }
+         Object service;
+         try {
+            service = sesClass.newInstance();
+         } catch (InstantiationException e) {
+            throw new RuntimeException("InstantiationException creating instance of class set from Java property" + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, e);
+         } catch (IllegalAccessException e) {
+            throw new RuntimeException("IllegalAccessException creating instance of class set from Java property" + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, e);
+         }
+         try {
+            result = (EventService) service;
+         } catch (ClassCastException ex) {
+            throw new RuntimeException("ClassCastException casting to " + EventService.class + " from instance of class set from Java property" + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, ex);
+         }
+      } else {
+         result = defaultService;
+      }
+      return result;
+   }
+
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventSubscriber.java b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
new file mode 100644
index 000000000..03e8f9227
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Callback interface for class-based subscribers of an {@link EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface EventSubscriber<T> {
+
+   /**
+    * Handle a published event. <p>The EventService calls this method on each publication of an object that matches the
+    * class or interface passed to one of the EventService's class-based subscribe methods, specifically, {@link
+    * EventService#subscribe(Class,EventSubscriber)} {@link EventService#subscribeExactly(Class,EventSubscriber)}
+    * {@link EventService#subscribeStrongly(Class,EventSubscriber)} and {@link EventService#subscribeExactlyStrongly(Class,
+    *EventSubscriber)}.
+    *
+    * @param event The Object that is being published.
+    */
+   public void onEvent(T event);
+}
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
new file mode 100644
index 000000000..dbcd8bd87
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Callback interface for topic-based subscribers of an {@link EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface EventTopicSubscriber<T> {
+
+   /**
+    * Handle an event published on a topic.
+    * <p/>
+    * The EventService calls this method on each publication on a matching topic name passed to one of the
+    * EventService's topic-based subscribe methods, specifically, {@link EventService#subscribe(String,
+    *EventTopicSubscriber)} {@link EventService#subscribe(java.util.regex.Pattern,EventTopicSubscriber)} {@link
+    * EventService#subscribeStrongly(String,EventTopicSubscriber)} and {@link EventService#subscribeStrongly(java.util.regex.Pattern,
+    *EventTopicSubscriber)}.
+    *
+    * @param topic the name of the topic published on
+    * @param data the data object published on the topic
+    */
+   public void onEvent(String topic, T data);
+}
diff --git a/src/main/java/org/scijava/event/bushe/Logger.java b/src/main/java/org/scijava/event/bushe/Logger.java
new file mode 100644
index 000000000..0c940eec6
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/Logger.java
@@ -0,0 +1,218 @@
+package org.scijava.event.bushe;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Central Logging class.  Shields code from Logging implementation.
+ * <p/>
+ * The EventBus allows operation in two modes - using java.util.logging so that
+ * the EventBus can be deployed in its own jar or using any logging system supported
+ * by apache commons logging, which of course requires other jars.
+ * <p/>
+ * The EventBus logging uses the names of its classes as the log, primarily
+ * "org.scijava.event.bushe.EventService".  This aids in debugging which subscription and publication issues.
+ * <p/>
+ * Implementation note: There are no imports in this class to make things
+ * explicit.  There is also no explicit use of classes outside java.util,
+ * anything else is used by reflection to avoid NoClassDefFound errors on class load.
+ */
+public class Logger {
+   private java.util.logging.Logger utilLogger;
+   private /*Untyped to avoid java.lang.NoClassDefFoundError
+   org.apache.commons.logging.Log*/ Object commonsLogger;
+   private Map<String, Method> METHOD_CACHE_NO_PARAMS;
+   private Map<String, Method> METHOD_CACHE_ONE_PARAM;
+   private Map<String, Method> METHOD_CACHE_TWO_PARAMS;
+   private static Class<?> logFactoryClass;
+   private static Class<?> logClass;
+   private static Method getLogMethod;
+   private static final Object[] EMPTY_ARGS = new Object[0];
+   private static final Class[] CLASS_ARGS_EMPTY = new Class[0];
+   private static final Class[] CLASS_ARGS_ONE = new Class[]{Object.class};
+   private static final Class[] CLASS_ARGS_TWO = new Class[]{Object.class, Throwable.class};
+
+   /** Allows switching between Java and Commons logging.*/
+   public static enum LoggerType {
+      /*java.util.logging*/
+      JAVA,
+      /*org.apache.commons.logging*/
+      COMMONS
+   }
+
+   /** Standardized logging levels. */
+   public static enum Level {
+      FATAL,
+      ERROR,
+      WARN,
+      INFO,
+      DEBUG,
+      TRACE
+   }
+
+   public static LoggerType LOGGER_TYPE= null;
+
+   public static Logger getLogger(String name) {
+      if (LOGGER_TYPE == null) {
+         LOGGER_TYPE = getLoggerType();
+      }
+      if (LOGGER_TYPE == LoggerType.COMMONS) {
+            try {
+               Object logger = getLogMethod.invoke(null, name);
+               return new Logger(logger);
+            } catch (IllegalAccessException e) {
+               e.printStackTrace();
+            } catch (InvocationTargetException e) {
+               e.printStackTrace();
+            }
+      }
+      return new Logger(java.util.logging.Logger.getLogger(name));
+   }
+
+   /**
+    * This method should only be called once in a JVM run.
+    * @return
+    */
+   private static LoggerType getLoggerType() {
+      LoggerType result = null;
+      //See if apache commons is available
+      try {
+         logFactoryClass = Class.forName("org.apache.commons.logging.LogFactory");
+         getLogMethod = logFactoryClass.getMethod("getLog", new Class[]{String.class});
+         logClass = Class.forName("org.apache.commons.logging.Log");
+         return LoggerType.COMMONS;
+      } catch (Throwable e) {
+      }
+      return LoggerType.JAVA;
+   }
+
+   public Logger(java.util.logging.Logger utilLogger) {
+      this.utilLogger = utilLogger;
+   }
+
+   public Logger(Object commonsLogger) {
+      this.commonsLogger = commonsLogger;
+   }
+
+   /**
+    * Returns whether this level is loggable.  If there is
+    * a misconfiguration, this will always return false.
+    * @param level the EventBus Logger level
+    * @return whether this level is loggable.
+    */
+   public boolean isLoggable(Level level) {
+      if (utilLogger != null) {
+         java.util.logging.Level javaLevel = getJavaLevelFor(level);
+         return javaLevel != null && utilLogger.isLoggable(javaLevel);
+      } else if (commonsLogger != null) {
+         switch (level) {
+            case ERROR: return (Boolean)callCommonsLogger("isErrorEnabled");
+            case FATAL: return (Boolean)callCommonsLogger("isFatalEnabled");
+            case WARN: return (Boolean)callCommonsLogger("isWarnEnabled");
+            case INFO: return (Boolean)callCommonsLogger("isInfoEnabled");
+            case DEBUG: return (Boolean)callCommonsLogger("isDebugEnabled");
+            case TRACE: return (Boolean)callCommonsLogger("isTraceEnabled");
+         }
+      }
+      return false;
+   }
+
+   private java.util.logging.Level getJavaLevelFor(Level level) {
+      switch (level) {
+         case FATAL: return java.util.logging.Level.SEVERE;
+         case ERROR: return java.util.logging.Level.SEVERE;
+         case WARN: return java.util.logging.Level.WARNING;
+         case INFO: return java.util.logging.Level.INFO;
+         case DEBUG: return java.util.logging.Level.FINE;
+         case TRACE: return java.util.logging.Level.FINEST;
+      }
+      return null;
+   }
+
+   public void debug(String message) {
+      log(Level.DEBUG, message);
+   }
+
+   public void log(Level level, String message) {
+      log(level, message, null);
+   }
+
+   public void log(Level level, String message, Throwable throwable) {
+      if (!isLoggable(level)) {
+         return;
+      }
+      if (utilLogger != null) {
+         java.util.logging.Level javaLevel = getJavaLevelFor(level);
+         if (throwable == null) {
+            utilLogger.log(javaLevel, message);
+         } else {
+            utilLogger.log(javaLevel, message, throwable);
+         }
+      } else if (commonsLogger != null) {
+         if (throwable == null) {
+            switch (level) {
+               case ERROR: callCommonsLogger("error", message); break;
+               case FATAL: callCommonsLogger("fatal", message); break;
+               case WARN: callCommonsLogger("warn", message); break;
+               case INFO: callCommonsLogger("info", message); break;
+               case DEBUG: callCommonsLogger("debug", message); break;
+               case TRACE: callCommonsLogger("trace", message); break;
+            }
+         } else {
+            switch (level) {
+               case ERROR: callCommonsLogger("error", message, throwable); break;
+               case FATAL: callCommonsLogger("fatal", message, throwable); break;
+               case WARN: callCommonsLogger("warn", message, throwable); break;
+               case INFO: callCommonsLogger("info", message, throwable); break;
+               case DEBUG: callCommonsLogger("debug", message, throwable); break;
+               case TRACE: callCommonsLogger("trace", message, throwable); break;
+            }
+         }
+      }
+   }
+
+   private Object callCommonsLogger(String methodName) {
+      if (METHOD_CACHE_NO_PARAMS == null) {
+         METHOD_CACHE_NO_PARAMS = new HashMap<String, Method>();
+      }
+      return callCommonsLogger(METHOD_CACHE_NO_PARAMS, methodName, CLASS_ARGS_EMPTY, EMPTY_ARGS);
+   }
+
+   private Object callCommonsLogger(String methodName, String message) {
+      if (METHOD_CACHE_ONE_PARAM == null) {
+         METHOD_CACHE_ONE_PARAM = new HashMap<String, Method>();
+      }
+      return callCommonsLogger(METHOD_CACHE_ONE_PARAM, methodName, CLASS_ARGS_ONE, new Object[]{message});
+   }
+
+   private Object callCommonsLogger(String methodName, String message, Throwable throwable) {
+      if (METHOD_CACHE_TWO_PARAMS == null) {
+         METHOD_CACHE_TWO_PARAMS = new HashMap<String, Method>();
+      }
+      return callCommonsLogger(METHOD_CACHE_TWO_PARAMS, methodName, CLASS_ARGS_TWO, new Object[]{message, throwable});
+   }
+
+   private Object callCommonsLogger(Map<String, Method> cache, String methodName, Class[] classOfArgs, Object[] args) {
+      Method method = cache.get(methodName);
+      if (method == null) {
+         try {
+            method = logClass.getMethod(methodName, classOfArgs);
+            cache.put(methodName, method);
+         } catch (NoSuchMethodException e) {
+            e.printStackTrace();  
+         }
+      }
+      if (method == null) {
+         return null;
+      }
+      try {
+         return method.invoke(commonsLogger, args);
+      } catch (IllegalAccessException e) {
+         return null;
+      } catch (InvocationTargetException e) {
+         return null;
+      }
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/ObjectEvent.java b/src/main/java/org/scijava/event/bushe/ObjectEvent.java
new file mode 100644
index 000000000..db9790a76
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/ObjectEvent.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * A simple event that delivers an untyped object with a source object.
+ * <p/>
+ * Usage: EventBus.publish(new ObjectEvent(this, objectOfInterest);
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public class ObjectEvent extends AbstractEventServiceEvent {
+   private Object eventObject;
+
+   /**
+    * Constructor
+    *
+    * @param sourceObject the source of the event
+    * @param payload the payload or eventObject of the event
+    */
+   public ObjectEvent(Object sourceObject, Object payload) {
+      super(sourceObject);
+      this.eventObject = payload;
+   }
+
+   public Object getEventObject() {
+      return eventObject;
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/Prioritized.java b/src/main/java/org/scijava/event/bushe/Prioritized.java
new file mode 100644
index 000000000..ba57f4611
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/Prioritized.java
@@ -0,0 +1,14 @@
+package org.scijava.event.bushe;
+
+/**
+ * Subscribers can implement this interface in order to affect the order in which they are called.
+ * <p>
+ * Subscribers that do not implement this interface are called on a FIFO basis, as are subscribers that implement this
+ * interface and return 0.  If the priority returned from this interface is negative, then this subscriber will be
+ * called before non-Prioritized subscribers, the more negative, the earlier it is called.  If the priority returned
+ * from this interface is positive, then this subscriber will be called after non-Prioritized subscribers, the more
+ * positive, the later it is called.
+ */
+public interface Prioritized {
+   int getPriority();
+}
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
new file mode 100644
index 000000000..ea90a6425
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
@@ -0,0 +1,8 @@
+package org.scijava.event.bushe;
+
+/**
+ * This is a convenience interface, particularly for inner classes, that implements
+ * {@link EventSubscriber} and {@link Prioritized}.
+ */
+public interface PrioritizedEventSubscriber extends EventSubscriber, Prioritized {
+}
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
new file mode 100644
index 000000000..821259dec
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
@@ -0,0 +1,8 @@
+package org.scijava.event.bushe;
+
+/**
+ * This is a convenience interface, particularly for inner classes, that implements
+ * {@link org.scijava.event.bushe.EventTopicSubscriber} and {@link org.scijava.event.bushe.Prioritized}.
+ */
+public interface PrioritizedEventTopicSubscriber extends EventTopicSubscriber, Prioritized {
+}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/event/bushe/ProxySubscriber.java b/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
new file mode 100644
index 000000000..23ecaf8a0
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2007 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import org.scijava.event.bushe.annotation.ReferenceStrength;
+
+/**
+ * An interface that can be implemented when proxies are used for subscription, not needed in normal usage.  When an
+ * unsubscribe method is called on an EventService, the EventService is required to check if any of subscribed objects
+ * are ProxySubscribers and if the object to be unsubscribed is the ProxySubscriber's proxiedSubscriber. If so, the
+ * EventService proxy is unsubscribed and the ProxySubscriber's proxyUnsubscribed() method is called to allow the proxy
+ * to perform any cleanup if necessary.  ProxySubscribers should set their references to their proxied objects to null
+ * for strong subscriptions to allow garbage collection.
+ *
+ * @author Michael Bushe
+ */
+public interface ProxySubscriber {
+
+   /** @return the object this proxy is subscribed on behalf of */
+   public Object getProxiedSubscriber();
+
+   /**
+    * Called by EventServices to inform the proxy that it is unsubscribed.  The ProxySubscriber should null the
+    * reference to it's proxied subscriber
+    */
+   public void proxyUnsubscribed();
+
+   /**
+    * @return the reference strength from this proxy to the proxied subscriber
+    */
+   public ReferenceStrength getReferenceStrength();  
+}
diff --git a/src/main/java/org/scijava/event/bushe/PublicationStatus.java b/src/main/java/org/scijava/event/bushe/PublicationStatus.java
new file mode 100644
index 000000000..acdf3d4e2
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/PublicationStatus.java
@@ -0,0 +1,30 @@
+package org.scijava.event.bushe;
+
+/**
+ * The status of an event as it makes its way from publication through processing by subscribers.
+ * <p>
+ * EventServices are required to stamp any event object or payload that implements the PublicationStatusTracker
+ * with the corresponding PublicationStatus as the event object is processed.  The EventService is not
+ * required to set the Unpublished state.
+ */
+public enum PublicationStatus {
+   /** Recommended default.*/
+   Unpublished,
+   /** Set directly after publication on an EventService.*/
+   Initiated,
+   /** End status for events that are vetoed and never sent to subscribers.*/
+   Vetoed,
+   /** State set after veto test is passed before the event is send to any subscribers.*/
+   Queued,
+   /** Set while the event is sent to it's subscribers.  EventService implementations
+    * such as the ThreadSafeEventService and the SwingEventService will transition from Queued to
+    * Publishing immediately.  Others implementations that call subscribers on threads different
+    * from veto subscribers are free to leave an event in the Queued state and wait until
+    * the event is passed to the thread(s) that subscribers are called on to set the
+    * Publishing state */
+   Publishing,
+   /**
+    * Called when all subscribers have finished handling the event publication.
+    */
+   Completed
+}
diff --git a/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java b/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java
new file mode 100644
index 000000000..b22520751
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java
@@ -0,0 +1,24 @@
+package org.scijava.event.bushe;
+
+/**
+ * An optional interface that can be implemented by Events objects or topic Payloads
+ * to enable the events' status to be stamped on the event by an event service.
+ * <p>
+ * EventService implementations must call setEventStatus(status) on event objects and
+ * payloads that implement this interface.
+ */
+public interface PublicationStatusTracker {
+
+   /**
+    * Implementations of this method must be made thread safe.
+    * @return last value set by setPublicationStatus(), or
+    * {@link PublicationStatus#Unpublished} if setPublicationStatus was never called.
+    */
+   public PublicationStatus getPublicationStatus();
+
+   /**
+    * Implementations of this method must be made thread safe.
+    * @param status the status of the event during it's current publication
+    */
+   public void setPublicationStatus(PublicationStatus status);
+}
diff --git a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
new file mode 100644
index 000000000..41dee9629
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * This event is published internally to report timing for subscribers on an EventService.  Applications may subscribe to
+ * this event to do handle subscribers that take too long.
+ *
+ * @author Michael Bushe michael@bushe.com
+ * @see ThreadSafeEventService
+ */
+public class SubscriberTimingEvent extends AbstractEventServiceEvent {
+   private Long start;
+   private Long end;
+   private Long timeLimitMilliseconds;
+   private Object event;
+   private EventSubscriber subscriber;
+   private VetoEventListener vetoEventListener;
+   private String stringified;
+
+   /**
+    * Create a timing event
+    *
+    * @param source event source
+    * @param start system time at start of the notification of listener
+    * @param end system time at end of the notification of listener
+    * @param timeLimitMilliseconds expected maximum time
+    * @param event the published event
+    * @param subscriber the event subscriber that went over the time limit, can be null if vetoEventListener is not
+    * null
+    * @param vetoEventListener the vetoEventListener that took too long, can be null if the eventListener is not null
+    */
+   public SubscriberTimingEvent(Object source, Long start, Long end, Long timeLimitMilliseconds,
+           Object event, EventSubscriber subscriber, VetoEventListener vetoEventListener) {
+      super(source);
+      this.start = start;
+      this.end = end;
+      this.timeLimitMilliseconds = timeLimitMilliseconds;
+      this.event = event;
+      this.subscriber = subscriber;
+      this.vetoEventListener = vetoEventListener;
+      String type = "EventServiceSubscriber";
+      String thing = ", EventServiceSubscriber:" + subscriber;
+      if (vetoEventListener != null) {
+         type = "VetoEventListener";
+         thing = ", VetoEventListener" + vetoEventListener;
+      }
+      try {
+         stringified = "Time limit exceeded for " + type + ". Handling time=" + (end.longValue() - start.longValue()) +
+                 ", Time limit=" + timeLimitMilliseconds + ", event:" + event
+                 + thing + ", start:" + start + ", end:" + end;
+      } catch (Exception ex) {
+         stringified = "Time limit exceeded for event, toString threw and exception.";
+      }
+   }
+
+   /** @return system time at start of the notification of listener */
+   public Long getStart() {
+      return start;
+   }
+
+   /** @return system time at end of the notification of listener */
+   public Long getEnd() {
+      return end;
+   }
+
+   /** @return expected maximum time */
+   public Long getTimeLimitMilliseconds() {
+      return timeLimitMilliseconds;
+   }
+
+   /** @return the published event */
+   public Object getEvent() {
+      return event;
+   }
+
+   /**
+    * @return subscriber the event subscriber that went over the time limit, can be null if vetoEventListener is not
+    *         null
+    */
+   public EventSubscriber getSubscriber() {
+      return subscriber;
+   }
+
+   /** @return the vetoEventListener that took too long, can be null if the eventListener is not null */
+   public VetoEventListener getVetoEventListener() {
+      return vetoEventListener;
+   }
+
+   /** @return true if a veto listener took too long, false if an EventSubscriber took took long */
+   public boolean isVetoExceeded() {
+      return vetoEventListener != null;
+   }
+
+   /** @return true if an EventSubscriber took too long, false if a veto listener took took long */
+   public boolean isEventHandlingExceeded() {
+      return subscriber == null;
+   }
+
+   public String toString() {
+      return stringified;
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/SwingEventService.java b/src/main/java/org/scijava/event/bushe/SwingEventService.java
new file mode 100644
index 000000000..aded25830
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/SwingEventService.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import javax.swing.*;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * An {@link EventService} implementation for Swing.
+ * <p/>
+ * This class is Swing thread-safe.  All publish() calls NOT on the Swing EventDispatchThread thread are queued onto the
+ * EDT.  If the calling thread is the EDT, then this is a simple pass-through (i.e the subscribers are notified on the
+ * same stack frame, just like they would be had they added themselves via Swing addXXListener methods).
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public class SwingEventService extends ThreadSafeEventService {
+
+   /**
+    * By default, the SwingEventService is constructed such that any listener that takes over 200 ms causes an
+    * SubscriberTimingEvent to be published.  You will need to add a subscriber to this event.  Note that if you use
+    * event to launch a modal dialog, the timings will be as long as the dialog is up - this is the way Swing works.
+    */
+   public SwingEventService() {
+      super((long) 200, false, null, null, null);
+   }
+
+   public SwingEventService(Long timeThresholdForEventTimingEventPublication) {
+      super(timeThresholdForEventTimingEventPublication, false, null, null, null);
+   }
+
+   /**
+    * Create a SwingEventService is such that any listener that takes over timeThresholdForEventTimingEventPublication
+    * milliseconds causes an EventSubscriberTimingEvent to be published.  You can add a subscriber to this event or set
+    * subscribeTimingEventsInternally to true to cause the default logging to occur through the protected {@link
+    * #subscribeTiming(SubscriberTimingEvent)} call.
+    * <p/>
+    * Note that if you use event to launch a modal dialog, the timings will be as long as the dialog is up - this is the
+    * way Swing works.
+    *
+    * @param timeThresholdForEventTimingEventPublication the longest time a subscriber should spend handling an event,
+    * The service will publish an SubscriberTimingEvent after listener processing if the time was exceeded.  If null, no
+    * SubscriberTimingEvent will be issued.
+    * @param subscribeTimingEventsInternally add a subscriber to the EventSubscriberTimingEvent internally and call the
+    * protected {@link #subscribeTiming(SubscriberTimingEvent)} method when they occur.  This logs a warning to the
+    * {@link Logger} logger by default.
+    *
+    * @throws IllegalArgumentException if timeThresholdForEventTimingEventPublication is null and
+    * subscribeTimingEventsInternally is true.
+    */
+   public SwingEventService(Long timeThresholdForEventTimingEventPublication, boolean subscribeTimingEventsInternally) {
+      super(timeThresholdForEventTimingEventPublication, subscribeTimingEventsInternally, null, null, null);
+   }
+
+   /**
+    * Same as ThreadSafeEventService.publish(), except if the call is coming from a thread that is not the Swing Event
+    * Dispatch Thread, the request is put on the EDT through a a call to SwingUtilities.invokeLater(). Otherwise this
+    * DOES NOT post a new event on the EDT.  The subscribers are called on the same EDT event, just like addXXXListeners
+    * would be.
+    */
+   protected void publish(final Object event, final String topic, final Object eventObj,
+           final List subscribers, final List vetoSubscribers, final StackTraceElement[] callingStack) {
+      if (SwingUtilities.isEventDispatchThread()) {
+         super.publish(event, topic, eventObj, subscribers, vetoSubscribers, callingStack);
+      } else {
+         //Make call to this method - stick on the EDT if not on the EDT
+         //Check the params first so that this thread can get the exception thrown
+         SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+               if (LOG.isLoggable(Logger.Level.DEBUG)) {
+                  LOG.debug("publish(" + event + "," + topic + "," + eventObj
+                          + "), called from non-EDT Thread:" + Arrays.toString(callingStack));
+               }
+               SwingEventService.super.publish(event, topic, eventObj, subscribers, vetoSubscribers, callingStack);
+            }
+         });
+      }
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
new file mode 100644
index 000000000..4f78f02a7
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -0,0 +1,2216 @@
+/**
+ * Copyright 2005-2007 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Type;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.WildcardType;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.regex.Pattern;
+
+import org.scijava.event.bushe.Logger.Level;
+import org.scijava.event.bushe.annotation.ReferenceStrength;
+import org.scijava.event.bushe.exception.SwingException;
+
+/**
+ * A thread-safe EventService implementation.
+ * <h2>Multithreading</h2> 
+ * <p/>
+ * This implementation is <b>not Swing thread-safe</b>.  If publication occurs on a thread other than the Swing
+ * EventDispatchThread, subscribers will receive the event on the calling thread, and not the EDT.  Swing components
+ * should use the SwingEventService instead, which is the implementation used by the EventBus.
+ * <p/>
+ * Two threads may be accessing the ThreadSafeEventService at the same time, one unsubscribing a
+ * listener for topic "A" and the other publishing on topic "A".  If the unsubscribing thread gets the lock first,
+ * then it is unsubscribed, end of story.  If the publisher gets the lock first, then a snapshot copy of the current
+ * subscribers is made during the publication, the lock is released and the subscribers are called.  Between the time
+ * the lock is released and the time that the listener is called, the unsubscribing thread can unsubscribe, resulting
+ * in an unsubscribed object receiving notification of the event after it was unsubscribed (but just once).
+ * <p/>
+ * On event publication, subscribers are called in the order in which they subscribed.
+ * <p/>
+ * Events and/or topic data can be cached, but are not by default.  To cache events or topic data, call
+ * {@link #setDefaultCacheSizePerClassOrTopic(int)}, {@link #setCacheSizeForEventClass(Class, int)}, or
+ * {@link #setCacheSizeForTopic(String, int)}, {@link #setCacheSizeForTopic(Pattern, int)}.  Retrieve cached values
+ * with {@link #getLastEvent(Class)}, {@link #getLastTopicData(String)}, {@link #getCachedEvents(Class)}, or
+ * {@link #getCachedTopicData(String)}.  Using caching while subscribing
+ * is most likely to make sense only if you subscribe and publish on the same thread (so caching is very useful for
+ * Swing applications since both happen on the EDT in a single-threaded manner). In multithreaded applications, you
+ * never know if your subscriber has handled an event while it was being subscribed (before the subscribe() method
+ * returned) that is newer or older than the retrieved cached value (taken before or after subscribe() respectively).
+ * <p/>
+ * To deal with subscribers that take too long (a concern in Swing applications), the EventService can be made to issue
+ * {@link SubscriberTimingEvent}s when subscribers exceed a certain time.  This does not interrupt subscriber processing
+ * and is published after the subscriber finishes.  The service can log a warning for SubscriberTimingEvents, see the
+ * constructor {@link ThreadSafeEventService (long, boolean)}.  The timing is checked for veto subscribers too.
+ * <p/>
+ * <h2>Logging</h2> 
+ * <p/>                       
+ * All logging goes through the {@link Logger}.  The Logger is configurable and supports multiple logging systems.
+ * <p/>
+ * Exceptions are logged by default, override {@link #handleException(String,Object,String,Object,Throwable,
+ * StackTraceElement[],String)} to handleException exceptions in another way.  Each call to a subscriber is wrapped in
+ * a try block to ensure one listener does not interfere with another.
+ * <p/>
+ * <h2>Cleanup of Stale WeakReferences and Stale Annotation Proxies</h2> 
+ * <p/>
+ * The EventService may need to clean up stale WeakReferences and ProxySubscribers created for EventBus annotations.  (Aside: EventBus 
+ * Annotations are handled by the creation of proxies to the annotated objects.  Since the annotations create weak references 
+ * by default, annotation proxies must held strongly by the EventService, otherwise the proxy is garbage collected.)  When 
+ * a WeakReference's referent or an ProxySubscriber's proxiedObject (the annotated object) is claimed by the garbage collector, 
+ * the EventService still holds onto the actual WeakReference or ProxySubscriber subscribed to the EventService (which are pretty tiny).  
+ * <p/>
+ * There are two ways that these stale WeakReferences and ProxySubscribers are cleaned up.  
+ * <ol>
+ * <li>On every publish, subscribe and unsubscribe, every subscriber and veto subscriber to a class or topic is checked to see 
+ * if it is a stale WeakReference or a stale ProxySubscriber (one whose getProxySubscriber() returns null).  If the subscriber 
+ * is stale, it is unsubscribed from the EventService  immediately.  If it is a ProxySubscriber, it's  proxyUnsubscribed() 
+ * method is called after it is unsubscribed.  (This isn't as expensive as it sounds, since checks to avoid double subscription is
+ * necessary anyway).
+ * <li>Another cleanup thread may get started to clean up remaining stale subscribers.  This cleanup thread only comes into
+ * play for subscribers to topic or classes that haven't been used (published/subscribed/unsibscribed to).  A detailed description
+ * of the cleanup thread follows.
+ * </ol>
+ * <h3>The Cleanup Thread</h3>
+ * If a topic or class is never published to again, WeakReferences and ProxySubscribers can be left behind if they 
+ * are not cleaned up.  To prevent loitering stale subscribers, the ThreadSafeEventService may periodically run through 
+ * all the EventSubscribers and VetoSubscribers for all topics and classes and clean up stale proxies.  Proxies for 
+ * Annotations that have a ReferenceStrength.STRONG are never cleaned up in normal usage.   (By specifying 
+ * ReferenceStrength.STRONG, the programmer is buying into unsubscribing annotated objects themselves.  There is 
+ * one caveat: If getProxiedSubscriber() returns null, even for a ProxySubscriber with a STRONG reference strength, that proxy 
+ * is cleaned up as it is assumed it is stale or just wrong.  This would not occur normally in EventBus usage, but only 
+ * if someone is implementing their own custom ProxySubscriber and/or AnnotationProcessor.)
+ * <p/>
+ * Cleanup is pretty rare in general.  Not only are stale subscribers cleaned up with regular usage, stale 
+ * subscribers on abandoned topics and classes do not take up a lot of memory, hence, they are allowed to build up to a certain degree.
+ * Cleanup does not occur until the number of WeakReferences and SubscriptionsProxy's with WeakReference strength
+ * subscribed to an EventService for all the EventService's subscriptions in total exceed the <tt>cleanupStartThreshhold</tt>, 
+ * which is set to <tt>CLEANUP_START_THRESHOLD_DEFAULT</tt> (500) by default.  The default is overridable in the constructor 
+ * or via #setCleanupStartThreshhold(Integer).  If set to null, cleanup will never start.  
+ * <p/>
+ * Once the cleanup start threshold is exceeded, a <tt>java.util.Timer</tt> is started to clean up stale subscribers periodically 
+ * in another thread.  The timer will fire every <tt>cleanupPeriodMS</tt> milliseconds, which is set to the 
+ * <tt>CLEANUP_PERIOD_MS_DEFAULT<tt> (20 minutes) by default.  The default is overridable in the constructor or 
+ * via #setCleanupPeriodMS(Integer).  If set to null, cleanup will not start.  This is implemented with a <tt>java.util.Timer</tt>,
+ * so Timer's warnings apply - setting this too low will cause cleanups to bunch up and hog the cleanup thread.
+ * <p/>
+ * After a cleanup cycle completes, if the number of stale subscribers falls at or below the <tt>cleanupStopThreshhold</tt> 
+ * cleanup stops until the <tt>cleanupStartThreshhold</tt> is exceeded again. The <tt>cleanupStopThreshhold</tt> is set 
+ * to <tt>CLEANUP_STOP_THRESHOLD_DEFAULT</tt> (100) by default.  The default is overridable in the constructor or via 
+ * #setCleanupStopThreshhold(Integer).  If set to null or 0, cleanup will not stop if it is ever started.  
+ * <p/>
+ * Cleanup can be monitored by subscribing to the {@link CleanupEvent} class. 
+ * <p/>
+ * All cleanup parameters are tunable "live" and checked after each subscription and after each cleanup cycle.
+ * To make cleanup never run, set cleanupStartThreshhold to Integer.MAX_VALUE and cleanupPeriodMS to null.
+ * To get cleanup to run continuously, set set cleanupStartThreshhold to 0 and cleanupPeriodMS to some reasonable value,
+ * perhaps 1000 (1 second) or so (not recommended, cleanup is conducted with regular usage and the cleanup thread is
+ * rarely created or invoked).
+ * <p/>
+ * Cleanup is not run in a daemon thread, and thus will not stop the JVM from exiting.
+ * <p/>
+ * 
+ * @author Michael Bushe michael@bushe.com
+ * @todo (param) a JMS-like selector (can be done in base classes by implements like a commons filter
+ * @see EventService for a complete description of the API
+ */
+@SuppressWarnings({"unchecked", "ForLoopReplaceableByForEach"})
+public class ThreadSafeEventService implements EventService {
+   public static final Integer CLEANUP_START_THRESHOLD_DEFAULT = 250;
+   public static final Integer CLEANUP_STOP_THRESHOLD_DEFAULT = 100;
+   public static final Long CLEANUP_PERIOD_MS_DEFAULT = 20L*60L*1000L;
+
+   protected static final Logger LOG = Logger.getLogger(EventService.class.getName());
+
+   //Making these generic collections is a bad idea, it doesn't compile since it's better to have all the maps
+   //go through the same set of code to do all the real publish and subscribe work
+   private Map subscribersByEventType = new HashMap();
+   private Map subscribersByEventClass = new HashMap();
+   private Map subscribersByExactEventClass = new HashMap();
+   private Map subscribersByTopic = new HashMap();
+   private Map subscribersByTopicPattern = new HashMap();
+   private Map vetoListenersByClass = new HashMap();
+   private Map vetoListenersByExactClass = new HashMap();
+   private Map vetoListenersByTopic = new HashMap();
+   private Map vetoListenersByTopicPattern = new HashMap();
+   private final Object listenerLock = new Object();
+   private final Object cacheLock = new Object();
+   private Long timeThresholdForEventTimingEventPublication;
+   private Map<Class, List> cacheByEvent = new HashMap<Class, List>();
+   private int defaultCacheSizePerClassOrTopic = 0;
+   private Map<Class, Integer> cacheSizesForEventClass;
+   private Map<Class, Integer> rawCacheSizesForEventClass;
+   private boolean rawCacheSizesForEventClassChanged;
+   private Map<String, List> cacheByTopic = new HashMap<String, List>();
+   private Map<String, Integer> cacheSizesForTopic;
+   private Map<String, Integer> rawCacheSizesForTopic;
+   private boolean rawCacheSizesForTopicChanged;
+   private Map<PatternWrapper, Integer> rawCacheSizesForPattern;
+   private boolean rawCacheSizesForPatternChanged;
+   private Integer cleanupStartThreshhold;
+   private Integer cleanupStopThreshold;
+   private Long cleanupPeriodMS;
+   private int weakRefPlusProxySubscriberCount;
+   private Timer cleanupTimer;
+   private TimerTask cleanupTimerTask;
+   private static final Comparator PRIORITIZED_SUBSCRIBER_COMPARATOR = new PrioritizedSubscriberComparator();
+   private boolean hasEverUsedPrioritized;
+
+   /** Creates a ThreadSafeEventService that does not monitor timing of handlers. */
+   public ThreadSafeEventService() {
+      this(null, false, null, null, null);
+   }
+
+   /**
+    * Creates a ThreadSafeEventService while providing time monitoring options.
+    *
+    * @param timeThresholdForEventTimingEventPublication the longest time a subscriber should spend handling an event,
+    * The service will publish an SubscriberTimingEvent after listener processing if the time was exceeded.  If null, no
+    * EventSubscriberTimingEvent will be issued.
+    */
+   public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication) {
+      this(timeThresholdForEventTimingEventPublication, false, null, null, null);
+   }
+
+   /**
+    * Creates a ThreadSafeEventService while providing time monitoring options.
+    *
+    * @param timeThresholdForEventTimingEventPublication the longest time a subscriber should spend handling an event,
+    * The service will publish an SubscriberTimingEvent after listener processing if the time was exceeded.  If null, no
+    * EventSubscriberTimingEvent will be issued.
+    * @param subscribeTimingEventsInternally add a subscriber to the SubscriberTimingEvent internally and call the
+    * protected subscribeTiming() method when they occur.  This logs a warning to the {@link Logger} by
+    * default.
+    */
+   public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication, boolean subscribeTimingEventsInternally) {
+      this(timeThresholdForEventTimingEventPublication, subscribeTimingEventsInternally, null, null, null);
+   }
+
+   /**
+    * Creates a ThreadSafeEventService while providing proxy cleanup customization.
+    * Proxies are used with Annotations.
+    * 
+    * @param cleanupStartThreshold see class javadoc.
+    * @param cleanupStopThreshold see class javadoc.
+    * @param cleanupPeriodMS see class javadoc.
+    */
+   public ThreadSafeEventService(Integer  cleanupStartThreshold, 
+           Integer cleanupStopThreshold, Long cleanupPeriodMS) {
+      this(null, false,  cleanupStartThreshold, 
+           cleanupStopThreshold, cleanupPeriodMS);
+   }
+
+   /**
+    * Creates a ThreadSafeEventService while providing time monitoring options.
+    *
+    * @param timeThresholdForEventTimingEventPublication the longest time a subscriber should spend handling an event.
+    * The service will publish an SubscriberTimingEvent after listener processing if the time was exceeded.  If null, no
+    * SubscriberTimingEvent will be issued.
+    * @param subscribeTimingEventsInternally add a subscriber to the SubscriberTimingEvent internally and call the
+    * protected subscribeTiming() method when they occur.  This logs a warning to the {@link Logger} by
+    * default.
+    * @param cleanupStartThreshold see class javadoc.
+    * @param cleanupStopThreshold see class javadoc.
+    * @param cleanupPeriodMS see class javadoc.
+    *
+    * @throws IllegalArgumentException if timeThresholdForEventTimingEventPublication is null and
+    * subscribeTimingEventsInternally is true.
+    */
+   public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication,
+           boolean subscribeTimingEventsInternally, Integer  cleanupStartThreshold, 
+           Integer cleanupStopThreshold, Long cleanupPeriodMS) {
+      if (timeThresholdForEventTimingEventPublication == null && subscribeTimingEventsInternally) {
+         throw new IllegalArgumentException("null, true in constructor is not valid.  If you want to send timing messages for all events and subscribe them internally, pass 0, true");
+      }
+      this.timeThresholdForEventTimingEventPublication = timeThresholdForEventTimingEventPublication;
+      if (subscribeTimingEventsInternally) {
+         //Listen to timing events and log them
+         subscribeStrongly(SubscriberTimingEvent.class, new EventSubscriber() {
+            public void onEvent(Object event) {
+               subscribeTiming((SubscriberTimingEvent) event);
+            }
+         });
+      }      
+      if (cleanupStartThreshold == null) {
+         this.cleanupStartThreshhold = CLEANUP_START_THRESHOLD_DEFAULT;
+      } else {
+         this.cleanupStartThreshhold =  cleanupStartThreshold;         
+      }
+      if (cleanupStopThreshold == null) {
+         this.cleanupStopThreshold = CLEANUP_STOP_THRESHOLD_DEFAULT;
+      } else {
+         this.cleanupStopThreshold = cleanupStopThreshold;         
+      }
+      if (cleanupPeriodMS == null) {
+         this.cleanupPeriodMS = CLEANUP_PERIOD_MS_DEFAULT;
+      } else {
+         this.cleanupPeriodMS = cleanupPeriodMS;         
+      }
+   }
+
+   /**
+    * Gets the threshold above which cleanup starts.  See the class javadoc on cleanup.
+    * @return the threshold at which cleanup starts
+    */
+   public Integer getCleanupStartThreshhold() {
+      synchronized (listenerLock) {
+         return cleanupStartThreshhold;
+      }
+   }
+
+   /**
+    * Sets the threshold above which cleanup starts.  See the class javadoc on cleanup.
+    * @param cleanupStartThreshhold threshold at which cleanup starts
+    */
+   public void setCleanupStartThreshhold(Integer cleanupStartThreshhold) {
+      synchronized (listenerLock) {
+         this.cleanupStartThreshhold = cleanupStartThreshhold;
+      }
+   }
+
+   /**
+    * Gets the threshold below which cleanup stops.  See the class javadoc on cleanup.
+    * @return threshold at which cleanup stops (it may start again)
+    */
+   public Integer getCleanupStopThreshold() {
+      synchronized (listenerLock) {
+         return cleanupStopThreshold;
+      }
+   }
+
+   /**
+    * Sets the threshold below which cleanup stops.  See the class javadoc on cleanup.
+    * @param cleanupStopThreshold threshold at which cleanup stops (it may start again).
+    */
+   public void setCleanupStopThreshold(Integer cleanupStopThreshold) {
+      synchronized (listenerLock) {
+         this.cleanupStopThreshold = cleanupStopThreshold;
+      }
+   }
+
+   /**
+    * Get the cleanup interval. See the class javadoc on cleanup.
+    * @return interval in milliseconds between cleanup runs.
+    */
+   public Long getCleanupPeriodMS() {
+      synchronized (listenerLock) {
+         return cleanupPeriodMS;
+      }
+   }
+
+   /**
+    * Sets the cleanup interval. See the class javadoc on cleanup.
+    * @param cleanupPeriodMS interval in milliseconds between cleanup runs.  Passing null 
+    * stops cleanup.
+    */
+   public void setCleanupPeriodMS(Long cleanupPeriodMS) {
+      synchronized (listenerLock) {
+         this.cleanupPeriodMS = cleanupPeriodMS;
+      }
+   }
+
+   /** @see EventService#subscribe(Class,EventSubscriber) */
+   public boolean subscribe(Class cl, EventSubscriber eh) {
+      if (cl == null) {
+         throw new IllegalArgumentException("Event class must not be null");
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Event subscriber must not be null");
+      }
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing by class, class:" + cl + ", subscriber:" + eh);
+      }
+      return subscribe(cl, subscribersByEventClass, new WeakReference<EventSubscriber>(eh));
+   }
+
+   /** @see EventService#subscribe(java.lang.reflect.Type, EventSubscriber) */
+   public boolean subscribe(Type type, EventSubscriber eh) {
+      return subscribe(type, subscribersByEventType, new WeakReference<EventSubscriber>(eh));
+   }
+
+   /** @see EventService#subscribeExactly(Class,EventSubscriber) */
+   public boolean subscribeExactly(Class cl, EventSubscriber eh) {
+      if (cl == null) {
+         throw new IllegalArgumentException("Event class must not be null");
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Event subscriber must not be null");
+      }
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing by class, class:" + cl + ", subscriber:" + eh);
+      }
+      return subscribe(cl, subscribersByExactEventClass, new WeakReference<EventSubscriber>(eh));
+   }
+
+   /** @see EventService#subscribe(String,EventTopicSubscriber) */
+   public boolean subscribe(String topic, EventTopicSubscriber eh) {
+      if (topic == null) {
+         throw new IllegalArgumentException("Topic must not be null");
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Event topic subscriber must not be null");
+      }
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing by topic name, name:" + topic + ", subscriber:" + eh);
+      }
+      return subscribe(topic, subscribersByTopic, new WeakReference<EventTopicSubscriber>(eh));
+   }
+
+   /** @see EventService#subscribe(Pattern,EventTopicSubscriber) */
+   public boolean subscribe(Pattern pat, EventTopicSubscriber eh) {
+      if (pat == null) {
+         throw new IllegalArgumentException("Pattern must not be null");
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Event subscriber must not be null");
+      }
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing by pattern, pattern:" + pat + ", subscriber:" + eh);
+      }
+      PatternWrapper patternWrapper = new PatternWrapper(pat);
+      return subscribe(patternWrapper, subscribersByTopicPattern, new WeakReference<EventTopicSubscriber>(eh));
+   }
+
+   /** @see EventService#subscribeStrongly(Class,EventSubscriber) */
+   public boolean subscribeStrongly(Class cl, EventSubscriber eh) {
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing weakly by class, class:" + cl + ", subscriber:" + eh);
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Subscriber cannot be null.");
+      }
+      return subscribe(cl, subscribersByEventClass, eh);
+   }
+
+   /** @see EventService#subscribeExactlyStrongly(Class,EventSubscriber) */
+   public boolean subscribeExactlyStrongly(Class cl, EventSubscriber eh) {
+      if (cl == null) {
+         throw new IllegalArgumentException("Event class must not be null");
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Event subscriber must not be null");
+      }
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing by class, class:" + cl + ", subscriber:" + eh);
+      }
+      return subscribe(cl, subscribersByExactEventClass, eh);
+   }
+
+   /** @see EventService#subscribeStrongly(String,EventTopicSubscriber) */
+   public boolean subscribeStrongly(String name, EventTopicSubscriber eh) {
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing weakly by topic name, name:" + name + ", subscriber:" + eh);
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Subscriber cannot be null.");
+      }
+      return subscribe(name, subscribersByTopic, eh);
+   }
+
+   /** @see EventService#subscribeStrongly(Pattern,EventTopicSubscriber) */
+   public boolean subscribeStrongly(Pattern pat, EventTopicSubscriber eh) {
+      if (pat == null) {
+         throw new IllegalArgumentException("Pattern must not be null");
+      }
+      if (eh == null) {
+         throw new IllegalArgumentException("Event subscriber must not be null");
+      }
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("Subscribing by pattern, pattern:" + pat + ", subscriber:" + eh);
+      }
+      PatternWrapper patternWrapper = new PatternWrapper(pat);
+      return subscribe(patternWrapper, subscribersByTopicPattern, eh);
+   }
+
+
+   /** @see org.scijava.event.bushe.EventService#clearAllSubscribers() */
+   public void clearAllSubscribers() {
+      synchronized (listenerLock) {
+         unsubscribeAllInMap(subscribersByEventType);
+         unsubscribeAllInMap(subscribersByEventClass);
+         unsubscribeAllInMap(subscribersByExactEventClass);
+         unsubscribeAllInMap(subscribersByTopic);
+         unsubscribeAllInMap(subscribersByTopicPattern);
+         unsubscribeAllInMap(vetoListenersByClass);
+         unsubscribeAllInMap(vetoListenersByExactClass);
+         unsubscribeAllInMap(vetoListenersByTopic);
+         unsubscribeAllInMap(vetoListenersByTopicPattern);
+      }
+   }
+   
+   private void unsubscribeAllInMap(Map subscriberMap) {
+      synchronized (listenerLock) {
+         Set subscriptionKeys = subscriberMap.keySet();
+         for (Object key : subscriptionKeys) {
+            List subscribers = (List) subscriberMap.get(key);
+            while (!subscribers.isEmpty()) {
+               unsubscribe(key, subscriberMap, subscribers.get(0));               
+            }
+         }
+      }      
+   }
+ 
+   /** @see EventService#subscribeVetoListener(Class,VetoEventListener) */
+   public boolean subscribeVetoListener(Class eventClass, VetoEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoEventListener cannot be null.");
+      }
+      if (eventClass == null) {
+         throw new IllegalArgumentException("eventClass cannot be null.");
+      }
+      return subscribeVetoListener(eventClass, vetoListenersByClass, new WeakReference<VetoEventListener>(vetoListener));
+   }
+
+   /** @see EventService#subscribeVetoListenerExactly(Class,VetoEventListener) */
+   public boolean subscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoEventListener cannot be null.");
+      }
+      if (eventClass == null) {
+         throw new IllegalArgumentException("eventClass cannot be null.");
+      }
+      return subscribeVetoListener(eventClass, vetoListenersByExactClass, new WeakReference<VetoEventListener>(vetoListener));
+   }
+
+   /** @see EventService#subscribeVetoListener(String,VetoTopicEventListener) */
+   public boolean subscribeVetoListener(String topic, VetoTopicEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoEventListener cannot be null.");
+      }
+      if (topic == null) {
+         throw new IllegalArgumentException("topic cannot be null.");
+      }
+      return subscribeVetoListener(topic, vetoListenersByTopic, new WeakReference<VetoTopicEventListener>(vetoListener));
+   }
+
+   /** @see EventService#subscribeVetoListener(Pattern,VetoTopicEventListener) */
+   public boolean subscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoEventListener cannot be null.");
+      }
+      if (topicPattern == null) {
+         throw new IllegalArgumentException("topicPattern cannot be null.");
+      }
+      PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
+      return subscribeVetoListener(patternWrapper, vetoListenersByTopicPattern, new WeakReference<VetoTopicEventListener>(vetoListener));
+   }
+
+   /** @see EventService#subscribeVetoListenerStrongly(Class,VetoEventListener) */
+   public boolean subscribeVetoListenerStrongly(Class eventClass, VetoEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoEventListener cannot be null.");
+      }
+      if (eventClass == null) {
+         throw new IllegalArgumentException("eventClass cannot be null.");
+      }
+      return subscribeVetoListener(eventClass, vetoListenersByClass, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListenerExactlyStrongly(Class,VetoEventListener) */
+   public boolean subscribeVetoListenerExactlyStrongly(Class eventClass, VetoEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoEventListener cannot be null.");
+      }
+      if (eventClass == null) {
+         throw new IllegalArgumentException("eventClass cannot be null.");
+      }
+      return subscribeVetoListener(eventClass, vetoListenersByExactClass, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListenerStrongly(String,VetoTopicEventListener) */
+   public boolean subscribeVetoListenerStrongly(String topic, VetoTopicEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoListener cannot be null.");
+      }
+      if (topic == null) {
+         throw new IllegalArgumentException("topic cannot be null.");
+      }
+      return subscribeVetoListener(topic, vetoListenersByTopic, vetoListener);
+   }
+
+   /** @see EventService#subscribeVetoListenerStrongly(Pattern,VetoTopicEventListener) */
+   public boolean subscribeVetoListenerStrongly(Pattern topicPattern, VetoTopicEventListener vetoListener) {
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("VetoTopicEventListener cannot be null.");
+      }
+      if (topicPattern == null) {
+         throw new IllegalArgumentException("topicPattern cannot be null.");
+      }
+      PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
+      return subscribeVetoListener(patternWrapper, vetoListenersByTopicPattern, vetoListener);
+   }
+
+   /**
+    * All veto subscriptions methods call this method.  Extending classes only have to override this method to subscribe
+    * all veto subscriptions.
+    *
+    * @param subscription the topic, Pattern, or event class to subscribe to
+    * @param vetoListenerMap the internal map of veto listeners to use (by topic of class)
+    * @param vetoListener the veto listener to subscribe, may be a VetoEventListener or a WeakReference to one
+    *
+    * @return boolean if the veto listener is subscribed (was not subscribed).
+    *
+    * @throws IllegalArgumentException if vl or o is null
+    */
+   protected boolean subscribeVetoListener(final Object subscription, final Map vetoListenerMap, final Object vetoListener) {
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("subscribeVetoListener(" + subscription + "," + vetoListener + ")");
+      }
+      if (vetoListener == null) {
+         throw new IllegalArgumentException("Can't subscribe null veto listener to " + subscription);
+      }
+      if (subscription == null) {
+         throw new IllegalArgumentException("Can't subscribe veto listener to null.");
+      }
+      return subscribe(subscription, vetoListenerMap, vetoListener);
+   }
+
+   /**
+    * All subscribe methods call this method, including veto subscriptions.  
+    * Extending classes only have to override this method to subscribe all
+    * subscriber subscriptions.
+    * <p/>
+    * Overriding this method is only for the adventurous.  This basically gives you just enough rope to hang yourself.
+    *
+    * @param classTopicOrPatternWrapper the topic String, event Class, or PatternWrapper to subscribe to
+    * @param subscriberMap the internal map of subscribers to use (by topic or class)
+    * @param subscriber the EventSubscriber or EventTopicSubscriber to subscribe, or a WeakReference to either
+    *
+    * @return boolean if the subscriber is subscribed (was not subscribed).
+    *
+    * @throws IllegalArgumentException if subscriber or topicOrClass is null
+    */
+   protected boolean subscribe(final Object classTopicOrPatternWrapper, final Map<Object, Object> subscriberMap, final Object subscriber) {
+      if (classTopicOrPatternWrapper == null) {
+         throw new IllegalArgumentException("Can't subscribe to null.");
+      }
+      if (subscriber == null) {
+         throw new IllegalArgumentException("Can't subscribe null subscriber to " + classTopicOrPatternWrapper);
+      }
+      boolean alreadyExists = false;
+
+      //Find the real subscriber underlying weak refs and proxies
+      Object realSubscriber = subscriber;
+      boolean isWeakRef = subscriber instanceof WeakReference;
+      if (isWeakRef) {
+         realSubscriber = ((WeakReference) subscriber).get();
+      }
+      if (realSubscriber instanceof Prioritized) {
+         hasEverUsedPrioritized = true;
+      }
+      boolean isWeakProxySubscriber = false;
+      if (subscriber instanceof ProxySubscriber) {
+         ProxySubscriber proxySubscriber = (ProxySubscriber) subscriber;
+         if (proxySubscriber instanceof Prioritized) {
+            hasEverUsedPrioritized = true;
+         }
+         isWeakProxySubscriber = proxySubscriber.getReferenceStrength() == ReferenceStrength.WEAK;
+         if (isWeakProxySubscriber) {
+            realSubscriber = ((ProxySubscriber) subscriber).getProxiedSubscriber();
+         }
+      }
+      if (isWeakRef && isWeakProxySubscriber) {
+         throw new IllegalArgumentException("ProxySubscribers should always be subscribed strongly.");
+      }
+      if (realSubscriber == null) {
+         return false;//already garbage collected?  Weird.
+      }
+      synchronized (listenerLock) {
+         List currentSubscribers = (List) subscriberMap.get(classTopicOrPatternWrapper);
+         if (currentSubscribers == null) {
+            if (LOG.isLoggable(Level.DEBUG)) {
+               LOG.debug("Creating new subscriber map for:" + classTopicOrPatternWrapper);
+            }
+            currentSubscribers = new ArrayList();
+            subscriberMap.put(classTopicOrPatternWrapper, currentSubscribers);
+         } else {
+            //Double subscription check and stale subscriber cleanup
+            //Need to compare the underlying referents for WeakReferences and ProxySubscribers
+            //to make sure a weak ref and a hard ref aren't both subscribed
+            //to the same topic and object.
+            //Use the proxied subscriber for comparison if a ProxySubscribers is used
+            //Subscribing the same object by proxy and subscribing explicitly should
+            //not subscribe the same object twice
+            for (Iterator iterator = currentSubscribers.iterator(); iterator.hasNext();) {
+               Object currentSubscriber = iterator.next();
+               Object realCurrentSubscriber = getRealSubscriberAndCleanStaleSubscriberIfNecessary(iterator, currentSubscriber);
+               if (realSubscriber.equals(realCurrentSubscriber)) {
+                  //Already subscribed.  
+                  //Remove temporarily, to add to the end of the calling list
+                  iterator.remove();
+                  alreadyExists = true;                            
+               }
+            }
+         }
+         currentSubscribers.add(subscriber);
+         if (isWeakProxySubscriber || isWeakRef) {
+            incWeakRefPlusProxySubscriberCount();
+         }
+         return !alreadyExists;
+      }
+   }
+
+   /** @see EventService#unsubscribe(Class,EventSubscriber) */
+   public boolean unsubscribe(Class cl, EventSubscriber eh) {
+      return unsubscribe(cl, subscribersByEventClass, eh);
+   }
+
+   /** @see EventService#unsubscribeExactly(Class,EventSubscriber) */
+   public boolean unsubscribeExactly(Class cl, EventSubscriber eh) {
+      return unsubscribe(cl, subscribersByExactEventClass, eh);
+   }
+
+   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
+   public boolean unsubscribe(String name, EventTopicSubscriber eh) {
+      return unsubscribe(name, subscribersByTopic, eh);
+   }
+
+   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
+   public boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber eh) {
+      PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
+      return unsubscribe(patternWrapper, subscribersByTopicPattern, eh);
+   }
+
+   /** @see EventService#unsubscribe(Class,Object) */
+   public boolean unsubscribe(Class eventClass, Object subscribedByProxy) {
+      EventSubscriber subscriber = (EventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribe(eventClass, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribeExactly(Class,Object) */
+   public boolean unsubscribeExactly(Class eventClass, Object subscribedByProxy) {
+      EventSubscriber subscriber = (EventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribeExactly(eventClass, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribe(String,Object) */
+   public boolean unsubscribe(String topic, Object subscribedByProxy) {
+      EventTopicSubscriber subscriber = (EventTopicSubscriber) getProxySubscriber(topic, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribe(topic, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribe(java.util.regex.Pattern,Object) */
+   public boolean unsubscribe(Pattern pattern, Object subscribedByProxy) {
+      EventTopicSubscriber subscriber = (EventTopicSubscriber) getProxySubscriber(pattern, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribe(pattern, subscriber);
+      }
+   }
+
+   /**
+    * All event subscriber unsubscriptions call this method.  Extending classes only have to override this method to
+    * subscribe all subscriber unsubscriptions.
+    *
+    * @param o the topic or event class to unsubscribe from
+    * @param subscriberMap the map of subscribers to use (by topic of class)
+    * @param subscriber the subscriber to unsubscribe, either an EventSubscriber or an EventTopicSubscriber, or a WeakReference
+    * to either
+    *
+    * @return boolean if the subscriber is unsubscribed (was subscribed).
+    */
+   protected boolean unsubscribe(Object o, Map subscriberMap, Object subscriber) {
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("unsubscribe(" + o + "," + subscriber + ")");
+      }
+      if (o == null) {
+         throw new IllegalArgumentException("Can't unsubscribe to null.");
+      }
+      if (subscriber == null) {
+         throw new IllegalArgumentException("Can't unsubscribe null subscriber to " + o);
+      }
+      synchronized (listenerLock) {
+         return removeFromSetResolveWeakReferences(subscriberMap, o, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribeVeto(Class,Object) */
+   public boolean unsubscribeVeto(Class eventClass, Object subscribedByProxy) {
+      VetoEventListener subscriber = (VetoEventListener) getVetoProxySubscriber(eventClass, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribeVetoListener(eventClass, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribeVetoExactly(Class,Object) */
+   public boolean unsubscribeVetoExactly(Class eventClass, Object subscribedByProxy) {
+      VetoEventListener subscriber = (VetoEventListener) getVetoProxySubscriber(eventClass, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribeVetoListenerExactly(eventClass, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribeVeto(String,Object) */
+   public boolean unsubscribeVeto(String topic, Object subscribedByProxy) {
+      VetoTopicEventListener subscriber = (VetoTopicEventListener) getVetoProxySubscriber(topic, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribeVetoListener(topic, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribeVeto(java.util.regex.Pattern,Object) */
+   public boolean unsubscribeVeto(Pattern pattern, Object subscribedByProxy) {
+      VetoTopicEventListener subscriber = (VetoTopicEventListener) getVetoProxySubscriber(pattern, subscribedByProxy);
+      if (subscriber == null) {
+         return false;
+      } else {
+         return unsubscribeVetoListener(pattern, subscriber);
+      }
+   }
+
+   /** @see EventService#unsubscribeVetoListener(Class,VetoEventListener) */
+   public boolean unsubscribeVetoListener(Class eventClass, VetoEventListener vetoListener) {
+      return unsubscribeVetoListener(eventClass, vetoListenersByClass, vetoListener);
+   }
+
+   /** @see EventService#unsubscribeVetoListenerExactly(Class,VetoEventListener) */
+   public boolean unsubscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener) {
+      return unsubscribeVetoListener(eventClass, vetoListenersByExactClass, vetoListener);
+   }
+
+   /** @see EventService#unsubscribeVetoListener(String,VetoTopicEventListener) */
+   public boolean unsubscribeVetoListener(String topic, VetoTopicEventListener vetoListener) {
+      return unsubscribeVetoListener(topic, vetoListenersByTopic, vetoListener);
+   }
+
+   /** @see EventService#unsubscribeVetoListener(Pattern,VetoTopicEventListener) */
+   public boolean unsubscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener) {
+      PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
+      return unsubscribeVetoListener(patternWrapper, vetoListenersByTopicPattern, vetoListener);
+   }
+
+   /**
+    * All veto unsubscriptions methods call this method.  Extending classes only have to override this method to
+    * subscribe all veto unsubscriptions.
+    *
+    * @param o the topic or event class to unsubscribe from
+    * @param vetoListenerMap the map of veto listeners to use (by topic or class)
+    * @param vl the veto listener to unsubscribe, or a WeakReference to one
+    *
+    * @return boolean if the veto listener is unsubscribed (was subscribed).
+    */
+   protected boolean unsubscribeVetoListener(Object o, Map vetoListenerMap, Object vl) {
+      if (LOG.isLoggable(Level.DEBUG)) {
+         LOG.debug("unsubscribeVetoListener(" + o + "," + vl + ")");
+      }
+      if (o == null) {
+         throw new IllegalArgumentException("Can't unsubscribe veto listener to null.");
+      }
+      if (vl == null) {
+         throw new IllegalArgumentException("Can't unsubscribe null veto listener to " + o);
+      }
+      synchronized (listenerLock) {
+         return removeFromSetResolveWeakReferences(vetoListenerMap, o, vl);
+      }
+   }
+
+   private ProxySubscriber getProxySubscriber(Class eventClass, Object subscribedByProxy) {
+      List subscribers = getSubscribers(eventClass);
+      return getProxySubscriber(subscribers, subscribedByProxy);
+   }
+
+   private ProxySubscriber getProxySubscriber(String topic, Object subscribedByProxy) {
+      List subscribers = getSubscribers(topic);
+      return getProxySubscriber(subscribers, subscribedByProxy);
+   }
+
+   private ProxySubscriber getProxySubscriber(Pattern pattern, Object subscribedByProxy) {
+      List subscribers = getSubscribersToPattern(pattern);
+      return getProxySubscriber(subscribers, subscribedByProxy);
+   }
+
+   private ProxySubscriber getVetoProxySubscriber(Class eventClass, Object subscribedByProxy) {
+      List subscribers = getVetoSubscribers(eventClass);
+      return getProxySubscriber(subscribers, subscribedByProxy);
+   }
+
+   private ProxySubscriber getVetoProxySubscriber(String topic, Object subscribedByProxy) {
+      List subscribers = getVetoSubscribers(topic);
+      return getProxySubscriber(subscribers, subscribedByProxy);
+   }
+
+   private ProxySubscriber getVetoProxySubscriber(Pattern pattern, Object subscribedByProxy) {
+      List subscribers = getVetoSubscribers(pattern);
+      return getProxySubscriber(subscribers, subscribedByProxy);
+   }
+
+   private ProxySubscriber getProxySubscriber(List subscribers, Object subscribedByProxy) {
+      for (Iterator iter = subscribers.iterator(); iter.hasNext();) {
+         Object subscriber = iter.next();
+         if (subscriber instanceof WeakReference) {
+            WeakReference wr = (WeakReference) subscriber;
+            subscriber = wr.get();
+         }
+         if (subscriber instanceof ProxySubscriber) {
+            ProxySubscriber proxy = (ProxySubscriber) subscriber;
+            subscriber = proxy.getProxiedSubscriber();
+            if (subscriber == subscribedByProxy) {
+               return proxy;
+            }
+         }
+      }
+      return null;
+   }
+
+   /** @see EventService#publish(Object) */
+   public void publish(Object event) {
+      if (event == null) {
+         throw new IllegalArgumentException("Cannot publish null event.");
+      }
+      publish(event, null, null, getSubscribers(event.getClass()), getVetoSubscribers(event.getClass()), null);
+   }
+
+   /** @see EventService#publish(java.lang.reflect.Type, Object)  */
+   public void publish(Type genericType, Object event) {
+      if (genericType == null) {
+         throw new IllegalArgumentException("genericType must not be null.");
+      }
+      if (event == null) {
+         throw new IllegalArgumentException("Cannot publish null event.");
+      }
+      publish(event, null, null, getSubscribers(genericType), null/*getVetoSubscribers(genericType)*/, null);
+   }
+
+   /** @see EventService#publish(String,Object) */
+   public void publish(String topicName, Object eventObj) {
+      publish(null, topicName, eventObj, getSubscribers(topicName), getVetoEventListeners(topicName), null);
+   }
+
+   /**
+    * All publish methods call this method.  Extending classes only have to override this method to handle all
+    * publishing cases.
+    *
+    * @param event the event to publish, null if publishing on a topic
+    * @param topic if publishing on a topic, the topic to publish on, else null
+    * @param eventObj if publishing on a topic, the eventObj to publish, else null
+    * @param subscribers the subscribers to publish to - must be a snapshot copy
+    * @param vetoSubscribers the veto subscribers to publish to - must be a snapshot copy.
+    * @param callingStack the stack that called this publication, helpful for reporting errors on other threads
+    * @throws IllegalArgumentException if eh or o is null
+    */
+   protected void publish(final Object event, final String topic, final Object eventObj,
+           final List subscribers, final List vetoSubscribers, StackTraceElement[] callingStack) {
+
+      if (event == null && topic == null) {
+         throw new IllegalArgumentException("Can't publish to null topic/event.");
+      }
+
+      setStatus(PublicationStatus.Initiated, event, topic, eventObj);
+      //topic or event
+      logEvent(event, topic, eventObj);
+
+      //Check all veto subscribers, if any veto, then don't publish or cache
+      if (checkVetoSubscribers(event, topic, eventObj, vetoSubscribers, callingStack)) {
+         setStatus(PublicationStatus.Vetoed, event, topic, eventObj);
+         return;
+      } else {
+         setStatus(PublicationStatus.Queued, event, topic, eventObj);
+      }
+
+      addEventToCache(event, topic, eventObj);
+
+      if (subscribers == null || subscribers.isEmpty()) {
+         if (LOG.isLoggable(Level.DEBUG)) {
+            LOG.debug("No subscribers for event or topic. Event:" + event + ", Topic:" + topic);
+         }
+      } else {
+         if (LOG.isLoggable(Level.DEBUG)) {
+            LOG.debug("Publishing to subscribers:" + subscribers);
+         }
+         setStatus(PublicationStatus.Publishing, event, topic, eventObj);
+         for (int i = 0; i < subscribers.size(); i++) {
+            Object eh = subscribers.get(i);
+            if (event != null) {
+               EventSubscriber eventSubscriber = (EventSubscriber) eh;
+               long start = System.currentTimeMillis();
+               try {
+                  eventSubscriber.onEvent(event);
+                  checkTimeLimit(start, event, eventSubscriber, null);
+               } catch (Throwable e) {
+                  checkTimeLimit(start, event, eventSubscriber, null);
+                  handleException(event, e, callingStack, eventSubscriber);
+               }
+            } else {
+               EventTopicSubscriber eventTopicSubscriber = (EventTopicSubscriber) eh;
+               try {
+                  eventTopicSubscriber.onEvent(topic, eventObj);
+               } catch (Throwable e) {
+                  onEventException(topic, eventObj, e, callingStack, eventTopicSubscriber);
+               }
+            }
+         }
+      }
+      setStatus(PublicationStatus.Completed, event, topic, eventObj);      
+   }
+
+   /**
+    * Called during publication to set the status on an event.  Can be used by subclasses
+    * to be notified when an event transitions from one state to another.  Implementers
+    * are required to call setPublicationStatus
+    * @param status the status to set on the object
+    * @param event the event being published, will be null if topic is not null
+    * @param topic the topic eventObj is being published on, will be null if event is not null
+    * @param eventObj the payload being published on the topic , will be null if event is not null
+    */
+   @SuppressWarnings({"UnusedDeclaration"})
+   protected void setStatus(PublicationStatus status, Object event, String topic, Object eventObj) {
+      if (event instanceof PublicationStatusTracker) {
+         ((PublicationStatusTracker)event).setPublicationStatus(status);
+      }
+      if (eventObj instanceof PublicationStatusTracker) {
+         ((PublicationStatusTracker)eventObj).setPublicationStatus(status);
+      }
+   }
+
+   /**
+    * Handles subscribers that are Prioritized by putting the most negative prioritized subscribers
+    * first, the most positive prioritized subscribers last, and leaving non-Prioritized in their
+    * original FIFO order.
+    * @param subscribers the subscribers to sort
+    * @return the same list if there are no prioritized subscribers in the list, otherwise a new sorted result
+    */
+   private List sortSubscribers(List subscribers) {
+      if (subscribers == null) {
+         return null;
+      }
+      List<Prioritized> prioritizedSubscribers = null;
+      Iterator iterator = subscribers.iterator();
+      while (iterator.hasNext()) {
+         Object subscriber = iterator.next();
+         if (subscriber instanceof Prioritized) {
+            Prioritized prioritized = ((Prioritized)subscriber);
+            if (prioritized.getPriority() != 0) {
+               iterator.remove();
+               if (prioritizedSubscribers == null) {
+                  prioritizedSubscribers = new ArrayList<Prioritized>();
+               }
+               prioritizedSubscribers.add(prioritized);
+            }
+         }
+      }
+      if (prioritizedSubscribers  == null) {
+         return subscribers;
+      } else {
+         List result = new ArrayList(prioritizedSubscribers.size()+subscribers.size());
+         Collections.sort(prioritizedSubscribers, PRIORITIZED_SUBSCRIBER_COMPARATOR);
+         boolean haveAddedFIFOSubscribers = false;
+         for (Prioritized prioritizedSubscriber : prioritizedSubscribers) {
+            if (prioritizedSubscriber.getPriority() > 0 && !haveAddedFIFOSubscribers) {
+               for (Object subscriber : subscribers) {
+                  result.add(subscriber);
+               }
+               haveAddedFIFOSubscribers = true;
+            }
+            result.add(prioritizedSubscriber);
+         }
+         //Issue 26 - of all priorities are negative, then add the FIFO after processing all of them
+         if (!haveAddedFIFOSubscribers) {
+             for (Object subscriber : subscribers) {
+                result.add(subscriber);
+             }
+         }
+         return result;
+      }
+   }
+
+   private boolean checkVetoSubscribers(Object event, String topic, Object eventObj, List vetoSubscribers,
+           StackTraceElement[] callingStack) {
+      if (vetoSubscribers != null && !vetoSubscribers.isEmpty()) {
+         for (Iterator vlIter = vetoSubscribers.iterator(); vlIter.hasNext();) {
+            Object vetoer = vlIter.next();
+            VetoEventListener vl = null;
+            VetoTopicEventListener vtl = null;
+            if (event == null) {
+               vtl = (VetoTopicEventListener) vetoer;
+            } else {
+               vl = (VetoEventListener) vetoer;
+            }
+            long start = System.currentTimeMillis();
+            try {
+               boolean shouldVeto = false;
+               if (event == null) {
+                  shouldVeto = vtl.shouldVeto(topic, eventObj);
+               } else {
+                  shouldVeto = vl.shouldVeto(event);
+               }
+               if (shouldVeto) {
+                  handleVeto(vl, event, vtl, topic, eventObj);
+                  checkTimeLimit(start, event, null, vl);
+                  if (LOG.isLoggable(Level.DEBUG)) {
+                     LOG.debug("Publication vetoed. Event:" + event + ", Topic:" + topic + ", veto subscriber:" + vl);
+                  }
+                  return true;
+               }
+            } catch (Throwable ex) {
+               checkTimeLimit(start, event, null, vl);
+               subscribeVetoException(event, topic, eventObj, ex, callingStack, vl);
+            }
+         }
+      }
+      return false;
+   }
+
+   private void logEvent(Object event, String topic, Object eventObj) {
+      if (LOG.isLoggable(Level.DEBUG)) {
+         if (event != null) {
+            LOG.debug("Publishing event: class=" + event.getClass() + ", event=" + event);
+         } else if (topic != null) {
+            LOG.debug("Publishing event: topic=" + topic + ", eventObj=" + eventObj);
+         }
+      }
+   }
+
+   /**
+    * Adds an event to the event cache, if appropriate.  This method is called just before publication to listeners,
+    * after the event passes any veto listeners.
+    * <p/>
+    * Using protected visibility to open the caching to other implementations.
+    *
+    * @param event the event about to be published, null if topic is non-null
+    * @param topic the topic about to be published to, null if the event is non-null
+    * @param eventObj the eventObj about to be published on a topic, null if the event is non-null
+    */
+   protected void addEventToCache(Object event, String topic, Object eventObj) {
+      //Taking the listener lock here, since a listener that is now subscribing will want
+      //this event since they are not in this subscriber list.
+      synchronized (listenerLock) {
+         if (event != null) {
+            int cacheSizeForEventClass = getCacheSizeForEventClass(event.getClass());
+            List eventClassCache = (List) cacheByEvent.get(event.getClass());
+            if (cacheSizeForEventClass <= 0) {
+               if (eventClassCache != null) {
+                  //the cache threshold was lowered to 0
+                  cacheByEvent.remove(event.getClass());
+               }
+            } else {
+               if (eventClassCache == null) {
+                  eventClassCache = new LinkedList();
+                  cacheByEvent.put(event.getClass(), eventClassCache);
+               }
+               eventClassCache.add(0, event);
+               while (eventClassCache.size() > cacheSizeForEventClass) {
+                  eventClassCache.remove(eventClassCache.size() - 1);
+               }
+            }
+         } else {
+            //topic
+            int cacheSizeForTopic = getCacheSizeForTopic(topic);
+            List topicCache = (List) cacheByTopic.get(topic);
+            if (cacheSizeForTopic <= 0) {
+               if (topicCache != null) {
+                  //the cache threshold was lowered to 0
+                  topicCache.remove(topic);
+               }
+            } else {
+               if (topicCache == null) {
+                  topicCache = new LinkedList();
+                  cacheByTopic.put(topic, topicCache);
+               }
+               topicCache.add(0, eventObj);
+               while (topicCache.size() > cacheSizeForTopic) {
+                  topicCache.remove(topicCache.size() - 1);
+               }
+            }
+         }
+      }
+   }
+
+   /** @see EventService#getSubscribers(Class) */
+   public <T> List<T> getSubscribers(Class<T> eventClass) {
+      List hierarchyMatches;
+      List exactMatches;
+      synchronized (listenerLock) {
+         hierarchyMatches = getSubscribersToClass(eventClass);
+         exactMatches = getSubscribersToExactClass(eventClass);
+      }
+      List result = new ArrayList();
+      if (exactMatches != null) {
+         result.addAll(exactMatches);
+      }
+      if (hierarchyMatches != null) {
+         result.addAll(hierarchyMatches);
+      }
+      if (hasEverUsedPrioritized) {
+         result = sortSubscribers(result);
+      }
+      return result;
+
+   }
+
+   /** @see EventService#getSubscribersToClass(Class) */
+   public <T> List<T> getSubscribersToClass(Class<T> eventClass) {
+      synchronized (listenerLock) {
+         Map classMap = subscribersByEventClass;
+         List result = getEventOrVetoSubscribersToClass(classMap, eventClass);
+         if (hasEverUsedPrioritized) {
+            result = sortSubscribers(result);
+         }
+         return result;
+      }
+   }
+
+   /** @see EventService#getSubscribersToExactClass(Class) */
+   public <T> List<T> getSubscribersToExactClass(Class<T> eventClass) {
+      synchronized (listenerLock) {
+         return getSubscribers(eventClass, subscribersByExactEventClass);
+      }
+   }
+
+   /** @see EventService#getSubscribers(Type) */
+   public <T> List<T> getSubscribers(Type eventType) {
+      List result;
+      synchronized (listenerLock) {
+         result = getEventOrVetoSubscribersToType(subscribersByEventType, eventType);
+      }
+      if (hasEverUsedPrioritized) {
+         result = sortSubscribers(result);
+      }
+      return result;
+   }
+
+   /** @see EventService#getSubscribers(String) */
+   public <T> List<T> getSubscribers(String topic) {
+      List result = new ArrayList();
+      List exactMatches;
+      List patternMatches;
+      synchronized (listenerLock) {
+         exactMatches = getSubscribersToTopic(topic);
+         patternMatches = getSubscribersByPattern(topic);
+      }
+      if (exactMatches != null) {
+         result.addAll(exactMatches);
+      }
+      if (patternMatches != null) {
+         result.addAll(patternMatches);
+      }
+      if (hasEverUsedPrioritized) {
+         result = sortSubscribers(result);
+      }
+      return result;
+   }
+
+   /** @see EventService#getSubscribersToTopic(String)  */
+   public <T> List<T> getSubscribersToTopic(String topic) {
+      synchronized (listenerLock) {
+         return getSubscribers(topic, subscribersByTopic);
+      }
+   }
+
+   /** @see EventService#getSubscribers(Pattern)  */
+   public <T> List<T> getSubscribers(Pattern pattern) {
+      synchronized (listenerLock) {
+         return getSubscribers(pattern, subscribersByTopicPattern);
+      }
+   }
+
+   /** @see EventService#getSubscribersByPattern(String)  */
+   public <T> List<T> getSubscribersByPattern(String topic) {
+      return getSubscribersByPattern(topic, subscribersByTopicPattern);
+   }
+
+   /** @see EventService#getVetoSubscribers(Class) */
+   public <T> List<T> getVetoSubscribers(Class<T> eventClass) {
+      List result = new ArrayList();
+      List exactMatches;
+      List hierarchyMatches;
+      synchronized (listenerLock) {
+         exactMatches = getVetoSubscribersToClass(eventClass);
+         hierarchyMatches = getVetoSubscribersToExactClass(eventClass);
+      }
+      if (exactMatches != null) {
+         result.addAll(exactMatches);
+      }
+      if (hierarchyMatches != null) {
+         result.addAll(hierarchyMatches);
+      }
+      if (hasEverUsedPrioritized) {
+         result = sortSubscribers(result);
+      }
+      return result;
+   }
+
+   /** @see EventService#getVetoSubscribersToClass(Class) */
+   public <T> List<T> getVetoSubscribersToClass(Class<T> eventClass) {
+      List result;
+      synchronized (listenerLock) {
+         Map classMap = vetoListenersByClass;
+         result = getEventOrVetoSubscribersToClass(classMap, eventClass);
+      }
+      if (hasEverUsedPrioritized) {
+         result = sortSubscribers(result);
+      }
+      return result;
+   }
+
+   /** @see EventService#getVetoSubscribersToExactClass(Class) */
+   public <T> List<T> getVetoSubscribersToExactClass(Class<T> eventClass) {
+      synchronized (listenerLock) {
+         return getSubscribers(eventClass, vetoListenersByExactClass);
+      }
+   }
+
+   /** @see EventService#getVetoEventListeners(String)  */
+   public <T> List<T> getVetoEventListeners(String topicOrPattern) {
+      List result = new ArrayList();
+      List exactMatches;
+      List patternMatches;
+      synchronized (listenerLock) {
+         exactMatches = getVetoSubscribersToTopic(topicOrPattern);
+         patternMatches = getVetoSubscribersByPattern(topicOrPattern);
+      }
+      if (exactMatches != null) {
+         result.addAll(exactMatches);
+      }
+      if (patternMatches != null) {
+         result.addAll(patternMatches);
+      }
+      if (hasEverUsedPrioritized) {
+         result = sortSubscribers(result);
+      }
+      return result;
+   }
+
+   /** @see EventService#getVetoSubscribersToTopic(String) */
+   public <T> List<T> getVetoSubscribersToTopic(String topic) {
+      synchronized (listenerLock) {
+         return getSubscribers(topic, vetoListenersByTopic);
+      }
+   }
+
+   /**
+    * Note: this is inconsistent with getSubscribers(String)
+    * @see EventService#getVetoSubscribersToTopic(String)
+    * @deprecated use getVetoSubscribersToTopic instead for direct replacement,
+    *             or use getVetoEventListeners to get topic and pattern matchers.
+    *             In EventBus 2.0 this name will replace getVetoEventListeners()
+    *             and have it's union functionality
+    */
+   public <T> List<T> getVetoSubscribers(String topic) {
+      synchronized (listenerLock) {
+         return getVetoSubscribersToTopic(topic);
+      }
+   }
+
+   /** @see EventService#getVetoSubscribers(Pattern) */
+   public <T> List<T> getVetoSubscribers(Pattern topicPattern) {
+      synchronized (listenerLock) {
+         PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
+         return getSubscribers(patternWrapper, vetoListenersByTopicPattern);
+      }
+   }
+
+   /** @see EventService#getVetoSubscribersByPattern(String)   */
+   public <T> List<T> getVetoSubscribersByPattern(String pattern) {
+      return getSubscribersByPattern(pattern, vetoListenersByTopicPattern);
+   }
+
+   /** Used for subscribers and veto subscribers */
+   private <T> List<T> getSubscribersByPattern(String topic, Map subscribersByTopicPattern) {
+      List result = new ArrayList();
+      synchronized (listenerLock) {
+         Set keys = subscribersByTopicPattern.keySet();
+         for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
+            PatternWrapper patternKey = (PatternWrapper) iterator.next();
+            if (patternKey.matches(topic)) {
+               if (LOG.isLoggable(Level.DEBUG)) {
+                  LOG.debug("Pattern " + patternKey + " matched topic name " + topic);
+               }
+               Collection subscribers = (Collection) subscribersByTopicPattern.get(patternKey);
+               result.addAll(createCopyOfContentsRemoveWeakRefs(subscribers));
+            }
+         }
+         if (hasEverUsedPrioritized) {
+            result = sortSubscribers(result);
+         }
+         return result;
+      }
+   }
+
+   protected <T> List<T> getSubscribersToPattern(Pattern topicPattern) {
+      synchronized (listenerLock) {
+         PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
+         return getSubscribers(patternWrapper, subscribersByTopicPattern);
+      }
+   }
+
+   private List getSubscribers(Object classOrTopic, Map subscriberMap) {
+      List result;
+      synchronized (listenerLock) {
+         List subscribers = (List) subscriberMap.get(classOrTopic);
+         //Make a defensive copy of subscribers and veto listeners so listeners
+         //can change the listener list while the listeners are being called
+         //Resolve WeakReferences and unsubscribe if necessary.
+         result = createCopyOfContentsRemoveWeakRefs(subscribers);
+      }
+      if (hasEverUsedPrioritized) {
+         result = sortSubscribers(result);
+      }
+      return result;
+   }
+
+   private List getEventOrVetoSubscribersToClass(Map classMap, Class eventClass) {
+      List result = new ArrayList();
+      Set keys = classMap.keySet();
+      for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
+         Class cl = (Class) iterator.next();
+         if (cl.isAssignableFrom(eventClass)) {
+            if (LOG.isLoggable(Level.DEBUG)) {
+               LOG.debug("Hierarchical match " + cl + " matched event of class " + eventClass);
+            }
+            Collection subscribers = (Collection) classMap.get(cl);
+            result.addAll(createCopyOfContentsRemoveWeakRefs(subscribers));
+         }
+      }
+      return result;
+   }
+
+   private List getEventOrVetoSubscribersToType(Map typeMap, Type eventType) {
+      List result = new ArrayList();
+      Set mapKeySet = typeMap.keySet();
+      for (Object mapKey : mapKeySet) {
+         Type subscriberType = (Type) mapKey;
+         if (eventType instanceof ParameterizedType && subscriberType instanceof ParameterizedType) {
+            ParameterizedType subscriberPT = (ParameterizedType) subscriberType;
+            ParameterizedType eventPT = (ParameterizedType) eventType;
+            if (eventPT.getRawType().equals(subscriberPT.getRawType())) {
+               Type[] mapTypeArgs = subscriberPT.getActualTypeArguments();
+               Type[] eventTypeArgs = eventPT.getActualTypeArguments();
+               if (mapTypeArgs == null || eventTypeArgs == null || mapTypeArgs.length != eventTypeArgs.length) {
+                  continue;
+               }
+               boolean parameterArgsMatch = true;
+               for (int argCount = 0; argCount < mapTypeArgs.length; argCount++) {
+                  Type eventTypeArg = eventTypeArgs[argCount];
+                  if (eventTypeArg instanceof WildcardType) {
+                     throw new IllegalArgumentException("Only simple Class parameterized types can be published, not wildcards, etc.  Published attempt made for:"+eventTypeArg);
+                  }
+                  Type subscriberTypeArg = mapTypeArgs[argCount];
+                  if (subscriberTypeArg instanceof WildcardType) {
+                     WildcardType wildcardSubscriberTypeArg = (WildcardType) subscriberTypeArg;
+                     Type[] upperBound = wildcardSubscriberTypeArg.getUpperBounds();
+                     Type[] lowerBound = wildcardSubscriberTypeArg.getLowerBounds();
+                     if (upperBound != null && upperBound.length > 0) {
+                        if (upperBound[0] instanceof Class) {
+                           Class upper = (Class) upperBound[0];
+                           if (eventTypeArg instanceof Class) {
+                              if (!upper.isAssignableFrom((Class) eventTypeArg)) {
+                                 parameterArgsMatch = false;
+                                 break;
+                              }
+                           } else {
+                              parameterArgsMatch = false;
+                              break;
+                           }
+                        } else {
+                           throw new IllegalArgumentException("Only Class and Interface types are supported as types of wildcard subscriptions.  Type:"+upperBound[0]);
+                        }
+                     }
+                     if (lowerBound != null && lowerBound.length > 0) {
+                        if (lowerBound[0] instanceof Class) {
+                           Class lower = (Class) lowerBound[0];
+                           if (eventTypeArg instanceof Class) {
+                              if (!((Class)eventTypeArg).isAssignableFrom(lower)) {
+                                 parameterArgsMatch = false;
+                                 break;
+                              }
+                           } else {
+                              parameterArgsMatch = false;
+                              break;
+                           }
+                        } else {
+                           throw new IllegalArgumentException("Only Class and Interface types are supported as types of wildcard subscriptions.  Type:"+upperBound[0]);
+                        }
+                     }
+                  } else if (!subscriberTypeArg.equals(eventTypeArg)) {
+                     parameterArgsMatch = false;
+                     break;
+                  }
+               }
+               if (parameterArgsMatch) {
+                  if (LOG.isLoggable(Level.DEBUG)) {
+                     LOG.debug("Exact parameterized subscriberType match for event subscriberType " + eventType);
+                  }
+                  Collection subscribers = (Collection) typeMap.get(subscriberType);
+                  if (subscribers != null) {
+                     result.addAll(createCopyOfContentsRemoveWeakRefs(subscribers));
+                  }
+               }
+            }
+         }
+      }
+      return result;
+//            Type o = p.getOwnerType();
+//            if (o != null) {
+//
+//            }
+//            p.getActualTypeArguments();
+//         }
+         /*
+	} else if (type instanceof TypeVariable<?>) {
+	    TypeVariable<?> v = (TypeVariable<?>)type;
+	    out.print(v.getName());
+	} else if (type instanceof GenericArrayType) {
+	    GenericArrayType a = (GenericArrayType)type;
+	    printType(a.getGenericComponentType());
+	    out.print("[]");
+	} else if (type instanceof WildcardType) {
+	    WildcardType w = (WildcardType)type;
+	    Type[] upper = w.getUpperBounds();
+	    Type[] lower = w.getLowerBounds();
+	    if (upper.length==1 && lower.length==0) {
+		out.print("? extends ");
+		printType(upper[0]);
+	    } else if (upper.length==0 && lower.length==1) {
+		out.print("? super ");
+		printType(lower[0]);
+	    } else assert false;
+	}         
+          */
+   }
+
+   private void checkTimeLimit(long start, Object event, EventSubscriber subscriber, VetoEventListener l) {
+      if (timeThresholdForEventTimingEventPublication == null) {
+         return;
+      }
+      long end = System.currentTimeMillis();
+      if (end - start > timeThresholdForEventTimingEventPublication.longValue()) {
+         publish(new SubscriberTimingEvent(this, new Long(start), new Long(end), timeThresholdForEventTimingEventPublication, event, subscriber, l));
+      }
+   }
+
+   protected void subscribeTiming(SubscriberTimingEvent event) {
+      LOG.log(Level.INFO, event + "");
+   }
+
+   /**
+    * Handle vetos of an event or topic, by default logs finely.
+    *
+    * @param vl the veto listener for an event
+    * @param event the event, can be null if topic is not
+    * @param vtl the veto listener for a topic
+    * @param topic can be null if event is not
+    * @param eventObj the object published with the topic
+    */
+   protected void handleVeto(VetoEventListener vl, Object event,
+           VetoTopicEventListener vtl, String topic, Object eventObj) {
+      if (LOG.isLoggable(Level.DEBUG)) {
+         if (event != null) {
+            LOG.debug("Vetoing event: class=" + event.getClass() + ", event=" + event + ", vetoer:" + vl);
+         } else {
+            LOG.debug("Vetoing event: topic=" + topic + ", eventObj=" + eventObj + ", vetoer:" + vtl);
+         }
+      }
+   }
+
+   /**
+    * Given a Map (of Lists of subscribers or veto listeners), removes the toRemove element from the List in the map for
+    * the given key.  The entire map is checked for WeakReferences and ProxySubscribers and they are all unsubscribed
+    * if stale.
+    *
+    * @param map map of lists
+    * @param key key for a List in the map
+    * @param toRemove the object to remove form the list with the key of the map
+    *
+    * @return true if toRemove was unsubscribed
+    */
+   private boolean removeFromSetResolveWeakReferences(Map map, Object key, Object toRemove) {
+      List subscribers = (List) map.get(key);
+      if (subscribers == null) {
+         return false;
+      }
+      if (subscribers.remove(toRemove)) {
+         if (toRemove instanceof WeakReference) {
+            decWeakRefPlusProxySubscriberCount();            
+         }
+         if (toRemove instanceof ProxySubscriber) {
+            ((ProxySubscriber)toRemove).proxyUnsubscribed();
+            decWeakRefPlusProxySubscriberCount();
+         }
+         return true;
+      }
+
+      //search for WeakReferences and ProxySubscribers
+      for (Iterator iter = subscribers.iterator(); iter.hasNext();) {
+         Object existingSubscriber = iter.next();
+         if (existingSubscriber instanceof ProxySubscriber) {
+            ProxySubscriber proxy = (ProxySubscriber) existingSubscriber;
+            existingSubscriber = proxy.getProxiedSubscriber();
+            if (existingSubscriber == toRemove) {
+               removeProxySubscriber(proxy, iter);
+               return true;
+            }
+         }
+         if (existingSubscriber instanceof WeakReference) {
+            WeakReference wr = (WeakReference) existingSubscriber;
+            Object realRef = wr.get();
+            if (realRef == null) {
+               //clean up a garbage collected reference
+               iter.remove();
+               decWeakRefPlusProxySubscriberCount();
+               return true;
+            } else if (realRef == toRemove) {
+               iter.remove();
+               decWeakRefPlusProxySubscriberCount();
+               return true;
+            } else if (realRef instanceof ProxySubscriber) {
+               ProxySubscriber proxy = (ProxySubscriber) realRef;
+               existingSubscriber = proxy.getProxiedSubscriber();
+               if (existingSubscriber == toRemove) {
+                  removeProxySubscriber(proxy, iter);
+                  return true;
+               }
+            }
+         }
+      }
+      return false;
+   }
+
+   /**
+    * Given a set (or subscribers or veto listeners), makes a copy of the set, resolving WeakReferences to hard
+    * references, and removing garbage collected references from the original set.
+    *
+    * @param subscribersOrVetoListeners
+    *
+    * @return a copy of the set
+    */
+   private List createCopyOfContentsRemoveWeakRefs(Collection subscribersOrVetoListeners) {
+      if (subscribersOrVetoListeners == null) {
+         return null;
+      }
+      List copyOfSubscribersOrVetolisteners = new ArrayList(subscribersOrVetoListeners.size());
+      for (Iterator iter = subscribersOrVetoListeners.iterator(); iter.hasNext();) {
+         Object elem = iter.next();
+         if (elem instanceof ProxySubscriber) {
+            ProxySubscriber proxy = (ProxySubscriber)elem;
+            elem = proxy.getProxiedSubscriber();
+            if (elem == null) {
+               removeProxySubscriber(proxy, iter);
+            } else {
+               copyOfSubscribersOrVetolisteners.add(proxy);               
+            }
+         } else if (elem instanceof WeakReference) {
+            Object hardRef = ((WeakReference) elem).get();
+            if (hardRef == null) {
+               //Was reclaimed, unsubscribe
+               iter.remove();
+               decWeakRefPlusProxySubscriberCount();
+            } else {
+               copyOfSubscribersOrVetolisteners.add(hardRef);
+            }
+         } else {
+            copyOfSubscribersOrVetolisteners.add(elem);
+         }
+      }
+      return copyOfSubscribersOrVetolisteners;
+   }
+
+   /**
+    * Sets the default cache size for each kind of event, default is 0 (no caching).
+    * <p/>
+    * If this value is set to a positive number, then when an event is published, the EventService caches the event or
+    * topic payload data for later retrieval.  This allows subscribers to find out what has most recently happened
+    * before they subscribed.  The cached event(s) are returned from #getLastEvent(Class), #getLastTopicData(String),
+    * #getCachedEvents(Class), or #getCachedTopicData(String)
+    * <p/>
+    * The default can be overridden on a by-event-class or by-topic basis.
+    *
+    * @param defaultCacheSizePerClassOrTopic
+    */
+   public void setDefaultCacheSizePerClassOrTopic(int defaultCacheSizePerClassOrTopic) {
+      synchronized (cacheLock) {
+         this.defaultCacheSizePerClassOrTopic = defaultCacheSizePerClassOrTopic;
+      }
+   }
+
+   /** @return the default number of event payloads kept per event class or topic */
+   public int getDefaultCacheSizePerClassOrTopic() {
+      synchronized (cacheLock) {
+         return defaultCacheSizePerClassOrTopic;
+      }
+   }
+
+   /**
+    * Set the number of events cached for a particular class of event.  By default, no events are cached.
+    * <p/>
+    * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
+    * <p/>
+    * Class hierarchy semantics are respected.  That is, if there are three events, A, X and Y, and X and Y are both
+    * derived from A, then setting the cache size for A applies the cache size for all three.  Setting the cache size
+    * for X applies to X and leaves the settings for A and Y in tact.  Interfaces can be passed to this method, but they
+    * only take effect if the cache size of a class or it's superclasses has been set. Just like Class.getInterfaces(),
+    * if multiple cache sizes are set, the interface names declared earliest in the implements clause of the eventClass
+    * takes effect.
+    * <p/>
+    * The cache for an event is not adjusted until the next event of that class is published.
+    *
+    * @param eventClass the class of event
+    * @param cacheSize the number of published events to cache for this event
+    */
+   public void setCacheSizeForEventClass(Class eventClass, int cacheSize) {
+      synchronized (cacheLock) {
+         if (rawCacheSizesForEventClass == null) {
+            rawCacheSizesForEventClass = new HashMap();
+         }
+         rawCacheSizesForEventClass.put(eventClass, new Integer(cacheSize));
+         rawCacheSizesForEventClassChanged = true;
+      }
+   }
+
+   /**
+    * Returns the number of events cached for a particular class of event.  By default, no events are cached.
+    * <p/>
+    * This result is computed for a particular class from the values passed to #setCacheSizeForEventClass(Class, int),
+    * and respects the class hierarchy.
+    *
+    * @param eventClass the class of event
+    *
+    * @return the maximum size of the event cache for the given event class
+    *
+    * @see #setCacheSizeForEventClass(Class,int)
+    */
+   public int getCacheSizeForEventClass(Class eventClass) {
+      if (eventClass == null) {
+         throw new IllegalArgumentException("eventClass must not be null.");
+      }
+      synchronized (cacheLock) {
+         if (rawCacheSizesForEventClass == null || rawCacheSizesForEventClass.size() == 0) {
+            return getDefaultCacheSizePerClassOrTopic();
+         }
+         if (cacheSizesForEventClass == null) {
+            cacheSizesForEventClass = new HashMap();
+         }
+         if (rawCacheSizesForEventClassChanged) {
+            cacheSizesForEventClass.clear();
+            cacheSizesForEventClass.putAll(rawCacheSizesForEventClass);
+            rawCacheSizesForEventClassChanged = false;
+         }
+
+         //Has this been computed yet or set directly?
+         Integer size = (Integer) cacheSizesForEventClass.get(eventClass);
+         if (size != null) {
+            return size.intValue();
+         } else {
+            //must be computed
+            Class parent = eventClass.getSuperclass();
+            while (parent != null) {
+               Integer parentSize = (Integer) cacheSizesForEventClass.get(parent);
+               if (parentSize != null) {
+                  cacheSizesForEventClass.put(eventClass, parentSize);
+                  return parentSize.intValue();
+               }
+               parent = parent.getSuperclass();
+            }
+            //try interfaces
+            Class[] interfaces = eventClass.getInterfaces();
+            for (int i = 0; i < interfaces.length; i++) {
+               Class anInterface = interfaces[i];
+               Integer interfaceSize = (Integer) cacheSizesForEventClass.get(anInterface);
+               if (interfaceSize != null) {
+                  cacheSizesForEventClass.put(eventClass, interfaceSize);
+                  return interfaceSize.intValue();
+               }
+            }
+         }
+         return getDefaultCacheSizePerClassOrTopic();
+      }
+   }
+
+   /**
+    * Set the number of published data objects cached for a particular event topic.  By default, no caching is done.
+    * <p/>
+    * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
+    * <p/>
+    * Settings for exact topic names take precedence over pattern matching.
+    * <p/>
+    * The cache for a topic is not adjusted until the next publication on that topic.
+    *
+    * @param topicName the topic name
+    * @param cacheSize the number of published data Objects to cache for this topic
+    */
+   public void setCacheSizeForTopic(String topicName, int cacheSize) {
+      synchronized (cacheLock) {
+         if (rawCacheSizesForTopic == null) {
+            rawCacheSizesForTopic = new HashMap();
+         }
+         rawCacheSizesForTopic.put(topicName, new Integer(cacheSize));
+         rawCacheSizesForTopicChanged = true;
+      }
+   }
+
+   /**
+    * Set the number of published data objects cached for topics matching a pattern.  By default, caching is done.
+    * <p/>
+    * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
+    * <p/>
+    * Settings for exact topic names take precedence over pattern matching.  If a topic matches the cache settings for
+    * more than one pattern, the cache size chosen is an undetermined one from one of the matched pattern settings.
+    * <p/>
+    * The cache for a topic is not adjusted until the next publication on that topic.
+    *
+    * @param pattern the pattern matching topic names
+    * @param cacheSize the number of data Objects to cache for this topic
+    */
+   public void setCacheSizeForTopic(Pattern pattern, int cacheSize) {
+      synchronized (cacheLock) {
+         if (rawCacheSizesForPattern == null) {
+            rawCacheSizesForPattern = new HashMap();
+         }
+         PatternWrapper patternWrapper = new PatternWrapper(pattern);
+         rawCacheSizesForPattern.put(patternWrapper, new Integer(cacheSize));
+         rawCacheSizesForPatternChanged = true;
+      }
+   }
+
+   /**
+    * Returns the number of cached data objects published on a particular topic.  By default, no caching is performed.
+    * <p/>
+    * This result is computed for a particular topic from the values passed to #setCacheSizeForTopic(String, int) and
+    * #setCacheSizeForTopic(Pattern, int).
+    *
+    * @param topic the topic name
+    *
+    * @return the maximum size of the data Object cache for the given topic
+    *
+    * @see #setCacheSizeForTopic(String,int)
+    * @see #setCacheSizeForTopic(java.util.regex.Pattern,int)
+    */
+   public int getCacheSizeForTopic(String topic) {
+      if (topic == null) {
+         throw new IllegalArgumentException("topic must not be null.");
+      }
+      synchronized (cacheLock) {
+         if ((rawCacheSizesForTopic == null || (rawCacheSizesForTopic != null && rawCacheSizesForTopic.size() == 0)) &&
+                 (rawCacheSizesForPattern == null || (rawCacheSizesForPattern != null && rawCacheSizesForPattern.size() == 0))) {
+            return getDefaultCacheSizePerClassOrTopic();
+         }
+         if (cacheSizesForTopic == null) {
+            cacheSizesForTopic = new HashMap();
+         }
+         if (rawCacheSizesForTopicChanged || rawCacheSizesForPatternChanged) {
+            cacheSizesForTopic.clear();
+            cacheSizesForTopic.putAll(rawCacheSizesForTopic);
+            rawCacheSizesForTopicChanged = false;
+            rawCacheSizesForPatternChanged = false;
+         }
+
+         //Is this an exact match or has it been matched to a pattern yet?
+         Integer size = cacheSizesForTopic.get(topic);
+         if (size != null) {
+            return size;
+         } else {
+            //try matching patterns
+            if (rawCacheSizesForPattern != null) {
+               Set patterns = rawCacheSizesForPattern.keySet();
+               for (Iterator iterator = patterns.iterator(); iterator.hasNext();) {
+                  PatternWrapper pattern = (PatternWrapper) iterator.next();
+                  if (pattern.matches(topic)) {
+                     size = rawCacheSizesForPattern.get(pattern);
+                     cacheSizesForTopic.put(topic, size);
+                     return size;
+                  }
+               }
+            }
+         }
+         return getDefaultCacheSizePerClassOrTopic();
+      }
+   }
+
+   /**
+    * @param eventClass an index into the cache, cannot be an interface
+    *
+    * @return the last event published for this event class, or null if caching is turned off (the default)
+    */
+   public Object getLastEvent(Class eventClass) {
+      if (eventClass.isInterface()) {
+         throw new IllegalArgumentException("Interfaces are not accepted in get last event, use a specific event class.");
+      }
+      synchronized (cacheLock) {
+         List eventCache = cacheByEvent.get(eventClass);
+         if (eventCache == null || eventCache.size() == 0) {
+            return null;
+         }
+         return eventCache.get(0);
+      }
+   }
+
+   /**
+    * @param eventClass an index into the cache, cannot be an interface
+    *
+    * @return the last events published for this event class, or null if caching is turned off (the default)
+    */
+   public List getCachedEvents(Class eventClass) {
+      if (eventClass.isInterface()) {
+         throw new IllegalArgumentException("Interfaces are not accepted in get last event, use a specific event class.");
+      }
+      synchronized (cacheLock) {
+         List eventCache = cacheByEvent.get(eventClass);
+         if (eventCache == null || eventCache.size() == 0) {
+            return null;
+         }
+         return eventCache;
+      }
+   }
+
+   /**
+    * @param topic an index into the cache
+    *
+    * @return the last data Object published on this topic, or null if caching is turned off (the default)
+    */
+   public Object getLastTopicData(String topic) {
+      synchronized (cacheLock) {
+         List topicCache = cacheByTopic.get(topic);
+         if (topicCache == null || topicCache.size() == 0) {
+            return null;
+         }
+         return topicCache.get(0);
+      }
+   }
+
+   /**
+    * @param topic an index into the cache
+    *
+    * @return the last data Objects published on this topic, or null if caching is turned off (the default)
+    */
+   public List getCachedTopicData(String topic) {
+      synchronized (cacheLock) {
+         List topicCache = cacheByTopic.get(topic);
+         if (topicCache == null || topicCache.size() == 0) {
+            return null;
+         }
+         return topicCache;
+      }
+   }
+
+   /**
+    * Clears the event cache for a specific event class or interface and it's any of it's subclasses or implementing
+    * classes.
+    *
+    * @param eventClassToClear the event class to clear the cache for
+    */
+   public void clearCache(Class eventClassToClear) {
+      synchronized (cacheLock) {
+         Set classes = cacheByEvent.keySet();
+         for (Iterator iterator = classes.iterator(); iterator.hasNext();) {
+            Class cachedClass = (Class) iterator.next();
+            if (eventClassToClear.isAssignableFrom(cachedClass)) {
+               iterator.remove();
+            }
+         }
+      }
+   }
+
+   /**
+    * Clears the topic data cache for a specific topic name.
+    *
+    * @param topic the topic name to clear the cache for
+    */
+   public void clearCache(String topic) {
+      synchronized (cacheLock) {
+         cacheByTopic.remove(topic);
+      }
+   }
+
+   /**
+    * Clears the topic data cache for all topics that match a particular pattern.
+    *
+    * @param pattern the pattern to match topic caches to
+    */
+   public void clearCache(Pattern pattern) {
+      synchronized (cacheLock) {
+         Set classes = cacheByTopic.keySet();
+         for (Iterator iterator = classes.iterator(); iterator.hasNext();) {
+            String cachedTopic = (String) iterator.next();
+            if (pattern.matcher(cachedTopic).matches()) {
+               iterator.remove();
+            }
+         }
+      }
+   }
+
+   /** Clear all event caches for all topics and event. */
+   public void clearCache() {
+      synchronized (cacheLock) {
+         cacheByEvent.clear();
+         cacheByTopic.clear();
+      }
+   }
+
+   /** Called during veto exceptions, calls handleException */
+   protected void subscribeVetoException(final Object event, final String topic, final Object eventObj,
+           Throwable e, StackTraceElement[] callingStack, VetoEventListener vetoer) {
+      String str = "EventService veto event listener r:" + vetoer;
+      if (vetoer != null) {
+         str = str + ".  Vetoer class:" + vetoer.getClass();
+      }
+      handleException("vetoing", event, topic, eventObj, e, callingStack, str);
+   }
+
+   /** Called during event handling exceptions, calls handleException */
+   protected void onEventException(final String topic, final Object eventObj, Throwable e,
+           StackTraceElement[] callingStack, EventTopicSubscriber eventTopicSubscriber) {
+      String str = "EventService topic subscriber:" + eventTopicSubscriber;
+      if (eventTopicSubscriber != null) {
+         str = str + ".  Subscriber class:" + eventTopicSubscriber.getClass();
+      }
+      handleException("handling event", null, topic, eventObj, e, callingStack, str);
+   }
+
+   /** Called during event handling exceptions, calls handleException */
+   protected void handleException(final Object event, Throwable e,
+           StackTraceElement[] callingStack, EventSubscriber eventSubscriber) {
+      String str = "EventService subscriber:" + eventSubscriber;
+      if (eventSubscriber != null) {
+         str = str + ".  Subscriber class:" + eventSubscriber.getClass();
+      }
+      handleException("handling event topic", event, null, null, e, callingStack, str);
+   }
+
+   /**
+    * All exception handling goes through this method.  Logs a warning by default.
+    */
+   protected void handleException(final String action, final Object event, final String topic,
+           final Object eventObj, Throwable e, StackTraceElement[] callingStack, String sourceString) {
+      String eventClassString = (event == null ? "none" : event.getClass().getName());
+      String eventString = event + "";
+      String contextMsg = "Exception " + action + " event class=" + eventClassString
+              + ", event=" + eventString + ", topic=" + topic + ", eventObj=" + eventObj;
+      SwingException clientEx = new SwingException(contextMsg, e, callingStack);
+      String msg = "Exception thrown by;" + sourceString;
+      LOG.log(Level.WARN, msg, clientEx);
+   }
+
+   /**
+    * Unsubscribe a subscriber if it is a stale ProxySubscriber. Used during subscribe() and
+    * in the cleanup Timer.  See the class javadoc.
+    * <p/>
+    * Not private since I don't claim I'm smart enough to anticipate all needs, but I
+    * am smart enough to doc the rules you must follow to override this method.  Those
+    * rules may change (changes will be doc'ed), override at your own risk.
+    * <p/>
+    * Overriders MUST call iterator.remove() to unsubscribe the proxy if the subscriber is
+    * a ProxySubscriber and is stale and should be cleaned up.  If the ProxySubscriber
+    * is unsubscribed, then implementers MUST also call proxyUnsubscribed() on the subscriber.
+    * Overriders MUST also remove the proxy from the weakProxySubscriber list by calling
+    * removeStaleProxyFromList.  Method assumes caller is holding the listenerList 
+    * lock (else how can you pass the iterator?).
+    * @param iterator current iterator
+    * @param existingSubscriber the current value of the iterator
+    * @return the real value of the param, or the proxied subscriber of the param if 
+    * the param is a a ProxySubscriber
+    */
+   protected Object getRealSubscriberAndCleanStaleSubscriberIfNecessary(Iterator iterator, Object existingSubscriber) {
+      ProxySubscriber existingProxySubscriber = null;
+      if (existingSubscriber instanceof WeakReference) {
+         existingSubscriber = ((WeakReference) existingSubscriber).get();
+         if (existingSubscriber == null) {
+            iterator.remove();
+            decWeakRefPlusProxySubscriberCount();
+         }         
+      }
+      if (existingSubscriber instanceof ProxySubscriber) {
+         existingProxySubscriber = (ProxySubscriber) existingSubscriber;
+         existingSubscriber = existingProxySubscriber.getProxiedSubscriber();
+         if (existingProxySubscriber == null) {
+            removeProxySubscriber(existingProxySubscriber, iterator);
+         }
+      }
+      return existingSubscriber;
+   }
+
+   protected void removeProxySubscriber(ProxySubscriber proxy, Iterator iter) {
+      iter.remove();
+      proxy.proxyUnsubscribed();
+      decWeakRefPlusProxySubscriberCount();
+   }
+
+   /**
+    * Increment the count of stale proxies and start a cleanup task if necessary
+    */
+   protected void incWeakRefPlusProxySubscriberCount() {
+      synchronized(listenerLock) {
+         weakRefPlusProxySubscriberCount++;
+         if (cleanupStartThreshhold == null || cleanupPeriodMS == null) {
+            return;
+         }
+         if (weakRefPlusProxySubscriberCount >= cleanupStartThreshhold) {
+            startCleanup();
+         }
+      }
+   }
+
+   /**
+    * Decrement the count of stale proxies
+    */
+   protected void decWeakRefPlusProxySubscriberCount() {
+      synchronized(listenerLock) {
+         weakRefPlusProxySubscriberCount--;
+         if (weakRefPlusProxySubscriberCount < 0) {
+            weakRefPlusProxySubscriberCount = 0;
+         }
+      }
+   }
+
+   private void startCleanup() {
+      synchronized(listenerLock) {
+         if (cleanupTimer == null) {
+            cleanupTimer = new Timer();
+         } 
+         if (cleanupTimerTask == null) {
+            cleanupTimerTask = new CleanupTimerTask();
+            cleanupTimer.schedule(cleanupTimerTask, 0L, cleanupPeriodMS);            
+         }
+      }
+   }
+   
+   class CleanupTimerTask extends TimerTask {
+      @Override
+      public void run() {
+         synchronized(listenerLock) {
+            ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.STARTING, weakRefPlusProxySubscriberCount, null));
+            if (weakRefPlusProxySubscriberCount <= cleanupStopThreshold) {
+               this.cancel();
+               cleanupTimer = null;
+               cleanupTimerTask = null;
+               LOG.debug("Cancelled scheduled weak reference and proxy cleanup.");
+               ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, weakRefPlusProxySubscriberCount, null));
+               return;
+            }
+            LOG.debug("Starting a weak reference and proxy cleanup.");
+            ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, weakRefPlusProxySubscriberCount, null));               
+            List<Map> allSubscriberMaps = new ArrayList<Map>();
+            allSubscriberMaps.add(subscribersByEventType);
+            allSubscriberMaps.add(subscribersByEventClass);
+            allSubscriberMaps.add(subscribersByExactEventClass);
+            allSubscriberMaps.add(subscribersByTopic);
+            allSubscriberMaps.add(subscribersByTopicPattern);
+            allSubscriberMaps.add(vetoListenersByClass);
+            allSubscriberMaps.add(vetoListenersByExactClass);
+            allSubscriberMaps.add(vetoListenersByTopic);
+            allSubscriberMaps.add(vetoListenersByTopicPattern);
+            
+            int staleCount = 0;
+            for (Map subscriberMap : allSubscriberMaps) {
+               Set subscriptions = subscriberMap.keySet();
+               for (Object subscription : subscriptions) {
+                  List subscribers = (List) subscriberMap.get(subscription);
+                  for (Iterator iter = subscribers.iterator(); iter.hasNext();) {
+                     Object subscriber = iter.next();
+                     Object realSubscriber = getRealSubscriberAndCleanStaleSubscriberIfNecessary(iter, subscriber);                      
+                     if (realSubscriber == null) {
+                        staleCount++;
+                     }
+                  }
+               }
+            }
+            ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.FINISHED_CLEANING, weakRefPlusProxySubscriberCount, staleCount));
+         }         
+      }      
+   }
+
+   private static class PrioritizedSubscriberComparator implements Comparator<Prioritized> {
+      public int compare(Prioritized prioritized1, Prioritized prioritized2) {
+         if (prioritized1 == null) {
+            return -1;
+         }
+         if (prioritized2 == null) {
+            return 1;
+         }
+         if (prioritized1.getPriority() < prioritized2.getPriority()) {
+            return -1;
+         } else if (prioritized1.getPriority() > prioritized2.getPriority()) {
+            return 1;
+         } else {
+            return 0;
+         }
+      }
+   }
+
+   /**
+    * Since Pattern doesn't implement equals(), we need one of these
+    */
+   private class PatternWrapper {
+      private Pattern pattern;
+
+      public PatternWrapper(Pattern pat) {
+         pattern = pat;
+      }
+
+      public boolean matches(CharSequence input) {
+         return pattern.matcher(input).matches();
+      }
+
+      public boolean equals(Object o) {
+         if (this == o) {
+            return true;
+         }
+         if (o == null || getClass() != o.getClass()) {
+            return false;
+         }
+
+         PatternWrapper that = (PatternWrapper) o;
+
+         if (pattern != null) {
+            if (!pattern.equals(that.pattern)) {//give the JVM a shot for forward compatibility
+               return pattern.pattern() != null && this.pattern.pattern().equals(this.pattern.pattern());
+            }
+         } else {
+            if (that.pattern != null) {
+               return false;
+            }
+         }
+
+         return true;
+      }
+
+      public int hashCode() {
+         if (this.pattern != null && this.pattern.pattern() != null) {
+            return this.pattern.pattern().hashCode();
+         }
+         return (pattern != null ? pattern.hashCode() : 0);
+      }
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/VetoEventListener.java b/src/main/java/org/scijava/event/bushe/VetoEventListener.java
new file mode 100644
index 000000000..693a15a36
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/VetoEventListener.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Interface for classes that can veto class-based event publication from the {@link EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface VetoEventListener<T> {
+
+   /**
+    * Determine whether an event should be vetoed or published.
+    * <p/>
+    * The EventService calls this method <b>before</b> class-based publication of objects.  If any of the
+    * VetoEventListeners return true, then none of the subscribers for that event are called. <p>Prerequisite:
+    * VetoEventListener has to be subscribed with the EventService for the event object's class.</p> <p>Guaranteed to be
+    * called in the SwingEventThread when using the SwingEventService (EventBus). See {@link EventService}</p>
+    *
+    * @param event The event object to veto or allow to be published.
+    *
+    * @return true if the event should be vetoed and not published, false if the event should be published.
+    */
+   public boolean shouldVeto(T event);
+}
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java b/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
new file mode 100644
index 000000000..8bfbb5755
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
@@ -0,0 +1,25 @@
+package org.scijava.event.bushe;
+
+/**
+ * Interface for classes that can veto publication on topic names from the {@link org.scijava.event.bushe.EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface VetoTopicEventListener<T> {
+
+   /**
+    * Determine whether a topic publication should be vetoed or allowed.
+    * <p/>
+    * The EventService calls this method <b>before</b> publication of on a topic name.  If any of the
+    * VetoTopicEventListeners return true, then none of the subscribers to that topic are called. <p>Prerequisite:
+    * VetoTopicEventListener has to be subscribed with the EventService for the topic name.</p> <p>Guaranteed to be
+    * called in the SwingEventThread when using the SwingEventService (EventBus). See {@link EventService}</p>
+    *
+    * @param topic The topic name the data object is published on.
+    * @param data The data object being published on the topic.
+    *
+    * @return true if the publication on the topic should be vetoed and not published, false if the data should be
+    *         published on the topic.
+    */
+   public boolean shouldVeto(String topic, T data);
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java
new file mode 100644
index 000000000..f7a7a84f2
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java
@@ -0,0 +1,169 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.InvocationTargetException;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.ProxySubscriber;
+import org.scijava.event.bushe.Prioritized;
+
+/**
+ * Common base class for EventService Proxies.
+ * <p>
+ * Implementing Prioritized even when Priority is not used is always OK.  The default
+ * value of 0 retains the FIFO order. 
+ */
+public abstract class AbstractProxySubscriber implements ProxySubscriber, Prioritized {
+   private Object proxiedSubscriber;
+   private Method subscriptionMethod;
+   private ReferenceStrength referenceStrength;
+   private EventService eventService;
+   private int priority;
+   protected boolean veto;
+
+   protected AbstractProxySubscriber(Object proxiedSubscriber, Method subscriptionMethod,
+           ReferenceStrength referenceStrength, EventService es, boolean veto) {
+      this(proxiedSubscriber, subscriptionMethod, referenceStrength, 0, es, veto);
+   }
+
+   protected AbstractProxySubscriber(Object proxiedSubscriber, Method subscriptionMethod,
+           ReferenceStrength referenceStrength, int priority, EventService es, boolean veto) {
+      this.referenceStrength = referenceStrength;
+      this.priority = priority;
+      eventService = es;
+      this.veto = veto;
+      if (proxiedSubscriber == null) {
+         throw new IllegalArgumentException("The realSubscriber cannot be null when constructing a proxy subscriber.");
+      }
+      if (subscriptionMethod == null) {
+         throw new IllegalArgumentException("The subscriptionMethod cannot be null when constructing a proxy subscriber.");
+      }
+      Class<?> returnType = subscriptionMethod.getReturnType();
+      if (veto && returnType != Boolean.TYPE) {
+         throw new IllegalArgumentException("The subscriptionMethod must have the two parameters, the first one must be a String and the second a non-primitive (Object or derivative).");
+      }
+      if (ReferenceStrength.WEAK.equals(referenceStrength)) {
+         this.proxiedSubscriber = new WeakReference(proxiedSubscriber);
+      } else {
+         this.proxiedSubscriber = proxiedSubscriber;
+      }
+      this.subscriptionMethod = subscriptionMethod;
+   }
+
+   /** @return the object this proxy is subscribed on behalf of */
+   public Object getProxiedSubscriber() {
+      if (proxiedSubscriber instanceof WeakReference) {
+         return ((WeakReference)proxiedSubscriber).get();
+      }
+      return proxiedSubscriber;
+   }
+   
+   /** @return the subscriptionMethod passed in the constructor */
+   public Method getSubscriptionMethod() {
+      return subscriptionMethod;
+   }
+
+   /** @return the EventService passed in the constructor */
+   public EventService getEventService() {
+      return eventService;
+   }
+
+   /** @return the ReferenceStrength passed in the constructor */
+   public ReferenceStrength getReferenceStrength() {
+      return referenceStrength;
+   }
+
+   /**
+    * @return the priority, no effect if priority is 0 (the default value)
+    */
+   public int getPriority() {
+      return priority;
+   }
+
+   /**
+    * Called by EventServices to inform the proxy that it is unsubscribed.  
+    * The ProxySubscriber should perform any necessary cleanup.
+    * <p>
+    * <b>Overriding classes must call super.proxyUnsubscribed() or risk
+    * things not being cleanup up properly.</b>
+    */
+   public void proxyUnsubscribed() {
+      proxiedSubscriber = null;
+   }
+
+   @Override
+   public final int hashCode() {
+      throw new RuntimeException("Proxy subscribers are not allowed in Hash " +
+              "Maps, since the underlying values use Weak References that" +
+              "may disappear, the calculations may not be the same in" +
+              "successive calls as required by hashCode.");
+   }
+
+   protected boolean retryReflectiveCallUsingAccessibleObject(Object[] args, Method subscriptionMethod, Object obj,
+           IllegalAccessException e, String message) {
+      boolean accessibleTriedAndFailed = false;
+      if (subscriptionMethod != null) {
+         AccessibleObject[] accessibleMethod = {subscriptionMethod};
+         try {
+            AccessibleObject.setAccessible(accessibleMethod, true);
+            Object returnValue = subscriptionMethod.invoke(obj, args);
+            return Boolean.valueOf(returnValue+"");
+         } catch (SecurityException ex) {
+            accessibleTriedAndFailed = true;
+         } catch (InvocationTargetException e1) {
+            throw new RuntimeException(message, e);
+         } catch (IllegalAccessException e1) {
+            throw new RuntimeException(message, e);
+         }
+      }
+      if (accessibleTriedAndFailed) {
+         message = message + ".  An attempt was made to make the method accessible, but the SecurityManager denied the attempt.";
+      }
+      throw new RuntimeException(message, e);
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (obj instanceof AbstractProxySubscriber) {
+         AbstractProxySubscriber bps = (AbstractProxySubscriber) obj;
+         if (referenceStrength != bps.referenceStrength) {
+            return false;
+         }
+         if (subscriptionMethod != bps.subscriptionMethod) {
+            return false;
+         }
+         if (ReferenceStrength.WEAK == referenceStrength) {
+            if (((WeakReference)proxiedSubscriber).get() != ((WeakReference)bps.proxiedSubscriber).get()) {
+               return false;
+            }            
+         } else {
+            if (proxiedSubscriber != bps.proxiedSubscriber) {
+               return false;
+            }
+         }
+         if (veto != bps.veto) {
+            return false;
+         }
+         if (eventService != bps.eventService) {
+            return false;
+         }
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @Override
+   public String toString() {
+      return "AbstractProxySubscriber{" +
+              "realSubscriber=" + (proxiedSubscriber instanceof WeakReference?
+                       ((WeakReference)proxiedSubscriber).get():proxiedSubscriber) +
+              ", subscriptionMethod=" + subscriptionMethod +
+              ", veto=" + veto +
+              ", referenceStrength=" + referenceStrength +
+              ", eventService=" + eventService +
+              '}';
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java b/src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java
new file mode 100644
index 000000000..2a9810322
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java
@@ -0,0 +1,562 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.regex.Pattern;
+import java.util.Arrays;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceExistsException;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.Logger;
+
+/**
+ * Enhances classes that use EventService Annotations.
+ * <p/>
+ * This class makes the EventService annotations "come alive."  This can be used in code like so:
+ * <pre>
+ * <code>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventSubscriber
+ *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
+ *      //do something
+ *   }
+ *   &#64;EventSubscriber
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
+ *      //do something
+ *   }
+ * }
+ * ... some other place, needed in some cases when the like a window disposal before it's garbage collected ....
+ * AnnotationProcessor.unprocess(this);
+ * </code>
+ * </pre>
+ * <p/>
+ * This class can be leveraged in outside of source code in other ways in which Annotations are used: <ul> <li>In an
+ * Aspect-Oriented tool <li>In a Swing Framework classloader that wants to load and understand events. <li>In other
+ * Inversion of Control containers, such as Spring or PicoContainer. <li>In the apt tool, though this does not generate
+ * code. <li>In a Annotation Processing Tool plugin, when it becomes available. </ul> Support for these other methods
+ * are not yet implemented.
+ */
+public class AnnotationProcessor {
+
+   protected static final Logger LOG = Logger.getLogger(EventService.class.getName());
+
+   /**
+    * Add the appropriate subscribers to one or more EventServices for an instance of a class with
+    * EventBus annotations.
+    * @param obj the instance that may or may not have annotations
+    */
+   public static void process(Object obj) {
+      processOrUnprocess(obj, true);
+   }
+
+   /**
+    * Remove the appropriate subscribers from one or more EventServices for an instance of a class with
+    * EventBus annotations.
+    * @param obj the instance that may or may not have annotations
+    */
+   public static void unprocess(Object obj) {
+      processOrUnprocess(obj, false);
+   }
+
+   private static void processOrUnprocess(Object obj, boolean add) {
+      if (obj == null) {
+         return;
+      }
+      Class cl = obj.getClass();
+      Method[] methods = cl.getMethods();
+      if (LOG.isLoggable(Logger.Level.DEBUG)) {
+        LOG.debug("Looking for EventBus annotations for class " + cl + ", methods:" + Arrays.toString(methods));
+      }
+      for (Method method : methods) {
+         
+         EventSubscriber classAnnotation = method.getAnnotation(EventSubscriber.class);
+         if (classAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found EventSubscriber:"+classAnnotation +" on method:" + method);
+            }
+            process(classAnnotation, obj, method, add);
+         }
+         EventTopicSubscriber topicAnnotation = method.getAnnotation(EventTopicSubscriber.class);
+         if (topicAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found EventTopicSubscriber: "+topicAnnotation +"  on method:" + method);
+            }
+            process(topicAnnotation, obj, method, add);
+         }
+         EventTopicPatternSubscriber topicPatternAnnotation = method.getAnnotation(EventTopicPatternSubscriber.class);
+         if (topicPatternAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found EventTopicPatternSubscriber: "+topicPatternAnnotation+" on method:" + method);
+            }
+            process(topicPatternAnnotation, obj, method, add);
+         }
+         RuntimeTopicEventSubscriber runtimeTopicAnnotation = method.getAnnotation(RuntimeTopicEventSubscriber.class);
+         if (runtimeTopicAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found RuntimeTopicEventSubscriber: "+runtimeTopicAnnotation+" on method:" + method);
+            }
+            process(runtimeTopicAnnotation, obj, method, add);
+         }
+         RuntimeTopicPatternEventSubscriber annotation = method.getAnnotation(RuntimeTopicPatternEventSubscriber.class);
+         if (annotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found RuntimeTopicPatternEventSubscriber:"+annotation+" on method:" + method);
+            }
+            process(annotation, obj, method, add);
+         }
+
+
+         VetoSubscriber vetoClassAnnotation = method.getAnnotation(VetoSubscriber.class);
+         if (vetoClassAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found VetoSubscriber:"+vetoClassAnnotation +" on method:" + method);
+            }
+            process(vetoClassAnnotation, obj, method, add);
+         }
+         VetoTopicSubscriber vetoTopicAnnotation = method.getAnnotation(VetoTopicSubscriber.class);
+         if (vetoTopicAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found VetoTopicSubscriber: "+vetoTopicAnnotation +"  on method:" + method);
+            }
+            process(vetoTopicAnnotation, obj, method, add);
+         }
+         VetoTopicPatternSubscriber vetoTopicPatternAnnotation = method.getAnnotation(VetoTopicPatternSubscriber.class);
+         if (vetoTopicPatternAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found VetoTopicPatternSubscriber: "+vetoTopicPatternAnnotation+" on method:" + method);
+            }
+            process(vetoTopicPatternAnnotation, obj, method, add);
+         }
+         VetoRuntimeTopicSubscriber vetoRuntimeTopicAnnotation = method.getAnnotation(VetoRuntimeTopicSubscriber.class);
+         if (vetoRuntimeTopicAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found VetoRuntimeTopicSubscriber: "+vetoRuntimeTopicAnnotation+" on method:" + method);
+            }
+            process(vetoRuntimeTopicAnnotation, obj, method, add);
+         }
+         VetoRuntimeTopicPatternSubscriber vetoAnnotation = method.getAnnotation(VetoRuntimeTopicPatternSubscriber.class);
+         if (vetoAnnotation != null) {
+            if (LOG.isLoggable(Logger.Level.DEBUG)) {
+               LOG.debug("Found VetoRuntimeTopicPatternSubscriber:"+vetoAnnotation+" on method:" + method);
+            }
+            process(vetoAnnotation, obj, method, add);
+         }
+      }
+   }
+
+
+   private static void process(EventTopicPatternSubscriber topicPatternAnnotation, Object obj,
+           Method method, boolean add) {
+      //Check args
+      String topicPattern = topicPatternAnnotation.topicPattern();
+      if (topicPattern == null) {
+         throw new IllegalArgumentException("Topic pattern cannot be null for EventTopicPatternSubscriber annotation");
+      }
+
+      //Get event service
+      Class<? extends EventService> eventServiceClass = topicPatternAnnotation.autoCreateEventServiceClass();
+      String eventServiceName = topicPatternAnnotation.eventServiceName();
+      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
+      int priority = topicPatternAnnotation.priority();
+
+      //Create proxy and subscribe
+      Pattern pattern = Pattern.compile(topicPattern);
+      //See Issue #18
+      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+      if (add) {
+         ProxyTopicPatternSubscriber subscriber = new ProxyTopicPatternSubscriber(obj, method,
+                 topicPatternAnnotation.referenceStrength(), priority, eventService,
+                 topicPattern, pattern, false);
+
+         eventService.subscribeStrongly(pattern, subscriber);
+      } else {
+         eventService.unsubscribe(pattern, obj);
+      }
+   }
+
+   private static void process(EventTopicSubscriber topicAnnotation, Object obj, Method method, boolean add) {
+      //Check args
+      String topic = topicAnnotation.topic();
+      if (topic == null) {
+         throw new IllegalArgumentException("Topic cannot be null for EventTopicSubscriber annotation");
+      }
+
+      //Get event service
+      Class<? extends EventService> eventServiceClass = topicAnnotation.autoCreateEventServiceClass();
+      String eventServiceName = topicAnnotation.eventServiceName();
+      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
+
+      int priority = topicAnnotation.priority();
+
+      //See Issue #18
+      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+      if (add) {
+         //Create proxy and subscribe
+         ProxyTopicSubscriber subscriber = new ProxyTopicSubscriber(obj, method,
+                 topicAnnotation.referenceStrength(), priority, eventService, topic, false);
+
+         eventService.subscribeStrongly(topic, subscriber);
+      } else {
+         eventService.unsubscribe(topic, obj);
+      }
+   }
+
+   private static void process(EventSubscriber annotation, Object obj, Method method, boolean add) {
+      //Check args
+      Class eventClass = annotation.eventClass();
+      if (eventClass == null) {
+         throw new IllegalArgumentException("Event class cannot be null for EventSubscriber annotation");
+      } else if (UseTheClassOfTheAnnotatedMethodsParameter.class.equals(eventClass)) {
+         Class[] params = method.getParameterTypes();
+         if (params.length < 1) {
+            throw new RuntimeException("Expected annotated method to have one parameter.");
+         } else {
+            eventClass = params[0];
+         }
+      }
+
+      //Get event service
+      Class<? extends EventService> eventServiceClass = annotation.autoCreateEventServiceClass();
+      String eventServiceName = annotation.eventServiceName();
+      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
+
+      if (add) {
+         int priority = annotation.priority();
+
+         //Create proxy and subscribe
+         //See https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+         BaseProxySubscriber subscriber = new BaseProxySubscriber(obj, method, annotation.referenceStrength(),
+                 priority, eventService, eventClass, false);
+         if (annotation.exact()) {
+            //See Issue #18
+            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+            eventService.subscribeExactlyStrongly(eventClass, subscriber);
+         } else {
+            //See Issue #18
+            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+            eventService.subscribeStrongly(eventClass, subscriber);
+         }
+      } else {
+         if (annotation.exact()) {
+            eventService.unsubscribeExactly(eventClass, obj);
+         } else {
+            eventService.unsubscribe(eventClass, obj);            
+         }
+      }
+   }
+
+
+
+   private static void process(final RuntimeTopicEventSubscriber annotation, final Object subscriber, final Method method, boolean add) {
+       EventTopicSubscriber eventTopicSubscriber = new EventTopicSubscriber() {
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public Class<? extends EventService> autoCreateEventServiceClass() {
+               return annotation.autoCreateEventServiceClass();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public String eventServiceName() {
+               return annotation.eventServiceName();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public ReferenceStrength referenceStrength() {
+               return annotation.referenceStrength();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+			  public int priority() {
+				return annotation.priority();
+			  }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public String topic() {
+               return getTopic(annotation.methodName(), subscriber, method);
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public Class<? extends Annotation> annotationType() {
+               return annotation.annotationType();
+           }
+       };
+       process(eventTopicSubscriber, subscriber, method, add);
+   }
+
+   private static void process(final RuntimeTopicPatternEventSubscriber annotation, final Object subscriber, final Method method, boolean add) {
+       EventTopicPatternSubscriber eventTopicPatternSubscriber = new EventTopicPatternSubscriber() {
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public Class<? extends EventService> autoCreateEventServiceClass() {
+               return annotation.autoCreateEventServiceClass();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public String eventServiceName() {
+               return annotation.eventServiceName();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public ReferenceStrength referenceStrength() {
+               return annotation.referenceStrength();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+			  public int priority() {
+				return annotation.priority();
+			  }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public boolean exact() {
+               return annotation.exact();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public String topicPattern() {
+               return getTopic(annotation.methodName(), subscriber, method);
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public Class<? extends Annotation> annotationType() {
+               return annotation.annotationType();
+           }
+       };
+       process(eventTopicPatternSubscriber, subscriber, method, add);
+   }
+
+   /* This is a cut and paste from above practically, sure which Annotations could be extended.
+    * TODO: When Java 7 comes out, or whatever JSR-308 is delivered, reduce this file by 70% */  
+   private static void process(VetoTopicPatternSubscriber topicPatternAnnotation, Object obj, Method method, boolean add) {
+      //Check args
+      String topicPattern = topicPatternAnnotation.topicPattern();
+      if (topicPattern == null) {
+         throw new IllegalArgumentException("Topic pattern cannot be null for VetoTopicPatternSubscriber annotation");
+      }
+
+      //Get event service
+      Class<? extends EventService> eventServiceClass = topicPatternAnnotation.autoCreateEventServiceClass();
+      String eventServiceName = topicPatternAnnotation.eventServiceName();
+      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
+      int priority = topicPatternAnnotation.priority();
+
+      //Create proxy and subscribe
+      Pattern pattern = Pattern.compile(topicPattern);
+      ProxyTopicPatternSubscriber subscriber = new ProxyTopicPatternSubscriber(obj, method, topicPatternAnnotation.referenceStrength(),
+              priority, eventService, topicPattern, pattern, true);
+
+      //See Issue #18
+      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+      if (add) {
+         eventService.subscribeVetoListenerStrongly(pattern, subscriber);
+      } else {
+         eventService.unsubscribeVeto(pattern, obj);
+      }
+   }
+
+   private static void process(VetoTopicSubscriber topicAnnotation, Object obj, Method method, boolean add) {
+      //Check args
+      String topic = topicAnnotation.topic();
+      if (topic == null) {
+         throw new IllegalArgumentException("Topic cannot be null for VetoTopicSubscriber annotation");
+      }
+
+      //Get event service
+      Class<? extends EventService> eventServiceClass = topicAnnotation.autoCreateEventServiceClass();
+      String eventServiceName = topicAnnotation.eventServiceName();
+      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
+
+      int priority = topicAnnotation.priority();
+
+      //Create proxy and subscribe
+      ProxyTopicSubscriber subscriber = new ProxyTopicSubscriber(obj, method,
+              topicAnnotation.referenceStrength(), priority, eventService, topic, true);
+
+      //See Issue #18
+      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+      if (add) {
+         eventService.subscribeVetoListenerStrongly(topic, subscriber);
+      } else {
+         eventService.unsubscribeVeto(topic, obj);
+      }
+   }
+
+   private static void process(VetoSubscriber annotation, Object obj, Method method, boolean add) {
+      //Check args
+      Class eventClass = annotation.eventClass();
+      if (eventClass == null) {
+         throw new IllegalArgumentException("Event class cannot be null for VetoSubscriber annotation");
+      } else if (UseTheClassOfTheAnnotatedMethodsParameter.class.equals(eventClass)) {
+         Class[] params = method.getParameterTypes();
+         if (params.length < 1) {
+            throw new RuntimeException("Expected annotated method to have one parameter.");
+         } else {
+            eventClass = params[0];
+         }
+      }
+
+      //Get event service
+      Class<? extends EventService> eventServiceClass = annotation.autoCreateEventServiceClass();
+      String eventServiceName = annotation.eventServiceName();
+      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
+
+      int priority = annotation.priority();
+
+      //Create proxy and subscribe
+      //See https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+      BaseProxySubscriber subscriber = new BaseProxySubscriber(obj, method, annotation.referenceStrength(),
+              priority, eventService, eventClass, true);
+      if (add) {
+         if (annotation.exact()) {
+            //See Issue #18
+            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+            eventService.subscribeVetoListenerExactlyStrongly(eventClass, subscriber);
+         } else {
+            //See Issue #18
+            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
+            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
+            eventService.subscribeVetoListenerStrongly(eventClass, subscriber);
+         }
+      } else {
+         if (annotation.exact()) {
+            eventService.unsubscribeVetoExactly(eventClass, obj);
+         } else {
+            eventService.unsubscribeVeto(eventClass, obj);
+         }
+      }
+   }
+
+
+   private static void process(final VetoRuntimeTopicSubscriber annotation, final Object subscriber, final Method method, boolean add) {
+       VetoTopicSubscriber eventTopicSubscriber = new VetoTopicSubscriber() {
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public Class<? extends EventService> autoCreateEventServiceClass() {
+               return annotation.autoCreateEventServiceClass();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public String eventServiceName() {
+               return annotation.eventServiceName();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public ReferenceStrength referenceStrength() {
+               return annotation.referenceStrength();
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+			  public int priority() {
+			   	return annotation.priority();
+			  }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public String topic() {
+               return getTopic(annotation.methodName(), subscriber, method);
+           }
+
+           //TODO uncomment when language level is set to 1.6 (2.0) @Override
+           public Class<? extends Annotation> annotationType() {
+               return annotation.annotationType();
+           }
+       };
+       process(eventTopicSubscriber, subscriber, method, add);
+   }
+
+   private static void process(final VetoRuntimeTopicPatternSubscriber annotation, final Object subscriber, final Method method, boolean add) {
+      VetoTopicPatternSubscriber eventTopicPatternSubscriber = new VetoTopicPatternSubscriber() {
+         //TODO uncomment when language level is set to 1.6 (2.0) @Override
+         public Class<? extends EventService> autoCreateEventServiceClass() {
+            return annotation.autoCreateEventServiceClass();
+         }
+
+         //TODO uncomment when language level is set to 1.6 (2.0) @Override
+         public String eventServiceName() {
+            return annotation.eventServiceName();
+         }
+
+         //TODO uncomment when language level is set to 1.6 (2.0) @Override
+         public ReferenceStrength referenceStrength() {
+            return annotation.referenceStrength();
+         }
+
+         //TODO uncomment when language level is set to 1.6 (2.0) @Override
+         public int priority() {
+            return annotation.priority();
+         }
+
+         //TODO uncomment when language level is set to 1.6 (2.0) @Override
+         public boolean exact() {
+            return annotation.exact();
+         }
+
+         //TODO uncomment when language level is set to 1.6 (2.0) @Override
+         public String topicPattern() {
+            return getTopic(annotation.methodName(), subscriber, method);
+         }
+
+         //TODO uncomment when language level is set to 1.6 (2.0) @Override
+         public Class<? extends Annotation> annotationType() {
+            return annotation.annotationType();
+         }
+      };
+      process(eventTopicPatternSubscriber, subscriber, method, add);
+   }
+
+
+   private static String getTopic(String methodName, Object subscriber, Method method) {
+       try {
+           Method runtimeEvalMethod = subscriber.getClass().getMethod(methodName, new Class[0]);
+           //necessary in case the method does not have public access or if the class it belongs
+           //to isn't public
+           runtimeEvalMethod.setAccessible(true);
+           return runtimeEvalMethod.invoke(subscriber, new Object[0]).toString();
+       } catch (SecurityException e) {
+           throw new RuntimeException("Could not retrieve method for subscription. Method: " + methodName, e);
+       } catch (NoSuchMethodException e) {
+           throw new RuntimeException("Could not retrieve method for subscription. Method: " + methodName, e);
+       } catch (InvocationTargetException e) {
+           e.getTargetException().printStackTrace();
+           throw new RuntimeException("Could not invoke method for subscription. Method: " + methodName, e);
+       } catch (IllegalAccessException e) {
+           throw new RuntimeException("Could not invoke method for subscription. Method: " + methodName, e);
+       }
+   }
+
+
+   private static EventService getEventServiceFromAnnotation(String eventServiceName,
+           Class<? extends EventService> eventServiceClass) {
+      EventService eventService = EventServiceLocator.getEventService(eventServiceName);
+      if (eventService == null) {
+         if (EventServiceLocator.SERVICE_NAME_EVENT_BUS.equals(eventServiceName)) {
+            //This may be the first time the EventBus is accessed.
+            eventService = EventServiceLocator.getSwingEventService();
+         } else {
+            //The event service does not yet exist, create it
+            try {
+               eventService = eventServiceClass.newInstance();
+            } catch (InstantiationException e) {
+               throw new RuntimeException("Could not instance of create EventService class " + eventServiceClass, e);
+            } catch (IllegalAccessException e) {
+               throw new RuntimeException("Could not instance of create EventService class " + eventServiceClass, e);
+            }
+            try {
+               EventServiceLocator.setEventService(eventServiceName, eventService);
+            } catch (EventServiceExistsException e) {
+               //ignore it, it's OK
+               eventService = EventServiceLocator.getEventService(eventServiceName);
+            }
+         }
+      }
+      return eventService;
+   }
+
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java
new file mode 100644
index 000000000..f877d35e2
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java
@@ -0,0 +1,133 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.VetoEventListener;
+
+/** A class is subscribed to an EventService on behalf of another object. */
+public class BaseProxySubscriber extends AbstractProxySubscriber
+        implements org.scijava.event.bushe.EventSubscriber, VetoEventListener {
+   private Class subscriptionClass;
+
+   /**
+    * Creates a proxy.  This does not subscribe it.
+    *
+    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
+    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
+    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
+    * be too
+    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
+    * exist
+    * @param subscription the class to subscribe to, used for unsubscription only
+    * @param veto whether this is a veto subscriber
+    */
+   public BaseProxySubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
+           EventService es, Class subscription, boolean veto) {
+      this(proxiedSubscriber, subscriptionMethod, referenceStrength, 0, es, subscription, veto);
+   }
+
+   /**
+    * Creates a proxy with a priority.  This does not subscribe it.
+    *
+    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
+    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
+    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
+    * be too
+    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
+    * exist
+    * @param subscription the class to subscribe to, used for unsubscription only
+    * @param veto whether this is a veto subscriber
+    */
+   public BaseProxySubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
+           int priority, EventService es, Class subscription, boolean veto) {
+      super(proxiedSubscriber, subscriptionMethod, referenceStrength, priority, es, veto);
+      this.subscriptionClass = subscription;
+      Class[] params = subscriptionMethod.getParameterTypes();
+      if (params == null || params.length != 1 || params[0].isPrimitive()) {
+         throw new IllegalArgumentException("The subscriptionMethod must have a single non-primitive parameter.");
+      }
+   }
+
+   /**
+    * Handles the event publication by pushing it to the real subscriber's subscription Method.
+    *
+    * @param event The Object that is being published.
+    */
+   public void onEvent(Object event) {
+      Object[] args = new Object[]{event};
+      Method subscriptionMethod = null;
+      Object obj = null;
+      try {
+         obj = getProxiedSubscriber();
+         if (obj == null) {
+            //has been garbage collected
+            return;
+         }
+         subscriptionMethod = getSubscriptionMethod();
+         subscriptionMethod.invoke(obj, args);
+      } catch (IllegalAccessException e) {
+         String message = "Exception when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
+         retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
+      } catch (InvocationTargetException e) {
+         throw new RuntimeException("InvocationTargetException when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
+      }
+   }
+
+
+   public boolean shouldVeto(Object event) {
+      Object[] args = new Object[]{event};
+      Method subscriptionMethod = null;
+      Object obj = null;
+      try {
+         obj = getProxiedSubscriber();
+         if (obj == null) {
+            //has been garbage collected
+            return false;
+         }
+         subscriptionMethod = getSubscriptionMethod();
+         return Boolean.valueOf(subscriptionMethod.invoke(obj, args)+"");
+      } catch (IllegalAccessException e) {
+         String message = "Exception when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
+         return retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
+      } catch (InvocationTargetException e) {
+         throw new RuntimeException("InvocationTargetException when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
+      }
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (obj instanceof BaseProxySubscriber) {
+         if (!super.equals(obj)) {
+            return false;
+         }
+         BaseProxySubscriber bps = (BaseProxySubscriber) obj;
+         if (subscriptionClass != bps.subscriptionClass) {
+            if (subscriptionClass == null) {
+               return false;
+            } else {
+               if (!subscriptionClass.equals(bps.subscriptionClass)) {
+                  return false;
+               }
+            }
+         }
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @Override
+   public String toString() {
+      return "BaseProxySubscriber{" +
+              "subscription=" + subscriptionClass +
+              "veto=" + veto +
+              "realSubscriber=" + getProxiedSubscriber() +
+              ", subscriptionMethod=" + getSubscriptionMethod() +
+              ", referenceStrength=" + getReferenceStrength() +
+              ", eventService=" + getEventService() +
+              '}';
+   }
+
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java
new file mode 100644
index 000000000..e75b79568
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java
@@ -0,0 +1,110 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/**
+ * An Annotation for subscribing to EventService Events.
+ * <p>
+ * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Events.
+ * <p>
+ * Instead of this:
+ * <pre>
+ * public class MyAppController implements EventSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe(AppClosingEvent.class, this);
+ *   }
+ *   public void onEvent(EventServiceEvent event) {
+ *      AppClosingEvent appClosingEvent = (AppClosingEvent)event;
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * You can do this:
+ * <pre>
+ * public class MyAppController {  //no interface necessary
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//if not using AOP
+ *   }
+ *   &#64;EventSubscriber
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {//Use your own method name with typesafety
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * <p>
+ * That's pretty good, but when the controller does more, annotations are even nicer.
+ * <pre>
+ * public class MyAppController implements EventSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe(AppStartingEvent.class, this);
+ *      EventBus.subscribe(AppClosingEvent.class, this);
+ *   }
+ *   public void onEvent(EventServiceEvent event) {
+ *      //wicked bad pattern, but we have to this
+ *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
+ *      if (event instanceof AppStartingEvent) {
+ *         onAppStartingEvent((AppStartingEvent)event);
+ *      } else (event instanceof AppClosingEvent) {
+ *         onAppStartingEvent((AppClosingEvent)event);
+ *      }
+ *
+ *   }
+ *
+ *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
+ *      //do something
+ *   }
+ *
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * You can do this:
+ * <pre>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventSubscriber(eventClass=AppStartingEvent.class)
+ *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
+ *      //do something
+ *   }
+ *   &#64;EventSubscriber(eventClass=AppAppClosingEvent.class)
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * Brief, clear, and easy.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface EventSubscriber {
+   /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
+   Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
+
+   /** Determines the order in which this subscriber is called, default is FIFO.*/
+   int priority() default 0;
+
+   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
+   boolean exact() default false;
+
+   /** Whether to subscribe weakly or strongly. */
+   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+   /**
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
+    */
+   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/EventTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/EventTopicPatternSubscriber.java
new file mode 100644
index 000000000..3611d2c79
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/EventTopicPatternSubscriber.java
@@ -0,0 +1,35 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface EventTopicPatternSubscriber {
+   /** The Regular Expression to subscribe to. */
+   String topicPattern();
+
+   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
+   boolean exact() default false;
+
+   /** Whether to subscribe weakly or strongly. */
+   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+   /**
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
+    */
+   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+
+   /** Determines the order in which this subscriber is called, default is FIFO.*/
+   int priority() default 0;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java
new file mode 100644
index 000000000..5f99c4895
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java
@@ -0,0 +1,108 @@
+package org.scijava.event.bushe.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/**
+ * An Annotation for subscribing to EventService Topics.
+ * <p>
+ * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Topics.
+ * <p>
+ * Instead of this:
+ * <pre>
+ * public class MyAppController implements EventTopicSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe("AppClosing", this);
+ *   }
+ *   public void onEvent(String topic, Object data) {
+ *      JComponent source = (JComponent)data;
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * You can do this:
+ * <pre>
+ * public class MyAppController {  //no interface necessary
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
+ *   public void onAppClosing(String topic, Object data) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * <p>
+ * That's pretty good, but when the controller does more, annotations are even nicer.
+ * <pre>
+ * public class MyAppController implements EventTopicSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe("AppStartingEvent", this);
+ *      EventBus.subscribe("AppClosingEvent", this);
+ *   }
+ *   public void onEvent(String topic, Object data) {
+ *      //wicked bad pattern, but we have to this
+ *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
+ *      if ("AppStartingEvent".equals(topic)) {
+ *         onAppStartingEvent((JComponent)data);
+ *      } else ("AppClosingEvent".equals(topic)) {
+ *         onAppClosingEvent((JComponet)data);
+ *      }
+ *
+ *   }
+ *
+ *   public void onAppStartingEvent(JComponent requestor) {
+ *      //do something
+ *   }
+ *
+ *   public void onAppClosingEvent(JComponent requestor) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * Instead of all that, you can do this:
+ * <pre>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventTopicSubscriber{topic="AppStartingEvent"}
+ *   public void onAppStartingEvent(Object data) {
+ *      //do something
+ *   }
+ *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
+ *   public void onAppClosingEvent(Foo data) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * Brief, clear, and easy.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface EventTopicSubscriber {
+   /** The topic to subscribe to */
+   String topic();
+
+   /** Whether to subscribe weakly or strongly. */
+   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+   /** Determines the order in which this subscriber is called, default is FIFO.*/
+   int priority() default 0;
+
+   /**
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
+    */
+   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicPatternSubscriber.java
new file mode 100644
index 000000000..c3a65d33d
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicPatternSubscriber.java
@@ -0,0 +1,88 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.reflect.Method;
+import java.util.regex.Pattern;
+
+import org.scijava.event.bushe.EventService;
+
+/**
+ * A Proxy Subscriber for Annotations that use topic patterns
+ */
+public class ProxyTopicPatternSubscriber extends ProxyTopicSubscriber {
+   private Pattern pattern;
+
+   /**
+    * Creates a proxy.  This does not subscribe it.
+    *
+    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
+    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
+    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
+    * be too
+    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
+    * exist
+    * @param patternString the Regular Expression for topics to subscribe to, used for unsubscription only
+    */
+   public ProxyTopicPatternSubscriber(Object proxiedSubscriber, Method subscriptionMethod,
+           ReferenceStrength referenceStrength, EventService es, String patternString,
+           Pattern pattern, boolean veto) {
+      this(proxiedSubscriber, subscriptionMethod, referenceStrength, 0, es, patternString, pattern, veto);
+   }
+
+   /**
+    * Creates a proxy.  This does not subscribe it.
+    *
+    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
+    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
+    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
+    * be too
+    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
+    * exist
+    * @param patternString the Regular Expression for topics to subscribe to, used for unsubscription only
+    */
+   public ProxyTopicPatternSubscriber(Object proxiedSubscriber, Method subscriptionMethod,
+           ReferenceStrength referenceStrength, int priority,
+           EventService es, String patternString, Pattern pattern, boolean veto) {
+      super(proxiedSubscriber, subscriptionMethod, referenceStrength, priority, es, patternString, veto);
+      this.pattern = pattern;
+   }
+
+   protected void unsubscribe(String topic) {
+      if (veto) {
+         getEventService().unsubscribeVetoListener(pattern, this);
+      } else {
+         getEventService().unsubscribe(pattern, this);
+      }
+      pattern = null;
+   }
+
+   public boolean equals(Object o) {
+      if (this == o) {
+         return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+         return false;
+      }
+      if (!super.equals(o)) {
+         return false;
+      }
+
+      ProxyTopicPatternSubscriber that = (ProxyTopicPatternSubscriber) o;
+
+      if (pattern != null ? !pattern.equals(that.pattern) : that.pattern != null) {
+         return false;
+      }
+
+      return true;
+   }
+
+   public String toString() {
+      return "ProxyTopicPatternSubscriber{" +
+              "pattern=" + pattern +
+              "veto=" + veto +
+              "realSubscriber=" + getProxiedSubscriber() +
+              ", subscriptionMethod=" + getSubscriptionMethod() +
+              ", referenceStrength=" + getReferenceStrength() +
+              ", eventService=" + getEventService() +
+              '}';
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicSubscriber.java
new file mode 100644
index 000000000..8b900c8fe
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicSubscriber.java
@@ -0,0 +1,147 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.VetoTopicEventListener;
+
+/** A class that subscribes to an EventService on behalf of another object.
+ * This class is not used directly (though you could), but rather through the use of the
+ * {@link @org.scijava.event.bushe.annotation.EventTopicSubscriber}.  Advanced EventBus
+ * users could use this class in Aspect-Oriented code.  Consider using the
+ * {@link AnnotationProcessor} instead, it may suit your needs and be easier.*/
+public class ProxyTopicSubscriber extends AbstractProxySubscriber
+        implements org.scijava.event.bushe.EventTopicSubscriber, VetoTopicEventListener {
+   private String topic;
+
+   /**
+    * Creates a proxy.  This does not subscribe it.
+    *
+    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
+    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
+    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
+    * be too
+    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
+    * exist
+    * @param topic the topic to subscribe to, used for unsubscription only
+    * @param veto if this proxy is for a veto subscriber
+    */
+   public ProxyTopicSubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
+           EventService es, String topic, boolean veto) {
+      this(proxiedSubscriber, subscriptionMethod, referenceStrength, 0, es, topic, veto);
+   }
+
+   /**
+    * Creates a proxy.  This does not subscribe it.
+    *
+    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
+    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
+    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
+    * be too
+    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
+    * exist
+    * @param topic the topic to subscribe to, used for unsubscription only
+    * @param veto if this proxy is for a veto subscriber
+    */
+   public ProxyTopicSubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
+           int priority, EventService es, String topic, boolean veto) {
+      super(proxiedSubscriber, subscriptionMethod, referenceStrength, priority, es, veto);
+      this.topic = topic;
+      if (topic == null) {
+         throw new IllegalArgumentException("Proxies for topic subscribers require a non-null topic.");
+      }
+      Class[] params = subscriptionMethod.getParameterTypes();
+      if (params == null || params.length != 2 || !String.class.equals(params[0]) || params[1].isPrimitive()) {
+         throw new IllegalArgumentException("The subscriptionMethod must have the two parameters, the first one must be a String and the second a non-primitive (Object or derivative).");
+      }
+   }
+
+   /**
+    * Handles the event publication by pushing it to the real subscriber's subscription Method.
+    *
+    * @param topic the topic on which the object is being published
+    * @param data The Object that is being published on the topic.
+    */
+   public void onEvent(String topic, Object data) {
+      Object[] args = new Object[]{topic, data};
+      Object obj = null;
+      Method subscriptionMethod = null;
+      try {
+         obj = getProxiedSubscriber();
+         if (obj == null) {
+            return;
+         }
+         subscriptionMethod = getSubscriptionMethod();
+         subscriptionMethod.invoke(obj, args);
+      } catch (IllegalAccessException e) {
+         String message = "IllegalAccessException when invoking annotated method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
+         retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
+      } catch (InvocationTargetException e) {
+         throw new RuntimeException("InvocationTargetException when invoking annotated method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
+      }
+   }
+
+
+   public boolean shouldVeto(String topic, Object data) {
+      Object[] args = new Object[]{topic, data};
+      Object obj = null;
+      Method subscriptionMethod = null;
+      try {
+         obj = getProxiedSubscriber();
+         if (obj == null) {
+            return false;
+         }
+         subscriptionMethod = getSubscriptionMethod();
+         return Boolean.valueOf(subscriptionMethod.invoke(obj, args)+"");
+      } catch (IllegalAccessException e) {
+         String message = "IllegalAccessException when invoking annotated veto method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
+         return retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
+      } catch (InvocationTargetException e) {
+         throw new RuntimeException("InvocationTargetException when invoking annotated veto method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
+      }
+   }
+
+   protected void unsubscribe(String topic) {
+      if (veto) {
+         getEventService().unsubscribeVetoListener(topic, this);
+      } else {
+         getEventService().unsubscribe(topic, this);
+      }
+   }
+
+   @Override
+   public boolean equals(Object obj) {
+      if (obj instanceof ProxyTopicSubscriber) {
+         if (!super.equals(obj)) {
+            return false;
+         }
+         ProxyTopicSubscriber proxyTopicSubscriber = (ProxyTopicSubscriber) obj;
+         if (topic.equals(proxyTopicSubscriber.topic)) {
+            if (topic == null) {
+               return false;
+            } else {
+               if (!topic.equals(proxyTopicSubscriber.topic)) {
+                  return false;
+               }
+            }
+         }
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+
+   @Override
+   public String toString() {
+      return "ProxyTopicSubscriber{" +
+              "topic='" + topic + '\'' +
+              "veto='" + veto + '\'' +
+              "realSubscriber=" + getProxiedSubscriber() +
+              ", subscriptionMethod=" + getSubscriptionMethod() +
+              ", referenceStrength=" + getReferenceStrength() +
+              ", eventService=" + getEventService() +
+              '}';
+   }
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/ReferenceStrength.java b/src/main/java/org/scijava/event/bushe/annotation/ReferenceStrength.java
new file mode 100644
index 000000000..739255b3f
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/ReferenceStrength.java
@@ -0,0 +1,11 @@
+package org.scijava.event.bushe.annotation;
+
+/**
+ * The two kinds of references that are used in the EventBus.
+ *
+ * @author Michael Bushe
+ */
+public enum ReferenceStrength {
+   WEAK,
+   STRONG
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicEventSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicEventSubscriber.java
new file mode 100644
index 000000000..fb54e4432
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicEventSubscriber.java
@@ -0,0 +1,38 @@
+package org.scijava.event.bushe.annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/**
+ * A subscriber to a topic that is determined at runtime.
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface RuntimeTopicEventSubscriber {
+    /**
+     * @return name of a method (that must return a String) and whose return value will become the subscription topic.
+     */
+    String methodName() default "getTopicName";
+
+    /** @return Whether to subscribe weakly or strongly. */
+    ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+    /**
+     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
+     */
+    String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
+    int priority() default 0;
+
+    /**
+     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
+     */
+    Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicPatternEventSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicPatternEventSubscriber.java
new file mode 100644
index 000000000..8e92cf22d
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicPatternEventSubscriber.java
@@ -0,0 +1,38 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface RuntimeTopicPatternEventSubscriber {
+    /**
+     * @return name of a method (which should return a String) and whose return value will become the subscription topic.
+     */
+    String methodName() default "getTopicPatternName";
+
+    /** @return Whether to subscribe weakly or strongly. */
+    ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+    /**
+     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
+     */
+    String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
+    int priority() default 0;
+
+    /** @return Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
+    boolean exact() default false;
+
+    /**
+     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
+     */
+    Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/UseTheClassOfTheAnnotatedMethodsParameter.java b/src/main/java/org/scijava/event/bushe/annotation/UseTheClassOfTheAnnotatedMethodsParameter.java
new file mode 100644
index 000000000..dd7936fbd
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/UseTheClassOfTheAnnotatedMethodsParameter.java
@@ -0,0 +1,15 @@
+package org.scijava.event.bushe.annotation;
+
+/**
+ * This is a dummy class to get around a limitation with annotations.
+ * <p/>
+ * It's nice to use an @EventSubscriber annotation without any parameters.  For example:
+ * <pre>
+ * <code>@EventSubscriber public void onEvent(FooEvent event) { //do something } </code></pre> In this case, the method should
+ * obviously be subscribed to the FooEvent class. Since the eventClass is not required, annotations require a default to
+ * be supplied. A default of null is not allowed by the compiler since it is not a class literal. A default of
+ * Object.class cannot be used, since it is legal to subscribe to Object. hence, this class was created which documents
+ * the issue and provides decent feedback when using an IDE's parameter insight.
+ */
+public final class UseTheClassOfTheAnnotatedMethodsParameter {
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicPatternSubscriber.java
new file mode 100644
index 000000000..7c7d2870c
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicPatternSubscriber.java
@@ -0,0 +1,38 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface VetoRuntimeTopicPatternSubscriber {
+    /**
+     * @return name of a method (which should return a String) and whose return value will become the subscription topic.
+     */
+    public abstract String methodName() default "getTopicPatternName";
+
+    /** @return Whether to subscribe weakly or strongly. */
+    public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+    /**
+     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
+     */
+    public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
+    public abstract int priority() default 0;
+
+    /** @return Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
+    public abstract boolean exact() default false;
+
+    /**
+     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
+     */
+    public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicSubscriber.java
new file mode 100644
index 000000000..614de1382
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicSubscriber.java
@@ -0,0 +1,38 @@
+package org.scijava.event.bushe.annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/**
+ * A veto subscriber to a topic that is determined at runtime.
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface VetoRuntimeTopicSubscriber {
+    /**
+     * @return name of a method (that must return a String) and whose return value will become the subscription topic.
+     */
+    public abstract String methodName() default "getTopicName";
+
+    /** @return Whether to subscribe weakly or strongly. */
+    public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+    /**
+     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
+     */
+    public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
+    public abstract int priority() default 0;
+
+    /**
+     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
+     */
+    public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/VetoSubscriber.java
new file mode 100644
index 000000000..67e01db4b
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/VetoSubscriber.java
@@ -0,0 +1,69 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/**
+ * An Annotation for adding VetoListener subscriptions to EventService Events.
+ * <p>
+ * This annotation simplifies much of the repetitive boilerplate used for adding veto listeners
+ * (which in EventBus 2.0 will be called VetoSubscribers, thus this annotation name difference)
+ * to EventService Events.  Example:
+ * <p>
+ * <pre>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventSubscriber(eventClass=AppAppClosingEvent.class)
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
+ *      //close connections, close windows
+ *   }
+ * }
+ *
+ * public class MyDocumentController {
+ *   &#64;VetoSubscriber(eventClass=AppAppClosingEvent.class)
+ *   public boolean ensureDocumentIsSaved(AppAppClosingEvent appClosingEvent) {
+ *      if (docHasUnsavedChanges()) {
+ *         boolean answer = MyModalDialog.show("Are you sure you want to close and lose your changes?");
+ *         if (answer == StandardButtonValues.Cancel) {
+ *            //stop processing this event
+ *            return true;
+ *         }
+ *      }
+ *      //It's OK to close
+ *      return false;
+ *   }
+ * }
+ * </pre>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface VetoSubscriber {
+   /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
+   public abstract Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
+
+   /** Determines the order in which this veto subscriber is called, default is FIFO.*/
+   public abstract int priority() default 0;
+
+   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
+   public abstract boolean exact() default false;
+
+   /** Whether to subscribe weakly or strongly. */
+   public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+   /**
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
+    */
+   public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/VetoTopicPatternSubscriber.java
new file mode 100644
index 000000000..6fddb9b02
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/VetoTopicPatternSubscriber.java
@@ -0,0 +1,66 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/**
+ * An Annotation for adding VetoTopicPatternListener subscriptions to EventService Events.
+ * <p>
+ * This annotation simplifies much of the repetitive boilerplate used for adding veto topic pattern listeners
+ * (which in EventBus 2.0 will be called VetoTopicPatternSubscribers, thus this annotation name difference)
+ * to EventService Events.  Example:
+ * <p>
+ * <pre>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EvenTopicSubscriber(topic="App.Close.*")
+ *   public void onAppClosingEvent(String topic, Object payload) {
+ *      //close connections, close windows
+ *   }
+ * }
+ *
+ * public class MyDocumentController {
+ *   &#64;VetoTopicSubscriber(topic="App.Close.*")
+ *   public boolean ensureDocumentIsSaved(String topic, Object payload) {
+ *      if (docHasUnsavedChanges()) {
+ *         boolean answer = MyModalDialog.show("Are you sure you want to close and lose your changes?");
+ *         if (answer == StandardButtonValues.Cancel) {
+ *            //stop processing this event
+ *            return true;
+ *         }
+ *      }
+ *      //It's OK to close
+ *      return false;
+ *   }
+ * }
+ * </pre>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface VetoTopicPatternSubscriber {
+   /** The topic to subscribe to */
+   public abstract String topicPattern();
+
+   /** Determines the order in which this veto subscriber is called, default is FIFO.*/
+   public abstract int priority() default 0;
+
+   /** Whether to subscribe weakly or strongly. */
+   public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+   /**
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
+    */
+   public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/VetoTopicSubscriber.java
new file mode 100644
index 000000000..1ff069b69
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/annotation/VetoTopicSubscriber.java
@@ -0,0 +1,66 @@
+package org.scijava.event.bushe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/**
+ * An Annotation for adding VetoTopicListener subscriptions to EventService Events.
+ * <p>
+ * This annotation simplifies much of the repetitive boilerplate used for adding veto topic listeners
+ * (which in EventBus 2.0 will be called VetoTopicSubscribers, thus this annotation name difference)
+ * to EventService Events.  Example:
+ * <p>
+ * <pre>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EvenTopicSubscriber(topic="App.Close")
+ *   public void onAppClosingEvent(String topic, Object payload) {
+ *      //close connections, close windows
+ *   }
+ * }
+ *
+ * public class MyDocumentController {
+ *   &#64;VetoTopicSubscriber(topic="App.Close")
+ *   public boolean ensureDocumentIsSaved(String topic, Object payload) {
+ *      if (docHasUnsavedChanges()) {
+ *         boolean answer = MyModalDialog.show("Are you sure you want to close and lose your changes?");
+ *         if (answer == StandardButtonValues.Cancel) {
+ *            //stop processing this event
+ *            return true;
+ *         }
+ *      }
+ *      //It's OK to close
+ *      return false;
+ *   }
+ * }
+ * </pre>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface VetoTopicSubscriber {
+   /** The topic to subscribe to */
+   String topic();
+
+   /** Determines the order in which this veto subscriber is called, default is FIFO.*/
+   public abstract int priority() default 0;
+
+   /** Whether to subscribe weakly or strongly. */
+   public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+   /**
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
+    */
+   public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+}
diff --git a/src/main/java/org/scijava/event/bushe/exception/SwingException.java b/src/main/java/org/scijava/event/bushe/exception/SwingException.java
new file mode 100644
index 000000000..dfc3a048d
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/exception/SwingException.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe.exception;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * Aids in troubleshooting Swing application exceptions or any exception where the caller's stack may not be the
+ * exception stack (such as producer-consumer patterns that cross threads).
+ * <p/>
+ * Swing exceptions usually occur on the Swing Event Dispatch Thread, and often occur when code puts events on the EDT.
+ * This code is often in a non-EDT thread such as a thread that is receiving data from a server.  If the non-EDT threads
+ * puts a call on the EDT and that EDT call causes and exception, the stack trace of the exception is lost, and it often
+ * difficult or impossible to determine where the non-EDT call came from.
+ * <p/>
+ * This Exception class is used to handle exceptions that occur when events are posted on the Swing EDT or occur on
+ * another thread from the Swing EDT. It includes a "swing" call stack to record from where the event occurred, and
+ * overrides so that the exception and the swing calling stack print nicely to logs.
+ * <p/>
+ * The swing calling stack is different from the cause of the exception since it is gathered before the exception occurs
+ * in a different stack from the cause and used after the exception in a new thread occurs.
+ *
+ * @author Michael Bushe michael@bushe.com
+ * @todo in SwingUtils, make an invokeLater() method that saves the calling stack and catches all exceptions from a
+ * subsequent call to SwingUtilities.invokeLater(), then throws a Swing Exception so the calling stack is saved.
+ */
+public class SwingException extends Exception {
+   protected StackTraceElement[] callingStackTrace;
+
+   /** Default constructor */
+   public SwingException() {
+      super();
+   }
+
+   /**
+    * Constructor for compatibility with Exception. Use ClientException(String, Throwable, StackTraceElement[])
+    * instead
+    */
+   public SwingException(String message) {
+      super(message);
+   }
+
+   /** Constructor for compatibility with Exception Use ClientException(String, Throwable, StackTraceElement[]) instead */
+   public SwingException(Throwable cause) {
+      super(cause);
+   }
+
+   /** Constructor for compatibility with Exception Use ClientException(String, Throwable, StackTraceElement[]) instead */
+   public SwingException(String message, Throwable cause) {
+      super(message, cause);
+   }
+
+   /**
+    * Preferred constructor.
+    * <p/>
+    *
+    * @param message The message of exception
+    * @param cause The cause of the exception in the same call stack
+    * @param callingStack the stack trace that the client used to call the exception to occur.
+    */
+   public SwingException(String message, Throwable cause, StackTraceElement[] callingStack) {
+      super(message, cause);
+      setCallingStack(callingStack);
+   }
+
+   /**
+    * Swing exceptions often have two stacks - one thread causes the posting of an action on another thread - usually
+    * the Swing EDT thread.  The other is the stack of the actual thread the exception occurred on, the exception occurs
+    * after the post.
+    *
+    * @param swingCallingStack the stack trace that the client used to cause the exception to occur.
+    */
+   public void setCallingStack(StackTraceElement[] swingCallingStack) {
+      this.callingStackTrace = swingCallingStack;
+   }
+
+   /**
+    * Client exceptions often have two stacks - one thread causes the posting of an action on another thread - usually
+    * the Swing EDT thread.  The other is the stack of the actual thread the exception occurred on.
+    *
+    * @return the stack trace that the client used to cause the exception to occur.
+    */
+   public StackTraceElement[] getCallingStack() {
+      return callingStackTrace;
+   }
+
+   /**
+    * Calls printWriter(ps, true)
+    *
+    * @param ps the print stream
+    */
+   public void printStackTrace(PrintStream ps) {
+      PrintWriter pw = new PrintWriter(ps, true);
+      printStackTrace(pw);
+   }
+
+   /**
+    * Prints the calling stack and the exception stack trace.
+    *
+    * @param pw
+    */
+   public void printStackTrace(PrintWriter pw) {
+      pw.println(this);
+      if (callingStackTrace != null) {
+         pw.println("Calling stack:");
+         for (int i = 0; i < callingStackTrace.length; i++) {
+            pw.println("\tat " + callingStackTrace[i]);
+         }
+         pw.println("Stack after call:");
+      }
+      super.printStackTrace(pw);
+   }
+}
+
diff --git a/src/main/java/org/scijava/event/bushe/generics/TypeReference.java b/src/main/java/org/scijava/event/bushe/generics/TypeReference.java
new file mode 100644
index 000000000..2befb0a41
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/generics/TypeReference.java
@@ -0,0 +1,52 @@
+package org.scijava.event.bushe.generics;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * Courtesy of Neil Gafter's blog.
+ * Thanks to Curt Cox for the pointer.
+ */
+public abstract class TypeReference<T> {
+
+ private final Type type;
+ private volatile Constructor<?> constructor;
+
+ protected TypeReference() {
+     Type superclass = getClass().getGenericSuperclass();
+     if (superclass instanceof Class) {
+         throw new RuntimeException("Missing type parameter.");
+     }
+     this.type = ((ParameterizedType) superclass).getActualTypeArguments()[0];
+ }
+
+ /**
+  * @return a new instance of {@code T} using the default, no-arg
+  * constructor.
+  * @throws IllegalAccessException on security reflection issues
+  * @throws NoSuchMethodException there's not getRawType on the type
+  * @throws java.lang.reflect.InvocationTargetException if a reflective call causes an exception in the underlying instance
+  * @throws InstantiationException if the instance cannot be instantiated
+  */
+ @SuppressWarnings("unchecked")
+ public T newInstance()
+         throws NoSuchMethodException, IllegalAccessException,
+         InvocationTargetException, InstantiationException {
+     if (constructor == null) {
+         Class<?> rawType = type instanceof Class<?>
+             ? (Class<?>) type
+             : (Class<?>) ((ParameterizedType) type).getRawType();
+         constructor = rawType.getConstructor();
+     }
+     return (T) constructor.newInstance();
+ }
+
+ /**
+  * @return the referenced type.
+  */
+ public Type getType() {
+     return this.type;
+ }
+}
diff --git a/src/test/java/org/scijava/event/bushe/BadEventService.java b/src/test/java/org/scijava/event/bushe/BadEventService.java
new file mode 100644
index 000000000..2046821a2
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/BadEventService.java
@@ -0,0 +1,10 @@
+package org.scijava.event.bushe;
+
+public class BadEventService extends ThreadSafeEventService {
+
+
+   /** @see org.scijava.event.bushe.EventService#subscribe(String,org.scijava.event.bushe.EventTopicSubscriber) */
+   public boolean subscribe(String topic, EventTopicSubscriber eh) {
+      throw new RuntimeException("For testing");
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/EBTestCounter.java b/src/test/java/org/scijava/event/bushe/EBTestCounter.java
new file mode 100644
index 000000000..8ebf75160
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/EBTestCounter.java
@@ -0,0 +1,10 @@
+package org.scijava.event.bushe;
+
+/**
+ * @author Michael Bushe
+ * @since Nov 19, 2005 11:12:35 PM
+ */
+public class EBTestCounter {
+   public int eventsHandledCount;
+   public int subscribeExceptionCount;
+}
diff --git a/src/test/java/org/scijava/event/bushe/EDTUtil.java b/src/test/java/org/scijava/event/bushe/EDTUtil.java
new file mode 100644
index 000000000..c74d4846f
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/EDTUtil.java
@@ -0,0 +1,36 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.scijava.event.bushe;
+
+import java.awt.EventQueue;
+import java.awt.Toolkit;
+
+/**
+ *
+ * @author Michael Bushe
+ */
+public class EDTUtil {
+
+   /**
+    * Since we are using the event bus from a non-awt thread, stay alive for a sec to give time for the EDT to start and
+    * post the message
+    */
+   public static void waitForEDT() {
+      EventQueue eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
+      long start = System.currentTimeMillis();
+      do {
+         //wait at least once - plenty of time for the event sent to the queue to get there
+         long now = System.currentTimeMillis();
+         if (now > start + (1000*5) ) {
+            throw new RuntimeException("Waited too long for the EDT to finish.");
+         }
+         try {
+            Thread.sleep(100);
+         } catch (Throwable e) {
+         }
+      } while(eventQueue.peekEvent() != null);
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java b/src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java
new file mode 100644
index 000000000..8fb87e534
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java
@@ -0,0 +1,32 @@
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/**
+ * Cleans out the event service locators before each test
+ */
+public class EventServiceLocatorTestCase extends TestCase {
+   public EventServiceLocatorTestCase(String name) {
+      super(name);
+   }
+
+   public void testEmptyTestCaseToAvoidWarning() {
+
+   }
+
+   @Override
+   public void setUp() throws Exception {
+      clearEventServiceLocator();
+   }
+
+   public static void clearEventServiceLocator() {
+      System.clearProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS);
+      System.clearProperty(EventServiceLocator.EVENT_BUS_CLASS);
+      EventServiceLocator.clearAll();
+   }
+
+   @Override
+   protected void tearDown() throws Exception {
+      clearEventServiceLocator();
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/SubscriberForTest.java b/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
new file mode 100644
index 000000000..2fac88e57
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
@@ -0,0 +1,43 @@
+package org.scijava.event.bushe;
+
+import java.util.Date;
+
+/**
+ * @author Michael Bushe
+ * @since Nov 19, 2005 11:01:06 PM
+ */
+public class SubscriberForTest implements EventSubscriber {
+   private boolean throwException;
+   private Long waitTime;
+   private EBTestCounter testDefaultEventService;
+   Date callTime = null;
+
+   public SubscriberForTest(EBTestCounter testDefaultEventService, Long waitTime) {
+      this.testDefaultEventService = testDefaultEventService;
+      this.waitTime = waitTime;
+   }
+
+   public SubscriberForTest(EBTestCounter testDefaultEventService, boolean throwException) {
+      this.testDefaultEventService = testDefaultEventService;
+      this.throwException = throwException;
+   }
+
+   public void onEvent(Object evt) {
+      callTime = new Date();
+      if (waitTime != null) {
+         try {
+            Thread.sleep(waitTime.longValue());
+         } catch (InterruptedException e) {
+         }
+      }
+      testDefaultEventService.eventsHandledCount++;
+      if (throwException) {
+         testDefaultEventService.subscribeExceptionCount++;
+         throw new IllegalArgumentException();
+      }
+   }
+
+   public boolean equals(Object obj) {
+      return (this == obj);
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestContainerEventService.java b/src/test/java/org/scijava/event/bushe/TestContainerEventService.java
new file mode 100644
index 000000000..5c7c6a322
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestContainerEventService.java
@@ -0,0 +1,218 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestContainerEventService extends TestCase {
+   private ArrayList subscribedEvents;
+   private Object aSource = new Object();
+   private JFrame frame;
+   private JPanel panel;
+   private Object lastEventObject;
+
+   public TestContainerEventService(String name) {
+      super(name);
+   }
+
+   protected void setUp() throws Exception {
+      subscribedEvents = new ArrayList();
+      frame = new JFrame();
+      panel = new JPanel();
+      frame.setContentPane(panel);
+   }
+
+   public void testContainerEventServiceFinder() {
+      JButton button = new JButton("Foo");
+      panel.add(button);
+      JButton barButton = new JButton("Bar");
+      panel.add(barButton);
+      EventService es = ContainerEventServiceFinder.getEventService(button);
+      assertTrue(EventBus.getGlobalEventService() != es);
+      EventService esBar = ContainerEventServiceFinder.getEventService(barButton);
+      assertEquals(esBar, es);
+      assertEquals(0, subscribedEvents.size());
+      es.subscribe("FooTopic", new EventTopicSubscriber() {
+         public void onEvent(String topic, Object evt) {
+            subscribedEvents.add(evt);
+         }
+      });
+      esBar.publish("FooTopic", "Foo");
+      EDTUtil.waitForEDT();
+      assertEquals(1, subscribedEvents.size());
+      subscribedEvents.clear();
+      Point location = frame.getLocation();
+      frame.setLocation(33, 33);
+      EDTUtil.waitForEDT();
+      assertTrue(subscribedEvents.size() == 0);
+   }
+
+   public void testContainerEventServiceSupplier() {
+      JButton button = new JButton("Foo");
+      JPanel subPanel = new JPanel();
+      subPanel.add(button);
+      panel.add(subPanel);
+      JButton barButton = new JButton("Bar");
+      JPanel subPanel2 = new ContainerEventServiceSupplierPanel();
+      subPanel2.add(barButton);
+      panel.add(subPanel2);
+      EventService es = ContainerEventServiceFinder.getEventService(button);
+      assertTrue(EventBus.getGlobalEventService() != es);
+      EventService esBar = ContainerEventServiceFinder.getEventService(barButton);
+      assertTrue(esBar != es);
+      assertEquals(0, subscribedEvents.size());
+      es.subscribe("FooTopic", new EventTopicSubscriber() {
+         public void onEvent(String topic, Object evt) {
+            subscribedEvents.add(evt);
+         }
+      });
+      esBar.publish("FooTopic", "Foo");
+      EDTUtil.waitForEDT();
+      assertEquals(0, subscribedEvents.size());
+   }
+
+   public void testContainerEventServiceRegistrar() {
+      //Set the lastEventObject whenever the event fires on the right Container Event Service
+      EventTopicSubscriber buttonContainerTopicSubscriber = new EventTopicSubscriber() {
+         public void onEvent(String topic, Object data) {
+            System.out.println("topic=" + topic + ", data=" + data);
+            setLastEventObject(data);
+         }
+      };
+      //Set the lastEventObject whenever the event fires on the right Container Event Service
+      VetoTopicEventListener buttonContainerVetoTopicSubscriber = new VetoTopicEventListener() {
+          public boolean shouldVeto(String topic, Object data) {
+              return "VetoMe".equals(data);
+          }
+      };
+      //Set the lastEventObject whenever the event fires on the right Container Event Service
+      EventSubscriber buttonContainerSubscriber = new EventSubscriber() {
+          public void onEvent(Object data) {
+             System.out.println("class=" + data);
+             setLastEventObject(data);
+          }
+      };
+      //Set the lastEventObject whenever the event fires on the right Container Event Service
+      VetoEventListener buttonContainerVetoSubscriber = new VetoEventListener() {
+           public boolean shouldVeto(Object data) {
+               return "VetoMe".equals(data.toString());
+           }
+      };
+      JButton button = new JButton("Foo");
+
+      ContainerEventServiceRegistrar reg = new ContainerEventServiceRegistrar(button, buttonContainerTopicSubscriber,
+              "RegEvent");
+      EventService es = reg.getContainerEventService();
+      assertTrue(es != null);
+
+      ContainerEventServiceRegistrar reg2 = new ContainerEventServiceRegistrar(button, buttonContainerVetoTopicSubscriber,
+              "RegEvent");
+      EventService es4reg2 = reg2.getContainerEventService();
+      assertTrue(es4reg2 != null);
+
+      ContainerEventServiceRegistrar reg3 = new ContainerEventServiceRegistrar(button, buttonContainerSubscriber,
+              String.class);
+      EventService es4reg3 = reg3.getContainerEventService();
+      assertTrue(es4reg3 != null);
+
+      ContainerEventServiceRegistrar reg4 = new ContainerEventServiceRegistrar(button, buttonContainerVetoSubscriber,
+              String.class);
+      EventService es4reg4 = reg4.getContainerEventService();
+      assertTrue(es4reg4 != null);
+
+      //Publishing on the global event bus should not have an effect
+      EventBus.publish("RegEvent", "WrongBus");
+      assertEquals(getLastEventObject(), null);
+
+      //Make a container that has another container inside it that supplies a container event service
+      JPanel subPanel = new JPanel();
+      subPanel.add(button);
+      ContainerEventServiceSupplierPanel subPanel2 = new ContainerEventServiceSupplierPanel();
+      panel.add(subPanel);
+      panel.add(subPanel2);
+      EventService es2 = reg.getContainerEventService();
+      //the registrar kept up with the move
+      assertTrue(es2 != es);
+
+      EventBus.publish("RegEvent", "WrongBus");
+      assertEquals(getLastEventObject(), null);
+      EventBus.publish("StringClassEvent");
+      assertEquals(getLastEventObject(), null);
+
+      EventService topPanelES = ContainerEventServiceFinder.getEventService(panel);
+
+      topPanelES.publish("RegEvent", "TopLevelBus");
+      EDTUtil.waitForEDT();
+      assertEquals("TopLevelBus", getLastEventObject());
+
+      topPanelES.publish("Don'tVetoMe");
+      EDTUtil.waitForEDT();
+      assertEquals("Don'tVetoMe", getLastEventObject());
+
+      topPanelES.publish("VetoMe");
+      EDTUtil.waitForEDT();
+      assertEquals("Don'tVetoMe", getLastEventObject());//veto worked
+
+      topPanelES.publish("RegEvent", "TopLevelBus");
+      EDTUtil.waitForEDT();
+      assertEquals("TopLevelBus", getLastEventObject());
+
+      EventService subPanel2ES = subPanel2.getContainerEventService();
+      subPanel2ES.publish("RegEvent", "SuppliedBus");
+      EDTUtil.waitForEDT();
+      assertEquals("TopLevelBus", getLastEventObject());//still
+
+      subPanel2.add(button);
+      EDTUtil.waitForEDT();
+      subPanel2ES.publish("RegEvent", "SuppliedBus");
+      EDTUtil.waitForEDT();
+      assertEquals("SuppliedBus", getLastEventObject());//detected move
+
+      subPanel2ES.publish("RegEvent", "VetoMe");
+      EDTUtil.waitForEDT();
+      assertEquals("SuppliedBus", getLastEventObject());//veto moved
+
+      subPanel.add(button);
+      topPanelES.publish("RegEvent", "TopLevelBus");
+      EDTUtil.waitForEDT();
+      assertEquals("TopLevelBus", getLastEventObject());
+
+      subPanel2ES.publish("RegEvent", "SuppliedBus");
+      EDTUtil.waitForEDT();
+      assertEquals("TopLevelBus", getLastEventObject());
+   }
+
+   private synchronized void setLastEventObject(Object data) {
+      lastEventObject = data;
+   }
+
+   public synchronized Object getLastEventObject() {
+      return lastEventObject;
+   }
+
+   class ContainerEventServiceSupplierPanel extends JPanel implements ContainerEventServiceSupplier {
+      private EventService es = new SwingEventService();
+
+      public EventService getContainerEventService() {
+         return es;
+      }
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java b/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
new file mode 100644
index 000000000..05f2d3ac2
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
@@ -0,0 +1,1397 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Type;
+
+import java.awt.Container;
+import java.awt.Component;
+import javax.swing.JComponent;
+
+import junit.framework.TestCase;
+
+import org.scijava.event.bushe.generics.DataRequestEvent;
+import org.scijava.event.bushe.generics.TypeReference;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestDefaultEventService extends TestCase {
+
+   private ThreadSafeEventService eventService = null;
+   private EventSubscriber eventSubscriber = null;
+   private EventTopicSubscriber eventTopicSubscriber;
+   private SubscriberTimingEvent timing;
+   private EBTestCounter testCounter = new EBTestCounter();
+
+   public TestDefaultEventService(String name) {
+      super(name);
+   }
+
+   protected void setUp() throws Exception {
+      eventService = new ThreadSafeEventService(null, false);
+      EventServiceLocatorTestCase.clearEventServiceLocator();
+   }
+
+   protected void tearDown() throws Exception {
+      eventService = null;
+      EventServiceLocatorTestCase.clearEventServiceLocator();
+   }
+
+   private EventServiceEvent createEvent() {
+      return new EventServiceEvent() {
+         public Object getSource() {
+            return "";
+         }
+      };
+   }
+
+   private Class getEventClass() {
+      return createEvent().getClass();
+   }
+
+   private EventSubscriber createEventSubscriber(boolean throwException) {
+      return new SubscriberForTest(testCounter, throwException);
+   }
+
+   private EventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
+      return new TopicSubscriberForTest(testCounter, throwException);
+   }
+
+   private EventSubscriber createEventSubscriber(Long waitTime) {
+      return new SubscriberForTest(testCounter, waitTime);
+   }
+
+   private EventSubscriber getEventSubscriber() {
+      return getEventSubscriber(true);
+   }
+
+   private EventSubscriber getEventSubscriber(boolean throwException) {
+      if (eventSubscriber == null) {
+         eventSubscriber = createEventSubscriber(throwException);
+      }
+      return eventSubscriber;
+   }
+
+   private EventTopicSubscriber getEventTopicSubscriber() {
+      if (eventTopicSubscriber == null) {
+         eventTopicSubscriber = createEventTopicSubscriber(false);
+      }
+      return eventTopicSubscriber;
+   }
+
+   public void testTyping() {
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      Double doub = 3.14;
+      Number numb = doub;
+      eventService.subscribe(Number.class, subscriber);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(doub);
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      eventService.publish(numb);
+      assertEquals("testPublish(total)", 2, testCounter.eventsHandledCount);
+      eventService.unsubscribe(Number.class, subscriber);
+      eventService.subscribe(Double.class, subscriber);
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(doub);
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      eventService.publish(numb);
+      assertEquals("testPublish(total)", 2, testCounter.eventsHandledCount);
+   }
+
+   public void testSubscribe() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber);
+      assertTrue("testSubscribe(new subscriber)", actualReturn);
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber);
+      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      try {
+         actualReturn = eventService.subscribe((Class) null, getEventSubscriber());
+         fail("subscribeStrongly(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = eventService.subscribe(getEventClass(), null);
+         fail("subscribeStrongly(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+   }
+
+   public void testSubscribeOrder() {
+      boolean actualReturn;
+      SubscriberForTest subscriber1 = (SubscriberForTest) createEventSubscriber(new Long(100));
+      SubscriberForTest subscriber2 = (SubscriberForTest) createEventSubscriber(new Long(100));
+      SubscriberForTest subscriber3 = (SubscriberForTest) createEventSubscriber(new Long(100));
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber1);
+      actualReturn = eventService.subscribe(getEventClass(), subscriber2);
+      actualReturn = eventService.subscribe(getEventClass(), subscriber3);
+
+      eventService.publish(createEvent());
+
+      assertTrue(subscriber1.callTime.before(subscriber2.callTime));
+      assertTrue(subscriber2.callTime.before(subscriber3.callTime));
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber1);
+      eventService.publish(createEvent());
+
+      assertTrue(subscriber2.callTime.before(subscriber3.callTime));
+      assertTrue(subscriber3.callTime.before(subscriber1.callTime));
+
+      List subscribers = eventService.getSubscribers(getEventClass());
+      assertEquals(3, subscribers.size());
+      for (int i = 0; i < subscribers.size(); i++) {
+         EventSubscriber subscriber = (EventSubscriber) subscribers.get(i);
+         eventService.unsubscribe(getEventClass(), subscriber);
+      }
+      eventService.subscribe(getEventClass(), (EventSubscriber) subscribers.get(1));
+      eventService.subscribe(getEventClass(), (EventSubscriber) subscribers.get(0));
+      eventService.subscribe(getEventClass(), (EventSubscriber) subscribers.get(2));
+      eventService.publish(createEvent());
+      assertTrue(subscriber3.callTime.before(subscriber2.callTime));
+      assertTrue(subscriber2.callTime.before(subscriber1.callTime));
+   }
+
+   public void testSubscribeWeakly() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber);
+      assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber);
+      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+      subscriber = null;
+      System.gc();
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      try {
+         actualReturn = eventService.subscribeStrongly((Class) null, getEventSubscriber());
+         fail("subscribeStrongly(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = eventService.subscribeStrongly(getEventClass(), null);
+         fail("subscribeStrongly(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+   }
+
+   public void testSubscribeStrongly() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = eventService.subscribeStrongly(getEventClass(), subscriber);
+      assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
+
+      actualReturn = eventService.subscribeStrongly(getEventClass(), subscriber);
+      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+      subscriber = null;
+      System.gc();
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      try {
+         actualReturn = eventService.subscribeStrongly((Class) null, getEventSubscriber());
+         fail("subscribeStrongly(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = eventService.subscribeStrongly(getEventClass(), null);
+         fail("subscribeStrongly(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+   }
+
+
+   public void testIllegalArgs() {
+      try {
+         EventBus.subscribeVetoListenerStrongly((Class) null, new VetoEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.subscribeVetoListenerStrongly((String) null, new VetoTopicEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.subscribeVetoListenerStrongly("foo", null);
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.subscribeVetoListenerStrongly(getEventClass(), null);
+         fail();
+      } catch (Throwable t) {
+      }
+
+
+      try {
+         EventBus.unsubscribeVetoListener((Class) null, new VetoEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.unsubscribeVetoListener((String) null, new VetoTopicEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.unsubscribeVetoListener("foo", null);
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.unsubscribeVetoListener(getEventClass(), null);
+         fail();
+      } catch (Throwable t) {
+      }
+
+   }
+
+   public void testVeto() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber);
+
+      VetoEventListener vetoListener = new VetoEventListenerForTest();
+      actualReturn = eventService.subscribeVetoListener(getEventClass(), vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      eventService.unsubscribeVetoListener(getEventClass(), vetoListener);
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+   }
+
+   public void testVetoException() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber);
+
+      VetoEventListener vetoListener = new VetoEventListenerForTest(true);
+      actualReturn = eventService.subscribeVetoListenerStrongly(getEventClass(), vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      eventService.unsubscribeVetoListener(getEventClass(), vetoListener);
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 2, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+   }
+
+   public void testVetoTopic() {
+      boolean actualReturn;
+      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+
+      actualReturn = eventService.subscribe("FooTopic", subscriber);
+
+      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
+         public boolean shouldVeto(String topic, Object data) {
+            return true;
+         }
+      };
+      actualReturn = eventService.subscribeVetoListenerStrongly("FooTopic", vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish("FooTopic", "Bar");
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      eventService.unsubscribeVetoListener("FooTopic", vetoListener);
+      eventService.publish("FooTopic", "Bar");
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+
+   public void testVetoWeak() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = eventService.subscribe(getEventClass(), subscriber);
+
+      VetoEventListener vetoListener = new VetoEventListener() {
+         public boolean shouldVeto(Object evt) {
+            return true;
+         }
+      };
+      actualReturn = eventService.subscribeVetoListener(getEventClass(), vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      vetoListener = null;
+      System.gc();
+      try {
+         Thread.sleep(1000);
+      } catch (InterruptedException e) {
+      }
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   public void testVetoTopicWeak() {
+      boolean actualReturn;
+      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+
+      actualReturn = eventService.subscribe("FooTopic", subscriber);
+
+      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
+         public boolean shouldVeto(String topic, Object data) {
+            return true;
+         }
+      };
+      actualReturn = eventService.subscribeVetoListener("FooTopic", vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish("FooTopic", createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      vetoListener = null;
+      System.gc();
+      eventService.publish("FooTopic", createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+
+   public void testUnsubscribe() {
+      eventService.subscribe(getEventClass(), getEventSubscriber(false));
+
+      boolean actualReturn;
+
+      try {
+         actualReturn = eventService.unsubscribe((Class) null, getEventSubscriber());
+         fail("unsubscribe(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = eventService.unsubscribe(getEventClass(), null);
+         fail("unsubscribe(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      actualReturn = eventService.unsubscribe(getEventClass(), getEventSubscriber());
+      assertTrue("return value", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   public void testUnsubscribeTopic() {
+      EventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
+      eventService.subscribe("FooTopic", eventTopicSubscriber);
+
+      boolean actualReturn;
+
+      try {
+         actualReturn = eventService.unsubscribe((String) null, eventTopicSubscriber);
+         fail("unsubscribe(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = eventService.unsubscribe("FooTopic", null);
+         fail("unsubscribe(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish("FooTopic", "Foo");
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      actualReturn = eventService.unsubscribe("FooTopic", eventTopicSubscriber);
+      assertTrue("return value", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish("FooTopic", "Foo");
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   /**
+    * Test that the publish method works and that exceptions thrown in event subscribers don't halt publishing. In the
+    * test 2 subscribers are good and 2 subscribers throw exceptions.
+    */
+   public void testPublish() {
+      try {
+         eventService.publish(null);
+         fail("publish(null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         eventService.publish((String) null, createEvent());
+         fail("publish(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      eventService.publish(createEvent());
+      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      eventService.publish("Foo", "Bar");
+      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      eventService.subscribe(getEventClass(), createEventSubscriber(true));
+      eventService.subscribe(getEventClass(), createEventSubscriber(false));
+      eventService.subscribe(getEventClass(), createEventSubscriber(true));
+      eventService.subscribe(getEventClass(), createEventSubscriber(false));
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      eventService.publish(createEvent());
+
+      //The test passes if 2 subscribers completed and 2 subscribers threw exception.
+      assertEquals("testPublish(completed)", 4, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 2, testCounter.subscribeExceptionCount);
+
+      EventBus.subscribe(ObjectEvent.class, createEventSubscriber(false));
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      ObjectEvent evt = new ObjectEvent("Foo", "Bar");
+      assertEquals(evt.getEventObject(), "Bar");
+      EventBus.publish(evt);
+      //Since we are using hte event bus from a non-awt thread, stay alive for a sec
+      //to give time for the EDT to start and post the message
+      try {
+         Thread.sleep(500);
+      } catch (InterruptedException e) {
+      }
+      assertEquals("testPublish(completed)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   public void testTimeHandling() {
+      eventService.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
+      final Boolean[] wasCalled = new Boolean[1];
+      eventService.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+         public void onEvent(Object evt) {
+            wasCalled[0] = Boolean.TRUE;
+         }
+      });
+      eventService.publish(createEvent());
+      assertTrue(wasCalled[0] == null);
+      eventService = new ThreadSafeEventService(new Long(100), true);
+      eventService.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
+      final Boolean[] wasCalled2 = new Boolean[1];
+      eventService.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+         public void onEvent(Object evt) {
+            wasCalled2[0] = Boolean.TRUE;
+            timing = (SubscriberTimingEvent) evt;
+         }
+      });
+      eventService.publish(createEvent());
+      assertTrue(wasCalled2[0] == Boolean.TRUE);
+      assertNotNull(timing.getSource());
+      assertNotNull(timing.getEnd());
+      assertNotNull(timing.getEvent());
+      assertNotNull(timing.getSubscriber());
+      assertNotNull(timing.getStart());
+      assertNotNull(timing.getTimeLimitMilliseconds());
+      assertFalse(timing.isEventHandlingExceeded());
+      assertFalse(timing.isVetoExceeded());
+      assertNull(timing.getVetoEventListener());
+   }
+
+   public void testEventLocator() {
+      EventServiceLocatorTestCase.clearEventServiceLocator();
+      EventService es = EventServiceLocator.getSwingEventService();
+      assertTrue(es instanceof SwingEventService);
+      es = new ThreadSafeEventService(null, false);
+      try {
+         EventServiceLocator.setEventService("foo", es);
+      } catch (EventServiceExistsException e) {
+         fail("First set should succeed.");
+      }
+      EventService es2 = EventServiceLocator.getEventService("foo");
+      assertTrue(es2 == es);
+      try {
+         es = new ThreadSafeEventService(null, false);
+         EventServiceLocator.setEventService("foo", es);
+         fail("Second set should fail.");
+      } catch (EventServiceExistsException e) {
+      }
+      es2 = EventServiceLocator.getEventService("foo");
+      assertFalse(es2 == es);
+      try {
+         EventServiceLocator.setEventService("foo", null);
+      } catch (EventServiceExistsException e) {
+         fail("Null should succeed.");
+      }
+      es2 = EventServiceLocator.getEventService("foo");
+      assertNull(es2);
+      assertEquals(EventServiceLocator.getSwingEventService(), EventBus.getGlobalEventService());
+   }
+
+   /**
+    * Test for ISSUE #1: If a class implements both subscriber interfaces I've seen a topic 'event' be published from a
+    * publish method with the correct (topic) signature, yet be subscribed at the wrong subscriber method (the one with
+    * the signature for real event classes, not topics
+    */
+   public void testSimultaneousTopicAndClass() {
+      DoubleSubscriber doubleSubscriber = new DoubleSubscriber();
+      eventService.subscribe(org.scijava.event.bushe.ObjectEvent.class, doubleSubscriber);
+      eventService.subscribe("org.scijava.event.bushe.ObjectEvent.class", doubleSubscriber);
+      ObjectEvent evt = new ObjectEvent("Foo", "Bar");
+      assertEquals(evt.getEventObject(), "Bar");
+      eventService.publish(evt);
+      assertEquals(1, doubleSubscriber.timesEventCalled);
+      assertEquals(0, doubleSubscriber.timesTopicCalled);
+      assertEquals(evt, doubleSubscriber.lastEvent);
+      assertEquals(null, doubleSubscriber.lastEventString);
+      eventService.publish("org.scijava.event.bushe.ObjectEvent.class", "Bar");
+      assertEquals(1, doubleSubscriber.timesEventCalled);
+      assertEquals(1, doubleSubscriber.timesTopicCalled);
+      assertEquals(evt, doubleSubscriber.lastEvent);
+      assertEquals("org.scijava.event.bushe.ObjectEvent.class", doubleSubscriber.lastEventString);
+   }
+
+   public void testRegex() {
+      DoubleSubscriber doubleSubscriber = new DoubleSubscriber();
+      Pattern pat = Pattern.compile("Foo[1-5]");
+      eventService.subscribe(pat, doubleSubscriber);
+      List subscribers = eventService.getSubscribersToPattern(pat);
+      assertNotNull(subscribers);
+      assertEquals(1, subscribers.size());
+      subscribers = eventService.getSubscribersByPattern("Foo1");
+      assertNotNull(subscribers);
+      assertEquals(1, subscribers.size());
+      subscribers = eventService.getSubscribers("Foo1");
+      assertNotNull(subscribers);
+      assertEquals(1, subscribers.size());
+
+      eventService.publish("Foo1", "Bar");
+      assertEquals(0, doubleSubscriber.timesEventCalled);
+      assertEquals(1, doubleSubscriber.timesTopicCalled);
+      assertEquals(null, doubleSubscriber.lastEvent);
+      assertEquals("Foo1", doubleSubscriber.lastEventString);
+      eventService.publish("Foo2", "Bar");
+      assertEquals(0, doubleSubscriber.timesEventCalled);
+      assertEquals(2, doubleSubscriber.timesTopicCalled);
+      assertEquals(null, doubleSubscriber.lastEvent);
+      assertEquals("Foo2", doubleSubscriber.lastEventString);
+   }
+
+   public void testTypeSubscription() {
+      DoubleSubscriber subscriber = new DoubleSubscriber();
+
+      eventService.subscribe(TopLevelEvent.class, subscriber);
+      List subscribers = eventService.getSubscribersToClass(TopLevelEvent.class);
+      assertNotNull(subscribers);
+      assertEquals(1, subscribers.size());
+      subscribers = eventService.getSubscribersToClass(DerivedEvent.class);
+      assertNotNull(subscribers);
+      assertEquals(1, subscribers.size());
+      subscribers = eventService.getSubscribers(DerivedEvent.class);
+      assertNotNull(subscribers);
+      assertEquals(1, subscribers.size());
+      subscribers = eventService.getSubscribers(TopLevelEvent.class);
+      assertNotNull(subscribers);
+      assertEquals(1, subscribers.size());
+
+      DerivedEvent derivedEvent = new DerivedEvent(this);
+      eventService.publish(derivedEvent);
+      assertEquals(1, subscriber.timesEventCalled);
+      assertEquals(0, subscriber.timesTopicCalled);
+      assertEquals(derivedEvent, subscriber.lastEvent);
+      assertEquals(null, subscriber.lastEventString);
+      TopLevelEvent topLevelEvent = new TopLevelEvent(this);
+      eventService.publish(topLevelEvent);
+      assertEquals(2, subscriber.timesEventCalled);
+      assertEquals(0, subscriber.timesTopicCalled);
+      assertEquals(topLevelEvent, subscriber.lastEvent);
+      assertEquals(null, subscriber.lastEventString);
+   }
+
+   //Parameterized Type
+   public void testParameterizedEvent() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {
+      final int[] timesCalled = new int[1];
+      ParameterizedEvent<String> stringRequestEvent = new ParameterizedEvent<String>();
+      ParameterizedEvent<Integer> integerRequestEvent = new ParameterizedEvent<Integer>();
+
+      TypeReference<ParameterizedEvent<String>> stringTypeReference = new TypeReference<ParameterizedEvent<String>>(){};
+      TypeReference<ParameterizedEvent<Integer>> integerTypeReference = new TypeReference<ParameterizedEvent<Integer>>(){};
+//      ParameterizedEvent<String> dre = stringTypeReference.newInstance();
+//      System.out.println("dre.getClass()"+dre.getClass());
+//      System.out.println("stringTypeReference"+ stringTypeReference);
+//      System.out.println("stringTypeReference.getType()"+ stringTypeReference.getType());
+
+//      You can't simply do this, the TypeReference's generic type is important here
+//      Type superclass = integerRequestEvent.getClass().getGenericSuperclass();
+//      Type type = ((ParameterizedType) superclass).getActualTypeArguments()[0];
+//      System.out.println("superclass="+superclass);
+//      System.out.println("type="+type);
+
+      eventService.subscribe(stringTypeReference.getType(), new EventSubscriber() {
+         public void onEvent(Object event) {
+            timesCalled[0]++;
+         }
+      });
+      eventService.publish(stringTypeReference.getType(), stringRequestEvent);
+      eventService.publish(integerTypeReference.getType(), integerRequestEvent);
+      assertEquals(1, timesCalled[0]);
+   }
+
+   public void testParameterizedEventMultiParams() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {
+      final int[] timesCalled = new int[1];
+      DoublyParameterizedEvent<String, String> stringRequestEvent = new DoublyParameterizedEvent<String, String>();
+      DoublyParameterizedEvent<Integer, String> integerRequestEvent = new DoublyParameterizedEvent<Integer, String>();
+      DoublyParameterizedEvent<String, Integer> switchRequestEvent = new DoublyParameterizedEvent<String, Integer>();
+
+      TypeReference<DoublyParameterizedEvent<String, String>> stringTypeReference = new TypeReference<DoublyParameterizedEvent<String, String>>(){};
+      TypeReference<DoublyParameterizedEvent<Integer, String>> integerTypeReference = new TypeReference<DoublyParameterizedEvent<Integer, String>>(){};
+      TypeReference<DoublyParameterizedEvent<String, Integer>> switchTypeReference = new TypeReference<DoublyParameterizedEvent<String, Integer>>(){};
+
+      eventService.subscribe(stringTypeReference.getType(), new EventSubscriber() {
+         public void onEvent(Object event) {
+            timesCalled[0]++;
+         }
+      });
+      eventService.subscribe(integerTypeReference.getType(), new EventSubscriber() {
+         public void onEvent(Object event) {
+            timesCalled[0]++;
+         }
+      });
+      eventService.publish(stringTypeReference.getType(), stringRequestEvent);
+      assertEquals(1, timesCalled[0]);
+      eventService.publish(integerTypeReference.getType(), integerRequestEvent);
+      assertEquals(2, timesCalled[0]);
+      eventService.publish(switchTypeReference.getType(), switchRequestEvent);
+      assertEquals(2, timesCalled[0]);
+   }
+
+   public void testWildcardSubscription() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {
+      final int[] timesCalled = new int[1];
+      ParameterizedEvent<JComponent> jComponentRequestEvent = new ParameterizedEvent<JComponent>();
+
+      TypeReference<ParameterizedEvent<? extends Container>> containerWildcardTypeRef = new TypeReference<ParameterizedEvent<? extends Container>>(){};
+
+      eventService.subscribe(containerWildcardTypeRef.getType(), new EventSubscriber() {
+         public void onEvent(Object event) {
+            timesCalled[0]++;
+         }
+      });
+      TypeReference<ParameterizedEvent<JComponent>> jComponentTypeRef = new TypeReference<ParameterizedEvent<JComponent>>(){};
+
+      eventService.publish(jComponentTypeRef.getType(), jComponentRequestEvent);
+      assertEquals(1, timesCalled[0]);
+
+      //publishing a Component should not hit the wildcard since it doesn't extend Component
+      TypeReference<ParameterizedEvent<Component>> componentTypeRef = new TypeReference<ParameterizedEvent<Component>>(){};
+      ParameterizedEvent<Component> componentRequestEvent = new ParameterizedEvent<Component>();
+      eventService.publish(componentTypeRef.getType(), componentRequestEvent);
+      assertEquals(1, timesCalled[0]);
+
+      //publish wildcards is a not yet supported
+      try {
+         eventService.publish(containerWildcardTypeRef.getType(), jComponentRequestEvent);
+         fail();
+      } catch (IllegalArgumentException ex) {
+      }
+      assertEquals(1, timesCalled[0]);
+
+      //Test super wildcard, should be opposite of above
+      eventService.clearAllSubscribers();
+      TypeReference<ParameterizedEvent<? super Container>> containerSuperWildcardTypeRef = new TypeReference<ParameterizedEvent<? super Container>>(){};
+      eventService.subscribe(containerSuperWildcardTypeRef.getType(), new EventSubscriber() {
+         public void onEvent(Object event) {
+            timesCalled[0]++;
+         }
+      });
+      eventService.publish(jComponentTypeRef.getType(), jComponentRequestEvent);
+      assertEquals(1, timesCalled[0]);
+      eventService.publish(componentTypeRef.getType(), componentRequestEvent);
+      assertEquals(2, timesCalled[0]);
+
+      //Test exact matches
+   }
+
+   public class ParameterizedEvent<E> {
+      private Collection<E> data;
+      public Collection<E> getData() {
+         return data;
+      }
+   }
+
+   public class DoublyParameterizedEvent<E,F> {
+      private Map<E,F> data;
+      public Map<E,F> getData() {
+         return data;
+      }
+   }
+
+   class DoubleSubscriber implements EventTopicSubscriber, EventSubscriber {
+      public int timesTopicCalled = 0;
+      public int timesEventCalled = 0;
+      public String lastEventString;
+      public Object lastEvent;
+
+      public void onEvent(String topic, Object data) {
+         timesTopicCalled++;
+         lastEventString = topic;
+      }
+
+      public void onEvent(Object evt) {
+         timesEventCalled++;
+         lastEvent = evt;
+      }
+   }
+
+   class TopLevelEvent extends AbstractEventServiceEvent {
+      public TopLevelEvent(Object source) {
+         super(source);
+      }
+   }
+
+   class DerivedEvent extends TopLevelEvent {
+      public DerivedEvent(Object source) {
+         super(source);
+      }
+   }
+
+
+   /**
+    * Test match for generic type's of generic types
+    */
+   public void testGenericGeneric() {
+      final int[] timesCalled = new int[1];
+      DataRequestEvent<List<Integer>> request = new DataRequestEvent<List<Integer>>();
+      Type type = new TypeReference<DataRequestEvent<List<Integer>>>() {}.getType();
+      eventService.subscribe(type, new EventSubscriber() {
+         public void onEvent(Object event) {
+            timesCalled[0]++;
+         }
+      });
+      eventService.publish(type, request);
+      assertEquals(1, timesCalled[0]);
+      DataRequestEvent<List<String>> stringRequest = new DataRequestEvent<List<String>>();
+      Type stringType = new TypeReference<DataRequestEvent<List<String>>>() {}.getType();
+      eventService.publish(stringType , stringRequest);
+      assertEquals(1, timesCalled[0]);
+   }
+
+   public void testTopicsCache() {
+      Object a1 = new Object();
+      //All of the above should be checked with topics.
+      //Topics should test that exact matches are preferred over pattern matches
+      //Test that a default setting does not cache
+      EventService es = new ThreadSafeEventService(null);
+      es.publish("IceCream.Vanilla", a1);
+      List events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNull(events);
+      Object lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertNull(lastEventObj);
+      assertEquals(0, es.getCacheSizeForTopic("IceCream.Vanilla"));
+      assertEquals(0, es.getDefaultCacheSizePerClassOrTopic());
+      //Test that changing the default to 1 caches 1
+      es.setDefaultCacheSizePerClassOrTopic(1);
+      assertEquals(1, es.getDefaultCacheSizePerClassOrTopic());
+      Object publishedEventObj = new Object();
+      es.publish("IceCream.Vanilla", publishedEventObj);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNotNull(events);
+      assertEquals(1, events.size());
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertTrue(lastEventObj == publishedEventObj);
+      assertEquals(1, es.getCacheSizeForTopic("IceCream.Vanilla"));
+      //subscribe and see if it still works and that the new event is cached
+      EventTopicSubscriber sub = new EventTopicSubscriber() {
+         public void onEvent(String topic, Object data) {
+            System.out.println("Barrrr");
+         }
+      };
+      es.subscribe("IceCream.Vanilla", sub);
+      publishedEventObj = new Object();
+      es.publish("IceCream.Vanilla", publishedEventObj);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNotNull(events);
+      assertEquals(1, events.size());
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertTrue(lastEventObj == publishedEventObj);
+      assertEquals(1, es.getCacheSizeForTopic("IceCream.Vanilla"));
+
+      //Test that changing the default to 5 caches 5
+      es.setDefaultCacheSizePerClassOrTopic(5);
+      assertEquals(5, es.getDefaultCacheSizePerClassOrTopic());
+      Object publishedEventObj2 = new Object();
+      Object publishedEventObj3 = new Object();
+      Object publishedEventObj4 = new Object();
+      Object publishedEventObj5 = new Object();
+      es.publish("IceCream.Vanilla", publishedEventObj2);
+      es.publish("IceCream.Vanilla", publishedEventObj3);
+      es.publish("IceCream.Vanilla", publishedEventObj4);
+      es.publish("IceCream.Vanilla", publishedEventObj5);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNotNull(events);
+      assertEquals(5, events.size());
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertTrue(lastEventObj == publishedEventObj5);
+      assertEquals(5, es.getCacheSizeForTopic("IceCream.Vanilla"));
+      Object publishedEventObj6 = new Object();
+      es.publish("IceCream.Vanilla", publishedEventObj6);
+      assertEquals(5, events.size());
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertTrue(lastEventObj == publishedEventObj6);
+      assertEquals(5, es.getCacheSizeForTopic("IceCream.Vanilla"));
+
+      //Test that setting a topic cache with 10 caches 10 for that topic, but the default for the others
+      es.setCacheSizeForTopic("IceCream.Vanilla", 10);
+      Object publishedEventObjB1 = new Object();
+      Object publishedEventObjB2 = new Object();
+      Object publishedEventObjB3 = new Object();
+      Object publishedEventObjB4 = new Object();
+      Object publishedEventObjB5 = new Object();
+      Object publishedEventObjB6 = new Object();
+      es.publish("IceCream.Vanilla", publishedEventObj6);
+      es.publish("IceCream.Vanilla", publishedEventObj6);//see if reuse is OK
+      es.publish("IceCream.Blueberry", publishedEventObjB1);
+      es.publish("IceCream.Blueberry", publishedEventObjB2);
+      es.publish("IceCream.Blueberry", publishedEventObjB3);
+      es.publish("IceCream.Blueberry", publishedEventObjB4);
+      es.publish("IceCream.Blueberry", publishedEventObjB5);
+      es.publish("IceCream.Blueberry", publishedEventObjB6);
+      es.publish("IceCream.Vanilla", publishedEventObj6);
+      es.publish("IceCream.Vanilla", publishedEventObj6);
+      Object publishedEvent10 = new Object();
+      es.publish("IceCream.Vanilla", publishedEvent10);
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertTrue(lastEventObj == publishedEvent10);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNotNull(events);
+      assertEquals(10, events.size());
+      assertEquals(10, es.getCacheSizeForTopic("IceCream.Vanilla"));
+      assertTrue(publishedEvent10 == events.get(0));
+      assertTrue(publishedEventObj6 == events.get(1));
+      assertTrue(publishedEventObj6 == events.get(2));
+      assertTrue(publishedEventObj6 == events.get(3));
+      assertTrue(publishedEventObj6 == events.get(4));
+      assertTrue(publishedEventObj6 == events.get(5));
+      assertTrue(publishedEventObj5 == events.get(6));
+      assertTrue(publishedEventObj4 == events.get(7));
+      assertTrue(publishedEventObj3 == events.get(8));
+      assertTrue(publishedEventObj2 == events.get(9));
+      lastEventObj = es.getLastTopicData("IceCream.Blueberry");
+      assertTrue(lastEventObj == publishedEventObjB6);
+      events = es.getCachedTopicData("IceCream.Blueberry");
+      assertNotNull(events);
+      assertEquals(5, events.size());
+      assertEquals(5, es.getCacheSizeForTopic("IceCream.Blueberry"));
+      assertTrue(publishedEventObjB6 == events.get(0));
+      assertTrue(publishedEventObjB5 == events.get(1));
+      assertTrue(publishedEventObjB4 == events.get(2));
+      assertTrue(publishedEventObjB3 == events.get(3));
+      assertTrue(publishedEventObjB2 == events.get(4));
+      //this makes the cache resize to a smaller amount
+      es.setCacheSizeForTopic("IceCream.Vanilla", 1);
+      es.publish("IceCream.Vanilla", publishedEventObj4);
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertTrue(lastEventObj == publishedEventObj4);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNotNull(events);
+      assertEquals(1, events.size());
+      assertEquals(1, es.getCacheSizeForTopic("IceCream.Vanilla"));
+      es.publish("IceCream.Blueberry", publishedEventObjB4);
+      lastEventObj = es.getLastTopicData("IceCream.Blueberry");
+      assertTrue(lastEventObj == publishedEventObjB4);
+      events = es.getCachedTopicData("IceCream.Blueberry");
+      assertNotNull(events);
+      assertEquals(5, events.size());
+      assertEquals(5, es.getCacheSizeForTopic("IceCream.Blueberry"));
+      assertTrue(publishedEventObjB4 == events.get(0));
+      assertTrue(publishedEventObjB6 == events.get(1));
+      assertTrue(publishedEventObjB5 == events.get(2));
+      assertTrue(publishedEventObjB4 == events.get(3));
+      assertTrue(publishedEventObjB3 == events.get(4));
+
+      //Test pattern cache size works, but does not override a specific topic setting
+      Pattern pattern = Pattern.compile("IceCream.*");
+      es.setDefaultCacheSizePerClassOrTopic(5);
+      es.setCacheSizeForTopic(pattern, 2);
+      es.setCacheSizeForTopic("IceCream.Vanilla", 3);
+      Object publishedEventObjX1 = new Object();
+      Object publishedEventObjX2 = new Object();
+      Object publishedEventObjX3 = new Object();
+      Object publishedEventObjX4 = new Object();
+      Object publishedEventObjX5 = new Object();
+      Object publishedEventObjX6 = new Object();
+      Object publishedEventObjC1 = new Object();
+      Object publishedEventObjC2 = new Object();
+      Object publishedEventObjC3 = new Object();
+      Object publishedEventObjC4 = new Object();
+      es.publish("X", publishedEventObjX1);
+      es.publish("IceCream.Vanilla", publishedEventObj6);
+      es.publish("IceCream.Chocolate", publishedEventObjC1);
+      es.publish("X", publishedEventObjX2);//see if reuse is OK
+      es.publish("X", publishedEventObjX3);
+      es.publish("IceCream.Chocolate", publishedEventObjC2);
+      es.publish("X", publishedEventObjX4);
+      es.publish("IceCream.Vanilla", publishedEventObj4);
+      es.publish("IceCream.Vanilla", publishedEventObj5);
+      es.publish("IceCream.Vanilla", publishedEventObj6);
+      es.publish("X", publishedEventObjX5);
+      es.publish("IceCream.Chocolate", publishedEventObjC3);
+      es.publish("X", publishedEventObjX6);
+      es.publish("IceCream.Chocolate", publishedEventObjC4);
+
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertTrue(lastEventObj == publishedEventObj6);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNotNull(events);
+      assertEquals(3, events.size());
+      assertEquals(3, es.getCacheSizeForTopic("IceCream.Vanilla"));
+      lastEventObj = es.getLastTopicData("X");
+      assertTrue(lastEventObj == publishedEventObjX6);
+      events = es.getCachedTopicData("X");
+      assertNotNull(events);
+      assertEquals(5, events.size());
+      assertEquals(5, es.getCacheSizeForEventClass(EventX.class));
+      assertTrue(publishedEventObjX6 == events.get(0));
+      assertTrue(publishedEventObjX5 == events.get(1));
+      assertTrue(publishedEventObjX4 == events.get(2));
+      assertTrue(publishedEventObjX3 == events.get(3));
+      assertTrue(publishedEventObjX2 == events.get(4));
+      events = es.getCachedTopicData("IceCream.Chocolate");
+      assertNotNull(events);
+      assertEquals(2, events.size());
+      assertEquals(2, es.getCacheSizeForTopic("IceCream.Chocolate"));
+      assertTrue(publishedEventObjC4 == events.get(0));
+      assertTrue(publishedEventObjC3 == events.get(1));
+
+      es.clearCache("IceCream.Blueberry");
+      events = es.getCachedTopicData("IceCream.Blueberry");
+      assertNull(events);
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertNotNull(lastEventObj);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNotNull(events);
+      assertEquals(3, events.size());
+      lastEventObj = es.getLastTopicData("IceCream.Chocolate");
+      assertNotNull(lastEventObj);
+      events = es.getCachedTopicData("IceCream.Chocolate");
+      assertNotNull(events);
+      assertEquals(2, events.size());
+      lastEventObj = es.getLastTopicData("X");
+      assertNotNull(lastEventObj);
+      events = es.getCachedTopicData("X");
+      assertNotNull(events);
+      assertEquals(5, events.size());
+      es.clearCache(pattern);
+      events = es.getCachedTopicData("IceCream.Vanilla");
+      assertNull(events);
+      lastEventObj = es.getLastTopicData("IceCream.Chocolate");
+      assertNull(lastEventObj);
+      lastEventObj = es.getLastTopicData("X");
+      assertNotNull(lastEventObj);
+      events = es.getCachedTopicData("X");
+      assertNotNull(events);
+      assertEquals(5, events.size());
+
+      es.publish("X", publishedEventObjX6);
+      es.publish("IceCream.Blueberry", publishedEventObjB4);
+      es.publish("IceCream.Vanilla", publishedEvent10);
+      es.clearCache();
+      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
+      assertNull(lastEventObj);
+      lastEventObj = es.getLastTopicData("IceCream.Blueberry");
+      assertNull(lastEventObj);
+      lastEventObj = es.getLastTopicData("IceCream.Chocolate");
+      assertNull(lastEventObj);
+      lastEventObj = es.getLastTopicData("X");
+      assertNull(lastEventObj);
+   }
+
+
+   public void testEventsCache() {
+      //Test that a default setting does not cache
+      EventService es = new ThreadSafeEventService(null);
+      es.publish(new EventA());
+      List<EventA> aEvents = es.getCachedEvents(EventA.class);
+      assertNull(aEvents);
+      EventA lastAEvent = es.getLastEvent(EventA.class);
+      assertNull(lastAEvent);
+      assertEquals(0, es.getCacheSizeForEventClass(EventA.class));
+      assertEquals(0, es.getDefaultCacheSizePerClassOrTopic());
+      //Test that changing the default to 1 caches 1
+      es.setDefaultCacheSizePerClassOrTopic(1);
+      assertEquals(1, es.getDefaultCacheSizePerClassOrTopic());
+      EventA publishedEvent = new EventA();
+      es.publish(publishedEvent);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNotNull(aEvents);
+      assertEquals(1, aEvents.size());
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertTrue(lastAEvent == publishedEvent);
+      assertEquals(1, es.getCacheSizeForEventClass(EventA.class));
+      //subscribe and see if it still works and that the new event is cached
+      EventSubscriber sub = new EventSubscriber() {
+         public void onEvent(Object evt) {
+            System.out.println("Fooo");
+         }
+      };
+      es.subscribe(EventA.class, sub);
+      publishedEvent = new EventA();
+      es.publish(publishedEvent);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNotNull(aEvents);
+      assertEquals(1, aEvents.size());
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertTrue(lastAEvent == publishedEvent);
+      assertEquals(1, es.getCacheSizeForEventClass(EventA.class));
+
+      //Test that changing the default to 5 caches 5
+      es.setDefaultCacheSizePerClassOrTopic(5);
+      assertEquals(5, es.getDefaultCacheSizePerClassOrTopic());
+      EventA publishedEvent2 = new EventA();
+      EventA publishedEvent3 = new EventA();
+      EventA publishedEvent4 = new EventA();
+      EventA publishedEvent5 = new EventA();
+      es.publish(publishedEvent2);
+      es.publish(publishedEvent3);
+      es.publish(publishedEvent4);
+      es.publish(publishedEvent5);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNotNull(aEvents);
+      assertEquals(5, aEvents.size());
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertTrue(lastAEvent == publishedEvent5);
+      assertEquals(5, es.getCacheSizeForEventClass(EventA.class));
+      EventA publishedEvent6 = new EventA();
+      es.publish(publishedEvent6);
+      assertEquals(5, aEvents.size());
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertTrue(lastAEvent == publishedEvent6);
+      assertEquals(5, es.getCacheSizeForEventClass(EventA.class));
+
+      //Test that overriding a single event class with 10 caches 10 for that event, but the default for the others
+      es.setCacheSizeForEventClass(EventA.class, 10);
+      EventB publishedEventB1 = new EventB();
+      EventB publishedEventB2 = new EventB();
+      EventB publishedEventB3 = new EventB();
+      EventB publishedEventB4 = new EventB();
+      EventB publishedEventB5 = new EventB();
+      EventB publishedEventB6 = new EventB();
+      es.publish(publishedEvent6);
+      es.publish(publishedEvent6);//see if reuse is OK
+      es.publish(publishedEventB1);
+      es.publish(publishedEventB2);
+      es.publish(publishedEventB3);
+      es.publish(publishedEventB4);
+      es.publish(publishedEventB5);
+      es.publish(publishedEventB6);
+      es.publish(publishedEvent6);
+      es.publish(publishedEvent6);
+      EventA publishedEvent10 = new EventA();
+      es.publish(publishedEvent10);
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertTrue(lastAEvent == publishedEvent10);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNotNull(aEvents);
+      assertEquals(10, aEvents.size());
+      assertEquals(10, es.getCacheSizeForEventClass(EventA.class));
+      assertTrue(publishedEvent10 == aEvents.get(0));
+      assertTrue(publishedEvent6 == aEvents.get(1));
+      assertTrue(publishedEvent6 == aEvents.get(2));
+      assertTrue(publishedEvent6 == aEvents.get(3));
+      assertTrue(publishedEvent6 == aEvents.get(4));
+      assertTrue(publishedEvent6 == aEvents.get(5));
+      assertTrue(publishedEvent5 == aEvents.get(6));
+      assertTrue(publishedEvent4 == aEvents.get(7));
+      assertTrue(publishedEvent3 == aEvents.get(8));
+      assertTrue(publishedEvent2 == aEvents.get(9));
+      EventB lastBEvent = es.getLastEvent(EventB.class);
+      assertTrue(lastBEvent == publishedEventB6);
+      List<EventB> bEvents = es.getCachedEvents(EventB.class);
+      assertNotNull(bEvents);
+      assertEquals(5, bEvents.size());
+      assertEquals(5, es.getCacheSizeForEventClass(EventB.class));
+      assertTrue(publishedEventB6 == bEvents.get(0));
+      assertTrue(publishedEventB5 == bEvents.get(1));
+      assertTrue(publishedEventB4 == bEvents.get(2));
+      assertTrue(publishedEventB3 == bEvents.get(3));
+      assertTrue(publishedEventB2 == bEvents.get(4));
+      //this makes the cache resize smaller
+      es.setCacheSizeForEventClass(EventA.class, 1);
+      es.publish(publishedEvent4);
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertTrue(lastAEvent == publishedEvent4);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNotNull(aEvents);
+      assertEquals(1, aEvents.size());
+      assertEquals(1, es.getCacheSizeForEventClass(EventA.class));
+      es.publish(publishedEventB4);
+      lastBEvent = es.getLastEvent(EventB.class);
+      assertTrue(lastBEvent == publishedEventB4);
+      bEvents = es.getCachedEvents(EventB.class);
+      assertNotNull(bEvents);
+      assertEquals(5, bEvents.size());
+      assertEquals(5, es.getCacheSizeForEventClass(EventB.class));
+      assertTrue(publishedEventB4 == bEvents.get(0));
+      assertTrue(publishedEventB6 == bEvents.get(1));
+      assertTrue(publishedEventB5 == bEvents.get(2));
+      assertTrue(publishedEventB4 == bEvents.get(3));
+      assertTrue(publishedEventB3 == bEvents.get(4));
+
+      //Test that overriding a subclass event class with 2 changes and a derived class with 5 ...
+      //caches 5 for the derived class
+      //caches 2 for the subclass
+      //caches 2 for another derived class
+      // and that interfaces only take effect if the cache size of a class or it's superclasses has been set.
+      es.setCacheSizeForEventClass(EventA.class, 2);
+      es.setCacheSizeForEventClass(EventX.class, 5);
+      es.setCacheSizeForEventClass(Serializable.class, 3);
+      EventX publishedEventX1 = new EventX();
+      EventX publishedEventX2 = new EventX();
+      EventX publishedEventX3 = new EventX();
+      EventX publishedEventX4 = new EventX();
+      EventX publishedEventX5 = new EventX();
+      EventX publishedEventX6 = new EventX();
+      EventC publishedEventC1 = new EventC();
+      EventC publishedEventC2 = new EventC();
+      EventC publishedEventC3 = new EventC();
+      EventC publishedEventC4 = new EventC();
+      es.publish(publishedEventX1);
+      es.publish(publishedEvent6);
+      es.publish(publishedEventC1);
+      es.publish(publishedEventX2);//see if reuse is OK
+      es.publish(publishedEventX3);
+      es.publish(publishedEventC2);
+      es.publish(publishedEventX4);
+      es.publish(publishedEvent4);
+      es.publish(publishedEventX5);
+      es.publish(publishedEventC3);
+      es.publish(publishedEventX6);
+      es.publish(publishedEventC4);
+
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertTrue(lastAEvent == publishedEvent4);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNotNull(aEvents);
+      assertEquals(2, aEvents.size());
+      assertEquals(2, es.getCacheSizeForEventClass(EventA.class));
+      lastAEvent = es.getLastEvent(EventX.class);
+      assertTrue(lastAEvent == publishedEventX6);
+      List<EventX> xEvents = es.getCachedEvents(EventX.class);
+      assertNotNull(xEvents);
+      assertEquals(5, xEvents.size());
+      assertEquals(5, es.getCacheSizeForEventClass(EventX.class));
+      assertTrue(publishedEventX6 == xEvents.get(0));
+      assertTrue(publishedEventX5 == xEvents.get(1));
+      assertTrue(publishedEventX4 == xEvents.get(2));
+      assertTrue(publishedEventX3 == xEvents.get(3));
+      assertTrue(publishedEventX2 == xEvents.get(4));
+      try {
+         Serializable serializableEvent = es.getLastEvent(Serializable.class);
+         fail("Shouldn't be able to pass an interface.");
+      } catch (IllegalArgumentException ex) {
+      }
+      EventC lastCEvent = es.getLastEvent(EventC.class);
+      assertTrue(lastCEvent == publishedEventC4);
+      try {
+         List<Serializable> serializableEvents = es.getCachedEvents(Serializable.class);
+         fail("Shouldn't be able to pass an interface.");
+      } catch (IllegalArgumentException ex) {
+      }
+      List<EventC> cEvents = es.getCachedEvents(EventC.class);
+      assertNotNull(cEvents);
+      assertEquals(3, cEvents.size());
+      assertEquals(3, es.getCacheSizeForEventClass(EventC.class));
+
+      es.clearCache(EventB.class);
+      bEvents = es.getCachedEvents(EventB.class);
+      assertNull(bEvents);
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertNotNull(lastAEvent);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNotNull(aEvents);
+      assertEquals(2, aEvents.size());
+      EventX lastXEvent = es.getLastEvent(EventX.class);
+      assertNotNull(lastXEvent);
+      xEvents = es.getCachedEvents(EventX.class);
+      assertNotNull(xEvents);
+      assertEquals(5, xEvents.size());
+      es.clearCache(EventA.class);
+      aEvents = es.getCachedEvents(EventA.class);
+      assertNull(aEvents);
+      lastXEvent = es.getLastEvent(EventX.class);
+      xEvents = es.getCachedEvents(EventX.class);
+      assertNull(lastXEvent);
+      assertNull(xEvents);
+
+      es.publish(publishedEventX6);
+      es.publish(publishedEventB4);
+      es.publish(publishedEvent10);
+      es.clearCache();
+      lastAEvent = es.getLastEvent(EventA.class);
+      assertNull(lastAEvent);
+      lastBEvent = es.getLastEvent(EventB.class);
+      assertNull(lastBEvent);
+      lastAEvent = es.getLastEvent(EventX.class);
+      assertNull(lastAEvent);
+   }
+
+
+   //Base
+   public static class EventA implements EventServiceEvent {
+      /** @return The issuer of the event. */
+      public Object getSource() {
+         return null;
+      }
+   }
+
+   //No relation
+   public static class EventB implements EventServiceEvent, Serializable {
+      /** @return The issuer of the event. */
+      public Object getSource() {
+         return null;
+      }
+   }
+
+   //No relation
+   public static class EventC implements EventServiceEvent, Serializable {
+      /** @return The issuer of the event. */
+      public Object getSource() {
+         return null;
+      }
+   }
+
+   //Derived 1
+   public static class EventX extends EventA {
+      /** @return The issuer of the event. */
+      public Object getSource() {
+         return null;
+      }
+   }
+
+   //Derived 2
+   public static class EventY extends EventA {
+      /** @return The issuer of the event. */
+      public Object getSource() {
+         return null;
+      }
+   }
+
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventAction.java b/src/test/java/org/scijava/event/bushe/TestEventAction.java
new file mode 100644
index 000000000..969bf2acf
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventAction.java
@@ -0,0 +1,181 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.util.ArrayList;
+import java.awt.event.ActionEvent;
+import javax.swing.Action;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventAction extends TestCase {
+   private ArrayList subscribedEvents;
+   private Object aSource = new Object();
+
+   private class MyEventServiceEvent extends AbstractEventServiceEvent {
+      private ActionEvent evt;
+
+      public MyEventServiceEvent(Object source, ActionEvent evt) {
+         super(source);
+         this.evt = evt;
+      }
+   }
+
+   public TestEventAction(String name) {
+      super(name);
+   }
+
+   protected void setUp() throws Exception {
+      subscribedEvents = new ArrayList();
+       System.clearProperty(EventServiceLocator.EVENT_BUS_CLASS);
+       System.clearProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS);
+   }
+
+   public void testEventBusTopicAction() {
+      EventBusAction action = new EventBusAction();
+      action.putValue(Action.ACTION_COMMAND_KEY, "FooAction");
+      EventTopicSubscriber subscriber = new EventTopicSubscriber() {
+         public void onEvent(String topic, Object evt) {
+            subscribedEvents.add(evt);
+         }
+      };
+      EventBus.subscribeStrongly("FooAction", subscriber);
+      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
+      try {
+         Thread.sleep(500);//Calling hte EDT, need to slow this thread
+      } catch (InterruptedException e) {
+      }
+      assertEquals(1, subscribedEvents.size());
+      assertNotNull(action);//keeps it from being garbage collected
+   }
+
+   public void testEventBusTopicActionEventServiceValueFirst() {
+      EventBusAction action = new EventBusAction();
+      action.putValue(EventBusAction.EVENT_SERVICE_TOPIC_NAME, "FooAction");
+      action.putValue(Action.ACTION_COMMAND_KEY, "BarAction");
+      EventBus.subscribeStrongly("FooAction", new EventTopicSubscriber() {
+         public void onEvent(String topic, Object evt) {
+            subscribedEvents.add(evt);
+         }
+      });
+      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
+      try {
+         Thread.sleep(500);//Calling hte EDT, need to slow this thread
+      } catch (InterruptedException e) {
+      }
+      assertEquals(1, subscribedEvents.size());
+   }
+
+   public void testEventBusTopicActionIDValueFirst() {
+      EventBusAction action = new EventBusAction();
+      action.putValue("ID", "FooAction");
+      action.putValue(Action.ACTION_COMMAND_KEY, "BarAction");
+      EventBus.subscribeStrongly("FooAction", new EventTopicSubscriber() {
+         public void onEvent(String topic, Object evt) {
+            subscribedEvents.add(evt);
+         }
+      });
+      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
+      try {
+         Thread.sleep(500);//Calling hte EDT, need to slow this thread
+      } catch (InterruptedException e) {
+      }
+      assertEquals(1, subscribedEvents.size());
+   }
+
+   public void testEventBusTopicActionNameWorks() {
+      EventBusAction action = new EventBusAction();
+      action.putValue(Action.NAME, "FooAction");
+      EventBus.subscribeStrongly("FooAction", new EventTopicSubscriber() {
+         public void onEvent(String topic, Object evt) {
+            subscribedEvents.add(evt);
+         }
+      });
+      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
+      try {
+         Thread.sleep(500);//Calling hte EDT, need to slow this thread
+      } catch (InterruptedException e) {
+      }
+      assertEquals(1, subscribedEvents.size());
+   }
+
+   public void testEventBusEventAction() {
+      EventBusAction action = new EventBusAction("FooAction", null) {
+         protected Object getEventServiceEvent(ActionEvent evt) {
+            return new MyEventServiceEvent(aSource, evt);
+         }
+      };
+      EventBus.subscribe(MyEventServiceEvent.class, new EventSubscriber() {
+         public void onEvent(Object evt) {
+            assertEquals(((EventServiceEvent) evt).getSource(), aSource);
+            subscribedEvents.add(evt);
+         }
+      });
+      action.setPublishesOnTopic(false);
+      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
+      try {
+         Thread.sleep(500);//Calling the EDT, need to slow this thread
+      } catch (InterruptedException e) {
+      }
+      assertEquals(1, subscribedEvents.size());
+   }
+
+
+   public void testContainerEventAction() {
+      JFrame frame = new JFrame();
+      JPanel panel = new JPanel();
+      frame.setContentPane(panel);
+      ContainerEventServiceAction action = new ContainerEventServiceAction("FooAction", null);
+      JButton button = new JButton(action);
+      panel.add(button);
+      EventService es = ContainerEventServiceFinder.getEventService(button);
+      assertTrue(EventBus.getGlobalEventService() != es);
+      assertEquals(0, subscribedEvents.size());
+      es.subscribe("FooAction", new EventTopicSubscriber() {
+         public void onEvent(String topic, Object evt) {
+            subscribedEvents.add(evt);
+         }
+      });
+      button.doClick();
+      try {
+         Thread.sleep(500);//Calling hte EDT, need to slow this thread
+      } catch (InterruptedException e) {
+      }
+      assertEquals(1, subscribedEvents.size());
+   }
+
+   public void testContainerEventActionException() {
+      ContainerEventServiceAction action = new ContainerEventServiceAction("FooAction", null);
+      try {
+         action.actionPerformed(new ActionEvent(this, 0, "Foo"));
+         fail("Throws exception when no event service");
+      } catch (Throwable t) {
+      }
+      try {
+         action.actionPerformed(new ActionEvent(null, 0, "Foo"));
+         fail("Throws exception when no event service");
+      } catch (Throwable t) {
+      }
+      action.setThrowsExceptionOnNullEventService(false);
+      action.actionPerformed(new ActionEvent(this, 0, "Foo"));
+      assertTrue("Set to not throw exception when no event service", true);
+   }
+
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBus.java b/src/test/java/org/scijava/event/bushe/TestEventBus.java
new file mode 100644
index 000000000..80f8cba2f
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventBus.java
@@ -0,0 +1,570 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.TypeVariable;
+import java.awt.EventQueue;
+
+import javax.swing.JComponent;
+
+import junit.framework.TestCase;
+
+public class TestEventBus extends TestCase {
+
+   private EventSubscriber eventSubscriber = null;
+   private EventTopicSubscriber eventTopicSubscriber;
+   private EBTestCounter testCounter = new EBTestCounter();
+
+   public TestEventBus(String name) {
+      super(name);
+   }
+
+   protected void setUp() throws Exception {
+      EventBus.getGlobalEventService().clearAllSubscribers();
+   }
+
+   protected void tearDown() throws Exception {
+   }
+
+   private EventServiceEvent createEvent() {
+      return new EventServiceEvent() {
+         public Object getSource() {
+            return "";
+         }
+      };
+   }
+
+   private Class getEventClass() {
+      return createEvent().getClass();
+   }
+
+   private EventSubscriber createEventSubscriber(boolean throwException) {
+      SubscriberForTest test = new SubscriberForTest(testCounter, throwException);
+      return test;
+   }
+
+   private EventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
+      return new TopicSubscriberForTest(testCounter, throwException);
+   }
+
+   private EventSubscriber getEventSubscriber() {
+      return getEventSubscriber(true);
+   }
+
+   private EventSubscriber getEventSubscriber(boolean throwException) {
+      if (eventSubscriber == null) {
+         eventSubscriber = createEventSubscriber(throwException);
+      }
+      return eventSubscriber;
+   }
+
+   public void testSubscribe() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
+      assertTrue("testSubscribe(new subscriber)", actualReturn);
+
+      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
+      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      try {
+         actualReturn = EventBus.subscribe((Class) null, getEventSubscriber());
+         fail("subscribeStrongly(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = EventBus.subscribe(getEventClass(), null);
+         fail("subscribeStrongly(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+   }
+   
+   public static class SwingThreadTestEventSubscriber implements EventSubscriber {
+      public boolean wasOnSwingThread;
+
+      public void onEvent(Object event) {
+         wasOnSwingThread = EventQueue.isDispatchThread();
+      }
+   }
+
+   public void testSwingThreading() {   
+      SwingThreadTestEventSubscriber sub = new SwingThreadTestEventSubscriber();
+      EventBus.subscribe(Number.class, sub);
+      EventBus.publish(1);
+      EDTUtil.waitForEDT();
+      assertTrue("Expected the EventBus to dispatch on the EDT", sub.wasOnSwingThread);
+   }
+   
+   public void testSubscribeWeakly() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
+      assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
+
+      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
+      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+      subscriber = null;
+      System.gc();
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      try {
+         actualReturn = EventBus.subscribeStrongly((Class) null, getEventSubscriber());
+         fail("subscribeStrongly(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = EventBus.subscribeStrongly(getEventClass(), null);
+         fail("subscribeStrongly(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+   }
+
+   public void testIllegalArgs() {
+      try {
+         EventBus.subscribeVetoListenerStrongly((Class) null, new VetoEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.subscribeVetoListenerStrongly((String) null, new VetoTopicEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.subscribeVetoListenerStrongly("foo", null);
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.subscribeVetoListenerStrongly(getEventClass(), null);
+         fail();
+      } catch (Throwable t) {
+      }
+
+
+      try {
+         EventBus.unsubscribeVetoListener((Class) null, new VetoEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.unsubscribeVetoListener((String) null, new VetoTopicEventListenerForTest());
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.unsubscribeVetoListener("foo", null);
+         fail();
+      } catch (Throwable t) {
+      }
+      try {
+         EventBus.unsubscribeVetoListener(getEventClass(), null);
+         fail();
+      } catch (Throwable t) {
+      }
+
+   }
+
+   public void testVeto() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
+
+      VetoEventListener vetoListener = new VetoEventListenerForTest();
+      actualReturn = EventBus.subscribeVetoListenerStrongly(getEventClass(), vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      EventBus.unsubscribeVetoListener(getEventClass(), vetoListener);
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+   }
+
+   public void testVetoException() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
+      assertTrue(actualReturn);
+      VetoEventListener vetoListener = new VetoEventListenerForTest(true);
+      actualReturn = EventBus.subscribeVetoListenerStrongly(getEventClass(), vetoListener);
+      assertTrue(actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      EventBus.unsubscribeVetoListener(getEventClass(), vetoListener);
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 2, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      System.out.println("Prevent garbage collection of subscriber by sys'outing it at the end:"+subscriber);
+   }
+
+   public void testVetoTopic() {
+      boolean actualReturn;
+      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+
+      actualReturn = EventBus.subscribeStrongly("FooTopic", subscriber);
+
+      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
+         public boolean shouldVeto(String topic, Object data) {
+            return true;
+         }
+      };
+      actualReturn = EventBus.subscribeVetoListenerStrongly("FooTopic", vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish("FooTopic", "Bar");
+      EDTUtil.waitForEDT();
+
+      //The test passes if 0 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      EventBus.unsubscribeVetoListener("FooTopic", vetoListener);
+      EventBus.publish("FooTopic", "Bar");
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+
+   public void testVetoWeak() {
+      boolean actualReturn;
+      EventSubscriber subscriber = createEventSubscriber(false);
+
+      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
+
+      VetoEventListener vetoListener = new VetoEventListener() {
+         public boolean shouldVeto(Object evt) {
+            return true;
+         }
+      };
+      actualReturn = EventBus.subscribeVetoListener(getEventClass(), vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      vetoListener = null;
+      System.gc();
+      try {
+         Thread.sleep(1000);
+      } catch (InterruptedException e) {
+      }
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   public void testVetoTopicWeak() {
+      boolean actualReturn;
+      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+
+      actualReturn = EventBus.subscribeStrongly("FooTopic", subscriber);
+
+      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
+         public boolean shouldVeto(String topic, Object data) {
+            return true;
+         }
+      };
+      actualReturn = EventBus.subscribeVetoListener("FooTopic", vetoListener);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish("FooTopic", "Bar");
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+      vetoListener = null;
+      System.gc();
+      EventBus.publish("FooTopic", "Bar");
+      EDTUtil.waitForEDT();
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+
+   public void testUnsubscribe() {
+      EventBus.subscribe(getEventClass(), getEventSubscriber(false));
+
+      boolean actualReturn;
+
+      try {
+         actualReturn = EventBus.unsubscribe((Class) null, getEventSubscriber());
+         fail("unsubscribe(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = EventBus.unsubscribe(getEventClass(), null);
+         fail("unsubscribe(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      actualReturn = EventBus.unsubscribe(getEventClass(), getEventSubscriber());
+      assertTrue("return value", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   public void testUnsubscribeTopic() {
+      EventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
+      EventBus.subscribeStrongly("FooTopic", eventTopicSubscriber);
+
+      boolean actualReturn;
+
+      try {
+         actualReturn = EventBus.unsubscribe((String) null, eventTopicSubscriber);
+         fail("unsubscribe(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         actualReturn = EventBus.unsubscribe("FooTopic", null);
+         fail("unsubscribe(x, null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish("FooTopic", "Foo");
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      actualReturn = EventBus.unsubscribe("FooTopic", eventTopicSubscriber);
+      assertTrue("return value", actualReturn);
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish("FooTopic", "Foo");
+      EDTUtil.waitForEDT();
+
+      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
+      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   /**
+    * Test that the publish method works and that exceptions thrown in event subscribers don't halt publishing. In the
+    * test 2 subscribers are good and 2 subscribers throw exceptions.
+    */
+   public void testPublish() {
+      try {
+         EventBus.publish(null);
+         EDTUtil.waitForEDT();
+         fail("publish(null) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      try {
+         EventBus.publish((String) null, createEvent());
+         EDTUtil.waitForEDT();
+         fail("publish(null, x) should have thrown exception");
+      } catch (Exception e) {
+      }
+
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      EventBus.publish("Foo", "Bar");
+      EDTUtil.waitForEDT();
+      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+
+      EventBus.subscribe(getEventClass(), createEventSubscriber(true));
+      EventBus.subscribe(getEventClass(), createEventSubscriber(false));
+      EventBus.subscribe(getEventClass(), createEventSubscriber(true));
+      EventBus.subscribe(getEventClass(), createEventSubscriber(false));
+
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+
+      //The test passes if 2 subscribers completed and 2 subscribers threw exception.
+      assertEquals("testPublish(completed)", 4, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 2, testCounter.subscribeExceptionCount);
+
+      EventSubscriber eventSubscriber = createEventSubscriber(false);
+      EventBus.subscribe(ObjectEvent.class, eventSubscriber);
+      testCounter.eventsHandledCount = 0;
+      testCounter.subscribeExceptionCount = 0;
+      ObjectEvent evt = new ObjectEvent("Foo", "Bar");
+      assertEquals(evt.getEventObject(), "Bar");
+      EventBus.publish(evt);
+      EDTUtil.waitForEDT();
+      assertEquals("testPublish(completed)", 1, testCounter.eventsHandledCount);
+      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
+   }
+
+   /**
+    * This tests whether the EventBus has a static method for each EventService method
+    */
+   public void testNumOfMethods() {
+      Method[] esMethods = EventService.class.getMethods();
+      Method[] ebMethods = EventBus.class.getMethods();
+      //Are all the es methods in the eb?
+      for (int i = 0; i < esMethods.length; i++) {
+         Method esMethod = esMethods[i];
+         boolean foundMatch = false;
+         nextMethod:
+         for (int j = 0; j < ebMethods.length; j++) {
+            Method ebMethod = ebMethods[j];
+            if (esMethod.getName().equals(ebMethod.getName())) {
+               TypeVariable<Method>[] esTypes = esMethod.getTypeParameters();
+               TypeVariable<Method>[] ebTypes = ebMethod.getTypeParameters();
+               if (esTypes.length != ebTypes.length) {
+                  break;
+               }
+               for (int typeCount = 0; typeCount < ebTypes.length; typeCount++) {
+                  TypeVariable<Method> esType = esTypes[typeCount];
+                  TypeVariable<Method> ebType = ebTypes[typeCount];
+                  if (!(ebType+"").equals((""+esType))) {
+                     continue nextMethod;
+                  }
+               }
+               Class[] esParams = esMethod.getParameterTypes();
+               Class[] ebParams = ebMethod.getParameterTypes();
+               if (esParams.length != ebParams.length) {
+                  continue nextMethod;
+               }
+               for (int typeCount = 0; typeCount < ebParams.length; typeCount++) {
+                  Class esType = esParams[typeCount];
+                  Class ebType = ebParams[typeCount];
+                  if (!ebType.equals(esType)) {
+                     continue nextMethod;
+                  }
+               }
+               foundMatch = true;
+            }
+         }
+         if (!foundMatch) {
+            System.out.println("No match for es method:" + esMethod.getName() + ", " + esMethod +", i="+i);
+         }
+         assertTrue(foundMatch);
+      }
+
+      //Are all the eb methods static?
+      ebMethods = EventBus.class.getDeclaredMethods();
+      for (int i = 0; i < ebMethods.length; i++) {
+         Method ebMethod = ebMethods[i];
+         int modifiers = ebMethod.getModifiers();
+         boolean isStatic = Modifier.isStatic(modifiers);
+         if (!isStatic) {
+            System.out.println("EventBus has a non-static method:" + ebMethod);
+         }
+         assertTrue(isStatic);
+      }
+   }
+
+   //Really a compilation test
+   public void testGeneric() {
+      EventBus.subscribe(String.class, new EventSubscriber<JComponent>() {
+         public void onEvent(JComponent event) {
+         }
+      });
+      EventBus.subscribe("foo", new EventTopicSubscriber<JComponent>() {
+         public void onEvent(String topic, JComponent data) {
+         }
+      });
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
new file mode 100644
index 000000000..c0b839a4a
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
@@ -0,0 +1,32 @@
+package org.scijava.event.bushe;
+
+import javax.swing.JComponent;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventBusServiceClass extends TestCase {
+
+   public TestEventBusServiceClass(String name) {
+      super(name);
+   }
+
+   protected void setUp() throws Exception {
+      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, BadEventService.class.getName());
+   }
+
+   protected void tearDown() throws Exception {
+   }
+
+   public void testConfigurableEventService() {
+      try {
+         EventBus.subscribe("foo", new EventTopicSubscriber() {
+            public void onEvent(String topic, Object data) {
+            }
+         });
+         fail("Expected runtime exception since the plugged in EventService is a bad one.");
+      } catch (Throwable ex) {
+         System.out.println("Got ex");
+      }
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
new file mode 100644
index 000000000..a89ec9765
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
@@ -0,0 +1,30 @@
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventBusServiceClassBadType extends TestCase {
+
+   public TestEventBusServiceClassBadType(String name) {
+      super(name);
+   }
+
+   protected void setUp() throws Exception {
+      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, EventServiceLocator.class.getName());
+   }
+
+   protected void tearDown() throws Exception {
+   }
+
+   public void testConfigurableEventService() {
+      try {
+         EventBus.subscribe("foo", new EventTopicSubscriber() {
+            public void onEvent(String topic, Object data) {
+            }
+         });
+         fail("Expected runtime exception since the plugged in EventService is a bad one.");
+      } catch (Throwable ex) {
+         System.out.println("Got ex");
+      }
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java b/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
new file mode 100644
index 000000000..791f558d7
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventBusTiming extends EventServiceLocatorTestCase {
+
+   private EventSubscriber eventSubscriber = null;
+   private EventTopicSubscriber eventTopicSubscriber;
+   private SubscriberTimingEvent timing;
+   private EBTestCounter testCounter = new EBTestCounter();
+
+   public TestEventBusTiming(String name) {
+      super(name);
+   }
+
+   private EventServiceEvent createEvent() {
+      return new EventServiceEvent() {
+         public Object getSource() {
+            return "";
+         }
+      };
+   }
+
+   private Class getEventClass() {
+      return createEvent().getClass();
+   }
+
+   private EventSubscriber createEventSubscriber(boolean throwException) {
+      return new SubscriberForTest(testCounter, throwException);
+   }
+
+   private EventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
+      return new TopicSubscriberForTest(testCounter, throwException);
+   }
+
+   private EventSubscriber createEventSubscriber(Long waitTime) {
+      return new SubscriberForTest(testCounter, waitTime);
+   }
+
+   private EventSubscriber getEventSubscriber() {
+      return getEventSubscriber(true);
+   }
+
+   private EventSubscriber getEventSubscriber(boolean throwException) {
+      if (eventSubscriber == null) {
+         eventSubscriber = createEventSubscriber(throwException);
+      }
+      return eventSubscriber;
+   }
+
+   private EventTopicSubscriber getEventTopicSubscriber() {
+      if (eventTopicSubscriber == null) {
+         eventTopicSubscriber = createEventTopicSubscriber(false);
+      }
+      return eventTopicSubscriber;
+   }
+
+   public void thisOnlyWorksSometimesNow_testTimeHandling() {
+      EventBus.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
+      final Boolean[] wasCalled = new Boolean[1];
+      EventBus.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+         public void onEvent(Object evt) {
+            wasCalled[0] = Boolean.TRUE;
+         }
+      });
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+      assertTrue(wasCalled[0] == null);
+      EventBus.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
+      final Boolean[] wasCalled2 = new Boolean[1];
+      EventBus.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+         public void onEvent(Object evt) {
+            wasCalled2[0] = Boolean.TRUE;
+            timing = (SubscriberTimingEvent) evt;
+         }
+      });
+      EventBus.publish(createEvent());
+      EDTUtil.waitForEDT();
+      assertTrue(wasCalled2[0] == Boolean.TRUE);
+      assertNotNull(timing.getSource());
+      assertNotNull(timing.getEnd());
+      assertNotNull(timing.getEvent());
+      assertNotNull(timing.getSubscriber());
+      assertNotNull(timing.getStart());
+      assertNotNull(timing.getTimeLimitMilliseconds());
+      assertFalse(timing.isEventHandlingExceeded());
+      assertFalse(timing.isVetoExceeded());
+      assertNull(timing.getVetoEventListener());
+   }
+
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java
new file mode 100644
index 000000000..8b00962cf
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+public class TestEventServiceLocator extends EventServiceLocatorTestCase {
+   
+   public TestEventServiceLocator(String name) {
+      super(name);
+   }
+
+   public void testDefaultEventBusService() {
+      EventService ebs = EventServiceLocator.getEventBusService();
+      assertTrue(ebs instanceof SwingEventService);
+      EventService ses = EventServiceLocator.getSwingEventService();
+      assertTrue(ses == ebs);
+   }
+   public void testDefaultEventBusService2() {
+      EventService ses = EventServiceLocator.getSwingEventService();
+      assertTrue(ses instanceof SwingEventService);
+      EventService ebs = EventServiceLocator.getEventBusService();
+      assertTrue(ses == ebs);
+   }
+   public void testNamedEventBusService1() {
+      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
+      assertTrue(ses instanceof SwingEventService);
+      EventService ebs = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
+      assertTrue(ses == ebs);
+   }
+   public void testNamedEventBusService2() {
+      EventService ebs = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
+      assertTrue(ebs instanceof SwingEventService);
+      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
+      assertTrue(ses == ebs);
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java
new file mode 100644
index 000000000..138ec277a
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventServiceLocator2 extends EventServiceLocatorTestCase {
+   
+   public TestEventServiceLocator2(String name) {
+      super(name);
+   }
+
+   public void testSetEventBusService() {
+      EventService ebs = new ThreadSafeEventService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
+      assertTrue(eb instanceof ThreadSafeEventService);
+      assertTrue(eb == ebs);
+      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
+      assertTrue(ses != ebs);
+      assertTrue(ses instanceof SwingEventService);
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
+         fail("It already exist yet");
+      } catch (EventServiceExistsException e) {
+      }
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java
new file mode 100644
index 000000000..1cd9c4964
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+public class TestEventServiceLocator3 extends EventServiceLocatorTestCase {
+   public TestEventServiceLocator3(String name) {
+      super(name);
+   }
+
+   public void testSetEventBusService() {
+      EventService ebs = new SwingEventService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ebs);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
+      assertTrue(eb instanceof ThreadSafeEventService);
+      assertTrue(eb == ebs);
+      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
+      assertTrue(ses == ebs);
+      assertTrue(ses instanceof ThreadSafeEventService);
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ebs);
+         fail("It already exist yet");
+      } catch (EventServiceExistsException e) {
+      }
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java
new file mode 100644
index 000000000..99106419a
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+public class TestEventServiceLocator4 extends EventServiceLocatorTestCase {
+   
+   public TestEventServiceLocator4(String name) {
+      super(name);
+   }
+
+   public void testSetEventBusService() {
+      EventService ebs = new ThreadSafeEventService();
+      EventService ses = new SwingEventService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ses);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
+      EventService se = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
+      assertTrue(eb == ebs);
+      assertTrue(se == ses);
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java
new file mode 100644
index 000000000..421d0bc70
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+public class TestEventServiceLocator5 extends EventServiceLocatorTestCase {
+   public TestEventServiceLocator5(String name) {
+      super(name);
+   }
+
+   public void testSetEventBusService() {
+      EventService ebs = new ThreadSafeEventService();
+      EventService ses = new SwingEventService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ses);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      EventService se = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
+      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
+      assertTrue(eb == ebs);
+      assertTrue(se == ses);
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java
new file mode 100644
index 000000000..8e035348b
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+public class TestEventServiceLocator6 extends EventServiceLocatorTestCase {
+   
+   public TestEventServiceLocator6(String name) {
+      super(name);
+   }
+
+   public void testSetEventBusService() {
+      EventService ebs = new ThreadSafeEventService();
+      EventService ses = new SwingEventService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ses);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      EventService eb = EventServiceLocator.getEventBusService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
+         fail("It exists");
+      } catch (EventServiceExistsException e) {
+      }
+      EventService se = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
+      assertTrue(se == ses);
+      assertTrue(eb == ses);
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java
new file mode 100644
index 000000000..c345bf74d
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+public class TestEventServiceLocator7 extends EventServiceLocatorTestCase {
+   
+   public TestEventServiceLocator7(String name) {
+      super(name);
+   }
+
+   public void testSetEventBusService() {
+      EventService ebs = new ThreadSafeEventService();
+      EventService ses = new SwingEventService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
+      } catch (EventServiceExistsException e) {
+         fail("It doesn't exist yet");
+      }
+      EventService se = EventServiceLocator.getSwingEventService();
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
+         fail("It exists");
+      } catch (EventServiceExistsException e) {
+      }
+      try {
+         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ebs);
+         fail("It exists");
+      } catch (EventServiceExistsException e) {
+      }
+      EventService eb = EventServiceLocator.getEventBusService();
+      assertTrue(eb == ebs);
+      assertTrue(se != eb);
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java
new file mode 100644
index 000000000..c7acd90b1
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java
@@ -0,0 +1,28 @@
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventServiceLocatorConfiguration extends EventServiceLocatorTestCase {
+
+   public static class ES1 extends ThreadSafeEventService {
+
+   }
+
+   public static class ES2 extends ThreadSafeEventService {
+
+   }
+
+   public TestEventServiceLocatorConfiguration(String name) {
+      super(name);
+   }
+
+   public void testConfigurableEventService() {
+      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, ES1.class.getName());
+      System.setProperty(EventServiceLocator.EVENT_BUS_CLASS, ES2.class.getName());
+      EventService es = EventServiceLocator.getSwingEventService();
+      assertTrue(es instanceof ES1);
+      es = EventServiceLocator.getEventBusService();
+      assertTrue(es instanceof ES2);
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java
new file mode 100644
index 000000000..aa4548b50
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java
@@ -0,0 +1,28 @@
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventServiceLocatorConfiguration2 extends EventServiceLocatorTestCase {
+
+   public static class ES1 extends ThreadSafeEventService {
+
+   }
+
+   public static class ES2 extends ThreadSafeEventService {
+
+   }
+
+   public TestEventServiceLocatorConfiguration2(String name) {
+      super(name);
+   }
+
+   public void testConfigurableEventService1() {
+      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, ES1.class.getName());
+      EventService es = EventServiceLocator.getEventBusService();
+      assertTrue(es instanceof ThreadSafeEventService);
+      es = EventServiceLocator.getSwingEventService();
+      assertTrue(es instanceof ES1);
+   }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java
new file mode 100644
index 000000000..b79e1eb24
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java
@@ -0,0 +1,28 @@
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventServiceLocatorConfiguration3 extends EventServiceLocatorTestCase {
+
+   public static class ES1 extends ThreadSafeEventService {
+
+   }
+
+   public static class ES2 extends ThreadSafeEventService {
+
+   }
+
+   public TestEventServiceLocatorConfiguration3(String name) {
+      super(name);
+   }
+
+   public void testConfigurableEventService3() {
+      System.setProperty(EventServiceLocator.EVENT_BUS_CLASS, ES2.class.getName());
+      EventService es = EventServiceLocator.getEventBusService();
+      assertTrue(es instanceof ES2);
+      es = EventServiceLocator.getSwingEventService();
+      assertTrue(es instanceof SwingEventService);
+   }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java
new file mode 100644
index 000000000..0b5ba3ca8
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java
@@ -0,0 +1,27 @@
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+
+/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
+public class TestEventServiceLocatorConfiguration4 extends EventServiceLocatorTestCase {
+
+   public static class ES1 extends ThreadSafeEventService {
+
+   }
+
+   public static class ES2 extends ThreadSafeEventService {
+
+   }
+
+   public TestEventServiceLocatorConfiguration4(String name) {
+      super(name);
+   }
+
+   public void testConfigurableEventService4() {
+      System.setProperty(EventServiceLocator.EVENT_BUS_CLASS, ES2.class.getName());
+      EventService es = EventServiceLocator.getSwingEventService();
+      assertTrue(es instanceof SwingEventService);
+      es = EventServiceLocator.getEventBusService();
+      assertTrue(es instanceof ES2);
+   }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestPerformance.java b/src/test/java/org/scijava/event/bushe/TestPerformance.java
new file mode 100644
index 000000000..a936200ee
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestPerformance.java
@@ -0,0 +1,75 @@
+package org.scijava.event.bushe;
+
+import junit.framework.TestCase;
+import junit.framework.Assert;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.List;
+import java.util.*;
+
+/**
+ * For proving performance.
+ */
+public class TestPerformance extends TestCase {
+    private EventSubscriber doNothingSubscriber = new EventSubscriber() {
+        public void onEvent(Object event) {
+        }
+    };
+
+    private EventTopicSubscriber doNothingTopicSubscriber = new EventTopicSubscriber() {
+        public void onEvent(String topic, Object payload) {
+        }
+    };
+
+    public void testClassPerformance() {
+        ThreadSafeEventService eventService = new ThreadSafeEventService();
+        Class[] classes = {Color.class, String.class, JTextField.class, List.class, JButton.class,
+            Boolean.class, Integer.class, Boolean.class, Set.class, Date.class};
+        Object[] payloads = {Color.BLUE, "foo", new JTextField(), new ArrayList(), new JButton(),
+            Boolean.TRUE, 35, 36L, new HashSet(), new Date()};
+        for (Class aClass : classes) {
+            eventService.subscribe(aClass, doNothingSubscriber);
+        }
+
+        long start = System.currentTimeMillis();
+        int count = 100000;
+        for (int i=0; i < count; i++) {
+            for (Object payload : payloads) {
+                eventService.publish(payload);
+            }
+        }
+        long end = System.currentTimeMillis();
+        long duration = (end - start)/1000;
+        int numPubs = count * payloads.length;
+        System.out.println("Time for "+ numPubs +" publications with subscribers to "+classes.length
+            +" different classes subscribed to was "+ duration +" s. Average:"+((double)duration/(double)numPubs));
+        Assert.assertTrue("Things are slowing down, "+numPubs+" class publications used to take 3.3 seconds, it now takes " +duration, duration < 7);
+    }
+
+    public void testStringPerformance() {
+        ThreadSafeEventService eventService = new ThreadSafeEventService();
+        String[] strings = {"Color", "String", "JTextField", "List", "JButton",
+            "Boolean", "Integer", "Boolean", "Set", "Date"};
+        Object[] payloads = {Color.BLUE, "foo", new JTextField(), new ArrayList(), new JButton(),
+            Boolean.TRUE, 35, 36L, new HashSet(), new Date()};
+        for (String aString : strings) {
+            eventService.subscribe(aString, doNothingTopicSubscriber);
+        }
+
+        long start = System.currentTimeMillis();
+        int count = 100000;
+        for (int i=0; i < count; i++) {
+            for (int j=0; j < strings.length; j++) {
+                eventService.publish(strings[j], payloads[j]);
+            }
+        }
+        long end = System.currentTimeMillis();
+        long duration = (end - start)/1000;
+        int numPubs = count * payloads.length;
+        System.out.println("Time for "+ numPubs +" topic publications with topic subscribers to "+ strings.length
+            +" different strings subscribed to was "+ duration +" s. Average:"+((double)duration/(double)numPubs));
+        Assert.assertTrue("Things are slowing down, "+numPubs+" string publications used to take 1.3 seconds, it now takes "+duration, duration < 4);
+    }
+
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java b/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
new file mode 100644
index 000000000..9f44264f0
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
@@ -0,0 +1,593 @@
+package org.scijava.event.bushe;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Random;
+import java.util.Collections;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+import java.awt.Color;
+
+import junit.framework.TestCase;
+
+import org.scijava.event.bushe.annotation.AnnotationProcessor;
+
+/**
+ * Tests the Prioritized interface va. normal FIFO order.
+ */
+public class TestPrioritizedSubscribers extends TestCase {
+    private ThreadSafeEventService eventService = null;
+    private static final String EVENT_SERVICE_TEST_PRIORITY_ANNOTATION = "testPriorityAnnotation";
+
+
+    /**
+     * Base class that adds itself to the list it's given when told.  Nice for annotation subscribers.
+     */
+    class OrderRecorder {
+        private List listToRecordTo;
+
+        public OrderRecorder(List listToRecordTo) {
+            this.listToRecordTo = listToRecordTo;
+        }
+
+        public void record() {
+            listToRecordTo.add(this);
+        }
+    }
+
+    /**
+     * A subscriber that adds itself to a supplied list so that the order of calls is recorded.
+     */
+    class OrderRecorderSubscriber extends OrderRecorder implements EventSubscriber {
+
+        OrderRecorderSubscriber(List listToRecordTo) {
+            super(listToRecordTo);
+        }
+
+        public void onEvent(Object event) {
+            record();
+        }
+    }
+
+    /**
+     * Ditto, for topics
+     */
+    class OrderRecorderTopicSubscriber extends OrderRecorder implements EventTopicSubscriber {
+
+        OrderRecorderTopicSubscriber(List listToRecordTo) {
+            super(listToRecordTo);
+        }
+
+        public void onEvent(String topic, Object event) {
+            record();
+        }
+    }
+
+    class PrioritizedOrderRecorderSubscriber extends OrderRecorderSubscriber implements Prioritized {
+        private int priority;
+
+        public PrioritizedOrderRecorderSubscriber(int priority, List listToRecordTo) {
+            super(listToRecordTo);
+            this.priority = priority;
+        }
+
+        public int getPriority() {
+            return priority;
+        }
+    }
+
+    class PrioritizedOrderRecorderTopicSubscriber extends OrderRecorderTopicSubscriber implements Prioritized {
+        private int priority;
+
+        public PrioritizedOrderRecorderTopicSubscriber(int priority, List listToRecordTo) {
+            super(listToRecordTo);
+            this.priority = priority;
+        }
+
+        public int getPriority() {
+            return priority;
+        }
+    }
+
+    public TestPrioritizedSubscribers(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        eventService = new ThreadSafeEventService(null, false);
+        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, null);
+    }
+
+    protected void tearDown() throws Exception {
+        eventService = null;
+    }
+
+    public void testNormalFIFO() {
+        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
+        List<EventSubscriber> originalOrder = new ArrayList<EventSubscriber>();
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        //mixing an inner class into the test
+        EventSubscriber inner = new EventSubscriber() {
+            public void onEvent(Object event) {
+            }
+        };
+        //originalOrder.add(inner);
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        //add them all
+        for (EventSubscriber eventSubscriber : originalOrder) {
+            eventService.subscribe(Color.class, eventSubscriber);
+        }
+        eventService.publish(Color.BLUE);
+        assertEquals(originalOrder, calledOrder);
+        System.out.println("inner sout to avoid garbage collection" + inner);
+    }
+
+    public void testNoPrioritizedWithZeroPrioritized() {
+        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
+        List<EventSubscriber> originalOrder = new ArrayList<EventSubscriber>();
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        //mixing an inner class into the test
+        PrioritizedEventSubscriber inner = new PrioritizedEventSubscriber() {
+            public void onEvent(Object event) {
+            }
+
+            public int getPriority() {
+                return 0;
+            }
+        };
+        //originalOrder.add(inner);
+        originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
+        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
+        //add them all
+        for (EventSubscriber eventSubscriber : originalOrder) {
+            eventService.subscribe(Color.class, eventSubscriber);
+        }
+        eventService.publish(Color.BLUE);
+        assertEquals(originalOrder, calledOrder);
+        System.out.println("inner sout to avoid garbage collection" + inner);
+    }
+
+    public void testOnlyPrioritized() {
+        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
+        List<EventSubscriber> originalOrder = new ArrayList<EventSubscriber>();
+        for (int i = 0; i < 100; i++) {
+            Random random = new Random();
+            originalOrder.add(new PrioritizedOrderRecorderSubscriber(random.nextInt(10000) - 5000, calledOrder));
+        }
+        for (EventSubscriber eventSubscriber : originalOrder) {
+            eventService.subscribe(Color.class, eventSubscriber);
+        }
+        eventService.publish(Color.BLUE);
+        int lastPriority = -5001;
+        for (EventSubscriber eventSubscriber : calledOrder) {
+            int priority = ((PrioritizedOrderRecorderSubscriber) eventSubscriber).getPriority();
+            assertTrue(priority >= lastPriority);
+            lastPriority = priority;
+        }
+    }
+
+    public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
+        Random rand = new Random();
+        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
+        List<EventSubscriber> prioritized = new ArrayList<EventSubscriber>();
+        //100 negative
+        for (int i = 0; i < 100; i++) {
+            Random random = new Random();
+            prioritized.add(new PrioritizedOrderRecorderSubscriber(random.nextInt(10000) * -1, calledOrder));
+        }
+        //100 positive
+        for (int i = 0; i < 100; i++) {
+            Random random = new Random();
+            prioritized.add(new PrioritizedOrderRecorderSubscriber(random.nextInt(10000), calledOrder));
+        }
+        Collections.shuffle(prioritized);
+        //100 fifo
+        List<EventSubscriber> fifo = new ArrayList<EventSubscriber>();
+        for (int i = 0; i < 100; i++) {
+            if (rand.nextBoolean()) {
+                fifo.add(new OrderRecorderSubscriber(calledOrder));
+            } else {
+                fifo.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
+            }
+        }
+        List<EventSubscriber> prioritizedCopy = new ArrayList(prioritized);
+        List<EventSubscriber> fifoCopy = new ArrayList(fifo);
+        //Subscribe all, randomizing a fifo or prioritized
+        EventSubscriber eventSubscriber;
+        int subscribeCount = 0;
+        int prioritizedSubscribeCount = 0;
+        int nonPrioritizedSubscribeCount = 0;
+        for (int i = 0; i < 300; i++) {
+            if (prioritizedCopy.isEmpty()) {
+                eventSubscriber = fifoCopy.remove(0);
+                nonPrioritizedSubscribeCount++;
+            } else if (fifoCopy.isEmpty()) {
+                eventSubscriber = prioritizedCopy.remove(0);
+                prioritizedSubscribeCount++;
+            } else {
+                if (rand.nextBoolean()) {
+                    eventSubscriber = fifoCopy.remove(0);
+                    nonPrioritizedSubscribeCount++;
+                } else {
+                    eventSubscriber = prioritizedCopy.remove(0);
+                    prioritizedSubscribeCount++;
+                }
+            }
+            subscribeCount++;
+            boolean success = eventService.subscribe(Color.class, eventSubscriber);
+            assertFalse(!success);
+        }
+
+        List subscribersToColor = eventService.getSubscribers(Color.class);
+        assertEquals(300, subscribersToColor.size());
+        assertEquals(100, nonPrioritizedSubscribeCount);
+        assertEquals(200, prioritizedSubscribeCount);
+        assertEquals(300, subscribeCount);
+        eventService.publish(Color.BLUE);
+        assertEquals(300, calledOrder.size());
+        int lastPriority = -10001;
+        for (int i = 0; i < 99; i++) {
+            EventSubscriber subscriber = calledOrder.get(i);
+            assertTrue(subscriber instanceof PrioritizedOrderRecorderSubscriber);
+            PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
+            int priority = prioritizedOrderRecorderSubscriber.getPriority();
+            assertTrue(priority < 0);
+            assertTrue(priority >= lastPriority);
+            lastPriority = priority;
+        }
+        for (int i = 100; i < 199; i++) {
+            EventSubscriber subscriber = calledOrder.get(i);
+            assertTrue(subscriber instanceof OrderRecorderSubscriber);
+            if (subscriber instanceof PrioritizedOrderRecorderSubscriber) {
+                PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
+                int priority = prioritizedOrderRecorderSubscriber.getPriority();
+                assertTrue(priority == 0);
+            }
+            assertEquals(subscriber, fifo.get(i - 100));
+        }
+        lastPriority = 0;
+        for (int i = 200; i < 299; i++) {
+            EventSubscriber subscriber = calledOrder.get(i);
+            assertTrue(subscriber instanceof PrioritizedOrderRecorderSubscriber);
+            PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
+            int priority = prioritizedOrderRecorderSubscriber.getPriority();
+            assertTrue(priority > 0);
+            assertTrue(priority >= lastPriority);
+            lastPriority = priority;
+        }
+        System.out.println(prioritized.size());
+        System.out.println(fifo.size());
+    }
+
+    public void testPriorityAnnotation() throws EventServiceExistsException {
+        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
+        List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
+        OrderRecorder sn100 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder sn50 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        PrioritizedOrderRecorderSubscriber spn30 = new PrioritizedOrderRecorderSubscriber(-30, calledOrder);
+        OrderRecorderSubscriber so_1 = new OrderRecorderSubscriber(calledOrder);
+        OrderRecorder s100 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder sn10 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s50 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s10 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(Object foo) {
+                record();
+            }
+        };
+        Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
+        List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
+        for (Object o : toAdd) {
+            if (o instanceof EventSubscriber) {
+                eventService.subscribe(Color.class, (EventSubscriber) o);
+            } else {
+                AnnotationProcessor.process(o);
+            }
+        }
+        eventService.publish(Color.BLUE);
+        assertEquals(expectedResult, calledOrder);
+    }
+
+    /**
+     * With more than one subscriber to the EventBus by class, if any of the
+     * subscribers are Prioritized with a negative priority, then no  FIFO subscribers
+     * are notified.
+     * <p/>
+     * This holds for non-Prioritized FIFO subscribers, and Prioritized subscribers
+     * with Priority of 0.
+     */
+    public void testIssue26OneNegOthersNormal() {
+        final List<Integer> calledOrder = new ArrayList<Integer>();
+        //non-Prioritized FIFO subscribers
+        EventSubscriber sub1 = new EventSubscriber() {
+            public void onEvent(Object event) {
+                calledOrder.add(1);
+            }
+        };
+        EventSubscriber sub0 = new PrioritizedEventSubscriber() {
+            public void onEvent(Object event) {
+                calledOrder.add(-1);
+            }
+            public int getPriority() {
+                return -1;
+            }
+        };
+        EventSubscriber sub2 = new EventSubscriber() {
+            public void onEvent(Object event) {
+                calledOrder.add(2);
+            }
+        };
+
+        eventService.subscribe(Color.class, sub1);
+        eventService.subscribe(Color.class, sub0);
+        eventService.subscribe(Color.class, sub2);
+        eventService.publish(Color.BLUE);
+        assertEquals(calledOrder.get(0).intValue(), -1);
+        assertEquals(calledOrder.get(1).intValue(), 1);
+        assertEquals(calledOrder.get(2).intValue(), 2);
+        System.out.println("to avoid garbage collection:"+sub1+sub2+sub0);
+    }
+
+    /**
+     * With more than one subscriber to the EventBus by class, if any of the
+     * subscribers are Prioritized with a negative priority, then no  FIFO subscribers
+     * are notified.
+     * <p/>
+     * This holds for non-Prioritized FIFO subscribers, and Prioritized subscribers
+     * with Priority of 0.
+     */
+    public void testOnePosOthersNormal() {
+        final List<Integer> calledOrder = new ArrayList<Integer>();
+        //non-Prioritized FIFO subscribers
+        EventSubscriber sub1 = new EventSubscriber() {
+            public void onEvent(Object event) {
+                calledOrder.add(1);
+            }
+        };
+        EventSubscriber sub0 = new PrioritizedEventSubscriber() {
+            public void onEvent(Object event) {
+                calledOrder.add(11);
+            }
+            public int getPriority() {
+                return 11;
+            }
+        };
+        EventSubscriber sub2 = new EventSubscriber() {
+            public void onEvent(Object event) {
+                calledOrder.add(2);
+            }
+        };
+
+        eventService.subscribe(Color.class, sub1);
+        eventService.subscribe(Color.class, sub0);
+        eventService.subscribe(Color.class, sub2);
+        eventService.publish(Color.BLUE);
+        assertEquals(1, calledOrder.get(0).intValue());
+        assertEquals(2, calledOrder.get(1).intValue());
+        assertEquals(11, calledOrder.get(2).intValue());
+        System.out.println("to avoid garbage collection:"+sub1+sub2+sub0);
+    }
+
+    /**
+     * shameless copy and paste test, only the subscriber type was changed
+     */
+    public void testPriorityTopicAnnotation() throws EventServiceExistsException {
+        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
+        List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
+        OrderRecorder sn100 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder sn50 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        PrioritizedOrderRecorderTopicSubscriber spn30 = new PrioritizedOrderRecorderTopicSubscriber(-30, calledOrder);
+        OrderRecorderTopicSubscriber so_1 = new OrderRecorderTopicSubscriber(calledOrder);
+        OrderRecorder s100 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder sn10 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s50 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s10 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
+        List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
+        for (Object o : toAdd) {
+            if (o instanceof EventTopicSubscriber) {
+                eventService.subscribe("Color", (EventTopicSubscriber) o);
+            } else {
+                AnnotationProcessor.process(o);
+            }
+        }
+        eventService.publish("Color", Color.BLUE);
+        assertEquals(expectedResult, calledOrder);
+    }
+
+
+    /**
+     * Another shameless copy and paste test, only the subscriber type was changed
+     */
+    public void testPriorityTopicPatternAnnotation() throws EventServiceExistsException {
+        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
+        List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
+        OrderRecorder sn100 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder sn50 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -50)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        PrioritizedOrderRecorderTopicSubscriber spn30 = new PrioritizedOrderRecorderTopicSubscriber(-30, calledOrder);
+        OrderRecorderTopicSubscriber so_1 = new OrderRecorderTopicSubscriber(calledOrder);
+        OrderRecorder s100 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder sn10 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s50 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s10 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
+            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            public void annotateMe(String topic, Object foo) {
+                record();
+            }
+        };
+        Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
+        List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
+        for (Object o : toAdd) {
+            if (o instanceof OrderRecorderTopicSubscriber) {
+                Pattern pattern = Pattern.compile("Col[a-z]+");
+                eventService.subscribe(pattern, (EventTopicSubscriber) o);
+            } else {
+                AnnotationProcessor.process(o);
+            }
+        }
+        eventService.publish("Color", Color.BLUE);
+        assertEquals(expectedResult, calledOrder);
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TestPublicationStates.java b/src/test/java/org/scijava/event/bushe/TestPublicationStates.java
new file mode 100644
index 000000000..d4aed0a81
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TestPublicationStates.java
@@ -0,0 +1,67 @@
+package org.scijava.event.bushe;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Tests the implementation of publication states
+ */
+public class TestPublicationStates extends TestCase {
+   List stuffHappens = new ArrayList();
+   ObjectEvent event = new ObjectEvent(null, null) {
+      @Override
+      public void setPublicationStatus(PublicationStatus status) {
+         super.setPublicationStatus(status);
+         stuffHappens.add(status);
+      }
+   };
+   EventSubscriber subscriber = new EventSubscriber() {
+      public void onEvent(Object event) {
+         stuffHappens.add(this);
+      }
+   };
+
+   EventService es = new ThreadSafeEventService() {
+      @Override
+      protected void setStatus(PublicationStatus status, Object event, String topic, Object eventObj) {
+         super.setStatus(status, event, topic, eventObj);
+      }
+   };
+
+   public void testStates() {
+      stuffHappens.clear();
+      es.subscribe(ObjectEvent.class, subscriber);
+      es.publish(event);
+      List expected = new ArrayList();
+      expected.add(PublicationStatus.Initiated);
+      expected.add(PublicationStatus.Queued);
+      expected.add(PublicationStatus.Publishing);
+      expected.add(subscriber);
+      expected.add(PublicationStatus.Completed);
+      Assert.assertEquals(expected.size(), stuffHappens.size());
+      for (int i = 0; i < expected.size(); i++) {
+         Assert.assertEquals(expected.get(i), stuffHappens.get(i));
+      }
+   }
+
+   public void testVetoStates() {
+      stuffHappens.clear();
+      es.subscribe(ObjectEvent.class, subscriber);
+      es.subscribeVetoListener(ObjectEvent.class, new VetoEventListener() {
+         public boolean shouldVeto(Object event) {
+            return true;
+         }
+      });
+      es.publish(event);
+      List expected = new ArrayList();
+      expected.add(PublicationStatus.Initiated);
+      expected.add(PublicationStatus.Vetoed);
+      Assert.assertEquals(expected.size(), stuffHappens.size());
+      for (int i = 0; i < expected.size(); i++) {
+         Assert.assertEquals(expected.get(i), stuffHappens.get(i));
+      }
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java b/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
new file mode 100644
index 000000000..3b7836df8
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
@@ -0,0 +1,35 @@
+package org.scijava.event.bushe;
+
+/**
+ * @author Michael Bushe
+ * @since Nov 19, 2005 11:00:53 PM
+ */
+public class TopicSubscriberForTest implements EventTopicSubscriber {
+   private boolean throwException;
+   private Long waitTime;
+   private EBTestCounter testDefaultEventService;
+
+   public TopicSubscriberForTest(EBTestCounter testDefaultEventService, Long waitTime) {
+      this.testDefaultEventService = testDefaultEventService;
+      this.waitTime = waitTime;
+   }
+
+   public TopicSubscriberForTest(EBTestCounter testDefaultEventService, boolean throwException) {
+      this.testDefaultEventService = testDefaultEventService;
+      this.throwException = throwException;
+   }
+
+   public void onEvent(String topic, Object evt) {
+      if (waitTime != null) {
+         try {
+            Thread.sleep(waitTime.longValue());
+         } catch (InterruptedException e) {
+         }
+      }
+      testDefaultEventService.eventsHandledCount++;
+      if (throwException) {
+         testDefaultEventService.subscribeExceptionCount++;
+         throw new IllegalArgumentException();
+      }
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/VetoEventListenerForTest.java b/src/test/java/org/scijava/event/bushe/VetoEventListenerForTest.java
new file mode 100644
index 000000000..81a481185
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/VetoEventListenerForTest.java
@@ -0,0 +1,24 @@
+package org.scijava.event.bushe;
+
+/**
+ * @author Michael Bushe
+ * @since Nov 19, 2005 11:00:42 PM
+ */
+public class VetoEventListenerForTest implements VetoEventListener {
+   private boolean throwException;
+
+   public VetoEventListenerForTest() {
+      this(false);
+   }
+
+   public VetoEventListenerForTest(boolean throwException) {
+      this.throwException = throwException;
+   }
+
+   public boolean shouldVeto(Object evt) {
+      if (throwException) {
+         throw new IllegalArgumentException("veto ex");
+      }
+      return true;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/VetoTopicEventListenerForTest.java b/src/test/java/org/scijava/event/bushe/VetoTopicEventListenerForTest.java
new file mode 100644
index 000000000..af8bf79e5
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/VetoTopicEventListenerForTest.java
@@ -0,0 +1,24 @@
+package org.scijava.event.bushe;
+
+/**
+ * @author Michael Bushe
+ * @since Nov 19, 2005 11:00:42 PM
+ */
+public class VetoTopicEventListenerForTest implements VetoTopicEventListener {
+   private boolean throwException;
+
+   public VetoTopicEventListenerForTest() {
+      this(false);
+   }
+
+   VetoTopicEventListenerForTest(boolean throwException) {
+      this.throwException = throwException;
+   }
+
+   public boolean shouldVeto(String topic, Object data) {
+      if (throwException) {
+         throw new IllegalArgumentException("veto ex");
+      }
+      return true;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AbstractSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/AbstractSubscriber.java
new file mode 100644
index 000000000..01f71125f
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/AbstractSubscriber.java
@@ -0,0 +1,27 @@
+package org.scijava.event.bushe.annotation;
+
+/**
+ * Intended to answer this post:
+ * https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=30702&forumID=1834
+ */
+public abstract class AbstractSubscriber {
+    private String targetType;
+
+    abstract protected void initialize(String type);
+
+    @EventSubscriber(eventClass=MyData.class)
+    public void loadDocumentAnalysis(MyData data) {
+        System.out.println(data + " received by " + getClass().getName());
+        setTargetType(data.getClassification());
+        //getStatusCallback().startProgress(getClass().getCanonicalName(), true, null);
+        initialize(getTargetType());
+    }
+
+    public void setTargetType(String targetType) {
+        this.targetType = targetType;
+    }
+
+    public String getTargetType() {
+        return targetType;
+    }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/AnnotatedEventSubscriber.java
new file mode 100644
index 000000000..4e5db4945
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/AnnotatedEventSubscriber.java
@@ -0,0 +1,90 @@
+package org.scijava.event.bushe.annotation;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.awt.Color;
+import javax.swing.JComponent;
+import javax.swing.JToggleButton;
+
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/** Test class for class-based subscriptions */
+public class AnnotatedEventSubscriber {
+   static int timesColorChanged = 0;
+   static String lastCall = null;
+   static int timesCalled = 0;
+
+   public static int getTimesColorChanged() {
+      return timesColorChanged;
+   }
+
+   public static void setTimesColorChanged(int times) {
+      timesColorChanged = times;
+   }
+
+   public static int getTimesCalled() {
+      return timesCalled;
+   }
+
+   public static void setTimesCalled(int times) {
+      timesCalled = times;
+   }
+
+   public static String getLastCall() {
+      return lastCall;
+   }
+
+   public static void setLastCall(String call) {
+      lastCall = call;
+   }
+
+   @EventSubscriber
+   public void doColorChange(Color color) {
+      timesColorChanged++;
+      timesCalled++;
+   }
+
+   @EventSubscriber(eventClass = List.class)
+   public void doList(Collection collection) {
+      lastCall = "doList";
+      timesCalled++;
+   }
+
+   @EventSubscriber(eventClass = JToggleButton.class, exact = true)
+   public void doJToggleButtonExactly(JComponent list) {
+      lastCall = "doJToggleButtonExactly";
+      timesCalled++;
+   }
+
+   @EventSubscriber(eventClass = Iterator.class,
+           eventServiceName = "IteratorService",
+           autoCreateEventServiceClass = ThreadSafeEventService.class)
+   public void autoCreateEventServiceClass(Iterator it) {
+      lastCall = "autoCreateEventServiceClass";
+      timesCalled++;
+   }
+
+   @EventTopicSubscriber(topic = "File.Open")
+   public void simpleTopicOpenFile(String topic, File file) {
+      lastCall = "simpleTopicOpenFile";
+      timesCalled++;
+   }
+
+   @EventTopicSubscriber(topic = "Iterator",
+           eventServiceName = "IteratorService",
+           autoCreateEventServiceClass = ThreadSafeEventService.class)
+   public void autoCreateEventServiceTopic(String topic, Iterator it) {
+      lastCall = "autoCreateEventServiceClass";
+      timesCalled++;
+   }
+
+   @EventTopicPatternSubscriber(topicPattern = "IceCream.*",
+           eventServiceName = "IceCreamService")
+   public void doIceCream(String topic, String order) {
+      lastCall = "doIceCream";
+      timesCalled++;
+   }
+
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnnotatedVetoSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/AnnotatedVetoSubscriber.java
new file mode 100644
index 000000000..6c82ec00f
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/AnnotatedVetoSubscriber.java
@@ -0,0 +1,85 @@
+package org.scijava.event.bushe.annotation;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.awt.Color;
+import javax.swing.JComponent;
+import javax.swing.JToggleButton;
+
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/** Test class for class-based subscriptions.
+ * Does not like null, empty, red or cherry */
+public class AnnotatedVetoSubscriber {
+
+   @VetoSubscriber
+   public boolean vetoBlueColorChange(Color color) {
+      if (color == Color.RED) {
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @VetoSubscriber(eventClass = List.class)
+   public boolean doList(Collection collection) {
+      if (collection == null || collection.isEmpty()) {
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @VetoSubscriber(eventClass = JToggleButton.class, exact = true)
+   public boolean doJToggleButtonExactly(JComponent button) {
+      if (button.getForeground() == Color.RED) {
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @VetoSubscriber(eventClass = Iterator.class,
+           eventServiceName = "IteratorService",
+           autoCreateEventServiceClass = ThreadSafeEventService.class)
+   public boolean autoCreateEventServiceClass(Iterator it) {
+      if (it == null || !it.hasNext()) {
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @VetoTopicSubscriber(topic = "File.Open")
+   public boolean simpleTopicOpenFile(String topic, File file) {
+      if (file == null) {
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @VetoTopicSubscriber(topic = "Iterator",
+           eventServiceName = "IteratorService",
+           autoCreateEventServiceClass = ThreadSafeEventService.class)
+   public boolean autoCreateEventServiceTopic(String topic, Iterator it) {
+      if (it == null || !it.hasNext()) {
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+   @VetoTopicPatternSubscriber(topicPattern = "IceCream.*",
+           eventServiceName = "IceCreamService")
+   public boolean doIceCream(String topic, String order) {
+      if (topic.indexOf("Cherry") > -1) {
+         return true;
+      } else {
+         return false;
+      }
+   }
+
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnotherAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/AnotherAnnotatedEventSubscriber.java
new file mode 100644
index 000000000..de7a4c9f9
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/AnotherAnnotatedEventSubscriber.java
@@ -0,0 +1,48 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.List;
+import java.util.Collection;
+import java.util.Iterator;
+import java.io.File;
+import java.awt.Color;
+import javax.swing.JToggleButton;
+import javax.swing.JComponent;
+
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/** Test class for class-based subscriptions */
+public class AnotherAnnotatedEventSubscriber {
+   static int timesColorChanged = 0;
+   static String lastCall = null;
+   static int timesCalled = 0;
+
+   public static int getTimesColorChanged() {
+      return timesColorChanged;
+   }
+
+   public static void setTimesColorChanged(int times) {
+      timesColorChanged = times;
+   }
+
+   public static int getTimesCalled() {
+      return timesCalled;
+   }
+
+   public static void setTimesCalled(int times) {
+      timesCalled = times;
+   }
+
+   public static String getLastCall() {
+      return lastCall;
+   }
+
+   public static void setLastCall(String call) {
+      lastCall = call;
+   }
+
+   @EventSubscriber(eventClass = List.class, referenceStrength = ReferenceStrength.STRONG)
+   public void doList(Collection collection) {
+      lastCall = "doList";
+      timesCalled++;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnotherDoubleAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/AnotherDoubleAnnotatedEventSubscriber.java
new file mode 100644
index 000000000..92bdf0534
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/AnotherDoubleAnnotatedEventSubscriber.java
@@ -0,0 +1,23 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.List;
+import java.util.Collection;
+
+/** Test class for class-based subscriptions */
+public class AnotherDoubleAnnotatedEventSubscriber {
+
+   static int timesCalled = 0;
+
+   public static int getTimesCalled() {
+      return timesCalled;
+   }
+
+   public static void setTimesCalled(int times) {
+      timesCalled = times;
+   }
+
+   @EventSubscriber(eventClass = List.class)
+   public void doList(Collection collection) {
+      timesCalled++;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/ConcreteSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/ConcreteSubscriber.java
new file mode 100644
index 000000000..701ce66b1
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/ConcreteSubscriber.java
@@ -0,0 +1,17 @@
+package org.scijava.event.bushe.annotation;
+
+/**
+ * Intended to answer this post:
+ * https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=30702&forumID=1834
+ */
+public class ConcreteSubscriber extends AbstractSubscriber {
+    private boolean wasInitialized = false;
+
+    protected void initialize(String type) {
+        this.wasInitialized = true;
+    }
+
+    public boolean isInitialized() {
+        return wasInitialized;
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/annotation/DoubleAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/DoubleAnnotatedEventSubscriber.java
new file mode 100644
index 000000000..f35ee065c
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/DoubleAnnotatedEventSubscriber.java
@@ -0,0 +1,35 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.List;
+import java.util.Collection;
+import java.util.Iterator;
+import java.io.File;
+import java.awt.Color;
+import javax.swing.JToggleButton;
+import javax.swing.JComponent;
+
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+/** Test class for class-based subscriptions */
+public class DoubleAnnotatedEventSubscriber {
+
+   static int timesCalled = 0;
+
+   public static int getTimesCalled() {
+      return timesCalled;
+   }
+
+   public static void setTimesCalled(int times) {
+      timesCalled = times;
+   }
+
+   @EventSubscriber(eventClass = List.class)
+   public void doList(Collection collection) {
+      timesCalled++;
+   }
+
+   @EventTopicSubscriber(topic="foo")
+   public void foo(String topic, Object o) {
+      timesCalled++;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber.java b/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber.java
new file mode 100644
index 000000000..ed22bf8d2
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber.java
@@ -0,0 +1,73 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.List;
+import javax.swing.SwingUtilities;
+
+import org.scijava.event.bushe.annotation.AnnotationProcessor;
+import org.scijava.event.bushe.annotation.EventSubscriber;
+import org.scijava.event.bushe.annotation.EventTopicPatternSubscriber;
+import org.scijava.event.bushe.annotation.EventTopicSubscriber;
+
+/**
+ *
+ */
+public class Issue15Subscriber {
+   private long timesCalled;
+
+   public Issue15Subscriber() {
+        AnnotationProcessor.process(this);
+    }
+    
+    @EventSubscriber(eventClass = List.class)
+    public void handleClassSubscription(List c) {
+       timesCalled++;
+        if (c != null) {
+            System.out.println("In handleClassSubscription");
+            System.out.println("By class: " + c);
+            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
+            System.out.println();
+        }
+    }
+
+   /*
+    @EventTopicSubscriber(topic = "Topic1")
+    public void handleTopic1Subscription(String topic, Object o) {
+        if (o != null) {
+            System.out.println("In handleTopic1Subscription");
+            System.out.println("By topic: " + topic);
+            System.out.println("    for class: " + o.getClass());
+            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
+            System.out.println();
+        }
+    }
+
+
+    @EventTopicSubscriber(topic = "Topic2")
+    public void handleTopic2Subscription(String topic, Object o) {
+        if (o != null) {
+            System.out.println("In handleTopic2Subscription");
+            System.out.println("By topic: " + topic);
+            System.out.println("    for class: " + o.getClass());
+            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
+            System.out.println();
+        }
+    }
+    
+    
+    
+    @EventTopicPatternSubscriber(topicPattern = ".*")
+    public void handleAllTopicsSubscription(String topic, Object o) {
+        if (o != null) {
+            System.out.println("In handleAllTopicsSubscription");
+            System.out.println("By topic: " + topic);
+            System.out.println("    for class: " + o.getClass());
+            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
+            System.out.println();
+        }
+    }
+    */
+
+   public long getTimesCalled() {
+      return timesCalled;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber2.java b/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber2.java
new file mode 100644
index 000000000..399542a86
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber2.java
@@ -0,0 +1,69 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JTextField;
+
+import org.scijava.event.bushe.EventBus;
+import org.scijava.event.bushe.annotation.AnnotationProcessor;
+import org.scijava.event.bushe.annotation.EventSubscriber;
+
+/**
+ *
+ */
+public class Issue15Subscriber2 extends JDialog {
+
+    private JTextField textField;
+   private long timesCalled;
+
+   /**
+     * A new setup has been selected.
+     * @param e
+     *      setup changed event notification
+     */
+    @EventSubscriber(eventClass = List.class)
+    public void handleEvent(List e) {
+         timesCalled++;
+        textField.setText(e+"");
+    }
+    
+    private ActionListener buttonListener = new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+            EventBus.publish(new ArrayList());
+        }
+    };
+    
+    public Issue15Subscriber2() {
+        super();
+        
+        AnnotationProcessor.process(this);
+        
+        setLayout(new GridLayout(1, 2));
+        
+        JButton button = new JButton("Push Me");
+        button.addActionListener(buttonListener);
+        textField = new JTextField("");
+        
+        add(button);
+        add(textField);
+    }
+    
+    public static void main(String args[]) {
+        
+        Issue15Subscriber s = new Issue15Subscriber();
+        
+        Issue15Subscriber2 dialog = new Issue15Subscriber2();
+        System.err.println(EventBus.getSubscribers(List.class).size());
+        dialog.setVisible(true);
+    }
+
+   public long getTimesCalled() {
+      return timesCalled;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/MyData.java b/src/test/java/org/scijava/event/bushe/annotation/MyData.java
new file mode 100644
index 000000000..5ff45afcf
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/MyData.java
@@ -0,0 +1,17 @@
+package org.scijava.event.bushe.annotation;
+
+/**
+ * Intended to answer this post:
+ * https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=30702&forumID=1834
+ */
+public class MyData {
+    private String classification = "foo";
+
+    public String getClassification() {
+        return classification;
+    }
+
+    public void setClassification(String classification) {
+        this.classification = classification;
+    }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/StrongAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/StrongAnnotatedEventSubscriber.java
new file mode 100644
index 000000000..6d611f5f8
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/StrongAnnotatedEventSubscriber.java
@@ -0,0 +1,30 @@
+package org.scijava.event.bushe.annotation;
+
+import java.io.File;
+
+public class StrongAnnotatedEventSubscriber {
+   static String lastCall = null;
+   static int timesCalled = 0;
+
+   public static int getTimesCalled() {
+      return timesCalled;
+   }
+
+   public static void setTimesCalled(int times) {
+      timesCalled = times;
+   }
+
+   public static String getLastCall() {
+      return lastCall;
+   }
+
+   public static void setLastCall(String call) {
+      lastCall = call;
+   }
+
+   @EventSubscriber(referenceStrength = ReferenceStrength.STRONG)
+   public void doStrong(File it) {
+      lastCall = "doStrong";
+      timesCalled++;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/StrongClassAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/StrongClassAnnotatedEventSubscriber.java
new file mode 100644
index 000000000..f2fc954a3
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/StrongClassAnnotatedEventSubscriber.java
@@ -0,0 +1,24 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.Collection;
+import java.util.List;
+
+/** Test class for class-based subscriptions */
+public class StrongClassAnnotatedEventSubscriber {
+   static int timesColorChanged = 0;
+   static String lastCall = null;
+   static int timesCalled = 0;
+
+   public static int getTimesCalled() {
+      return timesCalled;
+   }
+
+   public static void setTimesCalled(int times) {
+      timesCalled = times;
+   }
+
+   @EventSubscriber(eventClass = List.class, referenceStrength = ReferenceStrength.STRONG)
+   public void doList(Collection collection) {
+      timesCalled++;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/TestAnnotationInAbstractClass.java b/src/test/java/org/scijava/event/bushe/annotation/TestAnnotationInAbstractClass.java
new file mode 100644
index 000000000..316d44a67
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/TestAnnotationInAbstractClass.java
@@ -0,0 +1,20 @@
+package org.scijava.event.bushe.annotation;
+
+import junit.framework.TestCase;
+import junit.framework.Assert;
+import org.scijava.event.bushe.EventBus;
+import org.scijava.event.bushe.EDTUtil;
+
+/**
+ * Testing: 
+ * https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=30702&forumID=1834
+ */
+public class TestAnnotationInAbstractClass extends TestCase {
+    public void testAbstract() {
+        ConcreteSubscriber concrete = new ConcreteSubscriber();
+        AnnotationProcessor.process(concrete);
+        EventBus.publish(new MyData());
+        EDTUtil.waitForEDT();
+        Assert.assertTrue(concrete.isInitialized());
+    }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java b/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java
new file mode 100644
index 000000000..c5b1cc427
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java
@@ -0,0 +1,366 @@
+package org.scijava.event.bushe.annotation;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.awt.Color;
+import javax.swing.JButton;
+import javax.swing.JToggleButton;
+import javax.swing.SwingUtilities;
+
+import junit.framework.TestCase;
+
+import org.scijava.event.bushe.EDTUtil;
+import org.scijava.event.bushe.EventBus;
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventServiceLocator;
+import org.scijava.event.bushe.EventServiceLocatorTestCase;
+import org.scijava.event.bushe.annotation.runtime.Factory;
+import org.scijava.event.bushe.annotation.runtime.SubscriberForTesting;
+
+public class TestSubscriberAnnotation extends TestCase {
+
+   @Override
+   public void setUp() {
+      EventServiceLocatorTestCase.clearEventServiceLocator();
+      EventBus.getGlobalEventService();
+      EventBus.clearAllSubscribers();
+      AnnotatedEventSubscriber.setTimesCalled(0);
+      AnnotatedEventSubscriber.setLastCall(null);
+      System.gc();
+   }
+
+   protected void tearDown() throws Exception {
+      EventServiceLocatorTestCase.clearEventServiceLocator();      
+   }
+
+   public void testSimple() throws InvocationTargetException, InterruptedException {
+      AnnotatedEventSubscriber.setTimesColorChanged(0);
+      final AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      EventBus.publish(Color.BLUE);
+      Collection subs = EventBus.getSubscribers(Color.class);
+      assertEquals(0, subs.size());
+      EDTUtil.waitForEDT();
+      assertEquals(0, AnnotatedEventSubscriber.getTimesColorChanged());
+      SwingUtilities.invokeAndWait(new Runnable() {
+         public void run() {
+            AnnotationProcessor.process(subscriber);
+         }
+      });
+
+      subs = EventBus.getSubscribers(Color.class);
+      assertEquals(1, subs.size());
+      EventBus.publish(Color.BLUE);
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
+      
+      //Add veto
+      subs = EventBus.getVetoSubscribers(Color.class);
+      assertEquals(0, subs.size());
+      final AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      SwingUtilities.invokeAndWait(new Runnable() {
+         public void run() {
+            AnnotationProcessor.process(vetoSubscriber);
+         }
+      });
+
+      subs = EventBus.getSubscribers(Color.class);
+      assertEquals(1, subs.size());
+      subs = EventBus.getVetoSubscribers(Color.class);
+      assertEquals(1, subs.size());
+      EventBus.publish(Color.RED);
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
+
+      SwingUtilities.invokeAndWait(new Runnable() {
+         public void run() {
+            AnnotationProcessor.unprocess(vetoSubscriber);
+         }
+      });
+      EventBus.publish(Color.RED);
+      EDTUtil.waitForEDT();
+      assertEquals(2, AnnotatedEventSubscriber.getTimesColorChanged());
+      SwingUtilities.invokeAndWait(new Runnable() {
+         public void run() {
+            AnnotationProcessor.unprocess(subscriber);
+         }
+      });
+      EventBus.publish(Color.BLUE);
+      EDTUtil.waitForEDT();
+      assertEquals(2, AnnotatedEventSubscriber.getTimesColorChanged());
+      System.out.println("avoid garbage collection:"+subscriber + vetoSubscriber);
+   }
+
+   public void testWeakReference() {
+      AnnotatedEventSubscriber.setTimesColorChanged(0);
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      EventBus.publish(Color.BLUE);
+      EDTUtil.waitForEDT();
+      assertEquals(0, AnnotatedEventSubscriber.getTimesColorChanged());
+      AnnotationProcessor.process(subscriber);
+      AnnotationProcessor.process(vetoSubscriber);
+      EventBus.publish(Color.BLUE);
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
+      EventBus.publish(Color.RED);
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
+
+      System.out.println("avoid garbage collection:"+subscriber+vetoSubscriber);
+      subscriber = null;
+      System.gc();
+      EventBus.publish(Color.BLUE);
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
+      System.gc();
+   }
+
+   public void testEventClass() {
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(subscriber);
+      AnnotationProcessor.process(vetoSubscriber);
+
+      //Veto subscriber stops the empty list
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(null, AnnotatedEventSubscriber.getLastCall());
+
+      EventBus.publish(Arrays.asList("foo"));
+      EDTUtil.waitForEDT();
+      assertEquals("doList", AnnotatedEventSubscriber.getLastCall());
+
+      AnnotatedEventSubscriber.setLastCall(null);
+      EventBus.publish(Arrays.asList());
+      EDTUtil.waitForEDT();
+      assertEquals(null, AnnotatedEventSubscriber.getLastCall());
+      AnnotationProcessor.unprocess(vetoSubscriber);
+      EventBus.publish(Arrays.asList());
+      EDTUtil.waitForEDT();
+      assertEquals("doList", AnnotatedEventSubscriber.getLastCall());
+
+      System.out.println("avoid garbage collection:"+subscriber);
+      AnnotatedEventSubscriber.setLastCall(null);
+      //it was subscribed to a list, though the method param is Collection, it shouldn't get called
+      EventBus.publish(new HashSet());
+      EDTUtil.waitForEDT();
+   }
+
+   public void testExactly() {
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(subscriber);
+      AnnotationProcessor.process(vetoSubscriber);
+
+      JToggleButton jToggleButton = new JToggleButton();
+      EventBus.publish(jToggleButton);
+      EDTUtil.waitForEDT();
+      System.out.println("avoid garbage collection:"+subscriber);
+      assertEquals("doJToggleButtonExactly", AnnotatedEventSubscriber.getLastCall());
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+
+      EventBus.publish(new JButton());
+      EDTUtil.waitForEDT();
+      assertEquals("doJToggleButtonExactly", AnnotatedEventSubscriber.getLastCall());
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+
+      jToggleButton.setForeground(Color.RED);
+      EventBus.publish(jToggleButton);
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+
+      AnnotationProcessor.unprocess(vetoSubscriber);
+      EventBus.publish(jToggleButton);
+      EDTUtil.waitForEDT();
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+
+      AnnotationProcessor.unprocess(subscriber);
+      EventBus.publish(jToggleButton);
+      EDTUtil.waitForEDT();
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+   }
+
+   public void testAutoCreateEventServiceClass() {
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(vetoSubscriber);
+      AnnotationProcessor.process(subscriber);
+      EventService es = EventServiceLocator.getEventService("IteratorService");
+      es.publish(Arrays.asList("foo").iterator());
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      assertEquals("autoCreateEventServiceClass", AnnotatedEventSubscriber.getLastCall());
+      es.publish(Arrays.asList().iterator());
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      AnnotationProcessor.unprocess(vetoSubscriber);
+      es.publish(Arrays.asList().iterator());
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+      AnnotationProcessor.unprocess(subscriber);
+      es.publish(Arrays.asList().iterator());
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+   }
+
+   public void testStrongRef() {
+      StrongAnnotatedEventSubscriber subscriber = new StrongAnnotatedEventSubscriber();
+      AnnotationProcessor.process(subscriber);
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(vetoSubscriber);
+      EventBus.publish(new File("foo"));
+      EDTUtil.waitForEDT();
+      assertEquals("doStrong", StrongAnnotatedEventSubscriber.getLastCall());
+      assertEquals(1, StrongAnnotatedEventSubscriber.getTimesCalled());
+      System.gc();
+      EventBus.publish(new File("foo"));
+      EDTUtil.waitForEDT();
+      assertEquals("doStrong", StrongAnnotatedEventSubscriber.getLastCall());
+      assertEquals(2, StrongAnnotatedEventSubscriber.getTimesCalled());
+   }
+
+   public void testTopic() {
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(subscriber);
+      AnnotationProcessor.process(vetoSubscriber);
+      EventBus.publish("File.Open", new File("foo"));
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      EventBus.publish("File.Fooooooo", new File("foo"));
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      EventBus.publish("File.Open", null);
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      AnnotationProcessor.unprocess(vetoSubscriber);
+      EventBus.publish("File.Open", null);
+      EDTUtil.waitForEDT();
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+      AnnotationProcessor.unprocess(subscriber);
+      EventBus.publish("File.Open", null);
+      EDTUtil.waitForEDT();
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+   }
+
+   public void testAutoCreateEventServiceTopic() {
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(subscriber);
+      AnnotationProcessor.process(vetoSubscriber);
+      EventService es = EventServiceLocator.getEventService("IteratorService");
+      es.publish("Iterator", new ArrayList().iterator());
+      assertEquals(0, AnnotatedEventSubscriber.getTimesCalled());
+      es.publish("Iterator", Arrays.asList("foo").iterator());
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      assertEquals("autoCreateEventServiceClass", AnnotatedEventSubscriber.getLastCall());
+      AnnotationProcessor.unprocess(vetoSubscriber);
+      es.publish("Iterator", new ArrayList().iterator());
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+      AnnotationProcessor.unprocess(subscriber);
+      es.publish("Iterator", Arrays.asList("foo").iterator());
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+   }
+
+   public void testTopicPattern() {
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(vetoSubscriber);
+      AnnotationProcessor.process(subscriber);
+      EventService es = EventServiceLocator.getEventService("IceCreamService");
+      es.publish("IceCream.Chocolate", "DoubleDip");
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      assertEquals("doIceCream", AnnotatedEventSubscriber.getLastCall());
+      es.publish("IceCream.Cherry", "DoubleDip");
+      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
+      AnnotationProcessor.unprocess(vetoSubscriber);
+      es.publish("IceCream.Chocolate", "DoubleDip");
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
+      AnnotationProcessor.unprocess(subscriber);
+      es.publish("IceCream.Chocolate", "DoubleDip");
+      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());      
+      System.out.println(subscriber);
+   }
+
+   public void testIssue15MultipleAnnotatedSubscribers() {
+      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
+      AnnotationProcessor.process(vetoSubscriber);
+      AnnotationProcessor.process(subscriber);
+      AnotherAnnotatedEventSubscriber anotherSubscriber = new AnotherAnnotatedEventSubscriber();
+      AnnotationProcessor.process(anotherSubscriber);
+      EventBus.publish(Arrays.asList("foo"));
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnotherAnnotatedEventSubscriber.getTimesCalled());
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(1, AnotherAnnotatedEventSubscriber.getTimesCalled());
+      EDTUtil.waitForEDT();
+      System.out.println(subscriber);
+      System.out.println(anotherSubscriber);
+   }
+
+   public void testAnotherIssue15MultipleAnnotatedSubscribers() {
+      EventBus.clearAllSubscribers();
+      System.gc();
+      Issue15Subscriber i15s1 = new Issue15Subscriber();
+      Issue15Subscriber2 i15s2 = new Issue15Subscriber2();
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(1, i15s2.getTimesCalled());
+      assertEquals(1, i15s1.getTimesCalled());
+      //Ensure the garbage collector can't clean up the refs
+      System.out.println(i15s1);
+      System.out.println(i15s2);
+   }
+
+   //This one works with the DoubleAnnotatedEventSubscriber and AnotherDoubleAnnotatedEventSubscriber (and Single),
+   //but fails with AnnotatedEventSubscriber and AnotherAnnotatedEventSubscriber
+   public void testYetAnotherIssue15MultipleAnnotatedSubscribers() {
+      EventBus.clearAllSubscribers();
+      System.gc();
+      DoubleAnnotatedEventSubscriber subscriber = new DoubleAnnotatedEventSubscriber();
+      AnnotationProcessor.process(subscriber);
+      DoubleAnnotatedEventSubscriber secondSubscriber = new DoubleAnnotatedEventSubscriber();
+      AnnotationProcessor.process(secondSubscriber);
+      AnotherDoubleAnnotatedEventSubscriber anotherSubscriber = new AnotherDoubleAnnotatedEventSubscriber();
+      AnnotationProcessor.process(anotherSubscriber);
+      AnotherDoubleAnnotatedEventSubscriber secondAnotherSubscriber = new AnotherDoubleAnnotatedEventSubscriber();
+      AnnotationProcessor.process(secondAnotherSubscriber);
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(2, AnotherDoubleAnnotatedEventSubscriber.getTimesCalled());
+      assertEquals(2, DoubleAnnotatedEventSubscriber.getTimesCalled());
+      //Ensure the garbage collector can't clean up the refs
+      System.out.println("finished with:"+subscriber);
+      System.out.println("finished with:"+secondSubscriber);
+      System.out.println("finished with:"+anotherSubscriber);
+   }
+
+//Would like to test this, but an exception isn't thrown, since you want all the subscribers to be called
+//even if calling any one throws an exception
+//   public void testTopicWrongType() {
+//      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
+//      AnnotationProcessor.process(subscriber);
+//      EventService es = EventServiceLocator.getEventService("IteratorService");
+//      try {
+//         es.publish("Iterator", "foo");
+//         fail("Should get an IllegalArgumentException");
+//      } catch (Exception ex) {
+//      }
+//   }      
+
+   public void testRuntimeTopicSubscriber() {
+	   SubscriberForTesting runtimeTopicSubscriber = Factory.newRuntimeTopicSubscriber("foo");
+	   EventBus.publish("foo", new ArrayList<String>());
+	   EDTUtil.waitForEDT();
+	   assertEquals(1, runtimeTopicSubscriber.getTimesCalled());
+   }
+
+   public void testRuntimeTopicPatternSubscriber() {
+	   SubscriberForTesting runtimeTopicSubscriber = Factory.newRuntimeTopicPatternSubscriber("hope.*");
+	   EventBus.publish("hope_and_change", new ArrayList<String>());
+	   EDTUtil.waitForEDT();
+	   assertEquals(1, runtimeTopicSubscriber.getTimesCalled());
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java b/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java
new file mode 100644
index 000000000..2d1b19f44
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java
@@ -0,0 +1,336 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.JComponent;
+
+import junit.framework.TestCase;
+
+import org.scijava.event.bushe.CleanupEvent;
+import org.scijava.event.bushe.EDTUtil;
+import org.scijava.event.bushe.EventBus;
+import org.scijava.event.bushe.EventService;
+import org.scijava.event.bushe.EventSubscriber;
+import org.scijava.event.bushe.ThreadSafeEventService;
+
+public class TestSubscriberAnnotationMemoryLeaks extends TestCase {
+   Random rand = new Random();
+   
+   public void setUp() {
+      EventBus.getGlobalEventService();
+      EventBus.clearAllSubscribers();
+      System.gc();
+   }
+
+   public void testStrongClassAnnotatedEventSubscriber() {
+      StrongClassAnnotatedEventSubscriber subscriber = new StrongClassAnnotatedEventSubscriber();
+      AnnotationProcessor.process(subscriber);
+      StrongClassAnnotatedEventSubscriber.setTimesCalled(0);
+      assertEquals(0, StrongClassAnnotatedEventSubscriber.getTimesCalled());
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(1, StrongClassAnnotatedEventSubscriber.getTimesCalled());
+      subscriber = null;
+      System.gc();
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(2, StrongClassAnnotatedEventSubscriber.getTimesCalled());
+      List subscribers = EventBus.getSubscribers(List.class);
+      assertEquals(1, subscribers.size());
+      //I can unsubscribe without ever explicitly subscribing
+      EventBus.unsubscribe(List.class, (org.scijava.event.bushe.EventSubscriber) subscribers.get(0));
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(2, StrongClassAnnotatedEventSubscriber.getTimesCalled());
+      subscribers = EventBus.getSubscribers(List.class);
+      assertEquals(0, subscribers.size());
+   }
+
+   public void testWeakClassAnnotatedEventSubscriber() {
+      WeakClassAnnotatedEventSubscriber subscriber = new WeakClassAnnotatedEventSubscriber();
+      AnnotationProcessor.process(subscriber);
+      WeakClassAnnotatedEventSubscriber.setTimesCalled(0);
+      assertEquals(0, WeakClassAnnotatedEventSubscriber.getTimesCalled());
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
+
+      subscriber = null;
+      System.gc();
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
+      List subscribers = EventBus.getSubscribers(List.class);
+      assertEquals(0, subscribers.size());
+   }
+
+   public void testWeakClassAnnotatedEventSubscriberUnsubscription() {
+      WeakClassAnnotatedEventSubscriber subscriber = new WeakClassAnnotatedEventSubscriber();
+      AnnotationProcessor.process(subscriber);
+      WeakClassAnnotatedEventSubscriber.setTimesCalled(0);
+      assertEquals(0, WeakClassAnnotatedEventSubscriber.getTimesCalled());
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
+
+      EventBus.unsubscribe(List.class, subscriber);
+
+      subscriber = null;
+      System.gc();
+      EventBus.publish(new ArrayList());
+      EDTUtil.waitForEDT();
+      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
+      List subscribers = EventBus.getSubscribers(List.class);
+      assertEquals(0, subscribers.size());
+   }
+   
+   public void testCleanup() {
+      final int cleanStartThreshold = 100;
+      final long period = 5000L;
+      final int stopThreshold = 10;
+      EventService es = new ThreadSafeEventService(cleanStartThreshold, stopThreshold,period);
+      CleanupEventSubscriber cleanupEventSubscriber = new CleanupEventSubscriber();
+      es.subscribe(CleanupEvent.class, cleanupEventSubscriber);
+      //Go right up to the edge, but don't cross it.
+      Object[] subscribers = new Object[cleanStartThreshold];
+      for (int i = 0; i < cleanStartThreshold -2; i++) {
+         subscribers[i] = createSubscriber(es);
+         //these should have no effect 
+         es.subscribeStrongly(List.class, new DummySubscriber());
+      }
+      es.publish(new ArrayList());
+      try {
+         Thread.sleep(100);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(0, cleanupEventSubscriber.events.size());
+      
+      //Go over the edge, cleanup should start
+      subscribers[cleanStartThreshold-1] = createSubscriber(es);
+      try {
+         Thread.sleep(1000);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      
+      //There are no stale refs yet, should have tried cleaning, but not done it.
+      assertEquals(3, cleanupEventSubscriber.events.size()); 
+      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(0).getStatus());
+      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(1).getStatus());
+      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(2).getStatus());
+      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(0).getTotalWeakRefsAndProxies());
+      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(1).getTotalWeakRefsAndProxies());
+      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(2).getTotalWeakRefsAndProxies());
+      assertEquals(new Integer(0), cleanupEventSubscriber.events.get(2).getNumStaleSubscribersCleaned());
+
+      //Does it run again after the interval (exactly once more)?
+      try {
+         Thread.sleep(250+period);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(6, cleanupEventSubscriber.events.size()); 
+      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(3).getStatus());
+      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(4).getStatus());
+      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(5).getStatus());
+      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(3).getTotalWeakRefsAndProxies());
+      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(4).getTotalWeakRefsAndProxies());
+      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(5).getTotalWeakRefsAndProxies());
+      assertEquals(new Integer(0), cleanupEventSubscriber.events.get(5).getNumStaleSubscribersCleaned());
+
+      //Now make some stale
+      int numberToMakeStale = 10;
+      for (int i = 0; i < numberToMakeStale; i++) {
+         subscribers[i] = null;
+      }
+      System.gc();
+      try {
+         Thread.sleep(100);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      //Period has not yet pass, should not expect a cleaning yet.
+      assertEquals(6, cleanupEventSubscriber.events.size()); 
+
+      //After period, stale refs should be cleaned
+      try {
+         Thread.sleep(period);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(9, cleanupEventSubscriber.events.size()); 
+      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(6).getStatus());
+      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(7).getStatus());
+      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(8).getStatus());
+      assertEquals((int)cleanStartThreshold, (int)cleanupEventSubscriber.events.get(6).getTotalWeakRefsAndProxies());
+      assertEquals((int)cleanStartThreshold, (int)cleanupEventSubscriber.events.get(7).getTotalWeakRefsAndProxies());
+      assertEquals((int)(cleanStartThreshold - numberToMakeStale), (int)cleanupEventSubscriber.events.get(8).getTotalWeakRefsAndProxies());
+      assertEquals((int)numberToMakeStale, (int)cleanupEventSubscriber.events.get(8).getNumStaleSubscribersCleaned());      
+
+      //Now make so many stale that it gets below the stop threshold
+      int numberAlreadyStale = numberToMakeStale;
+      numberToMakeStale = cleanStartThreshold - stopThreshold;
+      for (int i = numberAlreadyStale; i < numberToMakeStale; i++) {
+         subscribers[i] = null;
+      }
+      System.gc();
+      //After period, stale refs should be cleaned
+      try {
+         Thread.sleep(period);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(12, cleanupEventSubscriber.events.size()); 
+      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(9).getStatus());
+      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(10).getStatus());
+      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(11).getStatus());
+      assertEquals((int)cleanStartThreshold-numberAlreadyStale, (int)cleanupEventSubscriber.events.get(9).getTotalWeakRefsAndProxies());
+      assertEquals((int)cleanStartThreshold-numberAlreadyStale, (int)cleanupEventSubscriber.events.get(10).getTotalWeakRefsAndProxies());
+      assertEquals((int)(cleanStartThreshold - numberToMakeStale), (int)cleanupEventSubscriber.events.get(11).getTotalWeakRefsAndProxies());
+      assertEquals((int)numberToMakeStale, (int)cleanupEventSubscriber.events.get(11).getNumStaleSubscribersCleaned()+numberAlreadyStale);      
+
+      //After period, next cleaning run should tell us that cleaning is stopped
+      try {
+         Thread.sleep(period);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(14, cleanupEventSubscriber.events.size()); 
+      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(12).getStatus());
+      assertEquals(CleanupEvent.Status.UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, cleanupEventSubscriber.events.get(13).getStatus());
+      assertEquals((int)cleanStartThreshold-numberToMakeStale, (int)cleanupEventSubscriber.events.get(12).getTotalWeakRefsAndProxies());
+      assertEquals((int)cleanStartThreshold-numberToMakeStale, (int)cleanupEventSubscriber.events.get(13).getTotalWeakRefsAndProxies());
+      assertEquals(null, cleanupEventSubscriber.events.get(13).getNumStaleSubscribersCleaned());      
+
+      //After period, no more cleaning should be done
+      try {
+         Thread.sleep(period);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(14, cleanupEventSubscriber.events.size()); 
+
+      es.clearAllSubscribers();
+      es.subscribe(CleanupEvent.class, cleanupEventSubscriber);
+
+      //Go back over the limit and the cleaning should restart
+      for (int i = 0; i < cleanStartThreshold-1; i++) {
+         subscribers[i] = createSubscriber(es);
+      }
+      subscribers[99] = createSubscriber(es);
+      System.out.println("Cleanup should be starting");
+      try {
+         Thread.sleep(250);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(17, cleanupEventSubscriber.events.size()); 
+      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(14).getStatus());
+      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(15).getStatus());
+      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(16).getStatus());
+      assertEquals(0, (int)cleanupEventSubscriber.events.get(16).getNumStaleSubscribersCleaned());      
+
+      es.clearAllSubscribers();
+      es.subscribe(CleanupEvent.class, cleanupEventSubscriber);
+      try {
+         Thread.sleep(period);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(19, cleanupEventSubscriber.events.size()); 
+      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(17).getStatus());
+      assertEquals(CleanupEvent.Status.UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, cleanupEventSubscriber.events.get(18).getStatus());
+      assertEquals(null, cleanupEventSubscriber.events.get(18).getNumStaleSubscribersCleaned());      
+
+      //After period, no more cleaning should be done
+      try {
+         Thread.sleep(period);
+      } catch (InterruptedException ex) {
+         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
+      }
+      assertEquals(19, cleanupEventSubscriber.events.size());       
+   }
+   
+   private Object createSubscriber(EventService es) {
+      Object result = null;
+      int randNum = rand.nextInt(2);
+      if (randNum == 0) {
+         //class
+         randNum = rand.nextInt(2);
+         if (true || randNum == 0) {
+            //normal
+            result = new DummySubscriber();
+            Class subscriptionClass = null;
+            randNum = rand.nextInt(3);
+            switch (randNum) {
+            case 0: subscriptionClass = List.class; break;
+            case 1: subscriptionClass = String.class;break;
+            case 2: subscriptionClass = JComponent.class;break;
+            }
+            es.subscribe(subscriptionClass, (EventSubscriber)result);
+         } else {
+            //annotated
+            result = new AnnotatedDummySubscriber();            
+            AnnotationProcessor.process(result);
+         }
+      } else {
+         //topic
+         randNum = rand.nextInt(2);
+         if (true || randNum == 0) {
+            //normal
+            result = new DummyTopicSubscriber();
+            String topic = null;
+            randNum = rand.nextInt(3);
+            switch (randNum) {
+            case 0: topic = "Lis"; break;
+            case 1: topic = "Strin";break;
+            case 2: topic = "JCompon";break;
+            }
+            es.subscribe(topic, (org.scijava.event.bushe.EventTopicSubscriber)result);
+         } else {
+            //annotated
+            result = new AnnotatedTopicDummySubscriber();            
+            AnnotationProcessor.process(result);
+         }
+      }
+      return result;
+   }
+
+   private class CleanupEventSubscriber implements EventSubscriber<CleanupEvent> {
+
+      public List<CleanupEvent> events = new ArrayList<CleanupEvent>();
+
+      public CleanupEventSubscriber() {
+      }
+
+      public void onEvent(CleanupEvent event) {
+         this.events.add(event);
+      }
+   }
+
+   private static class DummySubscriber implements EventSubscriber<List> {
+      public void onEvent(List list) {
+      }      
+   }
+   
+   private static class DummyTopicSubscriber implements org.scijava.event.bushe.EventTopicSubscriber {
+      public void onEvent(String topic, Object data) {
+      }
+   }
+   
+   private static class AnnotatedDummySubscriber  {
+      @org.scijava.event.bushe.annotation.EventSubscriber(eventClass=List.class)
+      public void foo(Object event) {
+      }      
+   }   
+
+   private static class AnnotatedTopicDummySubscriber  {
+      @EventTopicSubscriber(topic="bar")
+      public void foo(Object event) {
+      }      
+   }   
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/WeakClassAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/WeakClassAnnotatedEventSubscriber.java
new file mode 100644
index 000000000..0c7f7703a
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/WeakClassAnnotatedEventSubscriber.java
@@ -0,0 +1,24 @@
+package org.scijava.event.bushe.annotation;
+
+import java.util.Collection;
+import java.util.List;
+
+/** Test class for class-based subscriptions */
+public class WeakClassAnnotatedEventSubscriber {
+   static int timesColorChanged = 0;
+   static String lastCall = null;
+   static int timesCalled = 0;
+
+   public static int getTimesCalled() {
+      return timesCalled;
+   }
+
+   public static void setTimesCalled(int times) {
+      timesCalled = times;
+   }
+
+   @EventSubscriber(eventClass = List.class, referenceStrength = ReferenceStrength.WEAK)
+   public void doList(Collection collection) {
+      timesCalled++;
+   }
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/Factory.java b/src/test/java/org/scijava/event/bushe/annotation/runtime/Factory.java
new file mode 100644
index 000000000..03a33214d
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/runtime/Factory.java
@@ -0,0 +1,12 @@
+package org.scijava.event.bushe.annotation.runtime;
+
+public class Factory {
+
+	public static SubscriberForTesting newRuntimeTopicSubscriber(String topic) {
+		return new RuntimeTopicSubscriber(topic);
+	}
+
+	public static SubscriberForTesting newRuntimeTopicPatternSubscriber(String topicPattern) {
+		return new RuntimeTopicPatternSubscriber(topicPattern);
+	}
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicPatternSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicPatternSubscriber.java
new file mode 100644
index 000000000..be306c337
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicPatternSubscriber.java
@@ -0,0 +1,35 @@
+package org.scijava.event.bushe.annotation.runtime;
+
+import java.util.List;
+
+import org.scijava.event.bushe.annotation.AnnotationProcessor;
+import org.scijava.event.bushe.annotation.RuntimeTopicPatternEventSubscriber;
+
+class RuntimeTopicPatternSubscriber implements SubscriberForTesting {
+	private final String topicPattern;
+	private long timesCalled;
+
+	public RuntimeTopicPatternSubscriber(String topicPattern) {
+		this.topicPattern = topicPattern;
+
+		AnnotationProcessor.process(this);
+	}
+
+	@RuntimeTopicPatternEventSubscriber
+	public void handleEvent(String topic, List<String> event) {
+		timesCalled++;
+	}
+
+   @RuntimeTopicPatternEventSubscriber
+   public boolean shouldVeto(String topic, List<String> e) {
+      return e == null;
+   }
+
+	public String getTopicPatternName() {
+		return topicPattern;
+	}
+
+	public long getTimesCalled() {
+		return timesCalled;
+	}
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicSubscriber.java b/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicSubscriber.java
new file mode 100644
index 000000000..c751b2dce
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicSubscriber.java
@@ -0,0 +1,34 @@
+package org.scijava.event.bushe.annotation.runtime;
+
+import org.scijava.event.bushe.annotation.AnnotationProcessor;
+import org.scijava.event.bushe.annotation.RuntimeTopicEventSubscriber;
+
+import java.util.List;
+
+class RuntimeTopicSubscriber implements SubscriberForTesting {
+	private long timesCalled;
+	private final String topic;
+
+	public RuntimeTopicSubscriber(String topic) {
+		this.topic = topic;
+		AnnotationProcessor.process(this);
+	}
+	
+	@RuntimeTopicEventSubscriber
+	public void handleEvent(String topic, List<String> e) {
+		timesCalled++;
+	}
+
+   @RuntimeTopicEventSubscriber
+   public boolean shouldVeto(String topic, List<String> e) {
+      return e == null;
+   }
+
+	public String getTopicName() {
+		return topic;
+	}
+
+	public long getTimesCalled() {
+		return timesCalled;
+	}
+}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/SubscriberForTesting.java b/src/test/java/org/scijava/event/bushe/annotation/runtime/SubscriberForTesting.java
new file mode 100644
index 000000000..55c76dca4
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/annotation/runtime/SubscriberForTesting.java
@@ -0,0 +1,5 @@
+package org.scijava.event.bushe.annotation.runtime;
+
+public interface SubscriberForTesting {
+	long getTimesCalled();
+}
diff --git a/src/test/java/org/scijava/event/bushe/generics/DataRequestEvent.java b/src/test/java/org/scijava/event/bushe/generics/DataRequestEvent.java
new file mode 100644
index 000000000..3ff5b4952
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/generics/DataRequestEvent.java
@@ -0,0 +1,9 @@
+package org.scijava.event.bushe.generics;
+
+import java.util.List;
+
+/**
+ * Test event for Bill Wholer's typed events.
+ */
+public class DataRequestEvent<T extends List> {
+}
diff --git a/src/test/java/org/scijava/event/bushe/generics/GenericReflection.java b/src/test/java/org/scijava/event/bushe/generics/GenericReflection.java
new file mode 100644
index 000000000..87e80c600
--- /dev/null
+++ b/src/test/java/org/scijava/event/bushe/generics/GenericReflection.java
@@ -0,0 +1,125 @@
+package org.scijava.event.bushe.generics;
+
+import java.lang.reflect.TypeVariable;
+
+import java.lang.reflect.*;
+import java.io.*;
+
+/**
+ * From OReilly Book Java Generics
+ */
+public class GenericReflection {
+   DataRequestEvent dre;
+    private final static PrintStream out = System.out;
+    public static void printSuperclass (Type sup) {
+	if (sup != null && !sup.equals(Object.class)) {
+	    out.print("extends ");
+	    printType(sup);
+  	    out.println();
+	}
+    }
+    public static void printInterfaces (Type[] implementations) {
+	if (implementations != null && implementations.length > 0) {
+	    out.print("implements ");
+	    int i = 0;
+	    for (Type impl : implementations) {
+		if (i++ > 0) out.print(",");
+		printType(impl);
+	    }
+	    out.println();
+	}
+    }
+    public static void printTypeParameters (TypeVariable<?>[] vars) {
+	if (vars != null && vars.length > 0) {
+	    out.print("<");
+	    int i = 0;
+	    for (TypeVariable<?> var : vars) {
+		if (i++ > 0) out.print(",");
+		out.print(var.getName());
+		printBounds(var.getBounds());
+	    }
+	    out.print(">");
+	}
+    }
+    public static void printBounds (Type[] bounds) {
+	if (bounds != null && bounds.length > 0
+	    && !(bounds.length==1 && bounds[0]==Object.class)) {
+	    out.print(" extends ");
+	    int i = 0;
+	    for (Type bound : bounds) {
+		if (i++ > 0) out.print("&");
+		printType(bound);
+	    }
+	}
+    }
+    public static void printParams (Type[] types) {
+	if (types != null && types.length > 0) {
+	    out.print("<");
+	    int i = 0;
+	    for (Type type : types) {
+		if (i++ > 0) out.print(",");
+		printType(type);
+	    }
+	    out.print(">");
+	}
+    }
+    public static void printType (Type type) {
+	if (type instanceof Class) {
+	    Class<?> c = (Class)type;
+	    out.print(c.getName());
+	} else if (type instanceof ParameterizedType) {
+	    ParameterizedType p = (ParameterizedType)type;
+	    Class c = (Class)p.getRawType();
+	    Type o = p.getOwnerType();
+	    if (o != null) { printType(o); out.print("."); }
+	    out.print(c.getName());
+	    printParams(p.getActualTypeArguments());
+	} else if (type instanceof TypeVariable<?>) {
+	    TypeVariable<?> v = (TypeVariable<?>)type;
+	    out.print(v.getName());
+	} else if (type instanceof GenericArrayType) {
+	    GenericArrayType a = (GenericArrayType)type;
+	    printType(a.getGenericComponentType());
+	    out.print("[]");
+	} else if (type instanceof WildcardType) {
+	    WildcardType w = (WildcardType)type;
+	    Type[] upper = w.getUpperBounds();
+	    Type[] lower = w.getLowerBounds();
+	    if (upper.length==1 && lower.length==0) {
+		out.print("? extends ");
+		printType(upper[0]);
+	    } else if (upper.length==0 && lower.length==1) {
+		out.print("? super ");
+		printType(lower[0]);
+	    } else assert false;
+	}
+    }
+    public static void printClass (Class c) {
+	out.print("class ");
+	out.print(c.getName());
+	printTypeParameters(c.getTypeParameters());
+	out.println();
+	printSuperclass(c.getGenericSuperclass());
+	printInterfaces(c.getGenericInterfaces());
+	/*
+	out.println("{");
+	for (Field f : c.getFields()) {
+	    out.println("  "+f.toGenericString()+";");
+	}
+	for (Constructor k : c.getConstructors()) {
+	    out.println("  "+k.toGenericString()+";");
+	}
+	for (Method m : c.getMethods()) {
+	    out.println("  "+m.toGenericString()+";");
+	}
+	out.println("}");
+	*/
+    }
+    public static void main (String[] args) throws ClassNotFoundException {
+	for (String name : args) {
+	    Class<?> c = Class.forName(name);
+	    printClass(c);
+	}
+    }
+}
+

From 98a7b73c7cc7eb4211d167a8a92b114716485bad Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 11:33:20 -0500
Subject: [PATCH 1100/1208] Remove broken org.bushe:eventbus tests

---
 .../annotation/TestSubscriberAnnotation.java  | 366 ------------------
 .../TestSubscriberAnnotationMemoryLeaks.java  | 336 ----------------
 2 files changed, 702 deletions(-)
 delete mode 100644 src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java

diff --git a/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java b/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java
deleted file mode 100644
index c5b1cc427..000000000
--- a/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotation.java
+++ /dev/null
@@ -1,366 +0,0 @@
-package org.scijava.event.bushe.annotation;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.awt.Color;
-import javax.swing.JButton;
-import javax.swing.JToggleButton;
-import javax.swing.SwingUtilities;
-
-import junit.framework.TestCase;
-
-import org.scijava.event.bushe.EDTUtil;
-import org.scijava.event.bushe.EventBus;
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.EventServiceLocatorTestCase;
-import org.scijava.event.bushe.annotation.runtime.Factory;
-import org.scijava.event.bushe.annotation.runtime.SubscriberForTesting;
-
-public class TestSubscriberAnnotation extends TestCase {
-
-   @Override
-   public void setUp() {
-      EventServiceLocatorTestCase.clearEventServiceLocator();
-      EventBus.getGlobalEventService();
-      EventBus.clearAllSubscribers();
-      AnnotatedEventSubscriber.setTimesCalled(0);
-      AnnotatedEventSubscriber.setLastCall(null);
-      System.gc();
-   }
-
-   protected void tearDown() throws Exception {
-      EventServiceLocatorTestCase.clearEventServiceLocator();      
-   }
-
-   public void testSimple() throws InvocationTargetException, InterruptedException {
-      AnnotatedEventSubscriber.setTimesColorChanged(0);
-      final AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      EventBus.publish(Color.BLUE);
-      Collection subs = EventBus.getSubscribers(Color.class);
-      assertEquals(0, subs.size());
-      EDTUtil.waitForEDT();
-      assertEquals(0, AnnotatedEventSubscriber.getTimesColorChanged());
-      SwingUtilities.invokeAndWait(new Runnable() {
-         public void run() {
-            AnnotationProcessor.process(subscriber);
-         }
-      });
-
-      subs = EventBus.getSubscribers(Color.class);
-      assertEquals(1, subs.size());
-      EventBus.publish(Color.BLUE);
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
-      
-      //Add veto
-      subs = EventBus.getVetoSubscribers(Color.class);
-      assertEquals(0, subs.size());
-      final AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      SwingUtilities.invokeAndWait(new Runnable() {
-         public void run() {
-            AnnotationProcessor.process(vetoSubscriber);
-         }
-      });
-
-      subs = EventBus.getSubscribers(Color.class);
-      assertEquals(1, subs.size());
-      subs = EventBus.getVetoSubscribers(Color.class);
-      assertEquals(1, subs.size());
-      EventBus.publish(Color.RED);
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
-
-      SwingUtilities.invokeAndWait(new Runnable() {
-         public void run() {
-            AnnotationProcessor.unprocess(vetoSubscriber);
-         }
-      });
-      EventBus.publish(Color.RED);
-      EDTUtil.waitForEDT();
-      assertEquals(2, AnnotatedEventSubscriber.getTimesColorChanged());
-      SwingUtilities.invokeAndWait(new Runnable() {
-         public void run() {
-            AnnotationProcessor.unprocess(subscriber);
-         }
-      });
-      EventBus.publish(Color.BLUE);
-      EDTUtil.waitForEDT();
-      assertEquals(2, AnnotatedEventSubscriber.getTimesColorChanged());
-      System.out.println("avoid garbage collection:"+subscriber + vetoSubscriber);
-   }
-
-   public void testWeakReference() {
-      AnnotatedEventSubscriber.setTimesColorChanged(0);
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      EventBus.publish(Color.BLUE);
-      EDTUtil.waitForEDT();
-      assertEquals(0, AnnotatedEventSubscriber.getTimesColorChanged());
-      AnnotationProcessor.process(subscriber);
-      AnnotationProcessor.process(vetoSubscriber);
-      EventBus.publish(Color.BLUE);
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
-      EventBus.publish(Color.RED);
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
-
-      System.out.println("avoid garbage collection:"+subscriber+vetoSubscriber);
-      subscriber = null;
-      System.gc();
-      EventBus.publish(Color.BLUE);
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesColorChanged());
-      System.gc();
-   }
-
-   public void testEventClass() {
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(subscriber);
-      AnnotationProcessor.process(vetoSubscriber);
-
-      //Veto subscriber stops the empty list
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(null, AnnotatedEventSubscriber.getLastCall());
-
-      EventBus.publish(Arrays.asList("foo"));
-      EDTUtil.waitForEDT();
-      assertEquals("doList", AnnotatedEventSubscriber.getLastCall());
-
-      AnnotatedEventSubscriber.setLastCall(null);
-      EventBus.publish(Arrays.asList());
-      EDTUtil.waitForEDT();
-      assertEquals(null, AnnotatedEventSubscriber.getLastCall());
-      AnnotationProcessor.unprocess(vetoSubscriber);
-      EventBus.publish(Arrays.asList());
-      EDTUtil.waitForEDT();
-      assertEquals("doList", AnnotatedEventSubscriber.getLastCall());
-
-      System.out.println("avoid garbage collection:"+subscriber);
-      AnnotatedEventSubscriber.setLastCall(null);
-      //it was subscribed to a list, though the method param is Collection, it shouldn't get called
-      EventBus.publish(new HashSet());
-      EDTUtil.waitForEDT();
-   }
-
-   public void testExactly() {
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(subscriber);
-      AnnotationProcessor.process(vetoSubscriber);
-
-      JToggleButton jToggleButton = new JToggleButton();
-      EventBus.publish(jToggleButton);
-      EDTUtil.waitForEDT();
-      System.out.println("avoid garbage collection:"+subscriber);
-      assertEquals("doJToggleButtonExactly", AnnotatedEventSubscriber.getLastCall());
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-
-      EventBus.publish(new JButton());
-      EDTUtil.waitForEDT();
-      assertEquals("doJToggleButtonExactly", AnnotatedEventSubscriber.getLastCall());
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-
-      jToggleButton.setForeground(Color.RED);
-      EventBus.publish(jToggleButton);
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-
-      AnnotationProcessor.unprocess(vetoSubscriber);
-      EventBus.publish(jToggleButton);
-      EDTUtil.waitForEDT();
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-
-      AnnotationProcessor.unprocess(subscriber);
-      EventBus.publish(jToggleButton);
-      EDTUtil.waitForEDT();
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-   }
-
-   public void testAutoCreateEventServiceClass() {
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(vetoSubscriber);
-      AnnotationProcessor.process(subscriber);
-      EventService es = EventServiceLocator.getEventService("IteratorService");
-      es.publish(Arrays.asList("foo").iterator());
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      assertEquals("autoCreateEventServiceClass", AnnotatedEventSubscriber.getLastCall());
-      es.publish(Arrays.asList().iterator());
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      AnnotationProcessor.unprocess(vetoSubscriber);
-      es.publish(Arrays.asList().iterator());
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-      AnnotationProcessor.unprocess(subscriber);
-      es.publish(Arrays.asList().iterator());
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-   }
-
-   public void testStrongRef() {
-      StrongAnnotatedEventSubscriber subscriber = new StrongAnnotatedEventSubscriber();
-      AnnotationProcessor.process(subscriber);
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(vetoSubscriber);
-      EventBus.publish(new File("foo"));
-      EDTUtil.waitForEDT();
-      assertEquals("doStrong", StrongAnnotatedEventSubscriber.getLastCall());
-      assertEquals(1, StrongAnnotatedEventSubscriber.getTimesCalled());
-      System.gc();
-      EventBus.publish(new File("foo"));
-      EDTUtil.waitForEDT();
-      assertEquals("doStrong", StrongAnnotatedEventSubscriber.getLastCall());
-      assertEquals(2, StrongAnnotatedEventSubscriber.getTimesCalled());
-   }
-
-   public void testTopic() {
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(subscriber);
-      AnnotationProcessor.process(vetoSubscriber);
-      EventBus.publish("File.Open", new File("foo"));
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      EventBus.publish("File.Fooooooo", new File("foo"));
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      EventBus.publish("File.Open", null);
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      AnnotationProcessor.unprocess(vetoSubscriber);
-      EventBus.publish("File.Open", null);
-      EDTUtil.waitForEDT();
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-      AnnotationProcessor.unprocess(subscriber);
-      EventBus.publish("File.Open", null);
-      EDTUtil.waitForEDT();
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-   }
-
-   public void testAutoCreateEventServiceTopic() {
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(subscriber);
-      AnnotationProcessor.process(vetoSubscriber);
-      EventService es = EventServiceLocator.getEventService("IteratorService");
-      es.publish("Iterator", new ArrayList().iterator());
-      assertEquals(0, AnnotatedEventSubscriber.getTimesCalled());
-      es.publish("Iterator", Arrays.asList("foo").iterator());
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      assertEquals("autoCreateEventServiceClass", AnnotatedEventSubscriber.getLastCall());
-      AnnotationProcessor.unprocess(vetoSubscriber);
-      es.publish("Iterator", new ArrayList().iterator());
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-      AnnotationProcessor.unprocess(subscriber);
-      es.publish("Iterator", Arrays.asList("foo").iterator());
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-   }
-
-   public void testTopicPattern() {
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(vetoSubscriber);
-      AnnotationProcessor.process(subscriber);
-      EventService es = EventServiceLocator.getEventService("IceCreamService");
-      es.publish("IceCream.Chocolate", "DoubleDip");
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      assertEquals("doIceCream", AnnotatedEventSubscriber.getLastCall());
-      es.publish("IceCream.Cherry", "DoubleDip");
-      assertEquals(1, AnnotatedEventSubscriber.getTimesCalled());
-      AnnotationProcessor.unprocess(vetoSubscriber);
-      es.publish("IceCream.Chocolate", "DoubleDip");
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());
-      AnnotationProcessor.unprocess(subscriber);
-      es.publish("IceCream.Chocolate", "DoubleDip");
-      assertEquals(2, AnnotatedEventSubscriber.getTimesCalled());      
-      System.out.println(subscriber);
-   }
-
-   public void testIssue15MultipleAnnotatedSubscribers() {
-      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-      AnnotatedVetoSubscriber vetoSubscriber = new AnnotatedVetoSubscriber();
-      AnnotationProcessor.process(vetoSubscriber);
-      AnnotationProcessor.process(subscriber);
-      AnotherAnnotatedEventSubscriber anotherSubscriber = new AnotherAnnotatedEventSubscriber();
-      AnnotationProcessor.process(anotherSubscriber);
-      EventBus.publish(Arrays.asList("foo"));
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnotherAnnotatedEventSubscriber.getTimesCalled());
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(1, AnotherAnnotatedEventSubscriber.getTimesCalled());
-      EDTUtil.waitForEDT();
-      System.out.println(subscriber);
-      System.out.println(anotherSubscriber);
-   }
-
-   public void testAnotherIssue15MultipleAnnotatedSubscribers() {
-      EventBus.clearAllSubscribers();
-      System.gc();
-      Issue15Subscriber i15s1 = new Issue15Subscriber();
-      Issue15Subscriber2 i15s2 = new Issue15Subscriber2();
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(1, i15s2.getTimesCalled());
-      assertEquals(1, i15s1.getTimesCalled());
-      //Ensure the garbage collector can't clean up the refs
-      System.out.println(i15s1);
-      System.out.println(i15s2);
-   }
-
-   //This one works with the DoubleAnnotatedEventSubscriber and AnotherDoubleAnnotatedEventSubscriber (and Single),
-   //but fails with AnnotatedEventSubscriber and AnotherAnnotatedEventSubscriber
-   public void testYetAnotherIssue15MultipleAnnotatedSubscribers() {
-      EventBus.clearAllSubscribers();
-      System.gc();
-      DoubleAnnotatedEventSubscriber subscriber = new DoubleAnnotatedEventSubscriber();
-      AnnotationProcessor.process(subscriber);
-      DoubleAnnotatedEventSubscriber secondSubscriber = new DoubleAnnotatedEventSubscriber();
-      AnnotationProcessor.process(secondSubscriber);
-      AnotherDoubleAnnotatedEventSubscriber anotherSubscriber = new AnotherDoubleAnnotatedEventSubscriber();
-      AnnotationProcessor.process(anotherSubscriber);
-      AnotherDoubleAnnotatedEventSubscriber secondAnotherSubscriber = new AnotherDoubleAnnotatedEventSubscriber();
-      AnnotationProcessor.process(secondAnotherSubscriber);
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(2, AnotherDoubleAnnotatedEventSubscriber.getTimesCalled());
-      assertEquals(2, DoubleAnnotatedEventSubscriber.getTimesCalled());
-      //Ensure the garbage collector can't clean up the refs
-      System.out.println("finished with:"+subscriber);
-      System.out.println("finished with:"+secondSubscriber);
-      System.out.println("finished with:"+anotherSubscriber);
-   }
-
-//Would like to test this, but an exception isn't thrown, since you want all the subscribers to be called
-//even if calling any one throws an exception
-//   public void testTopicWrongType() {
-//      AnnotatedEventSubscriber subscriber = new AnnotatedEventSubscriber();
-//      AnnotationProcessor.process(subscriber);
-//      EventService es = EventServiceLocator.getEventService("IteratorService");
-//      try {
-//         es.publish("Iterator", "foo");
-//         fail("Should get an IllegalArgumentException");
-//      } catch (Exception ex) {
-//      }
-//   }      
-
-   public void testRuntimeTopicSubscriber() {
-	   SubscriberForTesting runtimeTopicSubscriber = Factory.newRuntimeTopicSubscriber("foo");
-	   EventBus.publish("foo", new ArrayList<String>());
-	   EDTUtil.waitForEDT();
-	   assertEquals(1, runtimeTopicSubscriber.getTimesCalled());
-   }
-
-   public void testRuntimeTopicPatternSubscriber() {
-	   SubscriberForTesting runtimeTopicSubscriber = Factory.newRuntimeTopicPatternSubscriber("hope.*");
-	   EventBus.publish("hope_and_change", new ArrayList<String>());
-	   EDTUtil.waitForEDT();
-	   assertEquals(1, runtimeTopicSubscriber.getTimesCalled());
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java b/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java
deleted file mode 100644
index 2d1b19f44..000000000
--- a/src/test/java/org/scijava/event/bushe/annotation/TestSubscriberAnnotationMemoryLeaks.java
+++ /dev/null
@@ -1,336 +0,0 @@
-package org.scijava.event.bushe.annotation;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JComponent;
-
-import junit.framework.TestCase;
-
-import org.scijava.event.bushe.CleanupEvent;
-import org.scijava.event.bushe.EDTUtil;
-import org.scijava.event.bushe.EventBus;
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventSubscriber;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
-public class TestSubscriberAnnotationMemoryLeaks extends TestCase {
-   Random rand = new Random();
-   
-   public void setUp() {
-      EventBus.getGlobalEventService();
-      EventBus.clearAllSubscribers();
-      System.gc();
-   }
-
-   public void testStrongClassAnnotatedEventSubscriber() {
-      StrongClassAnnotatedEventSubscriber subscriber = new StrongClassAnnotatedEventSubscriber();
-      AnnotationProcessor.process(subscriber);
-      StrongClassAnnotatedEventSubscriber.setTimesCalled(0);
-      assertEquals(0, StrongClassAnnotatedEventSubscriber.getTimesCalled());
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(1, StrongClassAnnotatedEventSubscriber.getTimesCalled());
-      subscriber = null;
-      System.gc();
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(2, StrongClassAnnotatedEventSubscriber.getTimesCalled());
-      List subscribers = EventBus.getSubscribers(List.class);
-      assertEquals(1, subscribers.size());
-      //I can unsubscribe without ever explicitly subscribing
-      EventBus.unsubscribe(List.class, (org.scijava.event.bushe.EventSubscriber) subscribers.get(0));
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(2, StrongClassAnnotatedEventSubscriber.getTimesCalled());
-      subscribers = EventBus.getSubscribers(List.class);
-      assertEquals(0, subscribers.size());
-   }
-
-   public void testWeakClassAnnotatedEventSubscriber() {
-      WeakClassAnnotatedEventSubscriber subscriber = new WeakClassAnnotatedEventSubscriber();
-      AnnotationProcessor.process(subscriber);
-      WeakClassAnnotatedEventSubscriber.setTimesCalled(0);
-      assertEquals(0, WeakClassAnnotatedEventSubscriber.getTimesCalled());
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
-
-      subscriber = null;
-      System.gc();
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
-      List subscribers = EventBus.getSubscribers(List.class);
-      assertEquals(0, subscribers.size());
-   }
-
-   public void testWeakClassAnnotatedEventSubscriberUnsubscription() {
-      WeakClassAnnotatedEventSubscriber subscriber = new WeakClassAnnotatedEventSubscriber();
-      AnnotationProcessor.process(subscriber);
-      WeakClassAnnotatedEventSubscriber.setTimesCalled(0);
-      assertEquals(0, WeakClassAnnotatedEventSubscriber.getTimesCalled());
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
-
-      EventBus.unsubscribe(List.class, subscriber);
-
-      subscriber = null;
-      System.gc();
-      EventBus.publish(new ArrayList());
-      EDTUtil.waitForEDT();
-      assertEquals(1, WeakClassAnnotatedEventSubscriber.getTimesCalled());
-      List subscribers = EventBus.getSubscribers(List.class);
-      assertEquals(0, subscribers.size());
-   }
-   
-   public void testCleanup() {
-      final int cleanStartThreshold = 100;
-      final long period = 5000L;
-      final int stopThreshold = 10;
-      EventService es = new ThreadSafeEventService(cleanStartThreshold, stopThreshold,period);
-      CleanupEventSubscriber cleanupEventSubscriber = new CleanupEventSubscriber();
-      es.subscribe(CleanupEvent.class, cleanupEventSubscriber);
-      //Go right up to the edge, but don't cross it.
-      Object[] subscribers = new Object[cleanStartThreshold];
-      for (int i = 0; i < cleanStartThreshold -2; i++) {
-         subscribers[i] = createSubscriber(es);
-         //these should have no effect 
-         es.subscribeStrongly(List.class, new DummySubscriber());
-      }
-      es.publish(new ArrayList());
-      try {
-         Thread.sleep(100);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(0, cleanupEventSubscriber.events.size());
-      
-      //Go over the edge, cleanup should start
-      subscribers[cleanStartThreshold-1] = createSubscriber(es);
-      try {
-         Thread.sleep(1000);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      
-      //There are no stale refs yet, should have tried cleaning, but not done it.
-      assertEquals(3, cleanupEventSubscriber.events.size()); 
-      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(0).getStatus());
-      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(1).getStatus());
-      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(2).getStatus());
-      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(0).getTotalWeakRefsAndProxies());
-      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(1).getTotalWeakRefsAndProxies());
-      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(2).getTotalWeakRefsAndProxies());
-      assertEquals(new Integer(0), cleanupEventSubscriber.events.get(2).getNumStaleSubscribersCleaned());
-
-      //Does it run again after the interval (exactly once more)?
-      try {
-         Thread.sleep(250+period);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(6, cleanupEventSubscriber.events.size()); 
-      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(3).getStatus());
-      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(4).getStatus());
-      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(5).getStatus());
-      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(3).getTotalWeakRefsAndProxies());
-      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(4).getTotalWeakRefsAndProxies());
-      assertTrue(cleanStartThreshold == cleanupEventSubscriber.events.get(5).getTotalWeakRefsAndProxies());
-      assertEquals(new Integer(0), cleanupEventSubscriber.events.get(5).getNumStaleSubscribersCleaned());
-
-      //Now make some stale
-      int numberToMakeStale = 10;
-      for (int i = 0; i < numberToMakeStale; i++) {
-         subscribers[i] = null;
-      }
-      System.gc();
-      try {
-         Thread.sleep(100);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      //Period has not yet pass, should not expect a cleaning yet.
-      assertEquals(6, cleanupEventSubscriber.events.size()); 
-
-      //After period, stale refs should be cleaned
-      try {
-         Thread.sleep(period);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(9, cleanupEventSubscriber.events.size()); 
-      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(6).getStatus());
-      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(7).getStatus());
-      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(8).getStatus());
-      assertEquals((int)cleanStartThreshold, (int)cleanupEventSubscriber.events.get(6).getTotalWeakRefsAndProxies());
-      assertEquals((int)cleanStartThreshold, (int)cleanupEventSubscriber.events.get(7).getTotalWeakRefsAndProxies());
-      assertEquals((int)(cleanStartThreshold - numberToMakeStale), (int)cleanupEventSubscriber.events.get(8).getTotalWeakRefsAndProxies());
-      assertEquals((int)numberToMakeStale, (int)cleanupEventSubscriber.events.get(8).getNumStaleSubscribersCleaned());      
-
-      //Now make so many stale that it gets below the stop threshold
-      int numberAlreadyStale = numberToMakeStale;
-      numberToMakeStale = cleanStartThreshold - stopThreshold;
-      for (int i = numberAlreadyStale; i < numberToMakeStale; i++) {
-         subscribers[i] = null;
-      }
-      System.gc();
-      //After period, stale refs should be cleaned
-      try {
-         Thread.sleep(period);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(12, cleanupEventSubscriber.events.size()); 
-      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(9).getStatus());
-      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(10).getStatus());
-      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(11).getStatus());
-      assertEquals((int)cleanStartThreshold-numberAlreadyStale, (int)cleanupEventSubscriber.events.get(9).getTotalWeakRefsAndProxies());
-      assertEquals((int)cleanStartThreshold-numberAlreadyStale, (int)cleanupEventSubscriber.events.get(10).getTotalWeakRefsAndProxies());
-      assertEquals((int)(cleanStartThreshold - numberToMakeStale), (int)cleanupEventSubscriber.events.get(11).getTotalWeakRefsAndProxies());
-      assertEquals((int)numberToMakeStale, (int)cleanupEventSubscriber.events.get(11).getNumStaleSubscribersCleaned()+numberAlreadyStale);      
-
-      //After period, next cleaning run should tell us that cleaning is stopped
-      try {
-         Thread.sleep(period);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(14, cleanupEventSubscriber.events.size()); 
-      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(12).getStatus());
-      assertEquals(CleanupEvent.Status.UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, cleanupEventSubscriber.events.get(13).getStatus());
-      assertEquals((int)cleanStartThreshold-numberToMakeStale, (int)cleanupEventSubscriber.events.get(12).getTotalWeakRefsAndProxies());
-      assertEquals((int)cleanStartThreshold-numberToMakeStale, (int)cleanupEventSubscriber.events.get(13).getTotalWeakRefsAndProxies());
-      assertEquals(null, cleanupEventSubscriber.events.get(13).getNumStaleSubscribersCleaned());      
-
-      //After period, no more cleaning should be done
-      try {
-         Thread.sleep(period);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(14, cleanupEventSubscriber.events.size()); 
-
-      es.clearAllSubscribers();
-      es.subscribe(CleanupEvent.class, cleanupEventSubscriber);
-
-      //Go back over the limit and the cleaning should restart
-      for (int i = 0; i < cleanStartThreshold-1; i++) {
-         subscribers[i] = createSubscriber(es);
-      }
-      subscribers[99] = createSubscriber(es);
-      System.out.println("Cleanup should be starting");
-      try {
-         Thread.sleep(250);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(17, cleanupEventSubscriber.events.size()); 
-      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(14).getStatus());
-      assertEquals(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, cleanupEventSubscriber.events.get(15).getStatus());
-      assertEquals(CleanupEvent.Status.FINISHED_CLEANING, cleanupEventSubscriber.events.get(16).getStatus());
-      assertEquals(0, (int)cleanupEventSubscriber.events.get(16).getNumStaleSubscribersCleaned());      
-
-      es.clearAllSubscribers();
-      es.subscribe(CleanupEvent.class, cleanupEventSubscriber);
-      try {
-         Thread.sleep(period);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(19, cleanupEventSubscriber.events.size()); 
-      assertEquals(CleanupEvent.Status.STARTING, cleanupEventSubscriber.events.get(17).getStatus());
-      assertEquals(CleanupEvent.Status.UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, cleanupEventSubscriber.events.get(18).getStatus());
-      assertEquals(null, cleanupEventSubscriber.events.get(18).getNumStaleSubscribersCleaned());      
-
-      //After period, no more cleaning should be done
-      try {
-         Thread.sleep(period);
-      } catch (InterruptedException ex) {
-         Logger.getLogger(TestSubscriberAnnotationMemoryLeaks.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      assertEquals(19, cleanupEventSubscriber.events.size());       
-   }
-   
-   private Object createSubscriber(EventService es) {
-      Object result = null;
-      int randNum = rand.nextInt(2);
-      if (randNum == 0) {
-         //class
-         randNum = rand.nextInt(2);
-         if (true || randNum == 0) {
-            //normal
-            result = new DummySubscriber();
-            Class subscriptionClass = null;
-            randNum = rand.nextInt(3);
-            switch (randNum) {
-            case 0: subscriptionClass = List.class; break;
-            case 1: subscriptionClass = String.class;break;
-            case 2: subscriptionClass = JComponent.class;break;
-            }
-            es.subscribe(subscriptionClass, (EventSubscriber)result);
-         } else {
-            //annotated
-            result = new AnnotatedDummySubscriber();            
-            AnnotationProcessor.process(result);
-         }
-      } else {
-         //topic
-         randNum = rand.nextInt(2);
-         if (true || randNum == 0) {
-            //normal
-            result = new DummyTopicSubscriber();
-            String topic = null;
-            randNum = rand.nextInt(3);
-            switch (randNum) {
-            case 0: topic = "Lis"; break;
-            case 1: topic = "Strin";break;
-            case 2: topic = "JCompon";break;
-            }
-            es.subscribe(topic, (org.scijava.event.bushe.EventTopicSubscriber)result);
-         } else {
-            //annotated
-            result = new AnnotatedTopicDummySubscriber();            
-            AnnotationProcessor.process(result);
-         }
-      }
-      return result;
-   }
-
-   private class CleanupEventSubscriber implements EventSubscriber<CleanupEvent> {
-
-      public List<CleanupEvent> events = new ArrayList<CleanupEvent>();
-
-      public CleanupEventSubscriber() {
-      }
-
-      public void onEvent(CleanupEvent event) {
-         this.events.add(event);
-      }
-   }
-
-   private static class DummySubscriber implements EventSubscriber<List> {
-      public void onEvent(List list) {
-      }      
-   }
-   
-   private static class DummyTopicSubscriber implements org.scijava.event.bushe.EventTopicSubscriber {
-      public void onEvent(String topic, Object data) {
-      }
-   }
-   
-   private static class AnnotatedDummySubscriber  {
-      @org.scijava.event.bushe.annotation.EventSubscriber(eventClass=List.class)
-      public void foo(Object event) {
-      }      
-   }   
-
-   private static class AnnotatedTopicDummySubscriber  {
-      @EventTopicSubscriber(topic="bar")
-      public void foo(Object event) {
-      }      
-   }   
-}

From 66c98fd04ac917f1050f2955866468fa31bbe4e5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 11:50:00 -0500
Subject: [PATCH 1101/1208] Move all org.bushe:eventbus code into one package

So that we can more easily decrease the visibility of these classes.
---
 .../scijava/event/DefaultEventService.java    |   8 +-
 .../java/org/scijava/event/EventHandler.java  |   2 +-
 .../org/scijava/event/EventSubscriber.java    |   2 +-
 .../AbstractProxySubscriber.java              |   6 +-
 .../{annotation => }/AnnotationProcessor.java |   7 +-
 .../{annotation => }/BaseProxySubscriber.java |   7 +-
 .../bushe/ContainerEventServiceRegistrar.java |  16 +--
 .../org/scijava/event/bushe/EventBus.java     |  52 +++----
 .../org/scijava/event/bushe/EventService.java |  58 ++++----
 .../scijava/event/bushe/EventSubscriber.java  | 121 +++++++++++++----
 .../EventTopicPatternSubscriber.java          |   6 +-
 .../event/bushe/EventTopicSubscriber.java     | 122 +++++++++++++----
 .../scijava/event/bushe/IEventSubscriber.java |  35 +++++
 .../event/bushe/IEventTopicSubscriber.java    |  38 ++++++
 .../bushe/PrioritizedEventSubscriber.java     |   4 +-
 .../PrioritizedEventTopicSubscriber.java      |   4 +-
 .../scijava/event/bushe/ProxySubscriber.java  |   2 -
 .../ProxyTopicPatternSubscriber.java          |   4 +-
 .../ProxyTopicSubscriber.java                 |   7 +-
 .../{annotation => }/ReferenceStrength.java   |   2 +-
 .../RuntimeTopicEventSubscriber.java          |   6 +-
 .../RuntimeTopicPatternEventSubscriber.java   |   6 +-
 .../event/bushe/SubscriberTimingEvent.java    |   6 +-
 .../bushe/{exception => }/SwingException.java |   2 +-
 .../event/bushe/ThreadSafeEventService.java   |  84 ++++++------
 .../bushe/{generics => }/TypeReference.java   |   2 +-
 ...heClassOfTheAnnotatedMethodsParameter.java |   2 +-
 .../VetoRuntimeTopicPatternSubscriber.java    |   6 +-
 .../VetoRuntimeTopicSubscriber.java           |   6 +-
 .../{annotation => }/VetoSubscriber.java      |   6 +-
 .../VetoTopicPatternSubscriber.java           |   6 +-
 .../{annotation => }/VetoTopicSubscriber.java |   6 +-
 .../bushe/annotation/EventSubscriber.java     | 110 ---------------
 .../annotation/EventTopicSubscriber.java      | 108 ---------------
 .../{annotation => }/AbstractSubscriber.java  |   2 +-
 .../AnnotatedEventSubscriber.java             |   4 +-
 .../AnnotatedVetoSubscriber.java              |   4 +-
 .../AnotherAnnotatedEventSubscriber.java      |   4 +-
 ...AnotherDoubleAnnotatedEventSubscriber.java |   4 +-
 .../scijava/event/bushe/BadEventService.java  |   4 +-
 .../{annotation => }/ConcreteSubscriber.java  |   2 +-
 .../{generics => }/DataRequestEvent.java      |   2 +-
 .../DoubleAnnotatedEventSubscriber.java       |   4 +-
 .../{annotation/runtime => }/Factory.java     |   2 +-
 .../{generics => }/GenericReflection.java     |   2 +-
 .../{annotation => }/Issue15Subscriber.java   |   7 +-
 .../{annotation => }/Issue15Subscriber2.java  |   6 +-
 .../event/bushe/{annotation => }/MyData.java  |   2 +-
 .../RuntimeTopicPatternSubscriber.java        |   5 +-
 .../runtime => }/RuntimeTopicSubscriber.java  |   5 +-
 .../StrongAnnotatedEventSubscriber.java       |   2 +-
 .../StrongClassAnnotatedEventSubscriber.java  |   2 +-
 .../event/bushe/SubscriberForTest.java        |   2 +-
 .../runtime => }/SubscriberForTesting.java    |   2 +-
 .../TestAnnotationInAbstractClass.java        |   4 +-
 .../bushe/TestContainerEventService.java      |   8 +-
 .../event/bushe/TestDefaultEventService.java  |  69 +++++-----
 .../scijava/event/bushe/TestEventAction.java  |  12 +-
 .../org/scijava/event/bushe/TestEventBus.java |  36 ++---
 .../event/bushe/TestEventBusServiceClass.java |   2 +-
 .../TestEventBusServiceClassBadType.java      |   2 +-
 .../event/bushe/TestEventBusTiming.java       |  20 +--
 .../scijava/event/bushe/TestPerformance.java  |   4 +-
 .../bushe/TestPrioritizedSubscribers.java     | 128 +++++++++---------
 .../event/bushe/TestPublicationStates.java    |   2 +-
 .../event/bushe/TopicSubscriberForTest.java   |   2 +-
 .../WeakClassAnnotatedEventSubscriber.java    |   2 +-
 67 files changed, 563 insertions(+), 654 deletions(-)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/AbstractProxySubscriber.java (97%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/AnnotationProcessor.java (99%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/BaseProxySubscriber.java (96%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/EventTopicPatternSubscriber.java (86%)
 create mode 100644 src/main/java/org/scijava/event/bushe/IEventSubscriber.java
 create mode 100644 src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
 rename src/main/java/org/scijava/event/bushe/{annotation => }/ProxyTopicPatternSubscriber.java (97%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/ProxyTopicSubscriber.java (96%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/ReferenceStrength.java (77%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/RuntimeTopicEventSubscriber.java (86%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/RuntimeTopicPatternEventSubscriber.java (87%)
 rename src/main/java/org/scijava/event/bushe/{exception => }/SwingException.java (99%)
 rename src/main/java/org/scijava/event/bushe/{generics => }/TypeReference.java (97%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/UseTheClassOfTheAnnotatedMethodsParameter.java (94%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/VetoRuntimeTopicPatternSubscriber.java (88%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/VetoRuntimeTopicSubscriber.java (87%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/VetoSubscriber.java (93%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/VetoTopicPatternSubscriber.java (92%)
 rename src/main/java/org/scijava/event/bushe/{annotation => }/VetoTopicSubscriber.java (92%)
 delete mode 100644 src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java
 rename src/test/java/org/scijava/event/bushe/{annotation => }/AbstractSubscriber.java (94%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/AnnotatedEventSubscriber.java (95%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/AnnotatedVetoSubscriber.java (95%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/AnotherAnnotatedEventSubscriber.java (91%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/AnotherDoubleAnnotatedEventSubscriber.java (91%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/ConcreteSubscriber.java (90%)
 rename src/test/java/org/scijava/event/bushe/{generics => }/DataRequestEvent.java (75%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/DoubleAnnotatedEventSubscriber.java (87%)
 rename src/test/java/org/scijava/event/bushe/{annotation/runtime => }/Factory.java (85%)
 rename src/test/java/org/scijava/event/bushe/{generics => }/GenericReflection.java (98%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/Issue15Subscriber.java (87%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/Issue15Subscriber2.java (88%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/MyData.java (89%)
 rename src/test/java/org/scijava/event/bushe/{annotation/runtime => }/RuntimeTopicPatternSubscriber.java (77%)
 rename src/test/java/org/scijava/event/bushe/{annotation/runtime => }/RuntimeTopicSubscriber.java (76%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/StrongAnnotatedEventSubscriber.java (93%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/StrongClassAnnotatedEventSubscriber.java (92%)
 rename src/test/java/org/scijava/event/bushe/{annotation/runtime => }/SubscriberForTesting.java (56%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/TestAnnotationInAbstractClass.java (80%)
 rename src/test/java/org/scijava/event/bushe/{annotation => }/WeakClassAnnotatedEventSubscriber.java (92%)

diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index e82d844a5..c5717d8a9 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -40,10 +40,10 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.scijava.event.bushe.annotation.AbstractProxySubscriber;
-import org.scijava.event.bushe.annotation.BaseProxySubscriber;
-import org.scijava.event.bushe.annotation.ReferenceStrength;
 import org.scijava.Priority;
+import org.scijava.event.bushe.AbstractProxySubscriber;
+import org.scijava.event.bushe.BaseProxySubscriber;
+import org.scijava.event.bushe.ReferenceStrength;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
@@ -263,7 +263,7 @@ private synchronized void keepIt(final Object o, final ProxySubscriber<?> subscr
 	 * Helper class used by {@link #subscribe(Object)}.
 	 * <p>
 	 * Recapitulates some logic from {@link BaseProxySubscriber}, because that
-	 * class implements {@link org.scijava.event.bushe.EventSubscriber} as a raw
+	 * class implements {@link org.scijava.event.bushe.IEventSubscriber} as a raw
 	 * type, which is incompatible with this class implementing SciJava's
 	 * {@link EventSubscriber} as a typed interface; it becomes impossible to
 	 * implement both {@code onEvent(Object)} and {@code onEvent(E)}.
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 27e0d7bbc..55f4b3a6f 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -40,7 +40,7 @@
  * handling methods and annotating each with @{@link EventHandler}.
  * <p>
  * Note to developers: This annotation serves exactly the same purpose as
- * EventBus's {@link org.scijava.event.bushe.annotation.EventSubscriber}
+ * EventBus's {@link org.scijava.event.bushe.EventSubscriber}
  * annotation, recapitulating a subset of the same functionality. We do this to
  * avoid third party code depending directly on EventBus. That is, we do not
  * wish to require SciJava developers to {@code import org.scijava.event.bushe.*}
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index a36181639..a25ba2c1a 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -44,7 +44,7 @@
  * @param <E> Type of event for which to listen
  */
 public interface EventSubscriber<E extends SciJavaEvent> extends
-	org.scijava.event.bushe.EventSubscriber<E>
+	org.scijava.event.bushe.IEventSubscriber<E>
 {
 
 	@Override
diff --git a/src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java b/src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java
similarity index 97%
rename from src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java
rename to src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java
index f7a7a84f2..f0db8aac1 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/AbstractProxySubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java
@@ -1,14 +1,10 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.InvocationTargetException;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.ProxySubscriber;
-import org.scijava.event.bushe.Prioritized;
-
 /**
  * Common base class for EventService Proxies.
  * <p>
diff --git a/src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java b/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
similarity index 99%
rename from src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java
rename to src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
index 2a9810322..22ae777ac 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -6,11 +6,6 @@
 import java.util.regex.Pattern;
 import java.util.Arrays;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceExistsException;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.Logger;
-
 /**
  * Enhances classes that use EventService Annotations.
  * <p/>
diff --git a/src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java b/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
similarity index 96%
rename from src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java
rename to src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
index f877d35e2..8c8ccd6ae 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/BaseProxySubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
@@ -1,14 +1,11 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.VetoEventListener;
-
 /** A class is subscribed to an EventService on behalf of another object. */
 public class BaseProxySubscriber extends AbstractProxySubscriber
-        implements org.scijava.event.bushe.EventSubscriber, VetoEventListener {
+        implements org.scijava.event.bushe.IEventSubscriber, VetoEventListener {
    private Class subscriptionClass;
 
    /**
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
index 5825dd664..d75de00c3 100644
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
@@ -37,10 +37,10 @@
  */
 public class ContainerEventServiceRegistrar {
    private JComponent jComp;
-   private EventSubscriber eventSubscriber;
+   private IEventSubscriber eventSubscriber;
    private VetoEventListener vetoSubscriber;
    private Class[] eventClasses;
-   private EventTopicSubscriber eventTopicSubscriber;
+   private IEventTopicSubscriber eventTopicSubscriber;
    private VetoTopicEventListener vetoTopicSubscriber;
    private String[] topics;
    private EventService containerEventService;
@@ -63,7 +63,7 @@ public ContainerEventServiceRegistrar(JComponent jComp) {
     * @param eventSubscriber the subscriber to register to the Container EventServer
     * @param eventClasses the class(es) to register for
     */
-   public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, Class... eventClasses) {
+   public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, Class... eventClasses) {
       this(jComp, eventSubscriber, null, eventClasses, null, null, null);
    }
 
@@ -75,7 +75,7 @@ public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSub
     * @param eventTopicSubscriber the topic subscriber to register to the Container EventServer
     * @param topics the event topic name to register for
     */
-   public ContainerEventServiceRegistrar(JComponent jComp, EventTopicSubscriber eventTopicSubscriber, String... topics) {
+   public ContainerEventServiceRegistrar(JComponent jComp, IEventTopicSubscriber eventTopicSubscriber, String... topics) {
       this(jComp, null, null, null, eventTopicSubscriber, null, topics);
    }
 
@@ -113,8 +113,8 @@ public ContainerEventServiceRegistrar(JComponent jComp, VetoTopicEventListener v
      * @param eventTopicSubscriber the topic subscriber to keep registered to the topic(s)
      * @param topics the event topic names to register for
      */
-    public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, Class[] eventClasses,
-            EventTopicSubscriber eventTopicSubscriber, String[] topics) {
+    public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, Class[] eventClasses,
+            IEventTopicSubscriber eventTopicSubscriber, String[] topics) {
         this(jComp, eventSubscriber, null, eventClasses, eventTopicSubscriber, null, topics);
     }
 
@@ -130,8 +130,8 @@ public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSub
     * @param vetoTopicSubscriber a veto subscriber for the topics
     * @param topics the event topic names to register for
     */
-   public ContainerEventServiceRegistrar(JComponent jComp, EventSubscriber eventSubscriber, VetoEventListener vetoSubscriber,
-           Class[] eventClasses, EventTopicSubscriber eventTopicSubscriber, VetoTopicEventListener vetoTopicSubscriber,
+   public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, VetoEventListener vetoSubscriber,
+           Class[] eventClasses, IEventTopicSubscriber eventTopicSubscriber, VetoTopicEventListener vetoTopicSubscriber,
            String[] topics) {
       this.jComp = jComp;
       this.eventSubscriber = eventSubscriber;
diff --git a/src/main/java/org/scijava/event/bushe/EventBus.java b/src/main/java/org/scijava/event/bushe/EventBus.java
index 846d96820..7a01fc2bd 100644
--- a/src/main/java/org/scijava/event/bushe/EventBus.java
+++ b/src/main/java/org/scijava/event/bushe/EventBus.java
@@ -74,68 +74,68 @@ public static void publish(Type genericType, Object o) {
    }
 
 
-   /** @see EventService#subscribe(Class,EventSubscriber) */
-   public static boolean subscribe(Class eventClass, EventSubscriber subscriber) {
+   /** @see EventService#subscribe(Class,IEventSubscriber) */
+   public static boolean subscribe(Class eventClass, IEventSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribe(eventClass, subscriber);
    }
 
-   /** @see EventService#subscribe(java.lang.reflect.Type, EventSubscriber)  */
-   public static boolean subscribe(Type genericType, EventSubscriber subscriber) {
+   /** @see EventService#subscribe(java.lang.reflect.Type, IEventSubscriber)  */
+   public static boolean subscribe(Type genericType, IEventSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribe(genericType, subscriber);
    }
 
-   /** @see EventService#subscribeExactly(Class,EventSubscriber) */
-   public static boolean subscribeExactly(Class eventClass, EventSubscriber subscriber) {
+   /** @see EventService#subscribeExactly(Class,IEventSubscriber) */
+   public static boolean subscribeExactly(Class eventClass, IEventSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribeExactly(eventClass, subscriber);
    }
 
-   /** @see EventService#subscribe(String,EventTopicSubscriber) */
-   public static boolean subscribe(String topic, EventTopicSubscriber subscriber) {
+   /** @see EventService#subscribe(String,IEventTopicSubscriber) */
+   public static boolean subscribe(String topic, IEventTopicSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribe(topic, subscriber);
    }
 
-   /** @see EventService#subscribe(Pattern,EventTopicSubscriber) */
-   public static boolean subscribe(Pattern topicPattern, EventTopicSubscriber subscriber) {
+   /** @see EventService#subscribe(Pattern,IEventTopicSubscriber) */
+   public static boolean subscribe(Pattern topicPattern, IEventTopicSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribe(topicPattern, subscriber);
    }
 
-   /** @see EventService#subscribeStrongly(Class,EventSubscriber) */
-   public static boolean subscribeStrongly(Class eventClass, EventSubscriber subscriber) {
+   /** @see EventService#subscribeStrongly(Class,IEventSubscriber) */
+   public static boolean subscribeStrongly(Class eventClass, IEventSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribeStrongly(eventClass, subscriber);
    }
 
-   /** @see EventService#subscribeExactlyStrongly(Class,EventSubscriber) */
-   public static boolean subscribeExactlyStrongly(Class eventClass, EventSubscriber subscriber) {
+   /** @see EventService#subscribeExactlyStrongly(Class,IEventSubscriber) */
+   public static boolean subscribeExactlyStrongly(Class eventClass, IEventSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribeExactlyStrongly(eventClass, subscriber);
    }
 
-   /** @see EventService#subscribeStrongly(String,EventTopicSubscriber) */
-   public static boolean subscribeStrongly(String topic, EventTopicSubscriber subscriber) {
+   /** @see EventService#subscribeStrongly(String,IEventTopicSubscriber) */
+   public static boolean subscribeStrongly(String topic, IEventTopicSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribeStrongly(topic, subscriber);
    }
 
-   /** @see EventService#subscribeStrongly(Pattern,EventTopicSubscriber) */
-   public static boolean subscribeStrongly(Pattern topicPattern, EventTopicSubscriber subscriber) {
+   /** @see EventService#subscribeStrongly(Pattern,IEventTopicSubscriber) */
+   public static boolean subscribeStrongly(Pattern topicPattern, IEventTopicSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().subscribeStrongly(topicPattern, subscriber);
    }
 
-   /** @see EventService#unsubscribe(Class,EventSubscriber) */
-   public static boolean unsubscribe(Class eventClass, EventSubscriber subscriber) {
+   /** @see EventService#unsubscribe(Class,IEventSubscriber) */
+   public static boolean unsubscribe(Class eventClass, IEventSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().unsubscribe(eventClass, subscriber);
    }
 
-   /** @see EventService#unsubscribeExactly(Class,EventSubscriber) */
-   public static boolean unsubscribeExactly(Class eventClass, EventSubscriber subscriber) {
+   /** @see EventService#unsubscribeExactly(Class,IEventSubscriber) */
+   public static boolean unsubscribeExactly(Class eventClass, IEventSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().unsubscribeExactly(eventClass, subscriber);
    }
 
-   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
-   public static boolean unsubscribe(String topic, EventTopicSubscriber subscriber) {
+   /** @see EventService#unsubscribe(String,IEventTopicSubscriber) */
+   public static boolean unsubscribe(String topic, IEventTopicSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().unsubscribe(topic, subscriber);
    }
 
-   /** @see EventService#unsubscribe(Pattern,EventTopicSubscriber) */
-   public static boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber subscriber) {
+   /** @see EventService#unsubscribe(Pattern,IEventTopicSubscriber) */
+   public static boolean unsubscribe(Pattern topicPattern, IEventTopicSubscriber subscriber) {
       return EventServiceLocator.getEventBusService().unsubscribe(topicPattern, subscriber);
    }
 
diff --git a/src/main/java/org/scijava/event/bushe/EventService.java b/src/main/java/org/scijava/event/bushe/EventService.java
index 8bbc69fa3..6ead66e96 100644
--- a/src/main/java/org/scijava/event/bushe/EventService.java
+++ b/src/main/java/org/scijava/event/bushe/EventService.java
@@ -23,17 +23,17 @@
  * The core interface.  An EventService provides publish/subscribe services to a single JVM using Class-based and
  * String-based (i.e. "topic") publications and subscriptions.
  * <p/>
- * In class-based pub/sub, {@link EventSubscriber}s subscribe to a type on an {@link EventService}, such
+ * In class-based pub/sub, {@link IEventSubscriber}s subscribe to a type on an {@link EventService}, such
  * as the {@link org.scijava.event.bushe.EventBus}, by providing a class, interface or generic type.  The EventService
  * notifies subscribers when objects are published on the EventService with a matching type.  Full class semantics are
  * respected.  That is, if a subscriber subscribes to a class, the subscriber is notified if an object of
  * that class is publish or if an object of a subclass of that class is published. Likewise if a subscriber subscribes
  * to an interface, it will be notified if any object that implements that interface is published.  Subscribers can
- * subscribe "exactly" using  {@link #subscribeExactly(Class, EventSubscriber)} so that they are notified only if an
+ * subscribe "exactly" using  {@link #subscribeExactly(Class, IEventSubscriber)} so that they are notified only if an
  * object of the exact class is published (and will not be notified if subclasses are published, since this would not
  * be "exact")
  * <p/>
- * In topic-based pub/sub, an object "payload" is published on a topic name (String).  {@link EventTopicSubscriber}s subscribe
+ * In topic-based pub/sub, an object "payload" is published on a topic name (String).  {@link IEventTopicSubscriber}s subscribe
  * to either the exact name of the topic or they may subscribe using a Regular Expression that is used to match topic
  * names.
  * <p/>
@@ -112,8 +112,8 @@
  * @see {@link ThreadSafeEventService} for the default implementation
  * @see {@link SwingEventService} for the Swing-safe implementation
  * @see {@link EventBus} for simple access to the Swing-safe implementation
- * @see {@link org.scijava.event.bushe.annotation.EventSubscriber} for subscription annotations
- * @see {@link org.scijava.event.bushe.annotation.EventTopicSubscriber} for subscription annotations
+ * @see {@link org.scijava.event.bushe.IEventSubscriber} for subscription annotations
+ * @see {@link org.scijava.event.bushe.IEventTopicSubscriber} for subscription annotations
  */
 public interface EventService {
 
@@ -127,10 +127,10 @@ public interface EventService {
 
    /**
     * Use this method to publish generified objects to subscribers of Types, i.e. subscribers that use
-    * {@link #subscribe(Type, EventSubscriber)}, and to publish to subscribers of the non-generic type.
+    * {@link #subscribe(Type, IEventSubscriber)}, and to publish to subscribers of the non-generic type.
     * <p>
     * Due to generic type erasure, the type must be supplied by the caller.  You can get a declared object's
-    * type by using the {@link org.scijava.event.bushe.generics.TypeReference} class.  For Example:
+    * type by using the {@link org.scijava.event.bushe.TypeReference} class.  For Example:
     * <pre>
     * TypeReference&#60;List&#60;Trade&#62;&#62; subscribingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
     * EventBus.subscribe(subscribingTypeReference.getType(), mySubscriber);
@@ -181,14 +181,14 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribe(Class eventClass, EventSubscriber subscriber);
+   public boolean subscribe(Class eventClass, IEventSubscriber subscriber);
 
   /** 
    * Subscribe an EventSubscriber to publication of generic Types.
    * Subscribers will only be notified for publications using  {@link #publish(java.lang.reflect.Type, Object)}.
    * <p>
    * Due to generic type erasure, the type must be supplied by the publisher.  You can get a declared object's
-   * type by using the {@link org.scijava.event.bushe.generics.TypeReference} class.  For Example:
+   * type by using the {@link org.scijava.event.bushe.TypeReference} class.  For Example:
    * <pre>
    * TypeReference&#60;List&#60;Trade&#62;&#62; subscribingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
    * EventBus.subscribe(subscribingTypeReference.getType(), mySubscriber);
@@ -206,7 +206,7 @@ public interface EventService {
    * @param subscriber the subscriber to the type
    * @return true if a new subscription is made, false if it already existed
    */
-   public boolean subscribe(Type type, EventSubscriber subscriber);
+   public boolean subscribe(Type type, IEventSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of objects exactly matching a type.  Only a <b>WeakReference</b>
@@ -227,7 +227,7 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeExactly(Class eventClass, EventSubscriber subscriber);
+   public boolean subscribeExactly(Class eventClass, IEventSubscriber subscriber);
 
    /**
     * Subscribes an EventTopicSubscriber to the publication of a topic name.  Only a <b>WeakReference</b>
@@ -247,7 +247,7 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribe(String topic, EventTopicSubscriber subscriber);
+   public boolean subscribe(String topic, IEventTopicSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of all the topic names that match a RegEx Pattern.  Only a
@@ -267,67 +267,67 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribe(Pattern topicPattern, EventTopicSubscriber subscriber);
+   public boolean subscribe(Pattern topicPattern, IEventTopicSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type.
     * <p/>
-    * The semantics are the same as {@link #subscribe(Class, EventSubscriber)}, except that the EventService holds
+    * The semantics are the same as {@link #subscribe(Class, IEventSubscriber)}, except that the EventService holds
     * a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(Class,IEventSubscriber)}  is called.
     *
     * @param eventClass the class of published objects to listen to
     * @param subscriber The subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeStrongly(Class eventClass, EventSubscriber subscriber);
+   public boolean subscribeStrongly(Class eventClass, IEventSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type exactly.
     * <p/>
-    * The semantics are the same as {@link #subscribeExactly(Class, EventSubscriber)}, except that the EventService
+    * The semantics are the same as {@link #subscribeExactly(Class, IEventSubscriber)}, except that the EventService
     * holds a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(Class,IEventSubscriber)}  is called.
     *
     * @param eventClass the class of published objects to listen to
     * @param subscriber The subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeExactlyStrongly(Class eventClass, EventSubscriber subscriber);
+   public boolean subscribeExactlyStrongly(Class eventClass, IEventSubscriber subscriber);
 
    /**
     * Subscribes a subscriber to an event topic name.
     * <p/>
-    * The semantics are the same as {@link #subscribe(String, EventTopicSubscriber)}, except that the EventService
+    * The semantics are the same as {@link #subscribe(String, IEventTopicSubscriber)}, except that the EventService
     * holds a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(String,IEventTopicSubscriber)}  is called.
     *
     * @param topic the name of the topic listened to
     * @param subscriber The topic subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeStrongly(String topic, EventTopicSubscriber subscriber);
+   public boolean subscribeStrongly(String topic, IEventTopicSubscriber subscriber);
 
    /**
     * Subscribes a subscriber to all the event topic names that match a RegEx expression.
     * <p/>
-    * The semantics are the same as {@link #subscribe(java.util.regex.Pattern, EventTopicSubscriber)}, except that the
+    * The semantics are the same as {@link #subscribe(java.util.regex.Pattern, IEventTopicSubscriber)}, except that the
     * EventService holds a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(String,IEventTopicSubscriber)}  is called.
     *
     * @param topicPattern the name of the topic listened to
     * @param subscriber The topic subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeStrongly(Pattern topicPattern, EventTopicSubscriber subscriber);
+   public boolean subscribeStrongly(Pattern topicPattern, IEventTopicSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to a class.
@@ -337,7 +337,7 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribe(Class eventClass, EventSubscriber subscriber);
+   public boolean unsubscribe(Class eventClass, IEventSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to an exact class.
@@ -347,7 +347,7 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribeExactly(Class eventClass, EventSubscriber subscriber);
+   public boolean unsubscribeExactly(Class eventClass, IEventSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to an event topic.
@@ -357,7 +357,7 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribe(String topic, EventTopicSubscriber subscriber);
+   public boolean unsubscribe(String topic, IEventTopicSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to event topics via a Pattern.
@@ -367,7 +367,7 @@ public interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber subscriber);
+   public boolean unsubscribe(Pattern topicPattern, IEventTopicSubscriber subscriber);
 
    /**
     * Subscribes a VetoEventListener to publication of event matching a class.  Only a <b>WeakReference</b> to the 
diff --git a/src/main/java/org/scijava/event/bushe/EventSubscriber.java b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
index 03e8f9227..1a1e89d34 100644
--- a/src/main/java/org/scijava/event/bushe/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
@@ -1,35 +1,106 @@
+package org.scijava.event.bushe;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 /**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ * An Annotation for subscribing to EventService Events.
+ * <p>
+ * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Events.
+ * <p>
+ * Instead of this:
+ * <pre>
+ * public class MyAppController implements EventSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe(AppClosingEvent.class, this);
+ *   }
+ *   public void onEvent(EventServiceEvent event) {
+ *      AppClosingEvent appClosingEvent = (AppClosingEvent)event;
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * You can do this:
+ * <pre>
+ * public class MyAppController {  //no interface necessary
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//if not using AOP
+ *   }
+ *   &#64;EventSubscriber
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {//Use your own method name with typesafety
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * <p>
+ * That's pretty good, but when the controller does more, annotations are even nicer.
+ * <pre>
+ * public class MyAppController implements EventSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe(AppStartingEvent.class, this);
+ *      EventBus.subscribe(AppClosingEvent.class, this);
+ *   }
+ *   public void onEvent(EventServiceEvent event) {
+ *      //wicked bad pattern, but we have to this
+ *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
+ *      if (event instanceof AppStartingEvent) {
+ *         onAppStartingEvent((AppStartingEvent)event);
+ *      } else (event instanceof AppClosingEvent) {
+ *         onAppStartingEvent((AppClosingEvent)event);
+ *      }
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   }
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
+ *      //do something
+ *   }
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * You can do this:
+ * <pre>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventSubscriber(eventClass=AppStartingEvent.class)
+ *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
+ *      //do something
+ *   }
+ *   &#64;EventSubscriber(eventClass=AppAppClosingEvent.class)
+ *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * Brief, clear, and easy.
  */
-package org.scijava.event.bushe;
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface EventSubscriber {
+   /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
+   Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
 
-/**
- * Callback interface for class-based subscribers of an {@link EventService}.
- *
- * @author Michael Bushe michael@bushe.com
- */
-public interface EventSubscriber<T> {
+   /** Determines the order in which this subscriber is called, default is FIFO.*/
+   int priority() default 0;
+
+   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
+   boolean exact() default false;
+
+   /** Whether to subscribe weakly or strongly. */
+   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
 
    /**
-    * Handle a published event. <p>The EventService calls this method on each publication of an object that matches the
-    * class or interface passed to one of the EventService's class-based subscribe methods, specifically, {@link
-    * EventService#subscribe(Class,EventSubscriber)} {@link EventService#subscribeExactly(Class,EventSubscriber)}
-    * {@link EventService#subscribeStrongly(Class,EventSubscriber)} and {@link EventService#subscribeExactlyStrongly(Class,
-    *EventSubscriber)}.
-    *
-    * @param event The Object that is being published.
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
     */
-   public void onEvent(T event);
+   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
 }
diff --git a/src/main/java/org/scijava/event/bushe/annotation/EventTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
similarity index 86%
rename from src/main/java/org/scijava/event/bushe/annotation/EventTopicPatternSubscriber.java
rename to src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
index 3611d2c79..8be245312 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/EventTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
@@ -1,14 +1,10 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface EventTopicPatternSubscriber {
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
index dbcd8bd87..f47a64ca8 100644
--- a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
@@ -1,38 +1,104 @@
+package org.scijava.event.bushe;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 /**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ * An Annotation for subscribing to EventService Topics.
+ * <p>
+ * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Topics.
+ * <p>
+ * Instead of this:
+ * <pre>
+ * public class MyAppController implements EventTopicSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe("AppClosing", this);
+ *   }
+ *   public void onEvent(String topic, Object data) {
+ *      JComponent source = (JComponent)data;
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * You can do this:
+ * <pre>
+ * public class MyAppController {  //no interface necessary
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
+ *   public void onAppClosing(String topic, Object data) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * <p>
+ * That's pretty good, but when the controller does more, annotations are even nicer.
+ * <pre>
+ * public class MyAppController implements EventTopicSubscriber {
+ *   public MyAppController {
+ *      EventBus.subscribe("AppStartingEvent", this);
+ *      EventBus.subscribe("AppClosingEvent", this);
+ *   }
+ *   public void onEvent(String topic, Object data) {
+ *      //wicked bad pattern, but we have to this
+ *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
+ *      if ("AppStartingEvent".equals(topic)) {
+ *         onAppStartingEvent((JComponent)data);
+ *      } else ("AppClosingEvent".equals(topic)) {
+ *         onAppClosingEvent((JComponet)data);
+ *      }
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   }
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   public void onAppStartingEvent(JComponent requestor) {
+ *      //do something
+ *   }
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *   public void onAppClosingEvent(JComponent requestor) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * Instead of all that, you can do this:
+ * <pre>
+ * public class MyAppController {
+ *   public MyAppController {
+ *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
+ *   }
+ *   &#64;EventTopicSubscriber{topic="AppStartingEvent"}
+ *   public void onAppStartingEvent(Object data) {
+ *      //do something
+ *   }
+ *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
+ *   public void onAppClosingEvent(Foo data) {
+ *      //do something
+ *   }
+ * }
+ * </pre>
+ * Brief, clear, and easy.
  */
-package org.scijava.event.bushe;
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface EventTopicSubscriber {
+   /** The topic to subscribe to */
+   String topic();
 
-/**
- * Callback interface for topic-based subscribers of an {@link EventService}.
- *
- * @author Michael Bushe michael@bushe.com
- */
-public interface EventTopicSubscriber<T> {
+   /** Whether to subscribe weakly or strongly. */
+   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+
+   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
+   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+
+   /** Determines the order in which this subscriber is called, default is FIFO.*/
+   int priority() default 0;
 
    /**
-    * Handle an event published on a topic.
-    * <p/>
-    * The EventService calls this method on each publication on a matching topic name passed to one of the
-    * EventService's topic-based subscribe methods, specifically, {@link EventService#subscribe(String,
-    *EventTopicSubscriber)} {@link EventService#subscribe(java.util.regex.Pattern,EventTopicSubscriber)} {@link
-    * EventService#subscribeStrongly(String,EventTopicSubscriber)} and {@link EventService#subscribeStrongly(java.util.regex.Pattern,
-    *EventTopicSubscriber)}.
-    *
-    * @param topic the name of the topic published on
-    * @param data the data object published on the topic
+    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
+    * service needs to be created, it must have a default constructor.
     */
-   public void onEvent(String topic, T data);
+   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
 }
diff --git a/src/main/java/org/scijava/event/bushe/IEventSubscriber.java b/src/main/java/org/scijava/event/bushe/IEventSubscriber.java
new file mode 100644
index 000000000..26556c25b
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/IEventSubscriber.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Callback interface for class-based subscribers of an {@link EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface IEventSubscriber<T> {
+
+   /**
+    * Handle a published event. <p>The EventService calls this method on each publication of an object that matches the
+    * class or interface passed to one of the EventService's class-based subscribe methods, specifically, {@link
+    * EventService#subscribe(Class,EventSubscriber)} {@link EventService#subscribeExactly(Class,EventSubscriber)}
+    * {@link EventService#subscribeStrongly(Class,EventSubscriber)} and {@link EventService#subscribeExactlyStrongly(Class,
+    *EventSubscriber)}.
+    *
+    * @param event The Object that is being published.
+    */
+   public void onEvent(T event);
+}
diff --git a/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
new file mode 100644
index 000000000..6a99f5f30
--- /dev/null
+++ b/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scijava.event.bushe;
+
+/**
+ * Callback interface for topic-based subscribers of an {@link EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface IEventTopicSubscriber<T> {
+
+   /**
+    * Handle an event published on a topic.
+    * <p/>
+    * The EventService calls this method on each publication on a matching topic name passed to one of the
+    * EventService's topic-based subscribe methods, specifically, {@link EventService#subscribe(String,
+    *EventTopicSubscriber)} {@link EventService#subscribe(java.util.regex.Pattern,EventTopicSubscriber)} {@link
+    * EventService#subscribeStrongly(String,EventTopicSubscriber)} and {@link EventService#subscribeStrongly(java.util.regex.Pattern,
+    *EventTopicSubscriber)}.
+    *
+    * @param topic the name of the topic published on
+    * @param data the data object published on the topic
+    */
+   public void onEvent(String topic, T data);
+}
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
index ea90a6425..8ebe233c7 100644
--- a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
@@ -2,7 +2,7 @@
 
 /**
  * This is a convenience interface, particularly for inner classes, that implements
- * {@link EventSubscriber} and {@link Prioritized}.
+ * {@link IEventSubscriber} and {@link Prioritized}.
  */
-public interface PrioritizedEventSubscriber extends EventSubscriber, Prioritized {
+public interface PrioritizedEventSubscriber extends IEventSubscriber, Prioritized {
 }
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
index 821259dec..63732799e 100644
--- a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
@@ -2,7 +2,7 @@
 
 /**
  * This is a convenience interface, particularly for inner classes, that implements
- * {@link org.scijava.event.bushe.EventTopicSubscriber} and {@link org.scijava.event.bushe.Prioritized}.
+ * {@link org.scijava.event.bushe.IEventTopicSubscriber} and {@link org.scijava.event.bushe.Prioritized}.
  */
-public interface PrioritizedEventTopicSubscriber extends EventTopicSubscriber, Prioritized {
+public interface PrioritizedEventTopicSubscriber extends IEventTopicSubscriber, Prioritized {
 }
\ No newline at end of file
diff --git a/src/main/java/org/scijava/event/bushe/ProxySubscriber.java b/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
index 23ecaf8a0..a80cc3bf1 100644
--- a/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
@@ -15,8 +15,6 @@
  */
 package org.scijava.event.bushe;
 
-import org.scijava.event.bushe.annotation.ReferenceStrength;
-
 /**
  * An interface that can be implemented when proxies are used for subscription, not needed in normal usage.  When an
  * unsubscribe method is called on an EventService, the EventService is required to check if any of subscribed objects
diff --git a/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
similarity index 97%
rename from src/main/java/org/scijava/event/bushe/annotation/ProxyTopicPatternSubscriber.java
rename to src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
index c3a65d33d..478665f25 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
@@ -1,10 +1,8 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.reflect.Method;
 import java.util.regex.Pattern;
 
-import org.scijava.event.bushe.EventService;
-
 /**
  * A Proxy Subscriber for Annotations that use topic patterns
  */
diff --git a/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
similarity index 96%
rename from src/main/java/org/scijava/event/bushe/annotation/ProxyTopicSubscriber.java
rename to src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
index 8b900c8fe..d2699b465 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/ProxyTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
@@ -1,18 +1,15 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.VetoTopicEventListener;
-
 /** A class that subscribes to an EventService on behalf of another object.
  * This class is not used directly (though you could), but rather through the use of the
  * {@link @org.scijava.event.bushe.annotation.EventTopicSubscriber}.  Advanced EventBus
  * users could use this class in Aspect-Oriented code.  Consider using the
  * {@link AnnotationProcessor} instead, it may suit your needs and be easier.*/
 public class ProxyTopicSubscriber extends AbstractProxySubscriber
-        implements org.scijava.event.bushe.EventTopicSubscriber, VetoTopicEventListener {
+        implements org.scijava.event.bushe.IEventTopicSubscriber, VetoTopicEventListener {
    private String topic;
 
    /**
diff --git a/src/main/java/org/scijava/event/bushe/annotation/ReferenceStrength.java b/src/main/java/org/scijava/event/bushe/ReferenceStrength.java
similarity index 77%
rename from src/main/java/org/scijava/event/bushe/annotation/ReferenceStrength.java
rename to src/main/java/org/scijava/event/bushe/ReferenceStrength.java
index 739255b3f..15e7a7eb5 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/ReferenceStrength.java
+++ b/src/main/java/org/scijava/event/bushe/ReferenceStrength.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 /**
  * The two kinds of references that are used in the EventBus.
diff --git a/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
similarity index 86%
rename from src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicEventSubscriber.java
rename to src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
index fb54e4432..878f2eb7c 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicEventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
@@ -1,13 +1,9 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /**
  * A subscriber to a topic that is determined at runtime.
  */
diff --git a/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicPatternEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
similarity index 87%
rename from src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicPatternEventSubscriber.java
rename to src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
index 8e92cf22d..168574556 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/RuntimeTopicPatternEventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
@@ -1,14 +1,10 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface RuntimeTopicPatternEventSubscriber {
diff --git a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
index 41dee9629..6bfaef918 100644
--- a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
+++ b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
@@ -27,7 +27,7 @@ public class SubscriberTimingEvent extends AbstractEventServiceEvent {
    private Long end;
    private Long timeLimitMilliseconds;
    private Object event;
-   private EventSubscriber subscriber;
+   private IEventSubscriber subscriber;
    private VetoEventListener vetoEventListener;
    private String stringified;
 
@@ -44,7 +44,7 @@ public class SubscriberTimingEvent extends AbstractEventServiceEvent {
     * @param vetoEventListener the vetoEventListener that took too long, can be null if the eventListener is not null
     */
    public SubscriberTimingEvent(Object source, Long start, Long end, Long timeLimitMilliseconds,
-           Object event, EventSubscriber subscriber, VetoEventListener vetoEventListener) {
+           Object event, IEventSubscriber subscriber, VetoEventListener vetoEventListener) {
       super(source);
       this.start = start;
       this.end = end;
@@ -91,7 +91,7 @@ public Object getEvent() {
     * @return subscriber the event subscriber that went over the time limit, can be null if vetoEventListener is not
     *         null
     */
-   public EventSubscriber getSubscriber() {
+   public IEventSubscriber getSubscriber() {
       return subscriber;
    }
 
diff --git a/src/main/java/org/scijava/event/bushe/exception/SwingException.java b/src/main/java/org/scijava/event/bushe/SwingException.java
similarity index 99%
rename from src/main/java/org/scijava/event/bushe/exception/SwingException.java
rename to src/main/java/org/scijava/event/bushe/SwingException.java
index dfc3a048d..68249e45a 100644
--- a/src/main/java/org/scijava/event/bushe/exception/SwingException.java
+++ b/src/main/java/org/scijava/event/bushe/SwingException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scijava.event.bushe.exception;
+package org.scijava.event.bushe;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
index 4f78f02a7..1a0dcf585 100644
--- a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -34,8 +34,6 @@
 import java.util.regex.Pattern;
 
 import org.scijava.event.bushe.Logger.Level;
-import org.scijava.event.bushe.annotation.ReferenceStrength;
-import org.scijava.event.bushe.exception.SwingException;
 
 /**
  * A thread-safe EventService implementation.
@@ -250,7 +248,7 @@ public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication,
       this.timeThresholdForEventTimingEventPublication = timeThresholdForEventTimingEventPublication;
       if (subscribeTimingEventsInternally) {
          //Listen to timing events and log them
-         subscribeStrongly(SubscriberTimingEvent.class, new EventSubscriber() {
+         subscribeStrongly(SubscriberTimingEvent.class, new IEventSubscriber() {
             public void onEvent(Object event) {
                subscribeTiming((SubscriberTimingEvent) event);
             }
@@ -334,8 +332,8 @@ public void setCleanupPeriodMS(Long cleanupPeriodMS) {
       }
    }
 
-   /** @see EventService#subscribe(Class,EventSubscriber) */
-   public boolean subscribe(Class cl, EventSubscriber eh) {
+   /** @see EventService#subscribe(Class,IEventSubscriber) */
+   public boolean subscribe(Class cl, IEventSubscriber eh) {
       if (cl == null) {
          throw new IllegalArgumentException("Event class must not be null");
       }
@@ -345,16 +343,16 @@ public boolean subscribe(Class cl, EventSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing by class, class:" + cl + ", subscriber:" + eh);
       }
-      return subscribe(cl, subscribersByEventClass, new WeakReference<EventSubscriber>(eh));
+      return subscribe(cl, subscribersByEventClass, new WeakReference<IEventSubscriber>(eh));
    }
 
-   /** @see EventService#subscribe(java.lang.reflect.Type, EventSubscriber) */
-   public boolean subscribe(Type type, EventSubscriber eh) {
-      return subscribe(type, subscribersByEventType, new WeakReference<EventSubscriber>(eh));
+   /** @see EventService#subscribe(java.lang.reflect.Type, IEventSubscriber) */
+   public boolean subscribe(Type type, IEventSubscriber eh) {
+      return subscribe(type, subscribersByEventType, new WeakReference<IEventSubscriber>(eh));
    }
 
-   /** @see EventService#subscribeExactly(Class,EventSubscriber) */
-   public boolean subscribeExactly(Class cl, EventSubscriber eh) {
+   /** @see EventService#subscribeExactly(Class,IEventSubscriber) */
+   public boolean subscribeExactly(Class cl, IEventSubscriber eh) {
       if (cl == null) {
          throw new IllegalArgumentException("Event class must not be null");
       }
@@ -364,11 +362,11 @@ public boolean subscribeExactly(Class cl, EventSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing by class, class:" + cl + ", subscriber:" + eh);
       }
-      return subscribe(cl, subscribersByExactEventClass, new WeakReference<EventSubscriber>(eh));
+      return subscribe(cl, subscribersByExactEventClass, new WeakReference<IEventSubscriber>(eh));
    }
 
-   /** @see EventService#subscribe(String,EventTopicSubscriber) */
-   public boolean subscribe(String topic, EventTopicSubscriber eh) {
+   /** @see EventService#subscribe(String,IEventTopicSubscriber) */
+   public boolean subscribe(String topic, IEventTopicSubscriber eh) {
       if (topic == null) {
          throw new IllegalArgumentException("Topic must not be null");
       }
@@ -378,11 +376,11 @@ public boolean subscribe(String topic, EventTopicSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing by topic name, name:" + topic + ", subscriber:" + eh);
       }
-      return subscribe(topic, subscribersByTopic, new WeakReference<EventTopicSubscriber>(eh));
+      return subscribe(topic, subscribersByTopic, new WeakReference<IEventTopicSubscriber>(eh));
    }
 
-   /** @see EventService#subscribe(Pattern,EventTopicSubscriber) */
-   public boolean subscribe(Pattern pat, EventTopicSubscriber eh) {
+   /** @see EventService#subscribe(Pattern,IEventTopicSubscriber) */
+   public boolean subscribe(Pattern pat, IEventTopicSubscriber eh) {
       if (pat == null) {
          throw new IllegalArgumentException("Pattern must not be null");
       }
@@ -393,11 +391,11 @@ public boolean subscribe(Pattern pat, EventTopicSubscriber eh) {
          LOG.debug("Subscribing by pattern, pattern:" + pat + ", subscriber:" + eh);
       }
       PatternWrapper patternWrapper = new PatternWrapper(pat);
-      return subscribe(patternWrapper, subscribersByTopicPattern, new WeakReference<EventTopicSubscriber>(eh));
+      return subscribe(patternWrapper, subscribersByTopicPattern, new WeakReference<IEventTopicSubscriber>(eh));
    }
 
-   /** @see EventService#subscribeStrongly(Class,EventSubscriber) */
-   public boolean subscribeStrongly(Class cl, EventSubscriber eh) {
+   /** @see EventService#subscribeStrongly(Class,IEventSubscriber) */
+   public boolean subscribeStrongly(Class cl, IEventSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing weakly by class, class:" + cl + ", subscriber:" + eh);
       }
@@ -407,8 +405,8 @@ public boolean subscribeStrongly(Class cl, EventSubscriber eh) {
       return subscribe(cl, subscribersByEventClass, eh);
    }
 
-   /** @see EventService#subscribeExactlyStrongly(Class,EventSubscriber) */
-   public boolean subscribeExactlyStrongly(Class cl, EventSubscriber eh) {
+   /** @see EventService#subscribeExactlyStrongly(Class,IEventSubscriber) */
+   public boolean subscribeExactlyStrongly(Class cl, IEventSubscriber eh) {
       if (cl == null) {
          throw new IllegalArgumentException("Event class must not be null");
       }
@@ -421,8 +419,8 @@ public boolean subscribeExactlyStrongly(Class cl, EventSubscriber eh) {
       return subscribe(cl, subscribersByExactEventClass, eh);
    }
 
-   /** @see EventService#subscribeStrongly(String,EventTopicSubscriber) */
-   public boolean subscribeStrongly(String name, EventTopicSubscriber eh) {
+   /** @see EventService#subscribeStrongly(String,IEventTopicSubscriber) */
+   public boolean subscribeStrongly(String name, IEventTopicSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing weakly by topic name, name:" + name + ", subscriber:" + eh);
       }
@@ -432,8 +430,8 @@ public boolean subscribeStrongly(String name, EventTopicSubscriber eh) {
       return subscribe(name, subscribersByTopic, eh);
    }
 
-   /** @see EventService#subscribeStrongly(Pattern,EventTopicSubscriber) */
-   public boolean subscribeStrongly(Pattern pat, EventTopicSubscriber eh) {
+   /** @see EventService#subscribeStrongly(Pattern,IEventTopicSubscriber) */
+   public boolean subscribeStrongly(Pattern pat, IEventTopicSubscriber eh) {
       if (pat == null) {
          throw new IllegalArgumentException("Pattern must not be null");
       }
@@ -675,30 +673,30 @@ protected boolean subscribe(final Object classTopicOrPatternWrapper, final Map<O
       }
    }
 
-   /** @see EventService#unsubscribe(Class,EventSubscriber) */
-   public boolean unsubscribe(Class cl, EventSubscriber eh) {
+   /** @see EventService#unsubscribe(Class,IEventSubscriber) */
+   public boolean unsubscribe(Class cl, IEventSubscriber eh) {
       return unsubscribe(cl, subscribersByEventClass, eh);
    }
 
-   /** @see EventService#unsubscribeExactly(Class,EventSubscriber) */
-   public boolean unsubscribeExactly(Class cl, EventSubscriber eh) {
+   /** @see EventService#unsubscribeExactly(Class,IEventSubscriber) */
+   public boolean unsubscribeExactly(Class cl, IEventSubscriber eh) {
       return unsubscribe(cl, subscribersByExactEventClass, eh);
    }
 
-   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
-   public boolean unsubscribe(String name, EventTopicSubscriber eh) {
+   /** @see EventService#unsubscribe(String,IEventTopicSubscriber) */
+   public boolean unsubscribe(String name, IEventTopicSubscriber eh) {
       return unsubscribe(name, subscribersByTopic, eh);
    }
 
-   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
-   public boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber eh) {
+   /** @see EventService#unsubscribe(String,IEventTopicSubscriber) */
+   public boolean unsubscribe(Pattern topicPattern, IEventTopicSubscriber eh) {
       PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
       return unsubscribe(patternWrapper, subscribersByTopicPattern, eh);
    }
 
    /** @see EventService#unsubscribe(Class,Object) */
    public boolean unsubscribe(Class eventClass, Object subscribedByProxy) {
-      EventSubscriber subscriber = (EventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
+      IEventSubscriber subscriber = (IEventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -708,7 +706,7 @@ public boolean unsubscribe(Class eventClass, Object subscribedByProxy) {
 
    /** @see EventService#unsubscribeExactly(Class,Object) */
    public boolean unsubscribeExactly(Class eventClass, Object subscribedByProxy) {
-      EventSubscriber subscriber = (EventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
+      IEventSubscriber subscriber = (IEventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -718,7 +716,7 @@ public boolean unsubscribeExactly(Class eventClass, Object subscribedByProxy) {
 
    /** @see EventService#unsubscribe(String,Object) */
    public boolean unsubscribe(String topic, Object subscribedByProxy) {
-      EventTopicSubscriber subscriber = (EventTopicSubscriber) getProxySubscriber(topic, subscribedByProxy);
+      IEventTopicSubscriber subscriber = (IEventTopicSubscriber) getProxySubscriber(topic, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -728,7 +726,7 @@ public boolean unsubscribe(String topic, Object subscribedByProxy) {
 
    /** @see EventService#unsubscribe(java.util.regex.Pattern,Object) */
    public boolean unsubscribe(Pattern pattern, Object subscribedByProxy) {
-      EventTopicSubscriber subscriber = (EventTopicSubscriber) getProxySubscriber(pattern, subscribedByProxy);
+      IEventTopicSubscriber subscriber = (IEventTopicSubscriber) getProxySubscriber(pattern, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -965,7 +963,7 @@ protected void publish(final Object event, final String topic, final Object even
          for (int i = 0; i < subscribers.size(); i++) {
             Object eh = subscribers.get(i);
             if (event != null) {
-               EventSubscriber eventSubscriber = (EventSubscriber) eh;
+               IEventSubscriber eventSubscriber = (IEventSubscriber) eh;
                long start = System.currentTimeMillis();
                try {
                   eventSubscriber.onEvent(event);
@@ -975,7 +973,7 @@ protected void publish(final Object event, final String topic, final Object even
                   handleException(event, e, callingStack, eventSubscriber);
                }
             } else {
-               EventTopicSubscriber eventTopicSubscriber = (EventTopicSubscriber) eh;
+               IEventTopicSubscriber eventTopicSubscriber = (IEventTopicSubscriber) eh;
                try {
                   eventTopicSubscriber.onEvent(topic, eventObj);
                } catch (Throwable e) {
@@ -1512,7 +1510,7 @@ private List getEventOrVetoSubscribersToType(Map typeMap, Type eventType) {
           */
    }
 
-   private void checkTimeLimit(long start, Object event, EventSubscriber subscriber, VetoEventListener l) {
+   private void checkTimeLimit(long start, Object event, IEventSubscriber subscriber, VetoEventListener l) {
       if (timeThresholdForEventTimingEventPublication == null) {
          return;
       }
@@ -1991,7 +1989,7 @@ protected void subscribeVetoException(final Object event, final String topic, fi
 
    /** Called during event handling exceptions, calls handleException */
    protected void onEventException(final String topic, final Object eventObj, Throwable e,
-           StackTraceElement[] callingStack, EventTopicSubscriber eventTopicSubscriber) {
+           StackTraceElement[] callingStack, IEventTopicSubscriber eventTopicSubscriber) {
       String str = "EventService topic subscriber:" + eventTopicSubscriber;
       if (eventTopicSubscriber != null) {
          str = str + ".  Subscriber class:" + eventTopicSubscriber.getClass();
@@ -2001,7 +1999,7 @@ protected void onEventException(final String topic, final Object eventObj, Throw
 
    /** Called during event handling exceptions, calls handleException */
    protected void handleException(final Object event, Throwable e,
-           StackTraceElement[] callingStack, EventSubscriber eventSubscriber) {
+           StackTraceElement[] callingStack, IEventSubscriber eventSubscriber) {
       String str = "EventService subscriber:" + eventSubscriber;
       if (eventSubscriber != null) {
          str = str + ".  Subscriber class:" + eventSubscriber.getClass();
diff --git a/src/main/java/org/scijava/event/bushe/generics/TypeReference.java b/src/main/java/org/scijava/event/bushe/TypeReference.java
similarity index 97%
rename from src/main/java/org/scijava/event/bushe/generics/TypeReference.java
rename to src/main/java/org/scijava/event/bushe/TypeReference.java
index 2befb0a41..1a40a5791 100644
--- a/src/main/java/org/scijava/event/bushe/generics/TypeReference.java
+++ b/src/main/java/org/scijava/event/bushe/TypeReference.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.generics;
+package org.scijava.event.bushe;
 
 import java.lang.reflect.Type;
 import java.lang.reflect.Constructor;
diff --git a/src/main/java/org/scijava/event/bushe/annotation/UseTheClassOfTheAnnotatedMethodsParameter.java b/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
similarity index 94%
rename from src/main/java/org/scijava/event/bushe/annotation/UseTheClassOfTheAnnotatedMethodsParameter.java
rename to src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
index dd7936fbd..ec1e35b60 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/UseTheClassOfTheAnnotatedMethodsParameter.java
+++ b/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 /**
  * This is a dummy class to get around a limitation with annotations.
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
similarity index 88%
rename from src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicPatternSubscriber.java
rename to src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
index 7c7d2870c..fb9fa479d 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
@@ -1,14 +1,10 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface VetoRuntimeTopicPatternSubscriber {
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
similarity index 87%
rename from src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicSubscriber.java
rename to src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
index 614de1382..04811518b 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/VetoRuntimeTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
@@ -1,13 +1,9 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /**
  * A veto subscriber to a topic that is determined at runtime.
  */
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
similarity index 93%
rename from src/main/java/org/scijava/event/bushe/annotation/VetoSubscriber.java
rename to src/main/java/org/scijava/event/bushe/VetoSubscriber.java
index 67e01db4b..22c86d8c9 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/VetoSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
@@ -1,14 +1,10 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /**
  * An Annotation for adding VetoListener subscriptions to EventService Events.
  * <p>
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
similarity index 92%
rename from src/main/java/org/scijava/event/bushe/annotation/VetoTopicPatternSubscriber.java
rename to src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
index 6fddb9b02..bf6e9134c 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/VetoTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
@@ -1,14 +1,10 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /**
  * An Annotation for adding VetoTopicPatternListener subscriptions to EventService Events.
  * <p>
diff --git a/src/main/java/org/scijava/event/bushe/annotation/VetoTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
similarity index 92%
rename from src/main/java/org/scijava/event/bushe/annotation/VetoTopicSubscriber.java
rename to src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
index 1ff069b69..630930660 100644
--- a/src/main/java/org/scijava/event/bushe/annotation/VetoTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
@@ -1,14 +1,10 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /**
  * An Annotation for adding VetoTopicListener subscriptions to EventService Events.
  * <p>
diff --git a/src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java
deleted file mode 100644
index e75b79568..000000000
--- a/src/main/java/org/scijava/event/bushe/annotation/EventSubscriber.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.scijava.event.bushe.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
-/**
- * An Annotation for subscribing to EventService Events.
- * <p>
- * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Events.
- * <p>
- * Instead of this:
- * <pre>
- * public class MyAppController implements EventSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe(AppClosingEvent.class, this);
- *   }
- *   public void onEvent(EventServiceEvent event) {
- *      AppClosingEvent appClosingEvent = (AppClosingEvent)event;
- *      //do something
- *   }
- * }
- * </pre>
- * You can do this:
- * <pre>
- * public class MyAppController {  //no interface necessary
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//if not using AOP
- *   }
- *   &#64;EventSubscriber
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {//Use your own method name with typesafety
- *      //do something
- *   }
- * }
- * </pre>
- * <p>
- * That's pretty good, but when the controller does more, annotations are even nicer.
- * <pre>
- * public class MyAppController implements EventSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe(AppStartingEvent.class, this);
- *      EventBus.subscribe(AppClosingEvent.class, this);
- *   }
- *   public void onEvent(EventServiceEvent event) {
- *      //wicked bad pattern, but we have to this
- *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
- *      if (event instanceof AppStartingEvent) {
- *         onAppStartingEvent((AppStartingEvent)event);
- *      } else (event instanceof AppClosingEvent) {
- *         onAppStartingEvent((AppClosingEvent)event);
- *      }
- *
- *   }
- *
- *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
- *      //do something
- *   }
- *
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
- *      //do something
- *   }
- * }
- * </pre>
- * You can do this:
- * <pre>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventSubscriber(eventClass=AppStartingEvent.class)
- *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
- *      //do something
- *   }
- *   &#64;EventSubscriber(eventClass=AppAppClosingEvent.class)
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
- *      //do something
- *   }
- * }
- * </pre>
- * Brief, clear, and easy.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface EventSubscriber {
-   /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
-   Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
-
-   /** Determines the order in which this subscriber is called, default is FIFO.*/
-   int priority() default 0;
-
-   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
-   boolean exact() default false;
-
-   /** Whether to subscribe weakly or strongly. */
-   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-   /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
-    */
-   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java
deleted file mode 100644
index 5f99c4895..000000000
--- a/src/main/java/org/scijava/event/bushe/annotation/EventTopicSubscriber.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.scijava.event.bushe.annotation;
-
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.scijava.event.bushe.EventService;
-import org.scijava.event.bushe.EventServiceLocator;
-import org.scijava.event.bushe.ThreadSafeEventService;
-
-/**
- * An Annotation for subscribing to EventService Topics.
- * <p>
- * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Topics.
- * <p>
- * Instead of this:
- * <pre>
- * public class MyAppController implements EventTopicSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe("AppClosing", this);
- *   }
- *   public void onEvent(String topic, Object data) {
- *      JComponent source = (JComponent)data;
- *      //do something
- *   }
- * }
- * </pre>
- * You can do this:
- * <pre>
- * public class MyAppController {  //no interface necessary
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
- *   public void onAppClosing(String topic, Object data) {
- *      //do something
- *   }
- * }
- * </pre>
- * <p>
- * That's pretty good, but when the controller does more, annotations are even nicer.
- * <pre>
- * public class MyAppController implements EventTopicSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe("AppStartingEvent", this);
- *      EventBus.subscribe("AppClosingEvent", this);
- *   }
- *   public void onEvent(String topic, Object data) {
- *      //wicked bad pattern, but we have to this
- *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
- *      if ("AppStartingEvent".equals(topic)) {
- *         onAppStartingEvent((JComponent)data);
- *      } else ("AppClosingEvent".equals(topic)) {
- *         onAppClosingEvent((JComponet)data);
- *      }
- *
- *   }
- *
- *   public void onAppStartingEvent(JComponent requestor) {
- *      //do something
- *   }
- *
- *   public void onAppClosingEvent(JComponent requestor) {
- *      //do something
- *   }
- * }
- * </pre>
- * Instead of all that, you can do this:
- * <pre>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventTopicSubscriber{topic="AppStartingEvent"}
- *   public void onAppStartingEvent(Object data) {
- *      //do something
- *   }
- *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
- *   public void onAppClosingEvent(Foo data) {
- *      //do something
- *   }
- * }
- * </pre>
- * Brief, clear, and easy.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface EventTopicSubscriber {
-   /** The topic to subscribe to */
-   String topic();
-
-   /** Whether to subscribe weakly or strongly. */
-   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-   /** Determines the order in which this subscriber is called, default is FIFO.*/
-   int priority() default 0;
-
-   /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
-    */
-   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AbstractSubscriber.java b/src/test/java/org/scijava/event/bushe/AbstractSubscriber.java
similarity index 94%
rename from src/test/java/org/scijava/event/bushe/annotation/AbstractSubscriber.java
rename to src/test/java/org/scijava/event/bushe/AbstractSubscriber.java
index 01f71125f..1666a0e20 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/AbstractSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/AbstractSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 /**
  * Intended to answer this post:
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/AnnotatedEventSubscriber.java
similarity index 95%
rename from src/test/java/org/scijava/event/bushe/annotation/AnnotatedEventSubscriber.java
rename to src/test/java/org/scijava/event/bushe/AnnotatedEventSubscriber.java
index 4e5db4945..182e26e7a 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/AnnotatedEventSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/AnnotatedEventSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.io.File;
 import java.util.Collection;
@@ -8,8 +8,6 @@
 import javax.swing.JComponent;
 import javax.swing.JToggleButton;
 
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /** Test class for class-based subscriptions */
 public class AnnotatedEventSubscriber {
    static int timesColorChanged = 0;
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnnotatedVetoSubscriber.java b/src/test/java/org/scijava/event/bushe/AnnotatedVetoSubscriber.java
similarity index 95%
rename from src/test/java/org/scijava/event/bushe/annotation/AnnotatedVetoSubscriber.java
rename to src/test/java/org/scijava/event/bushe/AnnotatedVetoSubscriber.java
index 6c82ec00f..817df28b7 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/AnnotatedVetoSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/AnnotatedVetoSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.io.File;
 import java.util.Collection;
@@ -8,8 +8,6 @@
 import javax.swing.JComponent;
 import javax.swing.JToggleButton;
 
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /** Test class for class-based subscriptions.
  * Does not like null, empty, red or cherry */
 public class AnnotatedVetoSubscriber {
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnotherAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/AnotherAnnotatedEventSubscriber.java
similarity index 91%
rename from src/test/java/org/scijava/event/bushe/annotation/AnotherAnnotatedEventSubscriber.java
rename to src/test/java/org/scijava/event/bushe/AnotherAnnotatedEventSubscriber.java
index de7a4c9f9..7f7f0c5e1 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/AnotherAnnotatedEventSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/AnotherAnnotatedEventSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.util.List;
 import java.util.Collection;
@@ -8,8 +8,6 @@
 import javax.swing.JToggleButton;
 import javax.swing.JComponent;
 
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /** Test class for class-based subscriptions */
 public class AnotherAnnotatedEventSubscriber {
    static int timesColorChanged = 0;
diff --git a/src/test/java/org/scijava/event/bushe/annotation/AnotherDoubleAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/AnotherDoubleAnnotatedEventSubscriber.java
similarity index 91%
rename from src/test/java/org/scijava/event/bushe/annotation/AnotherDoubleAnnotatedEventSubscriber.java
rename to src/test/java/org/scijava/event/bushe/AnotherDoubleAnnotatedEventSubscriber.java
index 92bdf0534..928b67428 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/AnotherDoubleAnnotatedEventSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/AnotherDoubleAnnotatedEventSubscriber.java
@@ -1,7 +1,7 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
-import java.util.List;
 import java.util.Collection;
+import java.util.List;
 
 /** Test class for class-based subscriptions */
 public class AnotherDoubleAnnotatedEventSubscriber {
diff --git a/src/test/java/org/scijava/event/bushe/BadEventService.java b/src/test/java/org/scijava/event/bushe/BadEventService.java
index 2046821a2..19cebe785 100644
--- a/src/test/java/org/scijava/event/bushe/BadEventService.java
+++ b/src/test/java/org/scijava/event/bushe/BadEventService.java
@@ -3,8 +3,8 @@
 public class BadEventService extends ThreadSafeEventService {
 
 
-   /** @see org.scijava.event.bushe.EventService#subscribe(String,org.scijava.event.bushe.EventTopicSubscriber) */
-   public boolean subscribe(String topic, EventTopicSubscriber eh) {
+   /** @see org.scijava.event.bushe.EventService#subscribe(String,org.scijava.event.bushe.IEventTopicSubscriber) */
+   public boolean subscribe(String topic, IEventTopicSubscriber eh) {
       throw new RuntimeException("For testing");
    }
 }
diff --git a/src/test/java/org/scijava/event/bushe/annotation/ConcreteSubscriber.java b/src/test/java/org/scijava/event/bushe/ConcreteSubscriber.java
similarity index 90%
rename from src/test/java/org/scijava/event/bushe/annotation/ConcreteSubscriber.java
rename to src/test/java/org/scijava/event/bushe/ConcreteSubscriber.java
index 701ce66b1..129d71987 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/ConcreteSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/ConcreteSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 /**
  * Intended to answer this post:
diff --git a/src/test/java/org/scijava/event/bushe/generics/DataRequestEvent.java b/src/test/java/org/scijava/event/bushe/DataRequestEvent.java
similarity index 75%
rename from src/test/java/org/scijava/event/bushe/generics/DataRequestEvent.java
rename to src/test/java/org/scijava/event/bushe/DataRequestEvent.java
index 3ff5b4952..236b44fa8 100644
--- a/src/test/java/org/scijava/event/bushe/generics/DataRequestEvent.java
+++ b/src/test/java/org/scijava/event/bushe/DataRequestEvent.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.generics;
+package org.scijava.event.bushe;
 
 import java.util.List;
 
diff --git a/src/test/java/org/scijava/event/bushe/annotation/DoubleAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/DoubleAnnotatedEventSubscriber.java
similarity index 87%
rename from src/test/java/org/scijava/event/bushe/annotation/DoubleAnnotatedEventSubscriber.java
rename to src/test/java/org/scijava/event/bushe/DoubleAnnotatedEventSubscriber.java
index f35ee065c..8448f28de 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/DoubleAnnotatedEventSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/DoubleAnnotatedEventSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.util.List;
 import java.util.Collection;
@@ -8,8 +8,6 @@
 import javax.swing.JToggleButton;
 import javax.swing.JComponent;
 
-import org.scijava.event.bushe.ThreadSafeEventService;
-
 /** Test class for class-based subscriptions */
 public class DoubleAnnotatedEventSubscriber {
 
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/Factory.java b/src/test/java/org/scijava/event/bushe/Factory.java
similarity index 85%
rename from src/test/java/org/scijava/event/bushe/annotation/runtime/Factory.java
rename to src/test/java/org/scijava/event/bushe/Factory.java
index 03a33214d..546c3fb49 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/runtime/Factory.java
+++ b/src/test/java/org/scijava/event/bushe/Factory.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation.runtime;
+package org.scijava.event.bushe;
 
 public class Factory {
 
diff --git a/src/test/java/org/scijava/event/bushe/generics/GenericReflection.java b/src/test/java/org/scijava/event/bushe/GenericReflection.java
similarity index 98%
rename from src/test/java/org/scijava/event/bushe/generics/GenericReflection.java
rename to src/test/java/org/scijava/event/bushe/GenericReflection.java
index 87e80c600..d3d2954b3 100644
--- a/src/test/java/org/scijava/event/bushe/generics/GenericReflection.java
+++ b/src/test/java/org/scijava/event/bushe/GenericReflection.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.generics;
+package org.scijava.event.bushe;
 
 import java.lang.reflect.TypeVariable;
 
diff --git a/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber.java b/src/test/java/org/scijava/event/bushe/Issue15Subscriber.java
similarity index 87%
rename from src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber.java
rename to src/test/java/org/scijava/event/bushe/Issue15Subscriber.java
index ed22bf8d2..8bb257efd 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber.java
+++ b/src/test/java/org/scijava/event/bushe/Issue15Subscriber.java
@@ -1,13 +1,8 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.util.List;
 import javax.swing.SwingUtilities;
 
-import org.scijava.event.bushe.annotation.AnnotationProcessor;
-import org.scijava.event.bushe.annotation.EventSubscriber;
-import org.scijava.event.bushe.annotation.EventTopicPatternSubscriber;
-import org.scijava.event.bushe.annotation.EventTopicSubscriber;
-
 /**
  *
  */
diff --git a/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber2.java b/src/test/java/org/scijava/event/bushe/Issue15Subscriber2.java
similarity index 88%
rename from src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber2.java
rename to src/test/java/org/scijava/event/bushe/Issue15Subscriber2.java
index 399542a86..5fbc7a162 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/Issue15Subscriber2.java
+++ b/src/test/java/org/scijava/event/bushe/Issue15Subscriber2.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -10,10 +10,6 @@
 import javax.swing.JDialog;
 import javax.swing.JTextField;
 
-import org.scijava.event.bushe.EventBus;
-import org.scijava.event.bushe.annotation.AnnotationProcessor;
-import org.scijava.event.bushe.annotation.EventSubscriber;
-
 /**
  *
  */
diff --git a/src/test/java/org/scijava/event/bushe/annotation/MyData.java b/src/test/java/org/scijava/event/bushe/MyData.java
similarity index 89%
rename from src/test/java/org/scijava/event/bushe/annotation/MyData.java
rename to src/test/java/org/scijava/event/bushe/MyData.java
index 5ff45afcf..43be650c8 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/MyData.java
+++ b/src/test/java/org/scijava/event/bushe/MyData.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 /**
  * Intended to answer this post:
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicPatternSubscriber.java b/src/test/java/org/scijava/event/bushe/RuntimeTopicPatternSubscriber.java
similarity index 77%
rename from src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicPatternSubscriber.java
rename to src/test/java/org/scijava/event/bushe/RuntimeTopicPatternSubscriber.java
index be306c337..01af68b6b 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicPatternSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/RuntimeTopicPatternSubscriber.java
@@ -1,10 +1,7 @@
-package org.scijava.event.bushe.annotation.runtime;
+package org.scijava.event.bushe;
 
 import java.util.List;
 
-import org.scijava.event.bushe.annotation.AnnotationProcessor;
-import org.scijava.event.bushe.annotation.RuntimeTopicPatternEventSubscriber;
-
 class RuntimeTopicPatternSubscriber implements SubscriberForTesting {
 	private final String topicPattern;
 	private long timesCalled;
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicSubscriber.java b/src/test/java/org/scijava/event/bushe/RuntimeTopicSubscriber.java
similarity index 76%
rename from src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicSubscriber.java
rename to src/test/java/org/scijava/event/bushe/RuntimeTopicSubscriber.java
index c751b2dce..5cb27936a 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/runtime/RuntimeTopicSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/RuntimeTopicSubscriber.java
@@ -1,7 +1,4 @@
-package org.scijava.event.bushe.annotation.runtime;
-
-import org.scijava.event.bushe.annotation.AnnotationProcessor;
-import org.scijava.event.bushe.annotation.RuntimeTopicEventSubscriber;
+package org.scijava.event.bushe;
 
 import java.util.List;
 
diff --git a/src/test/java/org/scijava/event/bushe/annotation/StrongAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/StrongAnnotatedEventSubscriber.java
similarity index 93%
rename from src/test/java/org/scijava/event/bushe/annotation/StrongAnnotatedEventSubscriber.java
rename to src/test/java/org/scijava/event/bushe/StrongAnnotatedEventSubscriber.java
index 6d611f5f8..8ff4b5ffe 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/StrongAnnotatedEventSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/StrongAnnotatedEventSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.io.File;
 
diff --git a/src/test/java/org/scijava/event/bushe/annotation/StrongClassAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/StrongClassAnnotatedEventSubscriber.java
similarity index 92%
rename from src/test/java/org/scijava/event/bushe/annotation/StrongClassAnnotatedEventSubscriber.java
rename to src/test/java/org/scijava/event/bushe/StrongClassAnnotatedEventSubscriber.java
index f2fc954a3..3894195a5 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/StrongClassAnnotatedEventSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/StrongClassAnnotatedEventSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/test/java/org/scijava/event/bushe/SubscriberForTest.java b/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
index 2fac88e57..4d683ce4f 100644
--- a/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
+++ b/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
@@ -6,7 +6,7 @@
  * @author Michael Bushe
  * @since Nov 19, 2005 11:01:06 PM
  */
-public class SubscriberForTest implements EventSubscriber {
+public class SubscriberForTest implements IEventSubscriber {
    private boolean throwException;
    private Long waitTime;
    private EBTestCounter testDefaultEventService;
diff --git a/src/test/java/org/scijava/event/bushe/annotation/runtime/SubscriberForTesting.java b/src/test/java/org/scijava/event/bushe/SubscriberForTesting.java
similarity index 56%
rename from src/test/java/org/scijava/event/bushe/annotation/runtime/SubscriberForTesting.java
rename to src/test/java/org/scijava/event/bushe/SubscriberForTesting.java
index 55c76dca4..a0a0fdf2c 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/runtime/SubscriberForTesting.java
+++ b/src/test/java/org/scijava/event/bushe/SubscriberForTesting.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation.runtime;
+package org.scijava.event.bushe;
 
 public interface SubscriberForTesting {
 	long getTimesCalled();
diff --git a/src/test/java/org/scijava/event/bushe/annotation/TestAnnotationInAbstractClass.java b/src/test/java/org/scijava/event/bushe/TestAnnotationInAbstractClass.java
similarity index 80%
rename from src/test/java/org/scijava/event/bushe/annotation/TestAnnotationInAbstractClass.java
rename to src/test/java/org/scijava/event/bushe/TestAnnotationInAbstractClass.java
index 316d44a67..8f04ff56c 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/TestAnnotationInAbstractClass.java
+++ b/src/test/java/org/scijava/event/bushe/TestAnnotationInAbstractClass.java
@@ -1,9 +1,7 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import junit.framework.TestCase;
 import junit.framework.Assert;
-import org.scijava.event.bushe.EventBus;
-import org.scijava.event.bushe.EDTUtil;
 
 /**
  * Testing: 
diff --git a/src/test/java/org/scijava/event/bushe/TestContainerEventService.java b/src/test/java/org/scijava/event/bushe/TestContainerEventService.java
index 5c7c6a322..9537e4349 100644
--- a/src/test/java/org/scijava/event/bushe/TestContainerEventService.java
+++ b/src/test/java/org/scijava/event/bushe/TestContainerEventService.java
@@ -50,7 +50,7 @@ public void testContainerEventServiceFinder() {
       EventService esBar = ContainerEventServiceFinder.getEventService(barButton);
       assertEquals(esBar, es);
       assertEquals(0, subscribedEvents.size());
-      es.subscribe("FooTopic", new EventTopicSubscriber() {
+      es.subscribe("FooTopic", new IEventTopicSubscriber() {
          public void onEvent(String topic, Object evt) {
             subscribedEvents.add(evt);
          }
@@ -79,7 +79,7 @@ public void testContainerEventServiceSupplier() {
       EventService esBar = ContainerEventServiceFinder.getEventService(barButton);
       assertTrue(esBar != es);
       assertEquals(0, subscribedEvents.size());
-      es.subscribe("FooTopic", new EventTopicSubscriber() {
+      es.subscribe("FooTopic", new IEventTopicSubscriber() {
          public void onEvent(String topic, Object evt) {
             subscribedEvents.add(evt);
          }
@@ -91,7 +91,7 @@ public void onEvent(String topic, Object evt) {
 
    public void testContainerEventServiceRegistrar() {
       //Set the lastEventObject whenever the event fires on the right Container Event Service
-      EventTopicSubscriber buttonContainerTopicSubscriber = new EventTopicSubscriber() {
+      IEventTopicSubscriber buttonContainerTopicSubscriber = new IEventTopicSubscriber() {
          public void onEvent(String topic, Object data) {
             System.out.println("topic=" + topic + ", data=" + data);
             setLastEventObject(data);
@@ -104,7 +104,7 @@ public boolean shouldVeto(String topic, Object data) {
           }
       };
       //Set the lastEventObject whenever the event fires on the right Container Event Service
-      EventSubscriber buttonContainerSubscriber = new EventSubscriber() {
+      IEventSubscriber buttonContainerSubscriber = new IEventSubscriber() {
           public void onEvent(Object data) {
              System.out.println("class=" + data);
              setLastEventObject(data);
diff --git a/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java b/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
index 05f2d3ac2..975a491d1 100644
--- a/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
+++ b/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
@@ -29,15 +29,12 @@
 
 import junit.framework.TestCase;
 
-import org.scijava.event.bushe.generics.DataRequestEvent;
-import org.scijava.event.bushe.generics.TypeReference;
-
 /** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
 public class TestDefaultEventService extends TestCase {
 
    private ThreadSafeEventService eventService = null;
-   private EventSubscriber eventSubscriber = null;
-   private EventTopicSubscriber eventTopicSubscriber;
+   private IEventSubscriber eventSubscriber = null;
+   private IEventTopicSubscriber eventTopicSubscriber;
    private SubscriberTimingEvent timing;
    private EBTestCounter testCounter = new EBTestCounter();
 
@@ -67,30 +64,30 @@ private Class getEventClass() {
       return createEvent().getClass();
    }
 
-   private EventSubscriber createEventSubscriber(boolean throwException) {
+   private IEventSubscriber createEventSubscriber(boolean throwException) {
       return new SubscriberForTest(testCounter, throwException);
    }
 
-   private EventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
+   private IEventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
       return new TopicSubscriberForTest(testCounter, throwException);
    }
 
-   private EventSubscriber createEventSubscriber(Long waitTime) {
+   private IEventSubscriber createEventSubscriber(Long waitTime) {
       return new SubscriberForTest(testCounter, waitTime);
    }
 
-   private EventSubscriber getEventSubscriber() {
+   private IEventSubscriber getEventSubscriber() {
       return getEventSubscriber(true);
    }
 
-   private EventSubscriber getEventSubscriber(boolean throwException) {
+   private IEventSubscriber getEventSubscriber(boolean throwException) {
       if (eventSubscriber == null) {
          eventSubscriber = createEventSubscriber(throwException);
       }
       return eventSubscriber;
    }
 
-   private EventTopicSubscriber getEventTopicSubscriber() {
+   private IEventTopicSubscriber getEventTopicSubscriber() {
       if (eventTopicSubscriber == null) {
          eventTopicSubscriber = createEventTopicSubscriber(false);
       }
@@ -98,7 +95,7 @@ private EventTopicSubscriber getEventTopicSubscriber() {
    }
 
    public void testTyping() {
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       Double doub = 3.14;
       Number numb = doub;
@@ -122,7 +119,7 @@ public void testTyping() {
 
    public void testSubscribe() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = eventService.subscribe(getEventClass(), subscriber);
       assertTrue("testSubscribe(new subscriber)", actualReturn);
@@ -176,12 +173,12 @@ public void testSubscribeOrder() {
       List subscribers = eventService.getSubscribers(getEventClass());
       assertEquals(3, subscribers.size());
       for (int i = 0; i < subscribers.size(); i++) {
-         EventSubscriber subscriber = (EventSubscriber) subscribers.get(i);
+         IEventSubscriber subscriber = (IEventSubscriber) subscribers.get(i);
          eventService.unsubscribe(getEventClass(), subscriber);
       }
-      eventService.subscribe(getEventClass(), (EventSubscriber) subscribers.get(1));
-      eventService.subscribe(getEventClass(), (EventSubscriber) subscribers.get(0));
-      eventService.subscribe(getEventClass(), (EventSubscriber) subscribers.get(2));
+      eventService.subscribe(getEventClass(), (IEventSubscriber) subscribers.get(1));
+      eventService.subscribe(getEventClass(), (IEventSubscriber) subscribers.get(0));
+      eventService.subscribe(getEventClass(), (IEventSubscriber) subscribers.get(2));
       eventService.publish(createEvent());
       assertTrue(subscriber3.callTime.before(subscriber2.callTime));
       assertTrue(subscriber2.callTime.before(subscriber1.callTime));
@@ -189,7 +186,7 @@ public void testSubscribeOrder() {
 
    public void testSubscribeWeakly() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = eventService.subscribe(getEventClass(), subscriber);
       assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
@@ -229,7 +226,7 @@ public void testSubscribeWeakly() {
 
    public void testSubscribeStrongly() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = eventService.subscribeStrongly(getEventClass(), subscriber);
       assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
@@ -316,7 +313,7 @@ public void testIllegalArgs() {
 
    public void testVeto() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = eventService.subscribe(getEventClass(), subscriber);
 
@@ -341,7 +338,7 @@ public void testVeto() {
 
    public void testVetoException() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = eventService.subscribe(getEventClass(), subscriber);
 
@@ -366,7 +363,7 @@ public void testVetoException() {
 
    public void testVetoTopic() {
       boolean actualReturn;
-      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
 
       actualReturn = eventService.subscribe("FooTopic", subscriber);
 
@@ -395,7 +392,7 @@ public boolean shouldVeto(String topic, Object data) {
 
    public void testVetoWeak() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = eventService.subscribe(getEventClass(), subscriber);
 
@@ -428,7 +425,7 @@ public boolean shouldVeto(Object evt) {
 
    public void testVetoTopicWeak() {
       boolean actualReturn;
-      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
 
       actualReturn = eventService.subscribe("FooTopic", subscriber);
 
@@ -494,7 +491,7 @@ public void testUnsubscribe() {
    }
 
    public void testUnsubscribeTopic() {
-      EventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
+      IEventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
       eventService.subscribe("FooTopic", eventTopicSubscriber);
 
       boolean actualReturn;
@@ -588,7 +585,7 @@ public void testPublish() {
    public void testTimeHandling() {
       eventService.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
       final Boolean[] wasCalled = new Boolean[1];
-      eventService.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+      eventService.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
          public void onEvent(Object evt) {
             wasCalled[0] = Boolean.TRUE;
          }
@@ -598,7 +595,7 @@ public void onEvent(Object evt) {
       eventService = new ThreadSafeEventService(new Long(100), true);
       eventService.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
       final Boolean[] wasCalled2 = new Boolean[1];
-      eventService.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+      eventService.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
          public void onEvent(Object evt) {
             wasCalled2[0] = Boolean.TRUE;
             timing = (SubscriberTimingEvent) evt;
@@ -746,7 +743,7 @@ public void testParameterizedEvent() throws IllegalAccessException, NoSuchMethod
 //      System.out.println("superclass="+superclass);
 //      System.out.println("type="+type);
 
-      eventService.subscribe(stringTypeReference.getType(), new EventSubscriber() {
+      eventService.subscribe(stringTypeReference.getType(), new IEventSubscriber() {
          public void onEvent(Object event) {
             timesCalled[0]++;
          }
@@ -766,12 +763,12 @@ public void testParameterizedEventMultiParams() throws IllegalAccessException, N
       TypeReference<DoublyParameterizedEvent<Integer, String>> integerTypeReference = new TypeReference<DoublyParameterizedEvent<Integer, String>>(){};
       TypeReference<DoublyParameterizedEvent<String, Integer>> switchTypeReference = new TypeReference<DoublyParameterizedEvent<String, Integer>>(){};
 
-      eventService.subscribe(stringTypeReference.getType(), new EventSubscriber() {
+      eventService.subscribe(stringTypeReference.getType(), new IEventSubscriber() {
          public void onEvent(Object event) {
             timesCalled[0]++;
          }
       });
-      eventService.subscribe(integerTypeReference.getType(), new EventSubscriber() {
+      eventService.subscribe(integerTypeReference.getType(), new IEventSubscriber() {
          public void onEvent(Object event) {
             timesCalled[0]++;
          }
@@ -790,7 +787,7 @@ public void testWildcardSubscription() throws IllegalAccessException, NoSuchMeth
 
       TypeReference<ParameterizedEvent<? extends Container>> containerWildcardTypeRef = new TypeReference<ParameterizedEvent<? extends Container>>(){};
 
-      eventService.subscribe(containerWildcardTypeRef.getType(), new EventSubscriber() {
+      eventService.subscribe(containerWildcardTypeRef.getType(), new IEventSubscriber() {
          public void onEvent(Object event) {
             timesCalled[0]++;
          }
@@ -817,7 +814,7 @@ public void onEvent(Object event) {
       //Test super wildcard, should be opposite of above
       eventService.clearAllSubscribers();
       TypeReference<ParameterizedEvent<? super Container>> containerSuperWildcardTypeRef = new TypeReference<ParameterizedEvent<? super Container>>(){};
-      eventService.subscribe(containerSuperWildcardTypeRef.getType(), new EventSubscriber() {
+      eventService.subscribe(containerSuperWildcardTypeRef.getType(), new IEventSubscriber() {
          public void onEvent(Object event) {
             timesCalled[0]++;
          }
@@ -844,7 +841,7 @@ public Map<E,F> getData() {
       }
    }
 
-   class DoubleSubscriber implements EventTopicSubscriber, EventSubscriber {
+   class DoubleSubscriber implements IEventTopicSubscriber, IEventSubscriber {
       public int timesTopicCalled = 0;
       public int timesEventCalled = 0;
       public String lastEventString;
@@ -881,7 +878,7 @@ public void testGenericGeneric() {
       final int[] timesCalled = new int[1];
       DataRequestEvent<List<Integer>> request = new DataRequestEvent<List<Integer>>();
       Type type = new TypeReference<DataRequestEvent<List<Integer>>>() {}.getType();
-      eventService.subscribe(type, new EventSubscriber() {
+      eventService.subscribe(type, new IEventSubscriber() {
          public void onEvent(Object event) {
             timesCalled[0]++;
          }
@@ -919,7 +916,7 @@ public void testTopicsCache() {
       assertTrue(lastEventObj == publishedEventObj);
       assertEquals(1, es.getCacheSizeForTopic("IceCream.Vanilla"));
       //subscribe and see if it still works and that the new event is cached
-      EventTopicSubscriber sub = new EventTopicSubscriber() {
+      IEventTopicSubscriber sub = new IEventTopicSubscriber() {
          public void onEvent(String topic, Object data) {
             System.out.println("Barrrr");
          }
@@ -1147,7 +1144,7 @@ public void testEventsCache() {
       assertTrue(lastAEvent == publishedEvent);
       assertEquals(1, es.getCacheSizeForEventClass(EventA.class));
       //subscribe and see if it still works and that the new event is cached
-      EventSubscriber sub = new EventSubscriber() {
+      IEventSubscriber sub = new IEventSubscriber() {
          public void onEvent(Object evt) {
             System.out.println("Fooo");
          }
diff --git a/src/test/java/org/scijava/event/bushe/TestEventAction.java b/src/test/java/org/scijava/event/bushe/TestEventAction.java
index 969bf2acf..6c3eff80f 100644
--- a/src/test/java/org/scijava/event/bushe/TestEventAction.java
+++ b/src/test/java/org/scijava/event/bushe/TestEventAction.java
@@ -51,7 +51,7 @@ protected void setUp() throws Exception {
    public void testEventBusTopicAction() {
       EventBusAction action = new EventBusAction();
       action.putValue(Action.ACTION_COMMAND_KEY, "FooAction");
-      EventTopicSubscriber subscriber = new EventTopicSubscriber() {
+      IEventTopicSubscriber subscriber = new IEventTopicSubscriber() {
          public void onEvent(String topic, Object evt) {
             subscribedEvents.add(evt);
          }
@@ -70,7 +70,7 @@ public void testEventBusTopicActionEventServiceValueFirst() {
       EventBusAction action = new EventBusAction();
       action.putValue(EventBusAction.EVENT_SERVICE_TOPIC_NAME, "FooAction");
       action.putValue(Action.ACTION_COMMAND_KEY, "BarAction");
-      EventBus.subscribeStrongly("FooAction", new EventTopicSubscriber() {
+      EventBus.subscribeStrongly("FooAction", new IEventTopicSubscriber() {
          public void onEvent(String topic, Object evt) {
             subscribedEvents.add(evt);
          }
@@ -87,7 +87,7 @@ public void testEventBusTopicActionIDValueFirst() {
       EventBusAction action = new EventBusAction();
       action.putValue("ID", "FooAction");
       action.putValue(Action.ACTION_COMMAND_KEY, "BarAction");
-      EventBus.subscribeStrongly("FooAction", new EventTopicSubscriber() {
+      EventBus.subscribeStrongly("FooAction", new IEventTopicSubscriber() {
          public void onEvent(String topic, Object evt) {
             subscribedEvents.add(evt);
          }
@@ -103,7 +103,7 @@ public void onEvent(String topic, Object evt) {
    public void testEventBusTopicActionNameWorks() {
       EventBusAction action = new EventBusAction();
       action.putValue(Action.NAME, "FooAction");
-      EventBus.subscribeStrongly("FooAction", new EventTopicSubscriber() {
+      EventBus.subscribeStrongly("FooAction", new IEventTopicSubscriber() {
          public void onEvent(String topic, Object evt) {
             subscribedEvents.add(evt);
          }
@@ -122,7 +122,7 @@ protected Object getEventServiceEvent(ActionEvent evt) {
             return new MyEventServiceEvent(aSource, evt);
          }
       };
-      EventBus.subscribe(MyEventServiceEvent.class, new EventSubscriber() {
+      EventBus.subscribe(MyEventServiceEvent.class, new IEventSubscriber() {
          public void onEvent(Object evt) {
             assertEquals(((EventServiceEvent) evt).getSource(), aSource);
             subscribedEvents.add(evt);
@@ -148,7 +148,7 @@ public void testContainerEventAction() {
       EventService es = ContainerEventServiceFinder.getEventService(button);
       assertTrue(EventBus.getGlobalEventService() != es);
       assertEquals(0, subscribedEvents.size());
-      es.subscribe("FooAction", new EventTopicSubscriber() {
+      es.subscribe("FooAction", new IEventTopicSubscriber() {
          public void onEvent(String topic, Object evt) {
             subscribedEvents.add(evt);
          }
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBus.java b/src/test/java/org/scijava/event/bushe/TestEventBus.java
index 80f8cba2f..487d0b277 100644
--- a/src/test/java/org/scijava/event/bushe/TestEventBus.java
+++ b/src/test/java/org/scijava/event/bushe/TestEventBus.java
@@ -26,8 +26,8 @@
 
 public class TestEventBus extends TestCase {
 
-   private EventSubscriber eventSubscriber = null;
-   private EventTopicSubscriber eventTopicSubscriber;
+   private IEventSubscriber eventSubscriber = null;
+   private IEventTopicSubscriber eventTopicSubscriber;
    private EBTestCounter testCounter = new EBTestCounter();
 
    public TestEventBus(String name) {
@@ -53,20 +53,20 @@ private Class getEventClass() {
       return createEvent().getClass();
    }
 
-   private EventSubscriber createEventSubscriber(boolean throwException) {
+   private IEventSubscriber createEventSubscriber(boolean throwException) {
       SubscriberForTest test = new SubscriberForTest(testCounter, throwException);
       return test;
    }
 
-   private EventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
+   private IEventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
       return new TopicSubscriberForTest(testCounter, throwException);
    }
 
-   private EventSubscriber getEventSubscriber() {
+   private IEventSubscriber getEventSubscriber() {
       return getEventSubscriber(true);
    }
 
-   private EventSubscriber getEventSubscriber(boolean throwException) {
+   private IEventSubscriber getEventSubscriber(boolean throwException) {
       if (eventSubscriber == null) {
          eventSubscriber = createEventSubscriber(throwException);
       }
@@ -75,7 +75,7 @@ private EventSubscriber getEventSubscriber(boolean throwException) {
 
    public void testSubscribe() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = EventBus.subscribe(getEventClass(), subscriber);
       assertTrue("testSubscribe(new subscriber)", actualReturn);
@@ -106,7 +106,7 @@ public void testSubscribe() {
 
    }
    
-   public static class SwingThreadTestEventSubscriber implements EventSubscriber {
+   public static class SwingThreadTestEventSubscriber implements IEventSubscriber {
       public boolean wasOnSwingThread;
 
       public void onEvent(Object event) {
@@ -124,7 +124,7 @@ public void testSwingThreading() {
    
    public void testSubscribeWeakly() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = EventBus.subscribe(getEventClass(), subscriber);
       assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
@@ -212,7 +212,7 @@ public void testIllegalArgs() {
 
    public void testVeto() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = EventBus.subscribe(getEventClass(), subscriber);
 
@@ -239,7 +239,7 @@ public void testVeto() {
 
    public void testVetoException() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = EventBus.subscribe(getEventClass(), subscriber);
       assertTrue(actualReturn);
@@ -267,7 +267,7 @@ public void testVetoException() {
 
    public void testVetoTopic() {
       boolean actualReturn;
-      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
 
       actualReturn = EventBus.subscribeStrongly("FooTopic", subscriber);
 
@@ -298,7 +298,7 @@ public boolean shouldVeto(String topic, Object data) {
 
    public void testVetoWeak() {
       boolean actualReturn;
-      EventSubscriber subscriber = createEventSubscriber(false);
+      IEventSubscriber subscriber = createEventSubscriber(false);
 
       actualReturn = EventBus.subscribe(getEventClass(), subscriber);
 
@@ -333,7 +333,7 @@ public boolean shouldVeto(Object evt) {
 
    public void testVetoTopicWeak() {
       boolean actualReturn;
-      EventTopicSubscriber subscriber = createEventTopicSubscriber(false);
+      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
 
       actualReturn = EventBus.subscribeStrongly("FooTopic", subscriber);
 
@@ -402,7 +402,7 @@ public void testUnsubscribe() {
    }
 
    public void testUnsubscribeTopic() {
-      EventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
+      IEventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
       EventBus.subscribeStrongly("FooTopic", eventTopicSubscriber);
 
       boolean actualReturn;
@@ -484,7 +484,7 @@ public void testPublish() {
       assertEquals("testPublish(completed)", 4, testCounter.eventsHandledCount);
       assertEquals("testPublish(exceptions)", 2, testCounter.subscribeExceptionCount);
 
-      EventSubscriber eventSubscriber = createEventSubscriber(false);
+      IEventSubscriber eventSubscriber = createEventSubscriber(false);
       EventBus.subscribe(ObjectEvent.class, eventSubscriber);
       testCounter.eventsHandledCount = 0;
       testCounter.subscribeExceptionCount = 0;
@@ -558,11 +558,11 @@ public void testNumOfMethods() {
 
    //Really a compilation test
    public void testGeneric() {
-      EventBus.subscribe(String.class, new EventSubscriber<JComponent>() {
+      EventBus.subscribe(String.class, new IEventSubscriber<JComponent>() {
          public void onEvent(JComponent event) {
          }
       });
-      EventBus.subscribe("foo", new EventTopicSubscriber<JComponent>() {
+      EventBus.subscribe("foo", new IEventTopicSubscriber<JComponent>() {
          public void onEvent(String topic, JComponent data) {
          }
       });
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
index c0b839a4a..49417097a 100644
--- a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
+++ b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
@@ -20,7 +20,7 @@ protected void tearDown() throws Exception {
 
    public void testConfigurableEventService() {
       try {
-         EventBus.subscribe("foo", new EventTopicSubscriber() {
+         EventBus.subscribe("foo", new IEventTopicSubscriber() {
             public void onEvent(String topic, Object data) {
             }
          });
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
index a89ec9765..7d6dcb309 100644
--- a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
+++ b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
@@ -18,7 +18,7 @@ protected void tearDown() throws Exception {
 
    public void testConfigurableEventService() {
       try {
-         EventBus.subscribe("foo", new EventTopicSubscriber() {
+         EventBus.subscribe("foo", new IEventTopicSubscriber() {
             public void onEvent(String topic, Object data) {
             }
          });
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java b/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
index 791f558d7..27cb12c06 100644
--- a/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
+++ b/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
@@ -20,8 +20,8 @@
 /** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
 public class TestEventBusTiming extends EventServiceLocatorTestCase {
 
-   private EventSubscriber eventSubscriber = null;
-   private EventTopicSubscriber eventTopicSubscriber;
+   private IEventSubscriber eventSubscriber = null;
+   private IEventTopicSubscriber eventTopicSubscriber;
    private SubscriberTimingEvent timing;
    private EBTestCounter testCounter = new EBTestCounter();
 
@@ -41,30 +41,30 @@ private Class getEventClass() {
       return createEvent().getClass();
    }
 
-   private EventSubscriber createEventSubscriber(boolean throwException) {
+   private IEventSubscriber createEventSubscriber(boolean throwException) {
       return new SubscriberForTest(testCounter, throwException);
    }
 
-   private EventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
+   private IEventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
       return new TopicSubscriberForTest(testCounter, throwException);
    }
 
-   private EventSubscriber createEventSubscriber(Long waitTime) {
+   private IEventSubscriber createEventSubscriber(Long waitTime) {
       return new SubscriberForTest(testCounter, waitTime);
    }
 
-   private EventSubscriber getEventSubscriber() {
+   private IEventSubscriber getEventSubscriber() {
       return getEventSubscriber(true);
    }
 
-   private EventSubscriber getEventSubscriber(boolean throwException) {
+   private IEventSubscriber getEventSubscriber(boolean throwException) {
       if (eventSubscriber == null) {
          eventSubscriber = createEventSubscriber(throwException);
       }
       return eventSubscriber;
    }
 
-   private EventTopicSubscriber getEventTopicSubscriber() {
+   private IEventTopicSubscriber getEventTopicSubscriber() {
       if (eventTopicSubscriber == null) {
          eventTopicSubscriber = createEventTopicSubscriber(false);
       }
@@ -74,7 +74,7 @@ private EventTopicSubscriber getEventTopicSubscriber() {
    public void thisOnlyWorksSometimesNow_testTimeHandling() {
       EventBus.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
       final Boolean[] wasCalled = new Boolean[1];
-      EventBus.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+      EventBus.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
          public void onEvent(Object evt) {
             wasCalled[0] = Boolean.TRUE;
          }
@@ -84,7 +84,7 @@ public void onEvent(Object evt) {
       assertTrue(wasCalled[0] == null);
       EventBus.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
       final Boolean[] wasCalled2 = new Boolean[1];
-      EventBus.subscribe(SubscriberTimingEvent.class, new EventSubscriber() {
+      EventBus.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
          public void onEvent(Object evt) {
             wasCalled2[0] = Boolean.TRUE;
             timing = (SubscriberTimingEvent) evt;
diff --git a/src/test/java/org/scijava/event/bushe/TestPerformance.java b/src/test/java/org/scijava/event/bushe/TestPerformance.java
index a936200ee..f597ae488 100644
--- a/src/test/java/org/scijava/event/bushe/TestPerformance.java
+++ b/src/test/java/org/scijava/event/bushe/TestPerformance.java
@@ -12,12 +12,12 @@
  * For proving performance.
  */
 public class TestPerformance extends TestCase {
-    private EventSubscriber doNothingSubscriber = new EventSubscriber() {
+    private IEventSubscriber doNothingSubscriber = new IEventSubscriber() {
         public void onEvent(Object event) {
         }
     };
 
-    private EventTopicSubscriber doNothingTopicSubscriber = new EventTopicSubscriber() {
+    private IEventTopicSubscriber doNothingTopicSubscriber = new IEventTopicSubscriber() {
         public void onEvent(String topic, Object payload) {
         }
     };
diff --git a/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java b/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
index 9f44264f0..a02310228 100644
--- a/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
+++ b/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
@@ -11,8 +11,6 @@
 
 import junit.framework.TestCase;
 
-import org.scijava.event.bushe.annotation.AnnotationProcessor;
-
 /**
  * Tests the Prioritized interface va. normal FIFO order.
  */
@@ -39,7 +37,7 @@ public void record() {
     /**
      * A subscriber that adds itself to a supplied list so that the order of calls is recorded.
      */
-    class OrderRecorderSubscriber extends OrderRecorder implements EventSubscriber {
+    class OrderRecorderSubscriber extends OrderRecorder implements IEventSubscriber {
 
         OrderRecorderSubscriber(List listToRecordTo) {
             super(listToRecordTo);
@@ -53,7 +51,7 @@ public void onEvent(Object event) {
     /**
      * Ditto, for topics
      */
-    class OrderRecorderTopicSubscriber extends OrderRecorder implements EventTopicSubscriber {
+    class OrderRecorderTopicSubscriber extends OrderRecorder implements IEventTopicSubscriber {
 
         OrderRecorderTopicSubscriber(List listToRecordTo) {
             super(listToRecordTo);
@@ -104,15 +102,15 @@ protected void tearDown() throws Exception {
     }
 
     public void testNormalFIFO() {
-        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
-        List<EventSubscriber> originalOrder = new ArrayList<EventSubscriber>();
+        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
+        List<IEventSubscriber> originalOrder = new ArrayList<IEventSubscriber>();
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         //mixing an inner class into the test
-        EventSubscriber inner = new EventSubscriber() {
+        IEventSubscriber inner = new IEventSubscriber() {
             public void onEvent(Object event) {
             }
         };
@@ -120,7 +118,7 @@ public void onEvent(Object event) {
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         //add them all
-        for (EventSubscriber eventSubscriber : originalOrder) {
+        for (IEventSubscriber eventSubscriber : originalOrder) {
             eventService.subscribe(Color.class, eventSubscriber);
         }
         eventService.publish(Color.BLUE);
@@ -129,8 +127,8 @@ public void onEvent(Object event) {
     }
 
     public void testNoPrioritizedWithZeroPrioritized() {
-        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
-        List<EventSubscriber> originalOrder = new ArrayList<EventSubscriber>();
+        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
+        List<IEventSubscriber> originalOrder = new ArrayList<IEventSubscriber>();
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
@@ -149,7 +147,7 @@ public int getPriority() {
         originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
         originalOrder.add(new OrderRecorderSubscriber(calledOrder));
         //add them all
-        for (EventSubscriber eventSubscriber : originalOrder) {
+        for (IEventSubscriber eventSubscriber : originalOrder) {
             eventService.subscribe(Color.class, eventSubscriber);
         }
         eventService.publish(Color.BLUE);
@@ -158,18 +156,18 @@ public int getPriority() {
     }
 
     public void testOnlyPrioritized() {
-        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
-        List<EventSubscriber> originalOrder = new ArrayList<EventSubscriber>();
+        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
+        List<IEventSubscriber> originalOrder = new ArrayList<IEventSubscriber>();
         for (int i = 0; i < 100; i++) {
             Random random = new Random();
             originalOrder.add(new PrioritizedOrderRecorderSubscriber(random.nextInt(10000) - 5000, calledOrder));
         }
-        for (EventSubscriber eventSubscriber : originalOrder) {
+        for (IEventSubscriber eventSubscriber : originalOrder) {
             eventService.subscribe(Color.class, eventSubscriber);
         }
         eventService.publish(Color.BLUE);
         int lastPriority = -5001;
-        for (EventSubscriber eventSubscriber : calledOrder) {
+        for (IEventSubscriber eventSubscriber : calledOrder) {
             int priority = ((PrioritizedOrderRecorderSubscriber) eventSubscriber).getPriority();
             assertTrue(priority >= lastPriority);
             lastPriority = priority;
@@ -178,8 +176,8 @@ public void testOnlyPrioritized() {
 
     public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
         Random rand = new Random();
-        List<EventSubscriber> calledOrder = new ArrayList<EventSubscriber>();
-        List<EventSubscriber> prioritized = new ArrayList<EventSubscriber>();
+        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
+        List<IEventSubscriber> prioritized = new ArrayList<IEventSubscriber>();
         //100 negative
         for (int i = 0; i < 100; i++) {
             Random random = new Random();
@@ -192,7 +190,7 @@ public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
         }
         Collections.shuffle(prioritized);
         //100 fifo
-        List<EventSubscriber> fifo = new ArrayList<EventSubscriber>();
+        List<IEventSubscriber> fifo = new ArrayList<IEventSubscriber>();
         for (int i = 0; i < 100; i++) {
             if (rand.nextBoolean()) {
                 fifo.add(new OrderRecorderSubscriber(calledOrder));
@@ -200,10 +198,10 @@ public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
                 fifo.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
             }
         }
-        List<EventSubscriber> prioritizedCopy = new ArrayList(prioritized);
-        List<EventSubscriber> fifoCopy = new ArrayList(fifo);
+        List<IEventSubscriber> prioritizedCopy = new ArrayList(prioritized);
+        List<IEventSubscriber> fifoCopy = new ArrayList(fifo);
         //Subscribe all, randomizing a fifo or prioritized
-        EventSubscriber eventSubscriber;
+        IEventSubscriber eventSubscriber;
         int subscribeCount = 0;
         int prioritizedSubscribeCount = 0;
         int nonPrioritizedSubscribeCount = 0;
@@ -237,7 +235,7 @@ public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
         assertEquals(300, calledOrder.size());
         int lastPriority = -10001;
         for (int i = 0; i < 99; i++) {
-            EventSubscriber subscriber = calledOrder.get(i);
+            IEventSubscriber subscriber = calledOrder.get(i);
             assertTrue(subscriber instanceof PrioritizedOrderRecorderSubscriber);
             PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
             int priority = prioritizedOrderRecorderSubscriber.getPriority();
@@ -246,7 +244,7 @@ public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
             lastPriority = priority;
         }
         for (int i = 100; i < 199; i++) {
-            EventSubscriber subscriber = calledOrder.get(i);
+            IEventSubscriber subscriber = calledOrder.get(i);
             assertTrue(subscriber instanceof OrderRecorderSubscriber);
             if (subscriber instanceof PrioritizedOrderRecorderSubscriber) {
                 PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
@@ -257,7 +255,7 @@ public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
         }
         lastPriority = 0;
         for (int i = 200; i < 299; i++) {
-            EventSubscriber subscriber = calledOrder.get(i);
+            IEventSubscriber subscriber = calledOrder.get(i);
             assertTrue(subscriber instanceof PrioritizedOrderRecorderSubscriber);
             PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
             int priority = prioritizedOrderRecorderSubscriber.getPriority();
@@ -273,13 +271,13 @@ public void testPriorityAnnotation() throws EventServiceExistsException {
         EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
         List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
         OrderRecorder sn100 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder sn50 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
             public void annotateMe(Object foo) {
                 record();
             }
@@ -287,49 +285,49 @@ public void annotateMe(Object foo) {
         PrioritizedOrderRecorderSubscriber spn30 = new PrioritizedOrderRecorderSubscriber(-30, calledOrder);
         OrderRecorderSubscriber so_1 = new OrderRecorderSubscriber(calledOrder);
         OrderRecorder s100 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder sn10 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder s50 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder s10 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
             public void annotateMe(Object foo) {
                 record();
             }
         };
         OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(Object foo) {
                 record();
             }
@@ -337,8 +335,8 @@ public void annotateMe(Object foo) {
         Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
         List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
         for (Object o : toAdd) {
-            if (o instanceof EventSubscriber) {
-                eventService.subscribe(Color.class, (EventSubscriber) o);
+            if (o instanceof IEventSubscriber) {
+                eventService.subscribe(Color.class, (IEventSubscriber) o);
             } else {
                 AnnotationProcessor.process(o);
             }
@@ -358,12 +356,12 @@ public void annotateMe(Object foo) {
     public void testIssue26OneNegOthersNormal() {
         final List<Integer> calledOrder = new ArrayList<Integer>();
         //non-Prioritized FIFO subscribers
-        EventSubscriber sub1 = new EventSubscriber() {
+        IEventSubscriber sub1 = new IEventSubscriber() {
             public void onEvent(Object event) {
                 calledOrder.add(1);
             }
         };
-        EventSubscriber sub0 = new PrioritizedEventSubscriber() {
+        IEventSubscriber sub0 = new PrioritizedEventSubscriber() {
             public void onEvent(Object event) {
                 calledOrder.add(-1);
             }
@@ -371,7 +369,7 @@ public int getPriority() {
                 return -1;
             }
         };
-        EventSubscriber sub2 = new EventSubscriber() {
+        IEventSubscriber sub2 = new IEventSubscriber() {
             public void onEvent(Object event) {
                 calledOrder.add(2);
             }
@@ -398,12 +396,12 @@ public void onEvent(Object event) {
     public void testOnePosOthersNormal() {
         final List<Integer> calledOrder = new ArrayList<Integer>();
         //non-Prioritized FIFO subscribers
-        EventSubscriber sub1 = new EventSubscriber() {
+        IEventSubscriber sub1 = new IEventSubscriber() {
             public void onEvent(Object event) {
                 calledOrder.add(1);
             }
         };
-        EventSubscriber sub0 = new PrioritizedEventSubscriber() {
+        IEventSubscriber sub0 = new PrioritizedEventSubscriber() {
             public void onEvent(Object event) {
                 calledOrder.add(11);
             }
@@ -411,7 +409,7 @@ public int getPriority() {
                 return 11;
             }
         };
-        EventSubscriber sub2 = new EventSubscriber() {
+        IEventSubscriber sub2 = new IEventSubscriber() {
             public void onEvent(Object event) {
                 calledOrder.add(2);
             }
@@ -434,13 +432,13 @@ public void testPriorityTopicAnnotation() throws EventServiceExistsException {
         EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
         List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
         OrderRecorder sn100 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder sn50 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
@@ -448,49 +446,49 @@ public void annotateMe(String topic, Object foo) {
         PrioritizedOrderRecorderTopicSubscriber spn30 = new PrioritizedOrderRecorderTopicSubscriber(-30, calledOrder);
         OrderRecorderTopicSubscriber so_1 = new OrderRecorderTopicSubscriber(calledOrder);
         OrderRecorder s100 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder sn10 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s50 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s10 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
@@ -498,8 +496,8 @@ public void annotateMe(String topic, Object foo) {
         Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
         List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
         for (Object o : toAdd) {
-            if (o instanceof EventTopicSubscriber) {
-                eventService.subscribe("Color", (EventTopicSubscriber) o);
+            if (o instanceof IEventTopicSubscriber) {
+                eventService.subscribe("Color", (IEventTopicSubscriber) o);
             } else {
                 AnnotationProcessor.process(o);
             }
@@ -516,13 +514,13 @@ public void testPriorityTopicPatternAnnotation() throws EventServiceExistsExcept
         EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
         List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
         OrderRecorder sn100 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder sn50 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -50)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -50)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
@@ -530,49 +528,49 @@ public void annotateMe(String topic, Object foo) {
         PrioritizedOrderRecorderTopicSubscriber spn30 = new PrioritizedOrderRecorderTopicSubscriber(-30, calledOrder);
         OrderRecorderTopicSubscriber so_1 = new OrderRecorderTopicSubscriber(calledOrder);
         OrderRecorder s100 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder sn10 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s50 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s10 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
         };
         OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
-            @org.scijava.event.bushe.annotation.EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
+            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
             public void annotateMe(String topic, Object foo) {
                 record();
             }
@@ -582,7 +580,7 @@ public void annotateMe(String topic, Object foo) {
         for (Object o : toAdd) {
             if (o instanceof OrderRecorderTopicSubscriber) {
                 Pattern pattern = Pattern.compile("Col[a-z]+");
-                eventService.subscribe(pattern, (EventTopicSubscriber) o);
+                eventService.subscribe(pattern, (IEventTopicSubscriber) o);
             } else {
                 AnnotationProcessor.process(o);
             }
diff --git a/src/test/java/org/scijava/event/bushe/TestPublicationStates.java b/src/test/java/org/scijava/event/bushe/TestPublicationStates.java
index d4aed0a81..71f7c02e8 100644
--- a/src/test/java/org/scijava/event/bushe/TestPublicationStates.java
+++ b/src/test/java/org/scijava/event/bushe/TestPublicationStates.java
@@ -18,7 +18,7 @@ public void setPublicationStatus(PublicationStatus status) {
          stuffHappens.add(status);
       }
    };
-   EventSubscriber subscriber = new EventSubscriber() {
+   IEventSubscriber subscriber = new IEventSubscriber() {
       public void onEvent(Object event) {
          stuffHappens.add(this);
       }
diff --git a/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java b/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
index 3b7836df8..3109681d1 100644
--- a/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
+++ b/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
@@ -4,7 +4,7 @@
  * @author Michael Bushe
  * @since Nov 19, 2005 11:00:53 PM
  */
-public class TopicSubscriberForTest implements EventTopicSubscriber {
+public class TopicSubscriberForTest implements IEventTopicSubscriber {
    private boolean throwException;
    private Long waitTime;
    private EBTestCounter testDefaultEventService;
diff --git a/src/test/java/org/scijava/event/bushe/annotation/WeakClassAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/WeakClassAnnotatedEventSubscriber.java
similarity index 92%
rename from src/test/java/org/scijava/event/bushe/annotation/WeakClassAnnotatedEventSubscriber.java
rename to src/test/java/org/scijava/event/bushe/WeakClassAnnotatedEventSubscriber.java
index 0c7f7703a..6d821a6ec 100644
--- a/src/test/java/org/scijava/event/bushe/annotation/WeakClassAnnotatedEventSubscriber.java
+++ b/src/test/java/org/scijava/event/bushe/WeakClassAnnotatedEventSubscriber.java
@@ -1,4 +1,4 @@
-package org.scijava.event.bushe.annotation;
+package org.scijava.event.bushe;
 
 import java.util.Collection;
 import java.util.List;

From bd41c8ace85af020099eaa95f09da4ce64eee47b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 11:56:18 -0500
Subject: [PATCH 1102/1208] Make most of the bushe classes package-private

The goal is not to add new SciJava Common API, but merely
to vendor the org.bushe:eventbus code for internal use.

Unfortunately, we don't have JPMS yet, and cannot
fully hide the package. But we can get pretty close.
---
 .../org/scijava/event/DefaultEventBus.java     |  4 ++--
 .../org/scijava/event/DefaultEventService.java |  8 ++++----
 .../java/org/scijava/event/EventHandler.java   | 18 +++++++++---------
 .../event/bushe/AbstractEventServiceEvent.java |  2 +-
 .../event/bushe/AnnotationProcessor.java       |  2 +-
 .../event/bushe/BaseProxySubscriber.java       |  2 +-
 .../bushe/ContainerEventServiceAction.java     |  2 +-
 .../bushe/ContainerEventServiceFinder.java     |  2 +-
 .../bushe/ContainerEventServiceRegistrar.java  |  2 +-
 .../bushe/ContainerEventServiceSupplier.java   |  2 +-
 .../java/org/scijava/event/bushe/EventBus.java |  2 +-
 .../scijava/event/bushe/EventBusAction.java    |  2 +-
 .../org/scijava/event/bushe/EventService.java  |  2 +-
 .../event/bushe/EventServiceAction.java        |  2 +-
 .../scijava/event/bushe/EventServiceEvent.java |  2 +-
 .../bushe/EventServiceExistsException.java     |  2 +-
 .../event/bushe/EventServiceLocator.java       |  2 +-
 .../scijava/event/bushe/EventSubscriber.java   |  2 +-
 .../bushe/EventTopicPatternSubscriber.java     |  2 +-
 .../event/bushe/EventTopicSubscriber.java      |  2 +-
 .../event/bushe/IEventTopicSubscriber.java     |  2 +-
 .../java/org/scijava/event/bushe/Logger.java   |  2 +-
 .../org/scijava/event/bushe/ObjectEvent.java   |  2 +-
 .../org/scijava/event/bushe/Prioritized.java   |  2 +-
 .../bushe/PrioritizedEventSubscriber.java      |  2 +-
 .../bushe/PrioritizedEventTopicSubscriber.java |  2 +-
 .../scijava/event/bushe/ProxySubscriber.java   |  2 +-
 .../bushe/ProxyTopicPatternSubscriber.java     |  2 +-
 .../event/bushe/ProxyTopicSubscriber.java      |  2 +-
 .../scijava/event/bushe/PublicationStatus.java |  2 +-
 .../event/bushe/PublicationStatusTracker.java  |  2 +-
 .../bushe/RuntimeTopicEventSubscriber.java     |  2 +-
 .../RuntimeTopicPatternEventSubscriber.java    |  2 +-
 .../event/bushe/SubscriberTimingEvent.java     |  2 +-
 .../scijava/event/bushe/SwingEventService.java |  2 +-
 .../scijava/event/bushe/SwingException.java    |  2 +-
 .../org/scijava/event/bushe/TypeReference.java |  2 +-
 ...TheClassOfTheAnnotatedMethodsParameter.java |  2 +-
 .../scijava/event/bushe/VetoEventListener.java |  2 +-
 .../VetoRuntimeTopicPatternSubscriber.java     |  2 +-
 .../bushe/VetoRuntimeTopicSubscriber.java      |  2 +-
 .../scijava/event/bushe/VetoSubscriber.java    |  2 +-
 .../event/bushe/VetoTopicEventListener.java    |  2 +-
 .../bushe/VetoTopicPatternSubscriber.java      |  2 +-
 .../event/bushe/VetoTopicSubscriber.java       |  2 +-
 45 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index a85989de8..85ae5f382 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -41,11 +41,11 @@
 import org.scijava.thread.ThreadService;
 
 /**
- * An {@link org.scijava.event.bushe.EventService} implementation for SciJava.
+ * An {@code org.scijava.event.bushe.EventService} implementation for SciJava.
  * <p>
  * It is called "DefaultEventBus" rather than "DefaultEventService" to avoid a
  * name clash with {@link DefaultEventService}, which is not an
- * {@link org.scijava.event.bushe.EventService} but rather a SciJava
+ * {@code org.scijava.event.bushe.EventService} but rather a SciJava
  * {@link Service} implementation.
  * </p>
  * 
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index c5717d8a9..b36ec1929 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -42,7 +42,6 @@
 
 import org.scijava.Priority;
 import org.scijava.event.bushe.AbstractProxySubscriber;
-import org.scijava.event.bushe.BaseProxySubscriber;
 import org.scijava.event.bushe.ReferenceStrength;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -262,9 +261,10 @@ private synchronized void keepIt(final Object o, final ProxySubscriber<?> subscr
 	/**
 	 * Helper class used by {@link #subscribe(Object)}.
 	 * <p>
-	 * Recapitulates some logic from {@link BaseProxySubscriber}, because that
-	 * class implements {@link org.scijava.event.bushe.IEventSubscriber} as a raw
-	 * type, which is incompatible with this class implementing SciJava's
+	 * Recapitulates some logic from
+	 * {@code org.scijava.event.bushe.BaseProxySubscriber}, because that class
+	 * implements {@link org.scijava.event.bushe.IEventSubscriber} as a raw type,
+	 * which is incompatible with this class implementing SciJava's
 	 * {@link EventSubscriber} as a typed interface; it becomes impossible to
 	 * implement both {@code onEvent(Object)} and {@code onEvent(E)}.
 	 * </p>
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 55f4b3a6f..a3d5a4bba 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -40,15 +40,15 @@
  * handling methods and annotating each with @{@link EventHandler}.
  * <p>
  * Note to developers: This annotation serves exactly the same purpose as
- * EventBus's {@link org.scijava.event.bushe.EventSubscriber}
- * annotation, recapitulating a subset of the same functionality. We do this to
- * avoid third party code depending directly on EventBus. That is, we do not
- * wish to require SciJava developers to {@code import org.scijava.event.bushe.*}
- * or similar. In this way, EventBus is isolated as only a transitive dependency
- * of downstream code, rather than a direct dependency. Unfortunately, because
- * Java annotation interfaces cannot utilize inheritance, we have to
- * recapitulate the functionality rather than extend it (as we are able to do
- * with {@link EventSubscriber}).
+ * EventBus's {@code org.scijava.event.bushe.EventSubscriber} annotation,
+ * recapitulating a subset of the same functionality. We do this to avoid third
+ * party code depending directly on EventBus. That is, we do not wish to require
+ * SciJava developers to {@code import org.scijava.event.bushe.*} or similar. In
+ * this way, EventBus is isolated as only a transitive dependency of downstream
+ * code, rather than a direct dependency. Unfortunately, because Java annotation
+ * interfaces cannot utilize inheritance, we have to recapitulate the
+ * functionality rather than extend it (as we are able to do with
+ * {@link EventSubscriber}).
  * </p>
  * 
  * @author Curtis Rueden
diff --git a/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java b/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
index 3c4b84b5c..2497af721 100644
--- a/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
+++ b/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
@@ -22,7 +22,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {
+abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {
 
    private Object source = null;
    protected final Object stateLock = new Object();
diff --git a/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java b/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
index 22ae777ac..c7428c7e1 100644
--- a/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
@@ -36,7 +36,7 @@
  * code. <li>In a Annotation Processing Tool plugin, when it becomes available. </ul> Support for these other methods
  * are not yet implemented.
  */
-public class AnnotationProcessor {
+class AnnotationProcessor {
 
    protected static final Logger LOG = Logger.getLogger(EventService.class.getName());
 
diff --git a/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java b/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
index 8c8ccd6ae..a84bcdde7 100644
--- a/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
@@ -4,7 +4,7 @@
 import java.lang.reflect.Method;
 
 /** A class is subscribed to an EventService on behalf of another object. */
-public class BaseProxySubscriber extends AbstractProxySubscriber
+class BaseProxySubscriber extends AbstractProxySubscriber
         implements org.scijava.event.bushe.IEventSubscriber, VetoEventListener {
    private Class subscriptionClass;
 
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
index 8e71a5a69..39844dfe4 100644
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
@@ -39,7 +39,7 @@
  * @see EventServiceAction for further documentation
  * @see ContainerEventServiceFinder on how the service is found
  */
-public class ContainerEventServiceAction extends EventServiceAction {
+class ContainerEventServiceAction extends EventServiceAction {
    public ContainerEventServiceAction() {
    }
 
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
index b62cc874f..a3464241f 100644
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
@@ -38,7 +38,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class ContainerEventServiceFinder {
+class ContainerEventServiceFinder {
    /** The client property used to put a new SwingEventService on top-level components. */
    public static final String CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE = "ContainerEventServiceFinder.createdService";
 
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
index d75de00c3..d39d1238e 100644
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
@@ -35,7 +35,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class ContainerEventServiceRegistrar {
+class ContainerEventServiceRegistrar {
    private JComponent jComp;
    private IEventSubscriber eventSubscriber;
    private VetoEventListener vetoSubscriber;
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
index 70985d749..915a41fb1 100644
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
+++ b/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
@@ -37,6 +37,6 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public interface ContainerEventServiceSupplier {
+interface ContainerEventServiceSupplier {
    public EventService getContainerEventService();
 }
diff --git a/src/main/java/org/scijava/event/bushe/EventBus.java b/src/main/java/org/scijava/event/bushe/EventBus.java
index 7a01fc2bd..0197d0ebd 100644
--- a/src/main/java/org/scijava/event/bushe/EventBus.java
+++ b/src/main/java/org/scijava/event/bushe/EventBus.java
@@ -37,7 +37,7 @@
  * @see SwingEventService
  * @see ThreadSafeEventService See package JavaDoc for more information
  */
-public class EventBus {
+class EventBus {
 
   /**
     * The EventBus uses a global static EventService.  This method is not necessary in usual usage, use the other static
diff --git a/src/main/java/org/scijava/event/bushe/EventBusAction.java b/src/main/java/org/scijava/event/bushe/EventBusAction.java
index a320bde9a..f4d69010b 100644
--- a/src/main/java/org/scijava/event/bushe/EventBusAction.java
+++ b/src/main/java/org/scijava/event/bushe/EventBusAction.java
@@ -25,7 +25,7 @@
  * @author Michael Bushe michael@bushe.com
  * @see EventServiceAction
  */
-public class EventBusAction extends EventServiceAction {
+class EventBusAction extends EventServiceAction {
    public EventBusAction() {
       this(null, null);
    }
diff --git a/src/main/java/org/scijava/event/bushe/EventService.java b/src/main/java/org/scijava/event/bushe/EventService.java
index 6ead66e96..4552ff752 100644
--- a/src/main/java/org/scijava/event/bushe/EventService.java
+++ b/src/main/java/org/scijava/event/bushe/EventService.java
@@ -115,7 +115,7 @@
  * @see {@link org.scijava.event.bushe.IEventSubscriber} for subscription annotations
  * @see {@link org.scijava.event.bushe.IEventTopicSubscriber} for subscription annotations
  */
-public interface EventService {
+interface EventService {
 
    /**
     * Publishes an object so that subscribers will be notified if they subscribed to the object's class, one of its
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceAction.java b/src/main/java/org/scijava/event/bushe/EventServiceAction.java
index bf304b091..a87cfc59d 100644
--- a/src/main/java/org/scijava/event/bushe/EventServiceAction.java
+++ b/src/main/java/org/scijava/event/bushe/EventServiceAction.java
@@ -40,7 +40,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public abstract class EventServiceAction extends AbstractAction {
+abstract class EventServiceAction extends AbstractAction {
    public static final String EVENT_SERVICE_TOPIC_NAME = "event-service-topic";
 
    private boolean throwsExceptionOnNullEventService = true;
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceEvent.java b/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
index 11a6e6edd..4eb3febaf 100644
--- a/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
+++ b/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
@@ -24,7 +24,7 @@
  * @author Michael Bushe michael@bushe.com
  * @see AbstractEventServiceEvent for a simple base class
  */
-public interface EventServiceEvent {
+interface EventServiceEvent {
    /** @return The issuer of the event. */
    Object getSource();
 }
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java b/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
index 4e1cb6f1f..f993c9418 100644
--- a/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
+++ b/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
@@ -1,7 +1,7 @@
 package org.scijava.event.bushe;
 
 /** Exception thrown by the EventServiceLocator when an EventService already is registered for a name. */
-public class EventServiceExistsException extends Exception {
+class EventServiceExistsException extends Exception {
    public EventServiceExistsException(String msg) {
       super(msg);
    }
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceLocator.java b/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
index 9d631196e..7854dcd0b 100644
--- a/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
+++ b/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
@@ -51,7 +51,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class EventServiceLocator {
+class EventServiceLocator {
    /** The name "EventBus" is reserved for the service that the EventBus wraps and is returned by {@link #getEventBusService}.*/
    public static final String SERVICE_NAME_EVENT_BUS = "EventBus";
    /** The name "SwingEventService" is reserved for the service that is returned by {@link #getSwingEventService}. */
diff --git a/src/main/java/org/scijava/event/bushe/EventSubscriber.java b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
index 1a1e89d34..f501cf50b 100644
--- a/src/main/java/org/scijava/event/bushe/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
@@ -82,7 +82,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface EventSubscriber {
+@interface EventSubscriber {
    /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
    Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
 
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
index 8be245312..2e07fa70f 100644
--- a/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
@@ -7,7 +7,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface EventTopicPatternSubscriber {
+@interface EventTopicPatternSubscriber {
    /** The Regular Expression to subscribe to. */
    String topicPattern();
 
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
index f47a64ca8..00f305ae7 100644
--- a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
@@ -83,7 +83,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface EventTopicSubscriber {
+@interface EventTopicSubscriber {
    /** The topic to subscribe to */
    String topic();
 
diff --git a/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
index 6a99f5f30..04570b631 100644
--- a/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
@@ -20,7 +20,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public interface IEventTopicSubscriber<T> {
+interface IEventTopicSubscriber<T> {
 
    /**
     * Handle an event published on a topic.
diff --git a/src/main/java/org/scijava/event/bushe/Logger.java b/src/main/java/org/scijava/event/bushe/Logger.java
index 0c940eec6..bc7476d31 100644
--- a/src/main/java/org/scijava/event/bushe/Logger.java
+++ b/src/main/java/org/scijava/event/bushe/Logger.java
@@ -19,7 +19,7 @@
  * explicit.  There is also no explicit use of classes outside java.util,
  * anything else is used by reflection to avoid NoClassDefFound errors on class load.
  */
-public class Logger {
+class Logger {
    private java.util.logging.Logger utilLogger;
    private /*Untyped to avoid java.lang.NoClassDefFoundError
    org.apache.commons.logging.Log*/ Object commonsLogger;
diff --git a/src/main/java/org/scijava/event/bushe/ObjectEvent.java b/src/main/java/org/scijava/event/bushe/ObjectEvent.java
index db9790a76..5a67d24a9 100644
--- a/src/main/java/org/scijava/event/bushe/ObjectEvent.java
+++ b/src/main/java/org/scijava/event/bushe/ObjectEvent.java
@@ -22,7 +22,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class ObjectEvent extends AbstractEventServiceEvent {
+class ObjectEvent extends AbstractEventServiceEvent {
    private Object eventObject;
 
    /**
diff --git a/src/main/java/org/scijava/event/bushe/Prioritized.java b/src/main/java/org/scijava/event/bushe/Prioritized.java
index ba57f4611..7a3187055 100644
--- a/src/main/java/org/scijava/event/bushe/Prioritized.java
+++ b/src/main/java/org/scijava/event/bushe/Prioritized.java
@@ -9,6 +9,6 @@
  * from this interface is positive, then this subscriber will be called after non-Prioritized subscribers, the more
  * positive, the later it is called.
  */
-public interface Prioritized {
+interface Prioritized {
    int getPriority();
 }
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
index 8ebe233c7..af3a93dc8 100644
--- a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
@@ -4,5 +4,5 @@
  * This is a convenience interface, particularly for inner classes, that implements
  * {@link IEventSubscriber} and {@link Prioritized}.
  */
-public interface PrioritizedEventSubscriber extends IEventSubscriber, Prioritized {
+interface PrioritizedEventSubscriber extends IEventSubscriber, Prioritized {
 }
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
index 63732799e..c58ce6b76 100644
--- a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
@@ -4,5 +4,5 @@
  * This is a convenience interface, particularly for inner classes, that implements
  * {@link org.scijava.event.bushe.IEventTopicSubscriber} and {@link org.scijava.event.bushe.Prioritized}.
  */
-public interface PrioritizedEventTopicSubscriber extends IEventTopicSubscriber, Prioritized {
+interface PrioritizedEventTopicSubscriber extends IEventTopicSubscriber, Prioritized {
 }
\ No newline at end of file
diff --git a/src/main/java/org/scijava/event/bushe/ProxySubscriber.java b/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
index a80cc3bf1..04ac3ce0a 100644
--- a/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/ProxySubscriber.java
@@ -25,7 +25,7 @@
  *
  * @author Michael Bushe
  */
-public interface ProxySubscriber {
+interface ProxySubscriber {
 
    /** @return the object this proxy is subscribed on behalf of */
    public Object getProxiedSubscriber();
diff --git a/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
index 478665f25..feaf2701b 100644
--- a/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
@@ -6,7 +6,7 @@
 /**
  * A Proxy Subscriber for Annotations that use topic patterns
  */
-public class ProxyTopicPatternSubscriber extends ProxyTopicSubscriber {
+class ProxyTopicPatternSubscriber extends ProxyTopicSubscriber {
    private Pattern pattern;
 
    /**
diff --git a/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
index d2699b465..76a821a10 100644
--- a/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
@@ -8,7 +8,7 @@
  * {@link @org.scijava.event.bushe.annotation.EventTopicSubscriber}.  Advanced EventBus
  * users could use this class in Aspect-Oriented code.  Consider using the
  * {@link AnnotationProcessor} instead, it may suit your needs and be easier.*/
-public class ProxyTopicSubscriber extends AbstractProxySubscriber
+class ProxyTopicSubscriber extends AbstractProxySubscriber
         implements org.scijava.event.bushe.IEventTopicSubscriber, VetoTopicEventListener {
    private String topic;
 
diff --git a/src/main/java/org/scijava/event/bushe/PublicationStatus.java b/src/main/java/org/scijava/event/bushe/PublicationStatus.java
index acdf3d4e2..84c0090d0 100644
--- a/src/main/java/org/scijava/event/bushe/PublicationStatus.java
+++ b/src/main/java/org/scijava/event/bushe/PublicationStatus.java
@@ -7,7 +7,7 @@
  * with the corresponding PublicationStatus as the event object is processed.  The EventService is not
  * required to set the Unpublished state.
  */
-public enum PublicationStatus {
+enum PublicationStatus {
    /** Recommended default.*/
    Unpublished,
    /** Set directly after publication on an EventService.*/
diff --git a/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java b/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java
index b22520751..cc6a98595 100644
--- a/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java
+++ b/src/main/java/org/scijava/event/bushe/PublicationStatusTracker.java
@@ -7,7 +7,7 @@
  * EventService implementations must call setEventStatus(status) on event objects and
  * payloads that implement this interface.
  */
-public interface PublicationStatusTracker {
+interface PublicationStatusTracker {
 
    /**
     * Implementations of this method must be made thread safe.
diff --git a/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
index 878f2eb7c..3fb264538 100644
--- a/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
@@ -10,7 +10,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface RuntimeTopicEventSubscriber {
+@interface RuntimeTopicEventSubscriber {
     /**
      * @return name of a method (that must return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
index 168574556..6d88c1432 100644
--- a/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
@@ -7,7 +7,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface RuntimeTopicPatternEventSubscriber {
+@interface RuntimeTopicPatternEventSubscriber {
     /**
      * @return name of a method (which should return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
index 6bfaef918..3037ee83e 100644
--- a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
+++ b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
@@ -22,7 +22,7 @@
  * @author Michael Bushe michael@bushe.com
  * @see ThreadSafeEventService
  */
-public class SubscriberTimingEvent extends AbstractEventServiceEvent {
+class SubscriberTimingEvent extends AbstractEventServiceEvent {
    private Long start;
    private Long end;
    private Long timeLimitMilliseconds;
diff --git a/src/main/java/org/scijava/event/bushe/SwingEventService.java b/src/main/java/org/scijava/event/bushe/SwingEventService.java
index aded25830..20d40e7b3 100644
--- a/src/main/java/org/scijava/event/bushe/SwingEventService.java
+++ b/src/main/java/org/scijava/event/bushe/SwingEventService.java
@@ -28,7 +28,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public class SwingEventService extends ThreadSafeEventService {
+class SwingEventService extends ThreadSafeEventService {
 
    /**
     * By default, the SwingEventService is constructed such that any listener that takes over 200 ms causes an
diff --git a/src/main/java/org/scijava/event/bushe/SwingException.java b/src/main/java/org/scijava/event/bushe/SwingException.java
index 68249e45a..f46dd321e 100644
--- a/src/main/java/org/scijava/event/bushe/SwingException.java
+++ b/src/main/java/org/scijava/event/bushe/SwingException.java
@@ -38,7 +38,7 @@
  * @todo in SwingUtils, make an invokeLater() method that saves the calling stack and catches all exceptions from a
  * subsequent call to SwingUtilities.invokeLater(), then throws a Swing Exception so the calling stack is saved.
  */
-public class SwingException extends Exception {
+class SwingException extends Exception {
    protected StackTraceElement[] callingStackTrace;
 
    /** Default constructor */
diff --git a/src/main/java/org/scijava/event/bushe/TypeReference.java b/src/main/java/org/scijava/event/bushe/TypeReference.java
index 1a40a5791..06ff73a8c 100644
--- a/src/main/java/org/scijava/event/bushe/TypeReference.java
+++ b/src/main/java/org/scijava/event/bushe/TypeReference.java
@@ -9,7 +9,7 @@
  * Courtesy of Neil Gafter's blog.
  * Thanks to Curt Cox for the pointer.
  */
-public abstract class TypeReference<T> {
+abstract class TypeReference<T> {
 
  private final Type type;
  private volatile Constructor<?> constructor;
diff --git a/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java b/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
index ec1e35b60..490303378 100644
--- a/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
+++ b/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
@@ -11,5 +11,5 @@
  * Object.class cannot be used, since it is legal to subscribe to Object. hence, this class was created which documents
  * the issue and provides decent feedback when using an IDE's parameter insight.
  */
-public final class UseTheClassOfTheAnnotatedMethodsParameter {
+final class UseTheClassOfTheAnnotatedMethodsParameter {
 }
diff --git a/src/main/java/org/scijava/event/bushe/VetoEventListener.java b/src/main/java/org/scijava/event/bushe/VetoEventListener.java
index 693a15a36..0c20a3c4f 100644
--- a/src/main/java/org/scijava/event/bushe/VetoEventListener.java
+++ b/src/main/java/org/scijava/event/bushe/VetoEventListener.java
@@ -20,7 +20,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public interface VetoEventListener<T> {
+interface VetoEventListener<T> {
 
    /**
     * Determine whether an event should be vetoed or published.
diff --git a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
index fb9fa479d..3a6283fe0 100644
--- a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
@@ -7,7 +7,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface VetoRuntimeTopicPatternSubscriber {
+@interface VetoRuntimeTopicPatternSubscriber {
     /**
      * @return name of a method (which should return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
index 04811518b..e5ce7d6eb 100644
--- a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
@@ -10,7 +10,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface VetoRuntimeTopicSubscriber {
+@interface VetoRuntimeTopicSubscriber {
     /**
      * @return name of a method (that must return a String) and whose return value will become the subscription topic.
      */
diff --git a/src/main/java/org/scijava/event/bushe/VetoSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
index 22c86d8c9..e8172744e 100644
--- a/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
@@ -41,7 +41,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface VetoSubscriber {
+@interface VetoSubscriber {
    /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
    public abstract Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
 
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java b/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
index 8bfbb5755..a1dd81a80 100644
--- a/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
+++ b/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
@@ -5,7 +5,7 @@
  *
  * @author Michael Bushe michael@bushe.com
  */
-public interface VetoTopicEventListener<T> {
+interface VetoTopicEventListener<T> {
 
    /**
     * Determine whether a topic publication should be vetoed or allowed.
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
index bf6e9134c..72de5cbed 100644
--- a/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
@@ -41,7 +41,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface VetoTopicPatternSubscriber {
+@interface VetoTopicPatternSubscriber {
    /** The topic to subscribe to */
    public abstract String topicPattern();
 
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
index 630930660..81fbb7366 100644
--- a/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
@@ -41,7 +41,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface VetoTopicSubscriber {
+@interface VetoTopicSubscriber {
    /** The topic to subscribe to */
    String topic();
 

From a51dfcdfa36028705c6e440f9a01e131338865c7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 11:35:54 -0500
Subject: [PATCH 1103/1208] Make EventBus cleanup timer a daemon thread

To prevent intermittent hangs on JVM shutdown.
---
 .../java/org/scijava/event/bushe/ThreadSafeEventService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
index 1a0dcf585..1f3868fd2 100644
--- a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -2095,7 +2095,7 @@ protected void decWeakRefPlusProxySubscriberCount() {
    private void startCleanup() {
       synchronized(listenerLock) {
          if (cleanupTimer == null) {
-            cleanupTimer = new Timer();
+            cleanupTimer = new Timer(true);
          } 
          if (cleanupTimerTask == null) {
             cleanupTimerTask = new CleanupTimerTask();

From ac03bcad87d6def72a79d78686c17cf4ead09784 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 12:23:39 -0500
Subject: [PATCH 1104/1208] Remove many unneeded org.bushe:eventbus classes

---
 .../org/scijava/event/DefaultEventBus.java    |    2 +-
 .../scijava/event/DefaultEventService.java    |    2 +-
 .../org/scijava/event/EventSubscriber.java    |    2 +-
 .../bushe/AbstractEventServiceEvent.java      |   56 -
 .../event/bushe/AnnotationProcessor.java      |  557 -------
 .../event/bushe/BaseProxySubscriber.java      |  130 --
 .../bushe/ContainerEventServiceAction.java    |   71 -
 .../bushe/ContainerEventServiceFinder.java    |   84 -
 .../bushe/ContainerEventServiceRegistrar.java |  248 ---
 .../bushe/ContainerEventServiceSupplier.java  |   42 -
 .../org/scijava/event/bushe/EventBus.java     |  423 -----
 .../scijava/event/bushe/EventBusAction.java   |   41 -
 .../org/scijava/event/bushe/EventService.java |   54 +-
 .../event/bushe/EventServiceAction.java       |  214 ---
 .../event/bushe/EventServiceEvent.java        |   30 -
 .../bushe/EventServiceExistsException.java    |    8 -
 .../event/bushe/EventServiceLocator.java      |  174 --
 .../scijava/event/bushe/EventSubscriber.java  |  121 +-
 .../bushe/EventTopicPatternSubscriber.java    |   31 -
 .../event/bushe/EventTopicSubscriber.java     |  122 +-
 .../scijava/event/bushe/IEventSubscriber.java |   35 -
 .../event/bushe/IEventTopicSubscriber.java    |   38 -
 .../org/scijava/event/bushe/ObjectEvent.java  |   42 -
 .../bushe/PrioritizedEventSubscriber.java     |    8 -
 .../PrioritizedEventTopicSubscriber.java      |    8 -
 .../bushe/ProxyTopicPatternSubscriber.java    |   86 -
 .../event/bushe/ProxyTopicSubscriber.java     |  144 --
 .../bushe/RuntimeTopicEventSubscriber.java    |   34 -
 .../RuntimeTopicPatternEventSubscriber.java   |   34 -
 .../event/bushe/SubscriberTimingEvent.java    |  116 --
 .../event/bushe/SwingEventService.java        |   93 --
 .../event/bushe/ThreadSafeEventService.java   |  137 +-
 ...heClassOfTheAnnotatedMethodsParameter.java |   15 -
 .../VetoRuntimeTopicPatternSubscriber.java    |   34 -
 .../bushe/VetoRuntimeTopicSubscriber.java     |   34 -
 .../scijava/event/bushe/VetoSubscriber.java   |   65 -
 .../bushe/VetoTopicPatternSubscriber.java     |   62 -
 .../event/bushe/VetoTopicSubscriber.java      |   62 -
 .../event/bushe/AbstractSubscriber.java       |   27 -
 .../event/bushe/AnnotatedEventSubscriber.java |   88 --
 .../event/bushe/AnnotatedVetoSubscriber.java  |   83 -
 .../AnotherAnnotatedEventSubscriber.java      |   46 -
 ...AnotherDoubleAnnotatedEventSubscriber.java |   23 -
 .../scijava/event/bushe/BadEventService.java  |    4 +-
 .../event/bushe/ConcreteSubscriber.java       |   17 -
 .../bushe/DoubleAnnotatedEventSubscriber.java |   33 -
 .../bushe/EventServiceLocatorTestCase.java    |   32 -
 .../java/org/scijava/event/bushe/Factory.java |   12 -
 .../event/bushe/Issue15Subscriber.java        |   68 -
 .../event/bushe/Issue15Subscriber2.java       |   65 -
 .../bushe/RuntimeTopicPatternSubscriber.java  |   32 -
 .../event/bushe/RuntimeTopicSubscriber.java   |   31 -
 .../bushe/StrongAnnotatedEventSubscriber.java |   30 -
 .../StrongClassAnnotatedEventSubscriber.java  |   24 -
 .../event/bushe/SubscriberForTest.java        |    2 +-
 .../bushe/TestAnnotationInAbstractClass.java  |   18 -
 .../bushe/TestContainerEventService.java      |  218 ---
 .../event/bushe/TestDefaultEventService.java  | 1394 -----------------
 .../scijava/event/bushe/TestEventAction.java  |  181 ---
 .../org/scijava/event/bushe/TestEventBus.java |  570 -------
 .../event/bushe/TestEventBusServiceClass.java |   32 -
 .../TestEventBusServiceClassBadType.java      |   30 -
 .../event/bushe/TestEventBusTiming.java       |  107 --
 .../event/bushe/TestEventServiceLocator.java  |   50 -
 .../event/bushe/TestEventServiceLocator2.java |   46 -
 .../event/bushe/TestEventServiceLocator3.java |   44 -
 .../event/bushe/TestEventServiceLocator4.java |   44 -
 .../event/bushe/TestEventServiceLocator5.java |   43 -
 .../event/bushe/TestEventServiceLocator6.java |   44 -
 .../event/bushe/TestEventServiceLocator7.java |   49 -
 .../TestEventServiceLocatorConfiguration.java |   28 -
 ...TestEventServiceLocatorConfiguration2.java |   28 -
 ...TestEventServiceLocatorConfiguration3.java |   28 -
 ...TestEventServiceLocatorConfiguration4.java |   27 -
 .../scijava/event/bushe/TestPerformance.java  |    4 +-
 .../bushe/TestPrioritizedSubscribers.java     |  591 -------
 .../event/bushe/TestPublicationStates.java    |   67 -
 .../event/bushe/TopicSubscriberForTest.java   |    2 +-
 .../WeakClassAnnotatedEventSubscriber.java    |   24 -
 79 files changed, 130 insertions(+), 7615 deletions(-)
 delete mode 100644 src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/EventBus.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/EventBusAction.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/EventServiceAction.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/EventServiceEvent.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/EventServiceLocator.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/IEventSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/ObjectEvent.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/SwingEventService.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/VetoSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
 delete mode 100644 src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/AbstractSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/AnnotatedEventSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/AnnotatedVetoSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/AnotherAnnotatedEventSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/AnotherDoubleAnnotatedEventSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/ConcreteSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/DoubleAnnotatedEventSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/Factory.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/Issue15Subscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/Issue15Subscriber2.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/RuntimeTopicPatternSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/RuntimeTopicSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/StrongAnnotatedEventSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/StrongClassAnnotatedEventSubscriber.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestAnnotationInAbstractClass.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestContainerEventService.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventAction.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventBus.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/TestPublicationStates.java
 delete mode 100644 src/test/java/org/scijava/event/bushe/WeakClassAnnotatedEventSubscriber.java

diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 85ae5f382..365102949 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -59,7 +59,7 @@ public class DefaultEventBus extends ThreadSafeEventService {
 	public DefaultEventBus(final ThreadService threadService,
 		final LogService log)
 	{
-		super(200L, false, null, null, null);
+		super(200L, null, null, null);
 		this.threadService = threadService;
 		this.log = log;
 	}
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index b36ec1929..074a20bad 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -263,7 +263,7 @@ private synchronized void keepIt(final Object o, final ProxySubscriber<?> subscr
 	 * <p>
 	 * Recapitulates some logic from
 	 * {@code org.scijava.event.bushe.BaseProxySubscriber}, because that class
-	 * implements {@link org.scijava.event.bushe.IEventSubscriber} as a raw type,
+	 * implements {@link org.scijava.event.bushe.EventSubscriber} as a raw type,
 	 * which is incompatible with this class implementing SciJava's
 	 * {@link EventSubscriber} as a typed interface; it becomes impossible to
 	 * implement both {@code onEvent(Object)} and {@code onEvent(E)}.
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index a25ba2c1a..a36181639 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -44,7 +44,7 @@
  * @param <E> Type of event for which to listen
  */
 public interface EventSubscriber<E extends SciJavaEvent> extends
-	org.scijava.event.bushe.IEventSubscriber<E>
+	org.scijava.event.bushe.EventSubscriber<E>
 {
 
 	@Override
diff --git a/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java b/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
deleted file mode 100644
index 2497af721..000000000
--- a/src/main/java/org/scijava/event/bushe/AbstractEventServiceEvent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * Convenience base class for EventServiceEvents in the application. Provides the convenience of
- * holding the event source publication and event status.  It is not necessary to use this event class when 
- * using an EventService.
- *
- * @author Michael Bushe michael@bushe.com
- */
-abstract class AbstractEventServiceEvent implements EventServiceEvent, PublicationStatusTracker {
-
-   private Object source = null;
-   protected final Object stateLock = new Object();
-   private PublicationStatus publicationStatus = PublicationStatus.Unpublished;
-
-   /**
-    * Default constructor
-    *
-    * @param source the source of the event
-    */
-   public AbstractEventServiceEvent(Object source) {
-      this.source = source;
-   }
-
-   /** @return the source of this event */
-   public Object getSource() {
-      return source;
-   }
-
-   public PublicationStatus getPublicationStatus() {
-      synchronized (stateLock) {
-         return publicationStatus;
-      }
-   }
-
-   public void setPublicationStatus(PublicationStatus status) {
-      synchronized (stateLock) {
-         publicationStatus = status;
-      }
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java b/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
deleted file mode 100644
index c7428c7e1..000000000
--- a/src/main/java/org/scijava/event/bushe/AnnotationProcessor.java
+++ /dev/null
@@ -1,557 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.regex.Pattern;
-import java.util.Arrays;
-
-/**
- * Enhances classes that use EventService Annotations.
- * <p/>
- * This class makes the EventService annotations "come alive."  This can be used in code like so:
- * <pre>
- * <code>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventSubscriber
- *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
- *      //do something
- *   }
- *   &#64;EventSubscriber
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
- *      //do something
- *   }
- * }
- * ... some other place, needed in some cases when the like a window disposal before it's garbage collected ....
- * AnnotationProcessor.unprocess(this);
- * </code>
- * </pre>
- * <p/>
- * This class can be leveraged in outside of source code in other ways in which Annotations are used: <ul> <li>In an
- * Aspect-Oriented tool <li>In a Swing Framework classloader that wants to load and understand events. <li>In other
- * Inversion of Control containers, such as Spring or PicoContainer. <li>In the apt tool, though this does not generate
- * code. <li>In a Annotation Processing Tool plugin, when it becomes available. </ul> Support for these other methods
- * are not yet implemented.
- */
-class AnnotationProcessor {
-
-   protected static final Logger LOG = Logger.getLogger(EventService.class.getName());
-
-   /**
-    * Add the appropriate subscribers to one or more EventServices for an instance of a class with
-    * EventBus annotations.
-    * @param obj the instance that may or may not have annotations
-    */
-   public static void process(Object obj) {
-      processOrUnprocess(obj, true);
-   }
-
-   /**
-    * Remove the appropriate subscribers from one or more EventServices for an instance of a class with
-    * EventBus annotations.
-    * @param obj the instance that may or may not have annotations
-    */
-   public static void unprocess(Object obj) {
-      processOrUnprocess(obj, false);
-   }
-
-   private static void processOrUnprocess(Object obj, boolean add) {
-      if (obj == null) {
-         return;
-      }
-      Class cl = obj.getClass();
-      Method[] methods = cl.getMethods();
-      if (LOG.isLoggable(Logger.Level.DEBUG)) {
-        LOG.debug("Looking for EventBus annotations for class " + cl + ", methods:" + Arrays.toString(methods));
-      }
-      for (Method method : methods) {
-         
-         EventSubscriber classAnnotation = method.getAnnotation(EventSubscriber.class);
-         if (classAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found EventSubscriber:"+classAnnotation +" on method:" + method);
-            }
-            process(classAnnotation, obj, method, add);
-         }
-         EventTopicSubscriber topicAnnotation = method.getAnnotation(EventTopicSubscriber.class);
-         if (topicAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found EventTopicSubscriber: "+topicAnnotation +"  on method:" + method);
-            }
-            process(topicAnnotation, obj, method, add);
-         }
-         EventTopicPatternSubscriber topicPatternAnnotation = method.getAnnotation(EventTopicPatternSubscriber.class);
-         if (topicPatternAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found EventTopicPatternSubscriber: "+topicPatternAnnotation+" on method:" + method);
-            }
-            process(topicPatternAnnotation, obj, method, add);
-         }
-         RuntimeTopicEventSubscriber runtimeTopicAnnotation = method.getAnnotation(RuntimeTopicEventSubscriber.class);
-         if (runtimeTopicAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found RuntimeTopicEventSubscriber: "+runtimeTopicAnnotation+" on method:" + method);
-            }
-            process(runtimeTopicAnnotation, obj, method, add);
-         }
-         RuntimeTopicPatternEventSubscriber annotation = method.getAnnotation(RuntimeTopicPatternEventSubscriber.class);
-         if (annotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found RuntimeTopicPatternEventSubscriber:"+annotation+" on method:" + method);
-            }
-            process(annotation, obj, method, add);
-         }
-
-
-         VetoSubscriber vetoClassAnnotation = method.getAnnotation(VetoSubscriber.class);
-         if (vetoClassAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found VetoSubscriber:"+vetoClassAnnotation +" on method:" + method);
-            }
-            process(vetoClassAnnotation, obj, method, add);
-         }
-         VetoTopicSubscriber vetoTopicAnnotation = method.getAnnotation(VetoTopicSubscriber.class);
-         if (vetoTopicAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found VetoTopicSubscriber: "+vetoTopicAnnotation +"  on method:" + method);
-            }
-            process(vetoTopicAnnotation, obj, method, add);
-         }
-         VetoTopicPatternSubscriber vetoTopicPatternAnnotation = method.getAnnotation(VetoTopicPatternSubscriber.class);
-         if (vetoTopicPatternAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found VetoTopicPatternSubscriber: "+vetoTopicPatternAnnotation+" on method:" + method);
-            }
-            process(vetoTopicPatternAnnotation, obj, method, add);
-         }
-         VetoRuntimeTopicSubscriber vetoRuntimeTopicAnnotation = method.getAnnotation(VetoRuntimeTopicSubscriber.class);
-         if (vetoRuntimeTopicAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found VetoRuntimeTopicSubscriber: "+vetoRuntimeTopicAnnotation+" on method:" + method);
-            }
-            process(vetoRuntimeTopicAnnotation, obj, method, add);
-         }
-         VetoRuntimeTopicPatternSubscriber vetoAnnotation = method.getAnnotation(VetoRuntimeTopicPatternSubscriber.class);
-         if (vetoAnnotation != null) {
-            if (LOG.isLoggable(Logger.Level.DEBUG)) {
-               LOG.debug("Found VetoRuntimeTopicPatternSubscriber:"+vetoAnnotation+" on method:" + method);
-            }
-            process(vetoAnnotation, obj, method, add);
-         }
-      }
-   }
-
-
-   private static void process(EventTopicPatternSubscriber topicPatternAnnotation, Object obj,
-           Method method, boolean add) {
-      //Check args
-      String topicPattern = topicPatternAnnotation.topicPattern();
-      if (topicPattern == null) {
-         throw new IllegalArgumentException("Topic pattern cannot be null for EventTopicPatternSubscriber annotation");
-      }
-
-      //Get event service
-      Class<? extends EventService> eventServiceClass = topicPatternAnnotation.autoCreateEventServiceClass();
-      String eventServiceName = topicPatternAnnotation.eventServiceName();
-      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
-      int priority = topicPatternAnnotation.priority();
-
-      //Create proxy and subscribe
-      Pattern pattern = Pattern.compile(topicPattern);
-      //See Issue #18
-      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-      if (add) {
-         ProxyTopicPatternSubscriber subscriber = new ProxyTopicPatternSubscriber(obj, method,
-                 topicPatternAnnotation.referenceStrength(), priority, eventService,
-                 topicPattern, pattern, false);
-
-         eventService.subscribeStrongly(pattern, subscriber);
-      } else {
-         eventService.unsubscribe(pattern, obj);
-      }
-   }
-
-   private static void process(EventTopicSubscriber topicAnnotation, Object obj, Method method, boolean add) {
-      //Check args
-      String topic = topicAnnotation.topic();
-      if (topic == null) {
-         throw new IllegalArgumentException("Topic cannot be null for EventTopicSubscriber annotation");
-      }
-
-      //Get event service
-      Class<? extends EventService> eventServiceClass = topicAnnotation.autoCreateEventServiceClass();
-      String eventServiceName = topicAnnotation.eventServiceName();
-      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
-
-      int priority = topicAnnotation.priority();
-
-      //See Issue #18
-      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-      if (add) {
-         //Create proxy and subscribe
-         ProxyTopicSubscriber subscriber = new ProxyTopicSubscriber(obj, method,
-                 topicAnnotation.referenceStrength(), priority, eventService, topic, false);
-
-         eventService.subscribeStrongly(topic, subscriber);
-      } else {
-         eventService.unsubscribe(topic, obj);
-      }
-   }
-
-   private static void process(EventSubscriber annotation, Object obj, Method method, boolean add) {
-      //Check args
-      Class eventClass = annotation.eventClass();
-      if (eventClass == null) {
-         throw new IllegalArgumentException("Event class cannot be null for EventSubscriber annotation");
-      } else if (UseTheClassOfTheAnnotatedMethodsParameter.class.equals(eventClass)) {
-         Class[] params = method.getParameterTypes();
-         if (params.length < 1) {
-            throw new RuntimeException("Expected annotated method to have one parameter.");
-         } else {
-            eventClass = params[0];
-         }
-      }
-
-      //Get event service
-      Class<? extends EventService> eventServiceClass = annotation.autoCreateEventServiceClass();
-      String eventServiceName = annotation.eventServiceName();
-      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
-
-      if (add) {
-         int priority = annotation.priority();
-
-         //Create proxy and subscribe
-         //See https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-         BaseProxySubscriber subscriber = new BaseProxySubscriber(obj, method, annotation.referenceStrength(),
-                 priority, eventService, eventClass, false);
-         if (annotation.exact()) {
-            //See Issue #18
-            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-            eventService.subscribeExactlyStrongly(eventClass, subscriber);
-         } else {
-            //See Issue #18
-            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-            eventService.subscribeStrongly(eventClass, subscriber);
-         }
-      } else {
-         if (annotation.exact()) {
-            eventService.unsubscribeExactly(eventClass, obj);
-         } else {
-            eventService.unsubscribe(eventClass, obj);            
-         }
-      }
-   }
-
-
-
-   private static void process(final RuntimeTopicEventSubscriber annotation, final Object subscriber, final Method method, boolean add) {
-       EventTopicSubscriber eventTopicSubscriber = new EventTopicSubscriber() {
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public Class<? extends EventService> autoCreateEventServiceClass() {
-               return annotation.autoCreateEventServiceClass();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public String eventServiceName() {
-               return annotation.eventServiceName();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public ReferenceStrength referenceStrength() {
-               return annotation.referenceStrength();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-			  public int priority() {
-				return annotation.priority();
-			  }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public String topic() {
-               return getTopic(annotation.methodName(), subscriber, method);
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public Class<? extends Annotation> annotationType() {
-               return annotation.annotationType();
-           }
-       };
-       process(eventTopicSubscriber, subscriber, method, add);
-   }
-
-   private static void process(final RuntimeTopicPatternEventSubscriber annotation, final Object subscriber, final Method method, boolean add) {
-       EventTopicPatternSubscriber eventTopicPatternSubscriber = new EventTopicPatternSubscriber() {
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public Class<? extends EventService> autoCreateEventServiceClass() {
-               return annotation.autoCreateEventServiceClass();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public String eventServiceName() {
-               return annotation.eventServiceName();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public ReferenceStrength referenceStrength() {
-               return annotation.referenceStrength();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-			  public int priority() {
-				return annotation.priority();
-			  }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public boolean exact() {
-               return annotation.exact();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public String topicPattern() {
-               return getTopic(annotation.methodName(), subscriber, method);
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public Class<? extends Annotation> annotationType() {
-               return annotation.annotationType();
-           }
-       };
-       process(eventTopicPatternSubscriber, subscriber, method, add);
-   }
-
-   /* This is a cut and paste from above practically, sure which Annotations could be extended.
-    * TODO: When Java 7 comes out, or whatever JSR-308 is delivered, reduce this file by 70% */  
-   private static void process(VetoTopicPatternSubscriber topicPatternAnnotation, Object obj, Method method, boolean add) {
-      //Check args
-      String topicPattern = topicPatternAnnotation.topicPattern();
-      if (topicPattern == null) {
-         throw new IllegalArgumentException("Topic pattern cannot be null for VetoTopicPatternSubscriber annotation");
-      }
-
-      //Get event service
-      Class<? extends EventService> eventServiceClass = topicPatternAnnotation.autoCreateEventServiceClass();
-      String eventServiceName = topicPatternAnnotation.eventServiceName();
-      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
-      int priority = topicPatternAnnotation.priority();
-
-      //Create proxy and subscribe
-      Pattern pattern = Pattern.compile(topicPattern);
-      ProxyTopicPatternSubscriber subscriber = new ProxyTopicPatternSubscriber(obj, method, topicPatternAnnotation.referenceStrength(),
-              priority, eventService, topicPattern, pattern, true);
-
-      //See Issue #18
-      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-      if (add) {
-         eventService.subscribeVetoListenerStrongly(pattern, subscriber);
-      } else {
-         eventService.unsubscribeVeto(pattern, obj);
-      }
-   }
-
-   private static void process(VetoTopicSubscriber topicAnnotation, Object obj, Method method, boolean add) {
-      //Check args
-      String topic = topicAnnotation.topic();
-      if (topic == null) {
-         throw new IllegalArgumentException("Topic cannot be null for VetoTopicSubscriber annotation");
-      }
-
-      //Get event service
-      Class<? extends EventService> eventServiceClass = topicAnnotation.autoCreateEventServiceClass();
-      String eventServiceName = topicAnnotation.eventServiceName();
-      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
-
-      int priority = topicAnnotation.priority();
-
-      //Create proxy and subscribe
-      ProxyTopicSubscriber subscriber = new ProxyTopicSubscriber(obj, method,
-              topicAnnotation.referenceStrength(), priority, eventService, topic, true);
-
-      //See Issue #18
-      //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-      //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-      if (add) {
-         eventService.subscribeVetoListenerStrongly(topic, subscriber);
-      } else {
-         eventService.unsubscribeVeto(topic, obj);
-      }
-   }
-
-   private static void process(VetoSubscriber annotation, Object obj, Method method, boolean add) {
-      //Check args
-      Class eventClass = annotation.eventClass();
-      if (eventClass == null) {
-         throw new IllegalArgumentException("Event class cannot be null for VetoSubscriber annotation");
-      } else if (UseTheClassOfTheAnnotatedMethodsParameter.class.equals(eventClass)) {
-         Class[] params = method.getParameterTypes();
-         if (params.length < 1) {
-            throw new RuntimeException("Expected annotated method to have one parameter.");
-         } else {
-            eventClass = params[0];
-         }
-      }
-
-      //Get event service
-      Class<? extends EventService> eventServiceClass = annotation.autoCreateEventServiceClass();
-      String eventServiceName = annotation.eventServiceName();
-      EventService eventService = getEventServiceFromAnnotation(eventServiceName, eventServiceClass);
-
-      int priority = annotation.priority();
-
-      //Create proxy and subscribe
-      //See https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-      BaseProxySubscriber subscriber = new BaseProxySubscriber(obj, method, annotation.referenceStrength(),
-              priority, eventService, eventClass, true);
-      if (add) {
-         if (annotation.exact()) {
-            //See Issue #18
-            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-            eventService.subscribeVetoListenerExactlyStrongly(eventClass, subscriber);
-         } else {
-            //See Issue #18
-            //Also note that this post is wrong: https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=19499&forumID=1834
-            //Since two WeakReferences are not treated as one.  So this always has to be strong and we'll have to clean up occasionally.
-            eventService.subscribeVetoListenerStrongly(eventClass, subscriber);
-         }
-      } else {
-         if (annotation.exact()) {
-            eventService.unsubscribeVetoExactly(eventClass, obj);
-         } else {
-            eventService.unsubscribeVeto(eventClass, obj);
-         }
-      }
-   }
-
-
-   private static void process(final VetoRuntimeTopicSubscriber annotation, final Object subscriber, final Method method, boolean add) {
-       VetoTopicSubscriber eventTopicSubscriber = new VetoTopicSubscriber() {
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public Class<? extends EventService> autoCreateEventServiceClass() {
-               return annotation.autoCreateEventServiceClass();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public String eventServiceName() {
-               return annotation.eventServiceName();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public ReferenceStrength referenceStrength() {
-               return annotation.referenceStrength();
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-			  public int priority() {
-			   	return annotation.priority();
-			  }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public String topic() {
-               return getTopic(annotation.methodName(), subscriber, method);
-           }
-
-           //TODO uncomment when language level is set to 1.6 (2.0) @Override
-           public Class<? extends Annotation> annotationType() {
-               return annotation.annotationType();
-           }
-       };
-       process(eventTopicSubscriber, subscriber, method, add);
-   }
-
-   private static void process(final VetoRuntimeTopicPatternSubscriber annotation, final Object subscriber, final Method method, boolean add) {
-      VetoTopicPatternSubscriber eventTopicPatternSubscriber = new VetoTopicPatternSubscriber() {
-         //TODO uncomment when language level is set to 1.6 (2.0) @Override
-         public Class<? extends EventService> autoCreateEventServiceClass() {
-            return annotation.autoCreateEventServiceClass();
-         }
-
-         //TODO uncomment when language level is set to 1.6 (2.0) @Override
-         public String eventServiceName() {
-            return annotation.eventServiceName();
-         }
-
-         //TODO uncomment when language level is set to 1.6 (2.0) @Override
-         public ReferenceStrength referenceStrength() {
-            return annotation.referenceStrength();
-         }
-
-         //TODO uncomment when language level is set to 1.6 (2.0) @Override
-         public int priority() {
-            return annotation.priority();
-         }
-
-         //TODO uncomment when language level is set to 1.6 (2.0) @Override
-         public boolean exact() {
-            return annotation.exact();
-         }
-
-         //TODO uncomment when language level is set to 1.6 (2.0) @Override
-         public String topicPattern() {
-            return getTopic(annotation.methodName(), subscriber, method);
-         }
-
-         //TODO uncomment when language level is set to 1.6 (2.0) @Override
-         public Class<? extends Annotation> annotationType() {
-            return annotation.annotationType();
-         }
-      };
-      process(eventTopicPatternSubscriber, subscriber, method, add);
-   }
-
-
-   private static String getTopic(String methodName, Object subscriber, Method method) {
-       try {
-           Method runtimeEvalMethod = subscriber.getClass().getMethod(methodName, new Class[0]);
-           //necessary in case the method does not have public access or if the class it belongs
-           //to isn't public
-           runtimeEvalMethod.setAccessible(true);
-           return runtimeEvalMethod.invoke(subscriber, new Object[0]).toString();
-       } catch (SecurityException e) {
-           throw new RuntimeException("Could not retrieve method for subscription. Method: " + methodName, e);
-       } catch (NoSuchMethodException e) {
-           throw new RuntimeException("Could not retrieve method for subscription. Method: " + methodName, e);
-       } catch (InvocationTargetException e) {
-           e.getTargetException().printStackTrace();
-           throw new RuntimeException("Could not invoke method for subscription. Method: " + methodName, e);
-       } catch (IllegalAccessException e) {
-           throw new RuntimeException("Could not invoke method for subscription. Method: " + methodName, e);
-       }
-   }
-
-
-   private static EventService getEventServiceFromAnnotation(String eventServiceName,
-           Class<? extends EventService> eventServiceClass) {
-      EventService eventService = EventServiceLocator.getEventService(eventServiceName);
-      if (eventService == null) {
-         if (EventServiceLocator.SERVICE_NAME_EVENT_BUS.equals(eventServiceName)) {
-            //This may be the first time the EventBus is accessed.
-            eventService = EventServiceLocator.getSwingEventService();
-         } else {
-            //The event service does not yet exist, create it
-            try {
-               eventService = eventServiceClass.newInstance();
-            } catch (InstantiationException e) {
-               throw new RuntimeException("Could not instance of create EventService class " + eventServiceClass, e);
-            } catch (IllegalAccessException e) {
-               throw new RuntimeException("Could not instance of create EventService class " + eventServiceClass, e);
-            }
-            try {
-               EventServiceLocator.setEventService(eventServiceName, eventService);
-            } catch (EventServiceExistsException e) {
-               //ignore it, it's OK
-               eventService = EventServiceLocator.getEventService(eventServiceName);
-            }
-         }
-      }
-      return eventService;
-   }
-
-}
diff --git a/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java b/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
deleted file mode 100644
index a84bcdde7..000000000
--- a/src/main/java/org/scijava/event/bushe/BaseProxySubscriber.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/** A class is subscribed to an EventService on behalf of another object. */
-class BaseProxySubscriber extends AbstractProxySubscriber
-        implements org.scijava.event.bushe.IEventSubscriber, VetoEventListener {
-   private Class subscriptionClass;
-
-   /**
-    * Creates a proxy.  This does not subscribe it.
-    *
-    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
-    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
-    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
-    * be too
-    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
-    * exist
-    * @param subscription the class to subscribe to, used for unsubscription only
-    * @param veto whether this is a veto subscriber
-    */
-   public BaseProxySubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
-           EventService es, Class subscription, boolean veto) {
-      this(proxiedSubscriber, subscriptionMethod, referenceStrength, 0, es, subscription, veto);
-   }
-
-   /**
-    * Creates a proxy with a priority.  This does not subscribe it.
-    *
-    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
-    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
-    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
-    * be too
-    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
-    * exist
-    * @param subscription the class to subscribe to, used for unsubscription only
-    * @param veto whether this is a veto subscriber
-    */
-   public BaseProxySubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
-           int priority, EventService es, Class subscription, boolean veto) {
-      super(proxiedSubscriber, subscriptionMethod, referenceStrength, priority, es, veto);
-      this.subscriptionClass = subscription;
-      Class[] params = subscriptionMethod.getParameterTypes();
-      if (params == null || params.length != 1 || params[0].isPrimitive()) {
-         throw new IllegalArgumentException("The subscriptionMethod must have a single non-primitive parameter.");
-      }
-   }
-
-   /**
-    * Handles the event publication by pushing it to the real subscriber's subscription Method.
-    *
-    * @param event The Object that is being published.
-    */
-   public void onEvent(Object event) {
-      Object[] args = new Object[]{event};
-      Method subscriptionMethod = null;
-      Object obj = null;
-      try {
-         obj = getProxiedSubscriber();
-         if (obj == null) {
-            //has been garbage collected
-            return;
-         }
-         subscriptionMethod = getSubscriptionMethod();
-         subscriptionMethod.invoke(obj, args);
-      } catch (IllegalAccessException e) {
-         String message = "Exception when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
-         retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
-      } catch (InvocationTargetException e) {
-         throw new RuntimeException("InvocationTargetException when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
-      }
-   }
-
-
-   public boolean shouldVeto(Object event) {
-      Object[] args = new Object[]{event};
-      Method subscriptionMethod = null;
-      Object obj = null;
-      try {
-         obj = getProxiedSubscriber();
-         if (obj == null) {
-            //has been garbage collected
-            return false;
-         }
-         subscriptionMethod = getSubscriptionMethod();
-         return Boolean.valueOf(subscriptionMethod.invoke(obj, args)+"");
-      } catch (IllegalAccessException e) {
-         String message = "Exception when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
-         return retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
-      } catch (InvocationTargetException e) {
-         throw new RuntimeException("InvocationTargetException when invoking annotated method from EventService publication.  Event class:" + event.getClass() + ", Event:" + event + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
-      }
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (obj instanceof BaseProxySubscriber) {
-         if (!super.equals(obj)) {
-            return false;
-         }
-         BaseProxySubscriber bps = (BaseProxySubscriber) obj;
-         if (subscriptionClass != bps.subscriptionClass) {
-            if (subscriptionClass == null) {
-               return false;
-            } else {
-               if (!subscriptionClass.equals(bps.subscriptionClass)) {
-                  return false;
-               }
-            }
-         }
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-   @Override
-   public String toString() {
-      return "BaseProxySubscriber{" +
-              "subscription=" + subscriptionClass +
-              "veto=" + veto +
-              "realSubscriber=" + getProxiedSubscriber() +
-              ", subscriptionMethod=" + getSubscriptionMethod() +
-              ", referenceStrength=" + getReferenceStrength() +
-              ", eventService=" + getEventService() +
-              '}';
-   }
-
-}
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
deleted file mode 100644
index 39844dfe4..000000000
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import javax.swing.ImageIcon;
-
-/**
- * When fired, this action publishes an ActionEvent on a Container EventService.
- * See {@link EventServiceAction} for more information.
- * <p/>
- * By default, the Container EventService is found by asking the ContainerEventServiceFinder to find the EventService
- * for the source of the fired ActionEvent, which must be a java.awt.Component and contained in a hierarchy (the source
- * must have been added to another Swing container).  If the action was on a button, this means the container hierarchy
- * of the button is walked (up) until a ContainerEventServiceSupplier is found or until the top of the hierarchy is
- * reached, at which point a ContainerEventService is created automatically on the fly via the top container's
- * putClientProperty() method using the key {@link ContainerEventServiceFinder#CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE}.
- * If the event is from a JPopupMenu then the popup menu's invoker's hierarchy is walked.
- * <p/>
- * To exhibit other behavior, override the getSwingEventService() to return another EventService. For example, the
- * creator of a popup menu may pass itself to the ContainerEventServiceFinder to return a parent's EventService.
- * <p/>
- *
- * @author Michael Bushe michael@bushe.com
- * @see EventServiceAction for further documentation
- * @see ContainerEventServiceFinder on how the service is found
- */
-class ContainerEventServiceAction extends EventServiceAction {
-   public ContainerEventServiceAction() {
-   }
-
-   public ContainerEventServiceAction(String actionName, ImageIcon icon) {
-      super(actionName, icon);
-   }
-
-   protected EventService getEventService(ActionEvent event) {
-      Component comp = null;
-      try {
-         if (event.getSource() instanceof Component) {
-            comp = (Component) event.getSource();
-         }
-         if (comp == null) {
-            if (getThrowsExceptionOnNullEventService()) {
-               throw new RuntimeException("ActionEvent source was null, could not find event bus, must override getContainerEventService in action with id:" + getName());
-            }
-         } else {
-            return ContainerEventServiceFinder.getEventService(comp);
-         }
-      } catch (ClassCastException ex) {
-         if (getThrowsExceptionOnNullEventService()) {
-            throw new RuntimeException("ActionEvent source was not a component (" + (comp == null ? "null" : comp.getClass() + "") + "), must override getContainerEventService in action with id:" + getName(), ex);
-         }
-      }
-      return null;
-   }
-}
-
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
deleted file mode 100644
index a3464241f..000000000
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceFinder.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.awt.Component;
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-import javax.swing.RootPaneContainer;
-
-/**
- * This class finds a component's container event service, and creates one if necessary and possible.
- * <p/>
- * A Container EventService is, unlike the EventBus, an EventService that is container specific, in other words, it is
- * shared only amongst components within a container.  For example, a Form component can supply an EventService used
- * only by components in the form.  The Form's components can publish value change events on their Container's Event
- * Service.  The Form's Model and Validator may listen to these events to collect data and show errors, respectively.
- * <p/>
- * Most importantly, Container EventService's cuts down event traffic, avoid naming and listener clashes, promotes
- * componentization, and splits events usage into logical subsets.
- * <p/>
- * The finder will walk up a component's hierarchy searching for a parent that implements ContainerEventServiceSupplier.
- * If it find one, it returns it.  If it doesn't find one, the top level JComponent (specifically, the highest parent in
- * the hierarchy, typically a JRootPane) has a client property added to it (if not already set) that has the value of a
- * new SwingEventService, which is then returned.  The EventBus is never returned.
- *
- * @author Michael Bushe michael@bushe.com
- */
-class ContainerEventServiceFinder {
-   /** The client property used to put a new SwingEventService on top-level components. */
-   public static final String CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE = "ContainerEventServiceFinder.createdService";
-
-   /**
-    * Walks the component's parents until it find an ContainerEventServiceSupplier and returns the supplier's
-    * EventService.  If the component in the tree is a JPopupMenu, then the menu's invoker is walked.
-    *
-    * @param component any component
-    *
-    * @return the ContainerEventService of the nearest parent
-    */
-   public static EventService getEventService(Component component) {
-      while (component != null) {
-         if (component instanceof ContainerEventServiceSupplier) {
-            return ((ContainerEventServiceSupplier) component).getContainerEventService();
-         }
-         if (component instanceof JPopupMenu) {
-            component = ((JPopupMenu) component).getInvoker();
-         } else {
-            if (component.getParent() == null) {
-               //There is no supplier.  Instead of returning null, make an event service
-               //and stick it in the client properties of the top level container.
-               if (component instanceof RootPaneContainer) {
-                  component = ((RootPaneContainer) component).getRootPane();
-               }
-               if (!(component instanceof JComponent)) {
-                  return null;
-               }
-               JComponent jComp = ((JComponent) component);
-               SwingEventService eventService = (SwingEventService) jComp.getClientProperty(CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE);
-               if (eventService == null) {
-                  eventService = new SwingEventService();
-                  jComp.putClientProperty(CLIENT_PROPERTY_KEY_TOP_LEVEL_EVENT_SERVICE, eventService);
-               }
-               return eventService;
-            } else {
-               component = component.getParent();
-            }
-         }
-      }
-      return null;
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
deleted file mode 100644
index d39d1238e..000000000
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceRegistrar.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import javax.swing.JComponent;
-import javax.swing.event.AncestorEvent;
-import javax.swing.event.AncestorListener;
-import java.awt.event.ContainerEvent;
-import java.awt.event.ContainerListener;
-import java.awt.event.HierarchyEvent;
-import java.awt.event.HierarchyListener;
-
-
-/**
- * Registers a component with it's Container's EventService while keeping track of the component's container.
- * <p/>
- * Registering with a component's ContainerEventService is tricky since components may not be in their hierarchy when
- * they want to register with it, or components may move (though rarely).  This class subscribes a component with it's
- * container event service.  If it is unavailable, the registrar waits until the component's Container becomes available
- * and subscribes at that time.  If the component changes Containers, the registrar unsubscribes the component from its
- * old container and subscribes it to the new one.
- *
- * @author Michael Bushe michael@bushe.com
- */
-class ContainerEventServiceRegistrar {
-   private JComponent jComp;
-   private IEventSubscriber eventSubscriber;
-   private VetoEventListener vetoSubscriber;
-   private Class[] eventClasses;
-   private IEventTopicSubscriber eventTopicSubscriber;
-   private VetoTopicEventListener vetoTopicSubscriber;
-   private String[] topics;
-   private EventService containerEventService;
-
-   /**
-    * Create a registrar that will keep track of the container event service, typically used in the publish-only cases
-    * where the getContainerEventServer() call will be made before publication.
-    *
-    * @param jComp the component whose container to monitor
-    */
-   public ContainerEventServiceRegistrar(JComponent jComp) {
-      this(jComp, null, null, null, null, null, null);
-   }
-
-   /**
-    * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the
-    * eventClass when the ContainerEventService is available and when it changes.
-    *
-    * @param jComp the component whose container to monitor
-    * @param eventSubscriber the subscriber to register to the Container EventServer
-    * @param eventClasses the class(es) to register for
-    */
-   public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, Class... eventClasses) {
-      this(jComp, eventSubscriber, null, eventClasses, null, null, null);
-   }
-
-   /**
-    * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the topic
-    * when the ContainerEventService is available and when it changes.
-    *
-    * @param jComp the component whose container to monitor
-    * @param eventTopicSubscriber the topic subscriber to register to the Container EventServer
-    * @param topics the event topic name to register for
-    */
-   public ContainerEventServiceRegistrar(JComponent jComp, IEventTopicSubscriber eventTopicSubscriber, String... topics) {
-      this(jComp, null, null, null, eventTopicSubscriber, null, topics);
-   }
-
-    /**
-     * Create a registrar that will keep track of the container event service, and subscribeStrongly the veto subscriber
-     * to the topics when the ContainerEventService is available and when it changes.
-     *
-     * @param jComp the component whose container to monitor
-     * @param vetoSubscriber the veto subscriber to register to the Container EventServer
-     * @param eventClasses the classes of event to register for
-     */
-    public ContainerEventServiceRegistrar(JComponent jComp, VetoEventListener vetoSubscriber, Class... eventClasses) {
-       this(jComp, null, vetoSubscriber, eventClasses, null, null, null);
-    }
-
-    /**
-     * Create a registrar that will keep track of the container event service, and subscribeStrongly the veto subscriber
-     * to the topics when the ContainerEventService is available and when it changes.
-     *
-     * @param jComp the component whose container to monitor
-     * @param vetoTopicSubscriber the veto subscriber to register to the Container EventServer
-     * @param topics the event topic(s) to register for
-     */
-    public ContainerEventServiceRegistrar(JComponent jComp, VetoTopicEventListener vetoTopicSubscriber, String... topics) {
-       this(jComp, null, null, null, null, vetoTopicSubscriber, topics);
-    }
-
-    /**
-     * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the topics
-     * and the event classes when the ContainerEventService is available and when it changes.
-     *
-     * @param jComp the component whose container to monitor
-     * @param eventSubscriber the subscriber to register to the Container EventServer
-     * @param eventClasses the classes of event to register for
-     * @param eventTopicSubscriber the topic subscriber to keep registered to the topic(s)
-     * @param topics the event topic names to register for
-     */
-    public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, Class[] eventClasses,
-            IEventTopicSubscriber eventTopicSubscriber, String[] topics) {
-        this(jComp, eventSubscriber, null, eventClasses, eventTopicSubscriber, null, topics);
-    }
-
-   /**
-    * Create a registrar that will keep track of the container event service, and subscribe the subscriber to the topics
-    * and the event classes when the ContainerEventService is available and when it changes.
-    *
-    * @param jComp the component whose container to monitor
-    * @param eventSubscriber the subscriber to register to the Container EventServer
-    * @param vetoSubscriber a veto subscriber for the eventClasses
-    * @param eventClasses the classes of event to register for
-    * @param eventTopicSubscriber the topic subscriber to keep registered to the topic(s)
-    * @param vetoTopicSubscriber a veto subscriber for the topics
-    * @param topics the event topic names to register for
-    */
-   public ContainerEventServiceRegistrar(JComponent jComp, IEventSubscriber eventSubscriber, VetoEventListener vetoSubscriber,
-           Class[] eventClasses, IEventTopicSubscriber eventTopicSubscriber, VetoTopicEventListener vetoTopicSubscriber,
-           String[] topics) {
-      this.jComp = jComp;
-      this.eventSubscriber = eventSubscriber;
-      this.vetoSubscriber = vetoSubscriber;
-      this.eventClasses = eventClasses;
-      this.eventTopicSubscriber = eventTopicSubscriber;
-      this.vetoTopicSubscriber = vetoTopicSubscriber;
-      this.topics = topics;
-
-      if (jComp == null) {
-         throw new NullPointerException("JComponent is null");
-      }
-      updateContainerEventService();
-      jComp.addHierarchyListener(new HierarchyListener() {
-         public void hierarchyChanged(HierarchyEvent e) {
-            updateContainerEventService();
-         }
-      });
-      jComp.addContainerListener(new ContainerListener() {
-         public void componentAdded(ContainerEvent e) {
-            updateContainerEventService();
-         }
-
-         public void componentRemoved(ContainerEvent e) {
-            updateContainerEventService();
-         }
-      });
-      jComp.addAncestorListener(new AncestorListener() {
-         public void ancestorAdded(AncestorEvent event) {
-            updateContainerEventService();
-         }
-
-         public void ancestorMoved(AncestorEvent event) {
-             //ignore - not necessary to keep track of movement
-         }
-
-         public void ancestorRemoved(AncestorEvent event) {
-            updateContainerEventService();
-         }
-      });
-   }
-
-   /**
-    * Called by this class when the container may have changed.
-    * <p/>
-    * Override this method and call super if your class wants to be notified when the container changes (compare the
-    * references of getContainerEventService() around the calls to super.updateContainerEventService()).
-    */
-   protected void updateContainerEventService() {
-      if (containerEventService != null) {
-         if (eventClasses != null) {
-            for (int i = 0; i < eventClasses.length; i++) {
-               Class eventClass = eventClasses[i];
-               if (eventSubscriber != null) {
-                  containerEventService.unsubscribe(eventClass, eventSubscriber);
-               }
-               if (vetoSubscriber != null) {
-                  containerEventService.unsubscribeVeto(eventClass, vetoSubscriber);
-               }
-            }
-         }
-         if (topics != null) {
-            for (int i = 0; i < topics.length; i++) {
-               String topic = topics[i];
-               if (eventTopicSubscriber != null) {
-                  containerEventService.unsubscribe(topic, eventTopicSubscriber);
-               }
-               if (vetoTopicSubscriber != null) {
-                  containerEventService.unsubscribeVeto(topic, vetoTopicSubscriber);
-               }
-            }
-         }
-      }
-
-      containerEventService = ContainerEventServiceFinder.getEventService(jComp);
-      if (containerEventService != null) {
-         if (eventClasses != null) {
-            for (int i = 0; i < eventClasses.length; i++) {
-               Class eventClass = eventClasses[i];
-                if (eventSubscriber != null) {
-                    containerEventService.subscribe(eventClass, eventSubscriber);
-                }
-                if (vetoSubscriber != null) {
-                    containerEventService.subscribeVetoListener(eventClass, vetoSubscriber);
-                }
-            }
-         }
-         if (topics != null) {
-            for (int i = 0; i < topics.length; i++) {
-               String topic = topics[i];
-                if (eventTopicSubscriber != null) {
-                    containerEventService.subscribe(topic, eventTopicSubscriber);
-                }
-                if (vetoTopicSubscriber != null) {
-                    containerEventService.subscribeVetoListener(topic, vetoTopicSubscriber);
-                }
-            }
-         }
-      }
-   }
-
-   /**
-    * @return the container event service, if null, it tries to find it, but it still may be null if this object is not
-    *         in a container.
-    */
-   public EventService getContainerEventService() {
-      if (containerEventService != null) {
-         return containerEventService;
-      } else {
-         updateContainerEventService();
-         return containerEventService;
-      }
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java b/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
deleted file mode 100644
index 915a41fb1..000000000
--- a/src/main/java/org/scijava/event/bushe/ContainerEventServiceSupplier.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * A interface implemented by a Swing Container to supply an EventService local to it's child components.
- * <p/>
- * A Container EventService is an {@link EventService} which, unlike the {@link EventBus}, is specific to a container,
- * in other words, it is shared only among components within a Swing Container.  The only difference between a Container
- * EventService and any other EventService is that it's found and used by the children of a container.  The API and
- * available implementations all work the same as any other EventService.
- * <p/>
- * A good candidate for a ContainerEventServiceSupplier is a Form class.  The components that the Form contains can
- * publish objects when they they change state - for example when their values change or when they become invalid or
- * valid.  The Form may have a model that collects the user's entries by subscribing to events published on the Form's
- * EventService. A FormValidator may also listen to publications on the Form's EventService to subscribe to validation
- * errors.  The Form's components don't have to know about the form, or the model or the validator.  They just publish
- * events on their Container's EventService, which they can find by using a {@link ContainerEventServiceFinder}.
- * <p/>
- * This class does not ever have to be implemented or used directly.  The ContainerEventServiceFinder will create a
- * ContainerEventService on JRootPanes by default on demand.  Hence, each dialog and Frame will have their own
- * automatically as needed.  You only want to implement this interface when you want to limit events to subscribers
- * in containers smaller than a JRootPane, such as a Form's JPanel.
- *
- * @author Michael Bushe michael@bushe.com
- */
-interface ContainerEventServiceSupplier {
-   public EventService getContainerEventService();
-}
diff --git a/src/main/java/org/scijava/event/bushe/EventBus.java b/src/main/java/org/scijava/event/bushe/EventBus.java
deleted file mode 100644
index 0197d0ebd..000000000
--- a/src/main/java/org/scijava/event/bushe/EventBus.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.util.List;
-import java.util.regex.Pattern;
-import java.lang.reflect.Type;
-
-/**
- * The EventBus provides event publication and subscription services.  It is a simple static wrapper around a
- * global instance of an {@link EventService}, specifically a {@link SwingEventService} by default.
- * <p/>
- * For Swing Applications the EventBus is nearly all you need, besides some of your own Event classes (if so desired).
- * <p/>
- * The EventBus is really just a convenience class that provides a static wrapper around a global {@link
- * EventService} instance.  This class exists solely for simplicity.  Calling
- * <code>EventBus.subscribeXXX/publishXXX</code> is equivalent to
- * <code>EventServiceLocator.getEventBusService().subscribeXXX/publishXXX</code>,
- * it is just shorter to type.  See {@link org.scijava.event.bushe.EventServiceLocator} for details on how to customize
- * the global EventService in place of the default SwingEventService. 
- *
- * @author Michael Bushe michael@bushe.com
- * @see EventService
- * @see SwingEventService
- * @see ThreadSafeEventService See package JavaDoc for more information
- */
-class EventBus {
-
-  /**
-    * The EventBus uses a global static EventService.  This method is not necessary in usual usage, use the other static
-    * methods instead.  It is used to expose any other functionality and for framework classes (EventBusAction)
-    *
-    * @return the global static EventService
-    */
-   public static EventService getGlobalEventService() {
-      return EventServiceLocator.getEventBusService();
-   }
-
-   /** @see EventService#publish(Object) */
-   public static void publish(Object event) {
-      if (event == null) {
-         throw new IllegalArgumentException("Can't publish null.");
-      }
-      EventServiceLocator.getEventBusService().publish(event);
-   }
-
-   /** @see EventService#publish(String,Object) */
-   public static void publish(String topic, Object o) {
-      if (topic == null) {
-         throw new IllegalArgumentException("Can't publish to null topic.");
-      }
-      EventServiceLocator.getEventBusService().publish(topic, o);
-   }
-
-   /** @see EventService#publish(java.lang.reflect.Type, Object)  */
-   public static void publish(Type genericType, Object o) {
-      if (genericType == null) {
-         throw new IllegalArgumentException("Can't publish to null type.");
-      }
-      EventServiceLocator.getEventBusService().publish(genericType, o);
-   }
-
-
-   /** @see EventService#subscribe(Class,IEventSubscriber) */
-   public static boolean subscribe(Class eventClass, IEventSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribe(eventClass, subscriber);
-   }
-
-   /** @see EventService#subscribe(java.lang.reflect.Type, IEventSubscriber)  */
-   public static boolean subscribe(Type genericType, IEventSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribe(genericType, subscriber);
-   }
-
-   /** @see EventService#subscribeExactly(Class,IEventSubscriber) */
-   public static boolean subscribeExactly(Class eventClass, IEventSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribeExactly(eventClass, subscriber);
-   }
-
-   /** @see EventService#subscribe(String,IEventTopicSubscriber) */
-   public static boolean subscribe(String topic, IEventTopicSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribe(topic, subscriber);
-   }
-
-   /** @see EventService#subscribe(Pattern,IEventTopicSubscriber) */
-   public static boolean subscribe(Pattern topicPattern, IEventTopicSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribe(topicPattern, subscriber);
-   }
-
-   /** @see EventService#subscribeStrongly(Class,IEventSubscriber) */
-   public static boolean subscribeStrongly(Class eventClass, IEventSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribeStrongly(eventClass, subscriber);
-   }
-
-   /** @see EventService#subscribeExactlyStrongly(Class,IEventSubscriber) */
-   public static boolean subscribeExactlyStrongly(Class eventClass, IEventSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribeExactlyStrongly(eventClass, subscriber);
-   }
-
-   /** @see EventService#subscribeStrongly(String,IEventTopicSubscriber) */
-   public static boolean subscribeStrongly(String topic, IEventTopicSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribeStrongly(topic, subscriber);
-   }
-
-   /** @see EventService#subscribeStrongly(Pattern,IEventTopicSubscriber) */
-   public static boolean subscribeStrongly(Pattern topicPattern, IEventTopicSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().subscribeStrongly(topicPattern, subscriber);
-   }
-
-   /** @see EventService#unsubscribe(Class,IEventSubscriber) */
-   public static boolean unsubscribe(Class eventClass, IEventSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().unsubscribe(eventClass, subscriber);
-   }
-
-   /** @see EventService#unsubscribeExactly(Class,IEventSubscriber) */
-   public static boolean unsubscribeExactly(Class eventClass, IEventSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().unsubscribeExactly(eventClass, subscriber);
-   }
-
-   /** @see EventService#unsubscribe(String,IEventTopicSubscriber) */
-   public static boolean unsubscribe(String topic, IEventTopicSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().unsubscribe(topic, subscriber);
-   }
-
-   /** @see EventService#unsubscribe(Pattern,IEventTopicSubscriber) */
-   public static boolean unsubscribe(Pattern topicPattern, IEventTopicSubscriber subscriber) {
-      return EventServiceLocator.getEventBusService().unsubscribe(topicPattern, subscriber);
-   }
-
-   /**
-    * For usage with annotations.
-    *
-    * @see EventService#unsubscribe(Class,Object)
-    */
-   public static boolean unsubscribe(Class eventClass, Object object) {
-      return EventServiceLocator.getEventBusService().unsubscribe(eventClass, object);
-   }
-
-   /**
-    * For usage with annotations.
-    *
-    * @see EventService#unsubscribeExactly(Class,Object)
-    */
-   public static boolean unsubscribeExactly(Class eventClass, Object subscriber) {
-      return EventServiceLocator.getEventBusService().unsubscribeExactly(eventClass, subscriber);
-   }
-
-   /**
-    * For usage with annotations.
-    *
-    * @see EventService#unsubscribe(String,Object)
-    */
-   public static boolean unsubscribe(String topic, Object subscriber) {
-      return EventServiceLocator.getEventBusService().unsubscribe(topic, subscriber);
-   }
-
-   /**
-    * For usage with annotations.
-    *
-    * @see EventService#unsubscribe(Pattern,Object)
-    */
-   public static boolean unsubscribe(Pattern topicPattern, Object subscriber) {
-      return EventServiceLocator.getEventBusService().unsubscribe(topicPattern, subscriber);
-   }
-
-   /** @see EventService#subscribeVetoListener(Class,VetoEventListener) */
-   public static boolean subscribeVetoListener(Class eventClass, VetoEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListener(eventClass, vetoListener);
-   }
-
-   /** @see EventService#subscribeVetoListener(Class,VetoEventListener) */
-   public static boolean subscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListenerExactly(eventClass, vetoListener);
-   }
-
-
-   /** @see EventService#subscribeVetoListener(String,VetoTopicEventListener) */
-   public static boolean subscribeVetoListener(String topic, VetoTopicEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListener(topic, vetoListener);
-   }
-
-   /** @see EventService#subscribeVetoListener(Pattern,VetoTopicEventListener) */
-   public static boolean subscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListener(topicPattern, vetoListener);
-   }
-
-   /** @see EventService#subscribeVetoListenerStrongly(Class,VetoEventListener) */
-   public static boolean subscribeVetoListenerStrongly(Class eventClass, VetoEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListenerStrongly(eventClass, vetoListener);
-   }
-
-   /** @see EventService#subscribeVetoListenerExactlyStrongly(Class,VetoEventListener) */
-   public static boolean subscribeVetoListenerExactlyStrongly(Class eventClass, VetoEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListenerExactlyStrongly(eventClass, vetoListener);
-   }
-
-   /** @see EventService#subscribeVetoListenerStrongly(String,VetoTopicEventListener) */
-   public static boolean subscribeVetoListenerStrongly(String topic, VetoTopicEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListenerStrongly(topic, vetoListener);
-   }
-
-   /** @see EventService#subscribeVetoListener(String,VetoTopicEventListener) */
-   public static boolean subscribeVetoListenerStrongly(Pattern topicPattern, VetoTopicEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().subscribeVetoListenerStrongly(topicPattern, vetoListener);
-   }
-
-   /** @see EventService#unsubscribeVetoListener(Class,VetoEventListener) */
-   public static boolean unsubscribeVetoListener(Class eventClass, VetoEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().unsubscribeVetoListener(eventClass, vetoListener);
-   }
-
-   /** @see EventService#unsubscribeVetoListenerExactly(Class,VetoEventListener) */
-   public static boolean unsubscribeVetoListenerExactly(Class eventClass, VetoEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().unsubscribeVetoListenerExactly(eventClass, vetoListener);
-   }
-
-   /** @see EventService#unsubscribeVetoListener(String,VetoTopicEventListener) */
-   public static boolean unsubscribeVetoListener(String topic, VetoTopicEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().unsubscribeVetoListener(topic, vetoListener);
-   }
-
-   /** @see EventService#unsubscribeVetoListener(Pattern,VetoTopicEventListener) */
-   public static boolean unsubscribeVetoListener(Pattern topicPattern, VetoTopicEventListener vetoListener) {
-      return EventServiceLocator.getEventBusService().unsubscribeVetoListener(topicPattern, vetoListener);
-   }
-
-   /** @see EventService#getSubscribers(Class) */
-   public static <T> List<T> getSubscribers(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getSubscribers(eventClass);
-   }   
-
-   /** @see EventService#getSubscribersToClass(Class) */
-   public static <T> List<T> getSubscribersToClass(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getSubscribersToClass(eventClass);
-   }
-
-   /** @see EventService#getSubscribersToExactClass(Class) */
-   public static <T> List<T> getSubscribersToExactClass(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getSubscribersToExactClass(eventClass);
-   }
-
-   /** @see EventService#getSubscribers(Type) */
-   public static <T> List<T> getSubscribers(Type type) {
-      return EventServiceLocator.getEventBusService().getSubscribers(type);
-   }
-
-   /** @see EventService#getSubscribers(String) */
-   public static <T> List<T> getSubscribers(String topic) {
-      return EventServiceLocator.getEventBusService().getSubscribers(topic);
-   }
-
-   /** @see EventService#getSubscribersToTopic(String) */
-   public static <T> List<T> getSubscribersToTopic(String topic) {
-      return EventServiceLocator.getEventBusService().getSubscribersToTopic(topic);
-   }
-
-   /** @see EventService#getSubscribers(Pattern) */
-   public static <T> List<T> getSubscribers(Pattern pattern) {
-      return EventServiceLocator.getEventBusService().getSubscribers(pattern);
-   }
-
-   /** @see EventService#getSubscribersByPattern(String) */
-   public static <T> List<T> getSubscribersByPattern(String topic) {
-      return EventServiceLocator.getEventBusService().getSubscribersByPattern(topic);
-   }
-
-   /** @see EventService#getSubscribers(Class) */
-   public static <T> List<T> getVetoSubscribers(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getVetoSubscribers(eventClass);
-   }
-
-   /** @see EventService#getVetoSubscribersToClass(Class) */
-   public static <T> List<T> getVetoSubscribersToClass(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getVetoSubscribersToClass(eventClass);
-   }
-
-   /** @see EventService#getVetoSubscribersToExactClass(Class) */
-   public static <T> List<T> getVetoSubscribersToExactClass(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getVetoSubscribersToExactClass(eventClass);
-   }
-
-   /** @see EventService#getVetoSubscribers(Class)
-    *  @deprecated use getVetoSubscribersToTopic instead for direct replacement,
-    *             or use getVetoEventListeners to get topic and pattern matchers.
-    *             In EventBus 2.0 this name will replace getVetoEventListeners()
-    *             and have it's union functionality
-    */
-   public static <T> List<T> getVetoSubscribers(String topic) {
-      return EventServiceLocator.getEventBusService().getVetoSubscribers(topic);
-   }
-
-   /** @see EventService#getVetoEventListeners(String) */
-   public static <T> List<T> getVetoEventListeners(String topic) {
-      return EventServiceLocator.getEventBusService().getVetoEventListeners(topic);
-   }
-
-   /** @see EventService#getVetoSubscribers(Pattern) */
-   public static <T> List<T> getVetoSubscribers(Pattern pattern) {
-      return EventServiceLocator.getEventBusService().getVetoSubscribers(pattern);
-   }
-
-   /** @see EventService#getVetoSubscribersToTopic(String) */
-   public static <T> List<T> getVetoSubscribersToTopic(String topic) {
-      return EventServiceLocator.getEventBusService().getVetoSubscribersToTopic(topic);
-   }
-
-   /** @see EventService#getVetoSubscribersByPattern(String) */
-   public static <T> List<T> getVetoSubscribersByPattern(String topic) {
-      return EventServiceLocator.getEventBusService().getVetoSubscribersByPattern(topic);
-   }
-
-   /** @see EventService#unsubscribeVeto(Class, Object) */
-   public static boolean unsubscribeVeto(Class eventClass, Object subscribedByProxy) {
-      return EventServiceLocator.getEventBusService().unsubscribeVeto(eventClass, subscribedByProxy);
-   }
-
-   /** @see EventService#unsubscribeVetoExactly(Class, Object) */
-   public static boolean unsubscribeVetoExactly(Class eventClass, Object subscribedByProxy) {
-      return EventServiceLocator.getEventBusService().unsubscribeVetoExactly(eventClass, subscribedByProxy);
-   }
-
-   /** @see EventService#unsubscribeVeto(String, Object) */
-   public static boolean unsubscribeVeto(String topic, Object subscribedByProxy) {
-      return EventServiceLocator.getEventBusService().unsubscribeVeto(topic, subscribedByProxy);
-   }
-
-   /** @see EventService#unsubscribeVeto(Pattern, Object) */
-   public static boolean unsubscribeVeto(Pattern pattern, Object subscribedByProxy) {
-      return EventServiceLocator.getEventBusService().unsubscribeVeto(pattern, subscribedByProxy);
-   }
-
-   /** @see EventService#clearAllSubscribers() */
-   public static void clearAllSubscribers() {
-      EventServiceLocator.getEventBusService().clearAllSubscribers();
-   }
-
-   /** @see EventService#setDefaultCacheSizePerClassOrTopic(int) */
-   public static void setDefaultCacheSizePerClassOrTopic(int defaultCacheSizePerClassOrTopic) {
-      EventServiceLocator.getEventBusService().setDefaultCacheSizePerClassOrTopic(defaultCacheSizePerClassOrTopic);
-   }
-
-   /** @see org.scijava.event.bushe.EventService#getDefaultCacheSizePerClassOrTopic() */
-   public static int getDefaultCacheSizePerClassOrTopic() {
-      return EventServiceLocator.getEventBusService().getDefaultCacheSizePerClassOrTopic();
-   }
-
-   /** @see EventService#setCacheSizeForEventClass(Class,int) */
-   public static void setCacheSizeForEventClass(Class eventClass, int cacheSize) {
-      EventServiceLocator.getEventBusService().setCacheSizeForEventClass(eventClass, cacheSize);
-   }
-
-   /** @see EventService#getCacheSizeForEventClass(Class) */
-   public static int getCacheSizeForEventClass(Class eventClass) {
-      return EventServiceLocator.getEventBusService().getCacheSizeForEventClass(eventClass);
-   }
-
-   /** @see EventService#setCacheSizeForTopic(String,int) */
-   public static void setCacheSizeForTopic(String topicName, int cacheSize) {
-      EventServiceLocator.getEventBusService().setCacheSizeForTopic(topicName, cacheSize);
-   }
-
-   /** @see EventService#setCacheSizeForTopic(java.util.regex.Pattern,int) */
-   public static void setCacheSizeForTopic(Pattern pattern, int cacheSize) {
-      EventServiceLocator.getEventBusService().setCacheSizeForTopic(pattern, cacheSize);
-   }
-
-   /** @see EventService#getCacheSizeForTopic(String) */
-   public static int getCacheSizeForTopic(String topic) {
-      return EventServiceLocator.getEventBusService().getCacheSizeForTopic(topic);
-   }
-
-   /** @see EventService#getLastEvent(Class) */
-   public static <T> T getLastEvent(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getLastEvent(eventClass);
-   }
-
-   /** @see EventService#getCachedEvents(Class) */
-   public static <T> List<T> getCachedEvents(Class<T> eventClass) {
-      return EventServiceLocator.getEventBusService().getCachedEvents(eventClass);
-   }
-
-   /** @see EventService#getLastTopicData(String) */
-   public static Object getLastTopicData(String topic) {
-      return EventServiceLocator.getEventBusService().getLastTopicData(topic);
-   }
-
-   /** @see EventService#getCachedTopicData(String) */
-   public static List getCachedTopicData(String topic) {
-      return EventServiceLocator.getEventBusService().getCachedTopicData(topic);
-   }
-
-   /** @see EventService#clearCache(Class) */
-   public static void clearCache(Class eventClass) {
-      EventServiceLocator.getEventBusService().clearCache(eventClass);
-   }
-
-   /** @see EventService#clearCache(String) */
-   public static void clearCache(String topic) {
-      EventServiceLocator.getEventBusService().clearCache(topic);
-   }
-
-   /** @see EventService#clearCache(java.util.regex.Pattern) */
-   public static void clearCache(Pattern pattern) {
-      EventServiceLocator.getEventBusService().clearCache(pattern);
-   }
-
-   /** @see org.scijava.event.bushe.EventService#clearCache() */
-   public static void clearCache() {
-      EventServiceLocator.getEventBusService().clearCache();
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/EventBusAction.java b/src/main/java/org/scijava/event/bushe/EventBusAction.java
deleted file mode 100644
index f4d69010b..000000000
--- a/src/main/java/org/scijava/event/bushe/EventBusAction.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.awt.event.ActionEvent;
-import javax.swing.ImageIcon;
-
-/**
- * When fired, this action publishes events on the EventBus.
- * <p/>
- *
- * @author Michael Bushe michael@bushe.com
- * @see EventServiceAction
- */
-class EventBusAction extends EventServiceAction {
-   public EventBusAction() {
-      this(null, null);
-   }
-
-   public EventBusAction(String actionName, ImageIcon icon) {
-      super(actionName, icon);
-   }
-
-   protected EventService getEventService(ActionEvent event) {
-      return EventBus.getGlobalEventService();
-   }
-}
-
diff --git a/src/main/java/org/scijava/event/bushe/EventService.java b/src/main/java/org/scijava/event/bushe/EventService.java
index 4552ff752..6b07fb777 100644
--- a/src/main/java/org/scijava/event/bushe/EventService.java
+++ b/src/main/java/org/scijava/event/bushe/EventService.java
@@ -23,17 +23,17 @@
  * The core interface.  An EventService provides publish/subscribe services to a single JVM using Class-based and
  * String-based (i.e. "topic") publications and subscriptions.
  * <p/>
- * In class-based pub/sub, {@link IEventSubscriber}s subscribe to a type on an {@link EventService}, such
+ * In class-based pub/sub, {@link EventSubscriber}s subscribe to a type on an {@link EventService}, such
  * as the {@link org.scijava.event.bushe.EventBus}, by providing a class, interface or generic type.  The EventService
  * notifies subscribers when objects are published on the EventService with a matching type.  Full class semantics are
  * respected.  That is, if a subscriber subscribes to a class, the subscriber is notified if an object of
  * that class is publish or if an object of a subclass of that class is published. Likewise if a subscriber subscribes
  * to an interface, it will be notified if any object that implements that interface is published.  Subscribers can
- * subscribe "exactly" using  {@link #subscribeExactly(Class, IEventSubscriber)} so that they are notified only if an
+ * subscribe "exactly" using  {@link #subscribeExactly(Class, EventSubscriber)} so that they are notified only if an
  * object of the exact class is published (and will not be notified if subclasses are published, since this would not
  * be "exact")
  * <p/>
- * In topic-based pub/sub, an object "payload" is published on a topic name (String).  {@link IEventTopicSubscriber}s subscribe
+ * In topic-based pub/sub, an object "payload" is published on a topic name (String).  {@link EventTopicSubscriber}s subscribe
  * to either the exact name of the topic or they may subscribe using a Regular Expression that is used to match topic
  * names.
  * <p/>
@@ -110,10 +110,6 @@
  *
  * @author Michael Bushe michael@bushe.com
  * @see {@link ThreadSafeEventService} for the default implementation
- * @see {@link SwingEventService} for the Swing-safe implementation
- * @see {@link EventBus} for simple access to the Swing-safe implementation
- * @see {@link org.scijava.event.bushe.IEventSubscriber} for subscription annotations
- * @see {@link org.scijava.event.bushe.IEventTopicSubscriber} for subscription annotations
  */
 interface EventService {
 
@@ -127,7 +123,7 @@ interface EventService {
 
    /**
     * Use this method to publish generified objects to subscribers of Types, i.e. subscribers that use
-    * {@link #subscribe(Type, IEventSubscriber)}, and to publish to subscribers of the non-generic type.
+    * {@link #subscribe(Type, EventSubscriber)}, and to publish to subscribers of the non-generic type.
     * <p>
     * Due to generic type erasure, the type must be supplied by the caller.  You can get a declared object's
     * type by using the {@link org.scijava.event.bushe.TypeReference} class.  For Example:
@@ -181,7 +177,7 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribe(Class eventClass, IEventSubscriber subscriber);
+   public boolean subscribe(Class eventClass, EventSubscriber subscriber);
 
   /** 
    * Subscribe an EventSubscriber to publication of generic Types.
@@ -206,7 +202,7 @@ interface EventService {
    * @param subscriber the subscriber to the type
    * @return true if a new subscription is made, false if it already existed
    */
-   public boolean subscribe(Type type, IEventSubscriber subscriber);
+   public boolean subscribe(Type type, EventSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of objects exactly matching a type.  Only a <b>WeakReference</b>
@@ -227,7 +223,7 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeExactly(Class eventClass, IEventSubscriber subscriber);
+   public boolean subscribeExactly(Class eventClass, EventSubscriber subscriber);
 
    /**
     * Subscribes an EventTopicSubscriber to the publication of a topic name.  Only a <b>WeakReference</b>
@@ -247,7 +243,7 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribe(String topic, IEventTopicSubscriber subscriber);
+   public boolean subscribe(String topic, EventTopicSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of all the topic names that match a RegEx Pattern.  Only a
@@ -267,67 +263,67 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribe(Pattern topicPattern, IEventTopicSubscriber subscriber);
+   public boolean subscribe(Pattern topicPattern, EventTopicSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type.
     * <p/>
-    * The semantics are the same as {@link #subscribe(Class, IEventSubscriber)}, except that the EventService holds
+    * The semantics are the same as {@link #subscribe(Class, EventSubscriber)}, except that the EventService holds
     * a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(Class,IEventSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
     *
     * @param eventClass the class of published objects to listen to
     * @param subscriber The subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeStrongly(Class eventClass, IEventSubscriber subscriber);
+   public boolean subscribeStrongly(Class eventClass, EventSubscriber subscriber);
 
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type exactly.
     * <p/>
-    * The semantics are the same as {@link #subscribeExactly(Class, IEventSubscriber)}, except that the EventService
+    * The semantics are the same as {@link #subscribeExactly(Class, EventSubscriber)}, except that the EventService
     * holds a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(Class,IEventSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
     *
     * @param eventClass the class of published objects to listen to
     * @param subscriber The subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeExactlyStrongly(Class eventClass, IEventSubscriber subscriber);
+   public boolean subscribeExactlyStrongly(Class eventClass, EventSubscriber subscriber);
 
    /**
     * Subscribes a subscriber to an event topic name.
     * <p/>
-    * The semantics are the same as {@link #subscribe(String, IEventTopicSubscriber)}, except that the EventService
+    * The semantics are the same as {@link #subscribe(String, EventTopicSubscriber)}, except that the EventService
     * holds a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(String,IEventTopicSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
     *
     * @param topic the name of the topic listened to
     * @param subscriber The topic subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeStrongly(String topic, IEventTopicSubscriber subscriber);
+   public boolean subscribeStrongly(String topic, EventTopicSubscriber subscriber);
 
    /**
     * Subscribes a subscriber to all the event topic names that match a RegEx expression.
     * <p/>
-    * The semantics are the same as {@link #subscribe(java.util.regex.Pattern, IEventTopicSubscriber)}, except that the
+    * The semantics are the same as {@link #subscribe(java.util.regex.Pattern, EventTopicSubscriber)}, except that the
     * EventService holds a regularly reference, not a WeakReference.
     * <p/>
-    * The subscriber will remain subscribed until {@link #unsubscribe(String,IEventTopicSubscriber)}  is called.
+    * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
     *
     * @param topicPattern the name of the topic listened to
     * @param subscriber The topic subscriber that will accept the events when published.
     *
     * @return true if the subscriber was subscribed successfully, false otherwise
     */
-   public boolean subscribeStrongly(Pattern topicPattern, IEventTopicSubscriber subscriber);
+   public boolean subscribeStrongly(Pattern topicPattern, EventTopicSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to a class.
@@ -337,7 +333,7 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribe(Class eventClass, IEventSubscriber subscriber);
+   public boolean unsubscribe(Class eventClass, EventSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to an exact class.
@@ -347,7 +343,7 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribeExactly(Class eventClass, IEventSubscriber subscriber);
+   public boolean unsubscribeExactly(Class eventClass, EventSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to an event topic.
@@ -357,7 +353,7 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribe(String topic, IEventTopicSubscriber subscriber);
+   public boolean unsubscribe(String topic, EventTopicSubscriber subscriber);
 
    /**
     * Stop the subscription for a subscriber that is subscribed to event topics via a Pattern.
@@ -367,7 +363,7 @@ interface EventService {
     *
     * @return true if the subscriber was subscribed to the event, false if it wasn't
     */
-   public boolean unsubscribe(Pattern topicPattern, IEventTopicSubscriber subscriber);
+   public boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber subscriber);
 
    /**
     * Subscribes a VetoEventListener to publication of event matching a class.  Only a <b>WeakReference</b> to the 
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceAction.java b/src/main/java/org/scijava/event/bushe/EventServiceAction.java
deleted file mode 100644
index a87cfc59d..000000000
--- a/src/main/java/org/scijava/event/bushe/EventServiceAction.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.awt.event.ActionEvent;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ImageIcon;
-
-/**
- * Abstract class that publishes a Swing ActionEvent (or another object) to an {@link EventService}.
- * <p/>
- * This abstract class ties the Swing Actions with the Event Bus.  When fired, an ActionEvent is published on an
- * EventService - either the global EventBus or a Container EventService.
- * <p/>
- * There are two derivatives of this class: The EventBusAction, which publishes the ActionEvent on the global EventBus,
- * and the ContainerEventServiceAction, which publishes the ActionEvent on the a local ContainerEventService.
- * <p/>
- * By default the ActionEvent is published on an EventService topic corresponding to this action's
- * Action.ACTION_COMMAND_KEY. Though this behavior is highly configurable.  See {@link #getTopicName(ActionEvent)} and
- * {@link #setTopicName(String)} for ways to customize the topic used.  Override {@link #getTopicValue(ActionEvent)} to
- * publish an object other than the ActionEvent.
- * <p/>
- * Instead of publishing on a topic, the ActionEvent can be published using class-based publication, use {@link
- * #setPublishesOnTopic(boolean)} to set this behavior.  When using class-based publication, the ActionEvent is published
- * by default.  Override {@link #getEventServiceEvent(ActionEvent)} to publish an object other than the ActionEvent.
- *
- * @author Michael Bushe michael@bushe.com
- */
-abstract class EventServiceAction extends AbstractAction {
-   public static final String EVENT_SERVICE_TOPIC_NAME = "event-service-topic";
-
-   private boolean throwsExceptionOnNullEventService = true;
-   public static final String EVENT_BUS_EVENT_CLASS_NAME = "eventBus.eventClassName";
-
-   private String topicName;
-   private boolean publishesOnTopic = true;
-
-   public EventServiceAction() {
-   }
-
-   public EventServiceAction(String actionName, ImageIcon icon) {
-      super(actionName, icon);
-   }
-
-
-   /**
-    * Override to return the EventService on which to publish.
-    *
-    * @param event the event passed to #execute(ActionEvent)
-    *
-    * @return the event service to publish on, if null and 
-    * getThrowsExceptionOnNullEventService() is true (default) an exception is thrown
-    *
-    * @see EventBusAction
-    * @see ContainerEventServiceAction
-    */
-   protected abstract EventService getEventService(ActionEvent event);
-
-   /** @return true if this action publishes on a topic, false if it uses class-based publication. */
-   public boolean isPublishesOnTopic() {
-      return publishesOnTopic;
-   }
-
-   /**
-    * Sets whether this action publishes on a topic or uses class-based publication.
-    *
-    * @param onTopic true if publishes on topic (the default), false if using class-based publication.
-    */
-   public void setPublishesOnTopic(boolean onTopic) {
-      this.publishesOnTopic = onTopic;
-   }
-
-   /**
-    * Explicitly sets the topic name this action publishes on.
-    * <p/>
-    * A topic name does not need to be explicitly set.  See {@link #getTopicName(ActionEvent)} to understand how the
-    * topic name is determined implicitly.
-    */
-   public void setTopicName(String topicName) {
-      this.topicName = topicName;
-   }
-
-   /**
-    * The topic name is the first non-null value out of: <ol> <li>A topic name explicitly set via {@link
-    * #setTopicName(String)} <li>the action's getValue("event-service-topic")  {@link #EVENT_SERVICE_TOPIC_NAME} <li>the
-    * action's getValue("ID") (for compatibility with the SAM ActionManager's ID) <li>the action's {@link
-    * javax.swing.Action#ACTION_COMMAND_KEY} <li>the action event's {@link javax.swing.Action#ACTION_COMMAND_KEY}
-    * <li>the action's {@link javax.swing.Action#NAME} the value is used (if the value is not a String, the value's
-    * toString() is used). 
-    * <p/>
-    * To use a different name, override this method.
-    *
-    * @param event the event passed to #execute(ActionEvent)
-    *
-    * @return the topic name to publish on, getId() by default
-    */
-   public String getTopicName(ActionEvent event) {
-      if (topicName != null) {
-         return topicName;
-      }
-      Object topic = getValue(EVENT_SERVICE_TOPIC_NAME);
-      if (topic != null) {
-         return topic + "";
-      } else {
-         topic = getValue("ID");
-         if (topic != null) {
-            return topic + "";
-         } else {
-            topic = getValue(Action.ACTION_COMMAND_KEY);
-            if (topic != null) {
-               return topic + "";
-            } else {
-               topic = event.getActionCommand();
-               if (topic != null) {
-                  return topic + "";
-               } else {
-                  return (String) getName();
-               }
-            }
-         }
-      }
-   }
-
-   /**
-    * By default, the ActionEvent is the object published on the topic.  Override this method to publish another
-    * object.
-    *
-    * @param event the event passed to #execute(ActionEvent)
-    *
-    * @return the topic value to publish, getId() by default
-    */
-   protected Object getTopicValue(ActionEvent event) {
-      return event;
-   }
-
-   /** @return the name of the action (javax.swing.Action#NAME) */
-   public Object getName() {
-      return getValue(Action.NAME);
-   }
-
-   /**
-    * If isPublishesOnTopic() returns false (i.e., when using class-based rather than topic-based publication), then
-    * override this method to publish an on object other than the ActionEvent.
-    *
-    * @return the Object to publish, cannot be null
-    */
-   protected Object getEventServiceEvent(ActionEvent event) {
-      return event;
-   }
-
-   /**
-    * Publishes the event on the EventService returned by getEventService(event)
-    * <p/>
-    * Gets the EventService from {@link #getEventService(java.awt.event.ActionEvent)}. Checks isPublishesOnTopic().  If true,
-    * gets the topic name from {@link #getTopicName(java.awt.event.ActionEvent)} and the topic value from {@link
-    * #getTopicValue(ActionEvent)}, and publishes the value on the topic on the EventService.  If false, gets event from
-    * {@link #getEventServiceEvent(java.awt.event.ActionEvent)}, and publishes the event on the EventService.
-    * <p/>
-    *
-    * @param event the action event to publish.
-    *
-    * @throws RuntimeException if getThrowsExceptionOnNullEventService() &&  getEventService(event) == null
-    */
-   public void actionPerformed(ActionEvent event) {
-      EventService eventService = getEventService(event);
-      if (eventService == null) {
-         if (getThrowsExceptionOnNullEventService()) {
-            throw new RuntimeException("Null EventService supplied to EventServiceAction with name:" + getName());
-         } else {
-            return;
-         }
-      }
-      if (isPublishesOnTopic()) {
-         String topic = getTopicName(event);
-         Object topicValue = getTopicValue(event);
-         eventService.publish(topic, topicValue);
-      } else {
-         Object esEvent = getEventServiceEvent(event);
-         eventService.publish(esEvent);
-      }
-   }
-
-   /**
-    * By default, exceptions are throw if getEventService() returns null.
-    *
-    * @return false to suppress this behavior
-    */
-   public boolean getThrowsExceptionOnNullEventService() {
-      return throwsExceptionOnNullEventService;
-   }
-
-   /**
-    * By default, exceptions are thrown if getEventService() returns null.
-    *
-    * @param throwsExceptionOnNullEventService true to suppress the exception when there is no event service
-    */
-   public void setThrowsExceptionOnNullEventService(boolean throwsExceptionOnNullEventService) {
-      this.throwsExceptionOnNullEventService = throwsExceptionOnNullEventService;
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceEvent.java b/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
deleted file mode 100644
index 4eb3febaf..000000000
--- a/src/main/java/org/scijava/event/bushe/EventServiceEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * Convenience interface for events that get processed by the EventService, its usage is not required in any way.  Any
- * object can be published on an EventService or on the EventBus.
- * <p/>
- * It is a good practice to specify the source of the event when using pub/sub, especially in Swing applications.
- *
- * @author Michael Bushe michael@bushe.com
- * @see AbstractEventServiceEvent for a simple base class
- */
-interface EventServiceEvent {
-   /** @return The issuer of the event. */
-   Object getSource();
-}
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java b/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
deleted file mode 100644
index f993c9418..000000000
--- a/src/main/java/org/scijava/event/bushe/EventServiceExistsException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.scijava.event.bushe;
-
-/** Exception thrown by the EventServiceLocator when an EventService already is registered for a name. */
-class EventServiceExistsException extends Exception {
-   public EventServiceExistsException(String msg) {
-      super(msg);
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/EventServiceLocator.java b/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
deleted file mode 100644
index 7854dcd0b..000000000
--- a/src/main/java/org/scijava/event/bushe/EventServiceLocator.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A central registry of EventServices.  Used by the {@link EventBus}.
- * <p/>
- * By default will lazily hold a SwingEventService, which is mapped to {@link #SERVICE_NAME_SWING_EVENT_SERVICE} and
- * returned by {@link #getSwingEventService()}.  Also by default this same instance is returned by {@link #getEventBusService()},
- * is mapped to {@link #SERVICE_NAME_EVENT_BUS} and wrapped by the EventBus.
- * <p/>
- * Since the default EventService implementation is thread safe, and since it's not good to have lots of events on the
- * EventDispatchThread you may want multiple EventServices running on multiple threads, perhaps pulling events from a
- * server and coalescing them into one or more events that are pushed onto the EDT.
- * <p/>
- * To change the default implementation class for the EventBus' EventService, use the API:
- * <pre>
- * EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, new SomeEventServiceImpl());
- * </pre>
- * Or use system properties by:
- * <pre>
- * System.setProperty(EventServiceLocator.SERVICE_NAME_EVENT_BUS, YourEventServiceImpl.class.getName());
- * </pre>
- * Likewise, you can set this on the command line via -Dorg.scijava.event.bushe.swingEventServiceClass=foo.YourEventServiceImpl
- * <p/>
- * To change the default implementation class for the SwingEventService, use the API:
- * <pre>
- * EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, new SomeSwingEventServiceImpl());
- * </pre>
- * Or use system properties by:
- * <pre>
- * System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, YourEventServiceImpl.class.getName());
- * </pre>
- * Likewise, you can set this on the command line via -Dorg.scijava.event.bushe.swingEventServiceClass=foo.YourEventServiceImpl
- *
- * @author Michael Bushe michael@bushe.com
- */
-class EventServiceLocator {
-   /** The name "EventBus" is reserved for the service that the EventBus wraps and is returned by {@link #getEventBusService}.*/
-   public static final String SERVICE_NAME_EVENT_BUS = "EventBus";
-   /** The name "SwingEventService" is reserved for the service that is returned by {@link #getSwingEventService}. */
-   public static final String SERVICE_NAME_SWING_EVENT_SERVICE = "SwingEventService";
-   
-   /**
-    * Set this Java property to a Class that implements EventService to use an instance of that class instead of
-    * the instance returned by {@link #getSwingEventService}.  Must be set before {@link #getEventBusService()} is called.
-    */
-   public static final String EVENT_BUS_CLASS = "org.scijava.event.bushe.eventBusClass";
-   /**
-    * Set this Java property to a Class that implements EventService to use an instance of that class instead of
-    * {@link SwingEventService} as service returned by {@link #getSwingEventService}.  Must be set on startup or
-    * before the method {@link #getSwingEventService}is called.
-    */
-   public static final String SWING_EVENT_SERVICE_CLASS = "org.scijava.event.bushe.swingEventServiceClass";
-
-   private static EventService EVENT_BUS_SERVICE;
-   private static EventService SWING_EVENT_SERVICE;
-
-   private static final Map EVENT_SERVICES = new HashMap();
-
-   /** @return the singleton instance of the EventService used by the EventBus */
-   public static synchronized EventService getEventBusService() {
-      if (EVENT_BUS_SERVICE == null) {
-         EVENT_BUS_SERVICE = getEventService(EVENT_BUS_CLASS, getSwingEventService());
-         EVENT_SERVICES.put(SERVICE_NAME_EVENT_BUS, EVENT_BUS_SERVICE);
-      }
-      return EVENT_BUS_SERVICE;
-   }
-
-   /** @return the singleton instance of a SwingEventService */
-   public static synchronized EventService getSwingEventService() {
-      if (SWING_EVENT_SERVICE == null) {
-         SWING_EVENT_SERVICE = getEventService(SWING_EVENT_SERVICE_CLASS, new SwingEventService());
-         EVENT_SERVICES.put(SERVICE_NAME_SWING_EVENT_SERVICE, SWING_EVENT_SERVICE);
-      }
-      return SWING_EVENT_SERVICE;
-   }
-
-   /**
-    * @param serviceName the service name of the EventService, as registered by #setEventService(String, EventService),
-    * or {@link #SERVICE_NAME_EVENT_BUS} or {@link #SERVICE_NAME_SWING_EVENT_SERVICE} .
-    *
-    * @return a named event service instance
-    */
-   public static synchronized EventService getEventService(String serviceName) {
-      EventService es = (EventService) EVENT_SERVICES.get(serviceName);
-      if (es == null) {
-         if (SERVICE_NAME_EVENT_BUS.equals(serviceName)) {
-            es = getEventBusService();
-         } else if (SERVICE_NAME_SWING_EVENT_SERVICE.equals(serviceName)) {
-            es = getSwingEventService();
-         }
-      }
-      return es;
-   }
-
-   /**
-    * Registers a named EventService to the locator.  Can be used to change the default EventBus implementation.
-    * 
-    * @param serviceName a named event service instance
-    * @param es the EventService to attach to the service name
-    *
-    * @throws EventServiceExistsException if a service by this name already exists and the new service is non-null
-    */
-   public static synchronized void setEventService(String serviceName, EventService es) throws EventServiceExistsException {
-      if (EVENT_SERVICES.get(serviceName) != null && es != null) {
-         throw new EventServiceExistsException("An event service by the name " + serviceName + "already exists.  Perhaps multiple threads tried to create a service about the same time?");
-      } else {
-         EVENT_SERVICES.put(serviceName, es);
-         if (SERVICE_NAME_EVENT_BUS.equals(serviceName)) {
-            EVENT_BUS_SERVICE = es;
-         } else if (SERVICE_NAME_SWING_EVENT_SERVICE.equals(serviceName)) {
-            SWING_EVENT_SERVICE = es;
-         }
-      }
-   }
-
-   /**
-    * Use this carefully.  Clears all the event services, including the SwingEventService (used by EventBus).
-    * <p>
-    * Callers may want to resubscribe existing subscribers.
-    */
-   static synchronized void clearAll() {
-         EVENT_SERVICES.clear();
-         EVENT_BUS_SERVICE = null;
-         SWING_EVENT_SERVICE = null;
-   }
-
-   private static synchronized EventService getEventService(String eventServiceClassPropertyName, EventService defaultService) {
-      EventService result;
-      String eventServiceClassName = System.getProperty(eventServiceClassPropertyName);
-      if (eventServiceClassName != null) {
-         Class sesClass;
-         try {
-            sesClass = Class.forName(eventServiceClassName);
-         } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Could not find class specified in the property " + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, e);
-         }
-         Object service;
-         try {
-            service = sesClass.newInstance();
-         } catch (InstantiationException e) {
-            throw new RuntimeException("InstantiationException creating instance of class set from Java property" + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, e);
-         } catch (IllegalAccessException e) {
-            throw new RuntimeException("IllegalAccessException creating instance of class set from Java property" + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, e);
-         }
-         try {
-            result = (EventService) service;
-         } catch (ClassCastException ex) {
-            throw new RuntimeException("ClassCastException casting to " + EventService.class + " from instance of class set from Java property" + eventServiceClassPropertyName + ".  Class=" + eventServiceClassName, ex);
-         }
-      } else {
-         result = defaultService;
-      }
-      return result;
-   }
-
-}
diff --git a/src/main/java/org/scijava/event/bushe/EventSubscriber.java b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
index f501cf50b..03e8f9227 100644
--- a/src/main/java/org/scijava/event/bushe/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventSubscriber.java
@@ -1,106 +1,35 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 /**
- * An Annotation for subscribing to EventService Events.
- * <p>
- * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Events.
- * <p>
- * Instead of this:
- * <pre>
- * public class MyAppController implements EventSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe(AppClosingEvent.class, this);
- *   }
- *   public void onEvent(EventServiceEvent event) {
- *      AppClosingEvent appClosingEvent = (AppClosingEvent)event;
- *      //do something
- *   }
- * }
- * </pre>
- * You can do this:
- * <pre>
- * public class MyAppController {  //no interface necessary
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//if not using AOP
- *   }
- *   &#64;EventSubscriber
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {//Use your own method name with typesafety
- *      //do something
- *   }
- * }
- * </pre>
- * <p>
- * That's pretty good, but when the controller does more, annotations are even nicer.
- * <pre>
- * public class MyAppController implements EventSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe(AppStartingEvent.class, this);
- *      EventBus.subscribe(AppClosingEvent.class, this);
- *   }
- *   public void onEvent(EventServiceEvent event) {
- *      //wicked bad pattern, but we have to this
- *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
- *      if (event instanceof AppStartingEvent) {
- *         onAppStartingEvent((AppStartingEvent)event);
- *      } else (event instanceof AppClosingEvent) {
- *         onAppStartingEvent((AppClosingEvent)event);
- *      }
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
  *
- *   }
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
- *      //do something
- *   }
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
- *      //do something
- *   }
- * }
- * </pre>
- * You can do this:
- * <pre>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventSubscriber(eventClass=AppStartingEvent.class)
- *   public void onAppStartingEvent(AppStartingEvent appStartingEvent) {
- *      //do something
- *   }
- *   &#64;EventSubscriber(eventClass=AppAppClosingEvent.class)
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
- *      //do something
- *   }
- * }
- * </pre>
- * Brief, clear, and easy.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface EventSubscriber {
-   /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
-   Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
-
-   /** Determines the order in which this subscriber is called, default is FIFO.*/
-   int priority() default 0;
-
-   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
-   boolean exact() default false;
-
-   /** Whether to subscribe weakly or strongly. */
-   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
+package org.scijava.event.bushe;
 
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+/**
+ * Callback interface for class-based subscribers of an {@link EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+public interface EventSubscriber<T> {
 
    /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
+    * Handle a published event. <p>The EventService calls this method on each publication of an object that matches the
+    * class or interface passed to one of the EventService's class-based subscribe methods, specifically, {@link
+    * EventService#subscribe(Class,EventSubscriber)} {@link EventService#subscribeExactly(Class,EventSubscriber)}
+    * {@link EventService#subscribeStrongly(Class,EventSubscriber)} and {@link EventService#subscribeExactlyStrongly(Class,
+    *EventSubscriber)}.
+    *
+    * @param event The Object that is being published.
     */
-   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+   public void onEvent(T event);
 }
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
deleted file mode 100644
index 2e07fa70f..000000000
--- a/src/main/java/org/scijava/event/bushe/EventTopicPatternSubscriber.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface EventTopicPatternSubscriber {
-   /** The Regular Expression to subscribe to. */
-   String topicPattern();
-
-   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
-   boolean exact() default false;
-
-   /** Whether to subscribe weakly or strongly. */
-   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-   /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
-    */
-   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-
-   /** Determines the order in which this subscriber is called, default is FIFO.*/
-   int priority() default 0;
-}
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
index 00f305ae7..54510621d 100644
--- a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
@@ -1,104 +1,38 @@
-package org.scijava.event.bushe;
-
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
 /**
- * An Annotation for subscribing to EventService Topics.
- * <p>
- * This annotation simplifies much of the repetitive boilerplate used for subscribing to EventService Topics.
- * <p>
- * Instead of this:
- * <pre>
- * public class MyAppController implements EventTopicSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe("AppClosing", this);
- *   }
- *   public void onEvent(String topic, Object data) {
- *      JComponent source = (JComponent)data;
- *      //do something
- *   }
- * }
- * </pre>
- * You can do this:
- * <pre>
- * public class MyAppController {  //no interface necessary
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
- *   public void onAppClosing(String topic, Object data) {
- *      //do something
- *   }
- * }
- * </pre>
- * <p>
- * That's pretty good, but when the controller does more, annotations are even nicer.
- * <pre>
- * public class MyAppController implements EventTopicSubscriber {
- *   public MyAppController {
- *      EventBus.subscribe("AppStartingEvent", this);
- *      EventBus.subscribe("AppClosingEvent", this);
- *   }
- *   public void onEvent(String topic, Object data) {
- *      //wicked bad pattern, but we have to this
- *      //...or create multiple subscriber classes and hold instances of them fields, which is even more verbose...
- *      if ("AppStartingEvent".equals(topic)) {
- *         onAppStartingEvent((JComponent)data);
- *      } else ("AppClosingEvent".equals(topic)) {
- *         onAppClosingEvent((JComponet)data);
- *      }
+ * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
  *
- *   }
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *   public void onAppStartingEvent(JComponent requestor) {
- *      //do something
- *   }
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *   public void onAppClosingEvent(JComponent requestor) {
- *      //do something
- *   }
- * }
- * </pre>
- * Instead of all that, you can do this:
- * <pre>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventTopicSubscriber{topic="AppStartingEvent"}
- *   public void onAppStartingEvent(Object data) {
- *      //do something
- *   }
- *   &#64;EventTopicSubscriber{topic="AppClosingEvent"}
- *   public void onAppClosingEvent(Foo data) {
- *      //do something
- *   }
- * }
- * </pre>
- * Brief, clear, and easy.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface EventTopicSubscriber {
-   /** The topic to subscribe to */
-   String topic();
-
-   /** Whether to subscribe weakly or strongly. */
-   ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
+package org.scijava.event.bushe;
 
-   /** Determines the order in which this subscriber is called, default is FIFO.*/
-   int priority() default 0;
+/**
+ * Callback interface for topic-based subscribers of an {@link EventService}.
+ *
+ * @author Michael Bushe michael@bushe.com
+ */
+interface EventTopicSubscriber<T> {
 
    /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
+    * Handle an event published on a topic.
+    * <p/>
+    * The EventService calls this method on each publication on a matching topic name passed to one of the
+    * EventService's topic-based subscribe methods, specifically, {@link EventService#subscribe(String,
+    *EventTopicSubscriber)} {@link EventService#subscribe(java.util.regex.Pattern,EventTopicSubscriber)} {@link
+    * EventService#subscribeStrongly(String,EventTopicSubscriber)} and {@link EventService#subscribeStrongly(java.util.regex.Pattern,
+    *EventTopicSubscriber)}.
+    *
+    * @param topic the name of the topic published on
+    * @param data the data object published on the topic
     */
-   Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
+   public void onEvent(String topic, T data);
 }
diff --git a/src/main/java/org/scijava/event/bushe/IEventSubscriber.java b/src/main/java/org/scijava/event/bushe/IEventSubscriber.java
deleted file mode 100644
index 26556c25b..000000000
--- a/src/main/java/org/scijava/event/bushe/IEventSubscriber.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * Callback interface for class-based subscribers of an {@link EventService}.
- *
- * @author Michael Bushe michael@bushe.com
- */
-public interface IEventSubscriber<T> {
-
-   /**
-    * Handle a published event. <p>The EventService calls this method on each publication of an object that matches the
-    * class or interface passed to one of the EventService's class-based subscribe methods, specifically, {@link
-    * EventService#subscribe(Class,EventSubscriber)} {@link EventService#subscribeExactly(Class,EventSubscriber)}
-    * {@link EventService#subscribeStrongly(Class,EventSubscriber)} and {@link EventService#subscribeExactlyStrongly(Class,
-    *EventSubscriber)}.
-    *
-    * @param event The Object that is being published.
-    */
-   public void onEvent(T event);
-}
diff --git a/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
deleted file mode 100644
index 04570b631..000000000
--- a/src/main/java/org/scijava/event/bushe/IEventTopicSubscriber.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * Callback interface for topic-based subscribers of an {@link EventService}.
- *
- * @author Michael Bushe michael@bushe.com
- */
-interface IEventTopicSubscriber<T> {
-
-   /**
-    * Handle an event published on a topic.
-    * <p/>
-    * The EventService calls this method on each publication on a matching topic name passed to one of the
-    * EventService's topic-based subscribe methods, specifically, {@link EventService#subscribe(String,
-    *EventTopicSubscriber)} {@link EventService#subscribe(java.util.regex.Pattern,EventTopicSubscriber)} {@link
-    * EventService#subscribeStrongly(String,EventTopicSubscriber)} and {@link EventService#subscribeStrongly(java.util.regex.Pattern,
-    *EventTopicSubscriber)}.
-    *
-    * @param topic the name of the topic published on
-    * @param data the data object published on the topic
-    */
-   public void onEvent(String topic, T data);
-}
diff --git a/src/main/java/org/scijava/event/bushe/ObjectEvent.java b/src/main/java/org/scijava/event/bushe/ObjectEvent.java
deleted file mode 100644
index 5a67d24a9..000000000
--- a/src/main/java/org/scijava/event/bushe/ObjectEvent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * A simple event that delivers an untyped object with a source object.
- * <p/>
- * Usage: EventBus.publish(new ObjectEvent(this, objectOfInterest);
- *
- * @author Michael Bushe michael@bushe.com
- */
-class ObjectEvent extends AbstractEventServiceEvent {
-   private Object eventObject;
-
-   /**
-    * Constructor
-    *
-    * @param sourceObject the source of the event
-    * @param payload the payload or eventObject of the event
-    */
-   public ObjectEvent(Object sourceObject, Object payload) {
-      super(sourceObject);
-      this.eventObject = payload;
-   }
-
-   public Object getEventObject() {
-      return eventObject;
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
deleted file mode 100644
index af3a93dc8..000000000
--- a/src/main/java/org/scijava/event/bushe/PrioritizedEventSubscriber.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.scijava.event.bushe;
-
-/**
- * This is a convenience interface, particularly for inner classes, that implements
- * {@link IEventSubscriber} and {@link Prioritized}.
- */
-interface PrioritizedEventSubscriber extends IEventSubscriber, Prioritized {
-}
diff --git a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
deleted file mode 100644
index c58ce6b76..000000000
--- a/src/main/java/org/scijava/event/bushe/PrioritizedEventTopicSubscriber.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.scijava.event.bushe;
-
-/**
- * This is a convenience interface, particularly for inner classes, that implements
- * {@link org.scijava.event.bushe.IEventTopicSubscriber} and {@link org.scijava.event.bushe.Prioritized}.
- */
-interface PrioritizedEventTopicSubscriber extends IEventTopicSubscriber, Prioritized {
-}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
deleted file mode 100644
index feaf2701b..000000000
--- a/src/main/java/org/scijava/event/bushe/ProxyTopicPatternSubscriber.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.reflect.Method;
-import java.util.regex.Pattern;
-
-/**
- * A Proxy Subscriber for Annotations that use topic patterns
- */
-class ProxyTopicPatternSubscriber extends ProxyTopicSubscriber {
-   private Pattern pattern;
-
-   /**
-    * Creates a proxy.  This does not subscribe it.
-    *
-    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
-    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
-    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
-    * be too
-    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
-    * exist
-    * @param patternString the Regular Expression for topics to subscribe to, used for unsubscription only
-    */
-   public ProxyTopicPatternSubscriber(Object proxiedSubscriber, Method subscriptionMethod,
-           ReferenceStrength referenceStrength, EventService es, String patternString,
-           Pattern pattern, boolean veto) {
-      this(proxiedSubscriber, subscriptionMethod, referenceStrength, 0, es, patternString, pattern, veto);
-   }
-
-   /**
-    * Creates a proxy.  This does not subscribe it.
-    *
-    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
-    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
-    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
-    * be too
-    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
-    * exist
-    * @param patternString the Regular Expression for topics to subscribe to, used for unsubscription only
-    */
-   public ProxyTopicPatternSubscriber(Object proxiedSubscriber, Method subscriptionMethod,
-           ReferenceStrength referenceStrength, int priority,
-           EventService es, String patternString, Pattern pattern, boolean veto) {
-      super(proxiedSubscriber, subscriptionMethod, referenceStrength, priority, es, patternString, veto);
-      this.pattern = pattern;
-   }
-
-   protected void unsubscribe(String topic) {
-      if (veto) {
-         getEventService().unsubscribeVetoListener(pattern, this);
-      } else {
-         getEventService().unsubscribe(pattern, this);
-      }
-      pattern = null;
-   }
-
-   public boolean equals(Object o) {
-      if (this == o) {
-         return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-         return false;
-      }
-      if (!super.equals(o)) {
-         return false;
-      }
-
-      ProxyTopicPatternSubscriber that = (ProxyTopicPatternSubscriber) o;
-
-      if (pattern != null ? !pattern.equals(that.pattern) : that.pattern != null) {
-         return false;
-      }
-
-      return true;
-   }
-
-   public String toString() {
-      return "ProxyTopicPatternSubscriber{" +
-              "pattern=" + pattern +
-              "veto=" + veto +
-              "realSubscriber=" + getProxiedSubscriber() +
-              ", subscriptionMethod=" + getSubscriptionMethod() +
-              ", referenceStrength=" + getReferenceStrength() +
-              ", eventService=" + getEventService() +
-              '}';
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
deleted file mode 100644
index 76a821a10..000000000
--- a/src/main/java/org/scijava/event/bushe/ProxyTopicSubscriber.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/** A class that subscribes to an EventService on behalf of another object.
- * This class is not used directly (though you could), but rather through the use of the
- * {@link @org.scijava.event.bushe.annotation.EventTopicSubscriber}.  Advanced EventBus
- * users could use this class in Aspect-Oriented code.  Consider using the
- * {@link AnnotationProcessor} instead, it may suit your needs and be easier.*/
-class ProxyTopicSubscriber extends AbstractProxySubscriber
-        implements org.scijava.event.bushe.IEventTopicSubscriber, VetoTopicEventListener {
-   private String topic;
-
-   /**
-    * Creates a proxy.  This does not subscribe it.
-    *
-    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
-    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
-    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
-    * be too
-    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
-    * exist
-    * @param topic the topic to subscribe to, used for unsubscription only
-    * @param veto if this proxy is for a veto subscriber
-    */
-   public ProxyTopicSubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
-           EventService es, String topic, boolean veto) {
-      this(proxiedSubscriber, subscriptionMethod, referenceStrength, 0, es, topic, veto);
-   }
-
-   /**
-    * Creates a proxy.  This does not subscribe it.
-    *
-    * @param proxiedSubscriber the subscriber that the proxy will call when an event is published
-    * @param subscriptionMethod the method the proxy will call, must have an Object as it's first and only parameter
-    * @param referenceStrength if the subscription is weak, the reference from the proxy to the real subscriber should
-    * be too
-    * @param es the EventService we will be subscribed to, since we may need to unsubscribe when weak refs no longer
-    * exist
-    * @param topic the topic to subscribe to, used for unsubscription only
-    * @param veto if this proxy is for a veto subscriber
-    */
-   public ProxyTopicSubscriber(Object proxiedSubscriber, Method subscriptionMethod, ReferenceStrength referenceStrength,
-           int priority, EventService es, String topic, boolean veto) {
-      super(proxiedSubscriber, subscriptionMethod, referenceStrength, priority, es, veto);
-      this.topic = topic;
-      if (topic == null) {
-         throw new IllegalArgumentException("Proxies for topic subscribers require a non-null topic.");
-      }
-      Class[] params = subscriptionMethod.getParameterTypes();
-      if (params == null || params.length != 2 || !String.class.equals(params[0]) || params[1].isPrimitive()) {
-         throw new IllegalArgumentException("The subscriptionMethod must have the two parameters, the first one must be a String and the second a non-primitive (Object or derivative).");
-      }
-   }
-
-   /**
-    * Handles the event publication by pushing it to the real subscriber's subscription Method.
-    *
-    * @param topic the topic on which the object is being published
-    * @param data The Object that is being published on the topic.
-    */
-   public void onEvent(String topic, Object data) {
-      Object[] args = new Object[]{topic, data};
-      Object obj = null;
-      Method subscriptionMethod = null;
-      try {
-         obj = getProxiedSubscriber();
-         if (obj == null) {
-            return;
-         }
-         subscriptionMethod = getSubscriptionMethod();
-         subscriptionMethod.invoke(obj, args);
-      } catch (IllegalAccessException e) {
-         String message = "IllegalAccessException when invoking annotated method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
-         retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
-      } catch (InvocationTargetException e) {
-         throw new RuntimeException("InvocationTargetException when invoking annotated method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
-      }
-   }
-
-
-   public boolean shouldVeto(String topic, Object data) {
-      Object[] args = new Object[]{topic, data};
-      Object obj = null;
-      Method subscriptionMethod = null;
-      try {
-         obj = getProxiedSubscriber();
-         if (obj == null) {
-            return false;
-         }
-         subscriptionMethod = getSubscriptionMethod();
-         return Boolean.valueOf(subscriptionMethod.invoke(obj, args)+"");
-      } catch (IllegalAccessException e) {
-         String message = "IllegalAccessException when invoking annotated veto method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod();
-         return retryReflectiveCallUsingAccessibleObject(args, subscriptionMethod, obj, e, message);
-      } catch (InvocationTargetException e) {
-         throw new RuntimeException("InvocationTargetException when invoking annotated veto method from EventService publication.  Topic:" + topic + ", data:" + data + ", subscriber:" + getProxiedSubscriber() + ", subscription Method=" + getSubscriptionMethod(), e);
-      }
-   }
-
-   protected void unsubscribe(String topic) {
-      if (veto) {
-         getEventService().unsubscribeVetoListener(topic, this);
-      } else {
-         getEventService().unsubscribe(topic, this);
-      }
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (obj instanceof ProxyTopicSubscriber) {
-         if (!super.equals(obj)) {
-            return false;
-         }
-         ProxyTopicSubscriber proxyTopicSubscriber = (ProxyTopicSubscriber) obj;
-         if (topic.equals(proxyTopicSubscriber.topic)) {
-            if (topic == null) {
-               return false;
-            } else {
-               if (!topic.equals(proxyTopicSubscriber.topic)) {
-                  return false;
-               }
-            }
-         }
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-
-   @Override
-   public String toString() {
-      return "ProxyTopicSubscriber{" +
-              "topic='" + topic + '\'' +
-              "veto='" + veto + '\'' +
-              "realSubscriber=" + getProxiedSubscriber() +
-              ", subscriptionMethod=" + getSubscriptionMethod() +
-              ", referenceStrength=" + getReferenceStrength() +
-              ", eventService=" + getEventService() +
-              '}';
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
deleted file mode 100644
index 3fb264538..000000000
--- a/src/main/java/org/scijava/event/bushe/RuntimeTopicEventSubscriber.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.scijava.event.bushe;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A subscriber to a topic that is determined at runtime.
- */
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface RuntimeTopicEventSubscriber {
-    /**
-     * @return name of a method (that must return a String) and whose return value will become the subscription topic.
-     */
-    String methodName() default "getTopicName";
-
-    /** @return Whether to subscribe weakly or strongly. */
-    ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-    /**
-     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
-     */
-    String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
-    int priority() default 0;
-
-    /**
-     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
-     */
-    Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
\ No newline at end of file
diff --git a/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java b/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
deleted file mode 100644
index 6d88c1432..000000000
--- a/src/main/java/org/scijava/event/bushe/RuntimeTopicPatternEventSubscriber.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface RuntimeTopicPatternEventSubscriber {
-    /**
-     * @return name of a method (which should return a String) and whose return value will become the subscription topic.
-     */
-    String methodName() default "getTopicPatternName";
-
-    /** @return Whether to subscribe weakly or strongly. */
-    ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-    /**
-     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
-     */
-    String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
-    int priority() default 0;
-
-    /** @return Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
-    boolean exact() default false;
-
-    /**
-     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
-     */
-    Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java b/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
deleted file mode 100644
index 3037ee83e..000000000
--- a/src/main/java/org/scijava/event/bushe/SubscriberTimingEvent.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * This event is published internally to report timing for subscribers on an EventService.  Applications may subscribe to
- * this event to do handle subscribers that take too long.
- *
- * @author Michael Bushe michael@bushe.com
- * @see ThreadSafeEventService
- */
-class SubscriberTimingEvent extends AbstractEventServiceEvent {
-   private Long start;
-   private Long end;
-   private Long timeLimitMilliseconds;
-   private Object event;
-   private IEventSubscriber subscriber;
-   private VetoEventListener vetoEventListener;
-   private String stringified;
-
-   /**
-    * Create a timing event
-    *
-    * @param source event source
-    * @param start system time at start of the notification of listener
-    * @param end system time at end of the notification of listener
-    * @param timeLimitMilliseconds expected maximum time
-    * @param event the published event
-    * @param subscriber the event subscriber that went over the time limit, can be null if vetoEventListener is not
-    * null
-    * @param vetoEventListener the vetoEventListener that took too long, can be null if the eventListener is not null
-    */
-   public SubscriberTimingEvent(Object source, Long start, Long end, Long timeLimitMilliseconds,
-           Object event, IEventSubscriber subscriber, VetoEventListener vetoEventListener) {
-      super(source);
-      this.start = start;
-      this.end = end;
-      this.timeLimitMilliseconds = timeLimitMilliseconds;
-      this.event = event;
-      this.subscriber = subscriber;
-      this.vetoEventListener = vetoEventListener;
-      String type = "EventServiceSubscriber";
-      String thing = ", EventServiceSubscriber:" + subscriber;
-      if (vetoEventListener != null) {
-         type = "VetoEventListener";
-         thing = ", VetoEventListener" + vetoEventListener;
-      }
-      try {
-         stringified = "Time limit exceeded for " + type + ". Handling time=" + (end.longValue() - start.longValue()) +
-                 ", Time limit=" + timeLimitMilliseconds + ", event:" + event
-                 + thing + ", start:" + start + ", end:" + end;
-      } catch (Exception ex) {
-         stringified = "Time limit exceeded for event, toString threw and exception.";
-      }
-   }
-
-   /** @return system time at start of the notification of listener */
-   public Long getStart() {
-      return start;
-   }
-
-   /** @return system time at end of the notification of listener */
-   public Long getEnd() {
-      return end;
-   }
-
-   /** @return expected maximum time */
-   public Long getTimeLimitMilliseconds() {
-      return timeLimitMilliseconds;
-   }
-
-   /** @return the published event */
-   public Object getEvent() {
-      return event;
-   }
-
-   /**
-    * @return subscriber the event subscriber that went over the time limit, can be null if vetoEventListener is not
-    *         null
-    */
-   public IEventSubscriber getSubscriber() {
-      return subscriber;
-   }
-
-   /** @return the vetoEventListener that took too long, can be null if the eventListener is not null */
-   public VetoEventListener getVetoEventListener() {
-      return vetoEventListener;
-   }
-
-   /** @return true if a veto listener took too long, false if an EventSubscriber took took long */
-   public boolean isVetoExceeded() {
-      return vetoEventListener != null;
-   }
-
-   /** @return true if an EventSubscriber took too long, false if a veto listener took took long */
-   public boolean isEventHandlingExceeded() {
-      return subscriber == null;
-   }
-
-   public String toString() {
-      return stringified;
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/SwingEventService.java b/src/main/java/org/scijava/event/bushe/SwingEventService.java
deleted file mode 100644
index 20d40e7b3..000000000
--- a/src/main/java/org/scijava/event/bushe/SwingEventService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import javax.swing.*;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * An {@link EventService} implementation for Swing.
- * <p/>
- * This class is Swing thread-safe.  All publish() calls NOT on the Swing EventDispatchThread thread are queued onto the
- * EDT.  If the calling thread is the EDT, then this is a simple pass-through (i.e the subscribers are notified on the
- * same stack frame, just like they would be had they added themselves via Swing addXXListener methods).
- *
- * @author Michael Bushe michael@bushe.com
- */
-class SwingEventService extends ThreadSafeEventService {
-
-   /**
-    * By default, the SwingEventService is constructed such that any listener that takes over 200 ms causes an
-    * SubscriberTimingEvent to be published.  You will need to add a subscriber to this event.  Note that if you use
-    * event to launch a modal dialog, the timings will be as long as the dialog is up - this is the way Swing works.
-    */
-   public SwingEventService() {
-      super((long) 200, false, null, null, null);
-   }
-
-   public SwingEventService(Long timeThresholdForEventTimingEventPublication) {
-      super(timeThresholdForEventTimingEventPublication, false, null, null, null);
-   }
-
-   /**
-    * Create a SwingEventService is such that any listener that takes over timeThresholdForEventTimingEventPublication
-    * milliseconds causes an EventSubscriberTimingEvent to be published.  You can add a subscriber to this event or set
-    * subscribeTimingEventsInternally to true to cause the default logging to occur through the protected {@link
-    * #subscribeTiming(SubscriberTimingEvent)} call.
-    * <p/>
-    * Note that if you use event to launch a modal dialog, the timings will be as long as the dialog is up - this is the
-    * way Swing works.
-    *
-    * @param timeThresholdForEventTimingEventPublication the longest time a subscriber should spend handling an event,
-    * The service will publish an SubscriberTimingEvent after listener processing if the time was exceeded.  If null, no
-    * SubscriberTimingEvent will be issued.
-    * @param subscribeTimingEventsInternally add a subscriber to the EventSubscriberTimingEvent internally and call the
-    * protected {@link #subscribeTiming(SubscriberTimingEvent)} method when they occur.  This logs a warning to the
-    * {@link Logger} logger by default.
-    *
-    * @throws IllegalArgumentException if timeThresholdForEventTimingEventPublication is null and
-    * subscribeTimingEventsInternally is true.
-    */
-   public SwingEventService(Long timeThresholdForEventTimingEventPublication, boolean subscribeTimingEventsInternally) {
-      super(timeThresholdForEventTimingEventPublication, subscribeTimingEventsInternally, null, null, null);
-   }
-
-   /**
-    * Same as ThreadSafeEventService.publish(), except if the call is coming from a thread that is not the Swing Event
-    * Dispatch Thread, the request is put on the EDT through a a call to SwingUtilities.invokeLater(). Otherwise this
-    * DOES NOT post a new event on the EDT.  The subscribers are called on the same EDT event, just like addXXXListeners
-    * would be.
-    */
-   protected void publish(final Object event, final String topic, final Object eventObj,
-           final List subscribers, final List vetoSubscribers, final StackTraceElement[] callingStack) {
-      if (SwingUtilities.isEventDispatchThread()) {
-         super.publish(event, topic, eventObj, subscribers, vetoSubscribers, callingStack);
-      } else {
-         //Make call to this method - stick on the EDT if not on the EDT
-         //Check the params first so that this thread can get the exception thrown
-         SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-               if (LOG.isLoggable(Logger.Level.DEBUG)) {
-                  LOG.debug("publish(" + event + "," + topic + "," + eventObj
-                          + "), called from non-EDT Thread:" + Arrays.toString(callingStack));
-               }
-               SwingEventService.super.publish(event, topic, eventObj, subscribers, vetoSubscribers, callingStack);
-            }
-         });
-      }
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
index 1f3868fd2..685af6b42 100644
--- a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -181,7 +181,7 @@ public class ThreadSafeEventService implements EventService {
 
    /** Creates a ThreadSafeEventService that does not monitor timing of handlers. */
    public ThreadSafeEventService() {
-      this(null, false, null, null, null);
+      this(null, null, null, null);
    }
 
    /**
@@ -192,21 +192,7 @@ public ThreadSafeEventService() {
     * EventSubscriberTimingEvent will be issued.
     */
    public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication) {
-      this(timeThresholdForEventTimingEventPublication, false, null, null, null);
-   }
-
-   /**
-    * Creates a ThreadSafeEventService while providing time monitoring options.
-    *
-    * @param timeThresholdForEventTimingEventPublication the longest time a subscriber should spend handling an event,
-    * The service will publish an SubscriberTimingEvent after listener processing if the time was exceeded.  If null, no
-    * EventSubscriberTimingEvent will be issued.
-    * @param subscribeTimingEventsInternally add a subscriber to the SubscriberTimingEvent internally and call the
-    * protected subscribeTiming() method when they occur.  This logs a warning to the {@link Logger} by
-    * default.
-    */
-   public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication, boolean subscribeTimingEventsInternally) {
-      this(timeThresholdForEventTimingEventPublication, subscribeTimingEventsInternally, null, null, null);
+      this(timeThresholdForEventTimingEventPublication, null, null, null);
    }
 
    /**
@@ -219,8 +205,7 @@ public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication,
     */
    public ThreadSafeEventService(Integer  cleanupStartThreshold, 
            Integer cleanupStopThreshold, Long cleanupPeriodMS) {
-      this(null, false,  cleanupStartThreshold, 
-           cleanupStopThreshold, cleanupPeriodMS);
+      this(null, cleanupStartThreshold, cleanupStopThreshold, cleanupPeriodMS);
    }
 
    /**
@@ -229,31 +214,13 @@ public ThreadSafeEventService(Integer  cleanupStartThreshold,
     * @param timeThresholdForEventTimingEventPublication the longest time a subscriber should spend handling an event.
     * The service will publish an SubscriberTimingEvent after listener processing if the time was exceeded.  If null, no
     * SubscriberTimingEvent will be issued.
-    * @param subscribeTimingEventsInternally add a subscriber to the SubscriberTimingEvent internally and call the
-    * protected subscribeTiming() method when they occur.  This logs a warning to the {@link Logger} by
-    * default.
     * @param cleanupStartThreshold see class javadoc.
     * @param cleanupStopThreshold see class javadoc.
     * @param cleanupPeriodMS see class javadoc.
-    *
-    * @throws IllegalArgumentException if timeThresholdForEventTimingEventPublication is null and
-    * subscribeTimingEventsInternally is true.
     */
    public ThreadSafeEventService(Long timeThresholdForEventTimingEventPublication,
-           boolean subscribeTimingEventsInternally, Integer  cleanupStartThreshold, 
-           Integer cleanupStopThreshold, Long cleanupPeriodMS) {
-      if (timeThresholdForEventTimingEventPublication == null && subscribeTimingEventsInternally) {
-         throw new IllegalArgumentException("null, true in constructor is not valid.  If you want to send timing messages for all events and subscribe them internally, pass 0, true");
-      }
+           Integer cleanupStartThreshold, Integer cleanupStopThreshold, Long cleanupPeriodMS) {
       this.timeThresholdForEventTimingEventPublication = timeThresholdForEventTimingEventPublication;
-      if (subscribeTimingEventsInternally) {
-         //Listen to timing events and log them
-         subscribeStrongly(SubscriberTimingEvent.class, new IEventSubscriber() {
-            public void onEvent(Object event) {
-               subscribeTiming((SubscriberTimingEvent) event);
-            }
-         });
-      }      
       if (cleanupStartThreshold == null) {
          this.cleanupStartThreshhold = CLEANUP_START_THRESHOLD_DEFAULT;
       } else {
@@ -332,8 +299,8 @@ public void setCleanupPeriodMS(Long cleanupPeriodMS) {
       }
    }
 
-   /** @see EventService#subscribe(Class,IEventSubscriber) */
-   public boolean subscribe(Class cl, IEventSubscriber eh) {
+   /** @see EventService#subscribe(Class,EventSubscriber) */
+   public boolean subscribe(Class cl, EventSubscriber eh) {
       if (cl == null) {
          throw new IllegalArgumentException("Event class must not be null");
       }
@@ -343,16 +310,16 @@ public boolean subscribe(Class cl, IEventSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing by class, class:" + cl + ", subscriber:" + eh);
       }
-      return subscribe(cl, subscribersByEventClass, new WeakReference<IEventSubscriber>(eh));
+      return subscribe(cl, subscribersByEventClass, new WeakReference<EventSubscriber>(eh));
    }
 
-   /** @see EventService#subscribe(java.lang.reflect.Type, IEventSubscriber) */
-   public boolean subscribe(Type type, IEventSubscriber eh) {
-      return subscribe(type, subscribersByEventType, new WeakReference<IEventSubscriber>(eh));
+   /** @see EventService#subscribe(java.lang.reflect.Type, EventSubscriber) */
+   public boolean subscribe(Type type, EventSubscriber eh) {
+      return subscribe(type, subscribersByEventType, new WeakReference<EventSubscriber>(eh));
    }
 
-   /** @see EventService#subscribeExactly(Class,IEventSubscriber) */
-   public boolean subscribeExactly(Class cl, IEventSubscriber eh) {
+   /** @see EventService#subscribeExactly(Class,EventSubscriber) */
+   public boolean subscribeExactly(Class cl, EventSubscriber eh) {
       if (cl == null) {
          throw new IllegalArgumentException("Event class must not be null");
       }
@@ -362,11 +329,11 @@ public boolean subscribeExactly(Class cl, IEventSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing by class, class:" + cl + ", subscriber:" + eh);
       }
-      return subscribe(cl, subscribersByExactEventClass, new WeakReference<IEventSubscriber>(eh));
+      return subscribe(cl, subscribersByExactEventClass, new WeakReference<EventSubscriber>(eh));
    }
 
-   /** @see EventService#subscribe(String,IEventTopicSubscriber) */
-   public boolean subscribe(String topic, IEventTopicSubscriber eh) {
+   /** @see EventService#subscribe(String,EventTopicSubscriber) */
+   public boolean subscribe(String topic, EventTopicSubscriber eh) {
       if (topic == null) {
          throw new IllegalArgumentException("Topic must not be null");
       }
@@ -376,11 +343,11 @@ public boolean subscribe(String topic, IEventTopicSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing by topic name, name:" + topic + ", subscriber:" + eh);
       }
-      return subscribe(topic, subscribersByTopic, new WeakReference<IEventTopicSubscriber>(eh));
+      return subscribe(topic, subscribersByTopic, new WeakReference<EventTopicSubscriber>(eh));
    }
 
-   /** @see EventService#subscribe(Pattern,IEventTopicSubscriber) */
-   public boolean subscribe(Pattern pat, IEventTopicSubscriber eh) {
+   /** @see EventService#subscribe(Pattern,EventTopicSubscriber) */
+   public boolean subscribe(Pattern pat, EventTopicSubscriber eh) {
       if (pat == null) {
          throw new IllegalArgumentException("Pattern must not be null");
       }
@@ -391,11 +358,11 @@ public boolean subscribe(Pattern pat, IEventTopicSubscriber eh) {
          LOG.debug("Subscribing by pattern, pattern:" + pat + ", subscriber:" + eh);
       }
       PatternWrapper patternWrapper = new PatternWrapper(pat);
-      return subscribe(patternWrapper, subscribersByTopicPattern, new WeakReference<IEventTopicSubscriber>(eh));
+      return subscribe(patternWrapper, subscribersByTopicPattern, new WeakReference<EventTopicSubscriber>(eh));
    }
 
-   /** @see EventService#subscribeStrongly(Class,IEventSubscriber) */
-   public boolean subscribeStrongly(Class cl, IEventSubscriber eh) {
+   /** @see EventService#subscribeStrongly(Class,EventSubscriber) */
+   public boolean subscribeStrongly(Class cl, EventSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing weakly by class, class:" + cl + ", subscriber:" + eh);
       }
@@ -405,8 +372,8 @@ public boolean subscribeStrongly(Class cl, IEventSubscriber eh) {
       return subscribe(cl, subscribersByEventClass, eh);
    }
 
-   /** @see EventService#subscribeExactlyStrongly(Class,IEventSubscriber) */
-   public boolean subscribeExactlyStrongly(Class cl, IEventSubscriber eh) {
+   /** @see EventService#subscribeExactlyStrongly(Class,EventSubscriber) */
+   public boolean subscribeExactlyStrongly(Class cl, EventSubscriber eh) {
       if (cl == null) {
          throw new IllegalArgumentException("Event class must not be null");
       }
@@ -419,8 +386,8 @@ public boolean subscribeExactlyStrongly(Class cl, IEventSubscriber eh) {
       return subscribe(cl, subscribersByExactEventClass, eh);
    }
 
-   /** @see EventService#subscribeStrongly(String,IEventTopicSubscriber) */
-   public boolean subscribeStrongly(String name, IEventTopicSubscriber eh) {
+   /** @see EventService#subscribeStrongly(String,EventTopicSubscriber) */
+   public boolean subscribeStrongly(String name, EventTopicSubscriber eh) {
       if (LOG.isLoggable(Level.DEBUG)) {
          LOG.debug("Subscribing weakly by topic name, name:" + name + ", subscriber:" + eh);
       }
@@ -430,8 +397,8 @@ public boolean subscribeStrongly(String name, IEventTopicSubscriber eh) {
       return subscribe(name, subscribersByTopic, eh);
    }
 
-   /** @see EventService#subscribeStrongly(Pattern,IEventTopicSubscriber) */
-   public boolean subscribeStrongly(Pattern pat, IEventTopicSubscriber eh) {
+   /** @see EventService#subscribeStrongly(Pattern,EventTopicSubscriber) */
+   public boolean subscribeStrongly(Pattern pat, EventTopicSubscriber eh) {
       if (pat == null) {
          throw new IllegalArgumentException("Pattern must not be null");
       }
@@ -673,30 +640,30 @@ protected boolean subscribe(final Object classTopicOrPatternWrapper, final Map<O
       }
    }
 
-   /** @see EventService#unsubscribe(Class,IEventSubscriber) */
-   public boolean unsubscribe(Class cl, IEventSubscriber eh) {
+   /** @see EventService#unsubscribe(Class,EventSubscriber) */
+   public boolean unsubscribe(Class cl, EventSubscriber eh) {
       return unsubscribe(cl, subscribersByEventClass, eh);
    }
 
-   /** @see EventService#unsubscribeExactly(Class,IEventSubscriber) */
-   public boolean unsubscribeExactly(Class cl, IEventSubscriber eh) {
+   /** @see EventService#unsubscribeExactly(Class,EventSubscriber) */
+   public boolean unsubscribeExactly(Class cl, EventSubscriber eh) {
       return unsubscribe(cl, subscribersByExactEventClass, eh);
    }
 
-   /** @see EventService#unsubscribe(String,IEventTopicSubscriber) */
-   public boolean unsubscribe(String name, IEventTopicSubscriber eh) {
+   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
+   public boolean unsubscribe(String name, EventTopicSubscriber eh) {
       return unsubscribe(name, subscribersByTopic, eh);
    }
 
-   /** @see EventService#unsubscribe(String,IEventTopicSubscriber) */
-   public boolean unsubscribe(Pattern topicPattern, IEventTopicSubscriber eh) {
+   /** @see EventService#unsubscribe(String,EventTopicSubscriber) */
+   public boolean unsubscribe(Pattern topicPattern, EventTopicSubscriber eh) {
       PatternWrapper patternWrapper = new PatternWrapper(topicPattern);
       return unsubscribe(patternWrapper, subscribersByTopicPattern, eh);
    }
 
    /** @see EventService#unsubscribe(Class,Object) */
    public boolean unsubscribe(Class eventClass, Object subscribedByProxy) {
-      IEventSubscriber subscriber = (IEventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
+      EventSubscriber subscriber = (EventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -706,7 +673,7 @@ public boolean unsubscribe(Class eventClass, Object subscribedByProxy) {
 
    /** @see EventService#unsubscribeExactly(Class,Object) */
    public boolean unsubscribeExactly(Class eventClass, Object subscribedByProxy) {
-      IEventSubscriber subscriber = (IEventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
+      EventSubscriber subscriber = (EventSubscriber) getProxySubscriber(eventClass, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -716,7 +683,7 @@ public boolean unsubscribeExactly(Class eventClass, Object subscribedByProxy) {
 
    /** @see EventService#unsubscribe(String,Object) */
    public boolean unsubscribe(String topic, Object subscribedByProxy) {
-      IEventTopicSubscriber subscriber = (IEventTopicSubscriber) getProxySubscriber(topic, subscribedByProxy);
+      EventTopicSubscriber subscriber = (EventTopicSubscriber) getProxySubscriber(topic, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -726,7 +693,7 @@ public boolean unsubscribe(String topic, Object subscribedByProxy) {
 
    /** @see EventService#unsubscribe(java.util.regex.Pattern,Object) */
    public boolean unsubscribe(Pattern pattern, Object subscribedByProxy) {
-      IEventTopicSubscriber subscriber = (IEventTopicSubscriber) getProxySubscriber(pattern, subscribedByProxy);
+      EventTopicSubscriber subscriber = (EventTopicSubscriber) getProxySubscriber(pattern, subscribedByProxy);
       if (subscriber == null) {
          return false;
       } else {
@@ -963,17 +930,15 @@ protected void publish(final Object event, final String topic, final Object even
          for (int i = 0; i < subscribers.size(); i++) {
             Object eh = subscribers.get(i);
             if (event != null) {
-               IEventSubscriber eventSubscriber = (IEventSubscriber) eh;
+               EventSubscriber eventSubscriber = (EventSubscriber) eh;
                long start = System.currentTimeMillis();
                try {
                   eventSubscriber.onEvent(event);
-                  checkTimeLimit(start, event, eventSubscriber, null);
                } catch (Throwable e) {
-                  checkTimeLimit(start, event, eventSubscriber, null);
                   handleException(event, e, callingStack, eventSubscriber);
                }
             } else {
-               IEventTopicSubscriber eventTopicSubscriber = (IEventTopicSubscriber) eh;
+               EventTopicSubscriber eventTopicSubscriber = (EventTopicSubscriber) eh;
                try {
                   eventTopicSubscriber.onEvent(topic, eventObj);
                } catch (Throwable e) {
@@ -1077,14 +1042,12 @@ private boolean checkVetoSubscribers(Object event, String topic, Object eventObj
                }
                if (shouldVeto) {
                   handleVeto(vl, event, vtl, topic, eventObj);
-                  checkTimeLimit(start, event, null, vl);
                   if (LOG.isLoggable(Level.DEBUG)) {
                      LOG.debug("Publication vetoed. Event:" + event + ", Topic:" + topic + ", veto subscriber:" + vl);
                   }
                   return true;
                }
             } catch (Throwable ex) {
-               checkTimeLimit(start, event, null, vl);
                subscribeVetoException(event, topic, eventObj, ex, callingStack, vl);
             }
          }
@@ -1510,20 +1473,6 @@ private List getEventOrVetoSubscribersToType(Map typeMap, Type eventType) {
           */
    }
 
-   private void checkTimeLimit(long start, Object event, IEventSubscriber subscriber, VetoEventListener l) {
-      if (timeThresholdForEventTimingEventPublication == null) {
-         return;
-      }
-      long end = System.currentTimeMillis();
-      if (end - start > timeThresholdForEventTimingEventPublication.longValue()) {
-         publish(new SubscriberTimingEvent(this, new Long(start), new Long(end), timeThresholdForEventTimingEventPublication, event, subscriber, l));
-      }
-   }
-
-   protected void subscribeTiming(SubscriberTimingEvent event) {
-      LOG.log(Level.INFO, event + "");
-   }
-
    /**
     * Handle vetos of an event or topic, by default logs finely.
     *
@@ -1989,7 +1938,7 @@ protected void subscribeVetoException(final Object event, final String topic, fi
 
    /** Called during event handling exceptions, calls handleException */
    protected void onEventException(final String topic, final Object eventObj, Throwable e,
-           StackTraceElement[] callingStack, IEventTopicSubscriber eventTopicSubscriber) {
+           StackTraceElement[] callingStack, EventTopicSubscriber eventTopicSubscriber) {
       String str = "EventService topic subscriber:" + eventTopicSubscriber;
       if (eventTopicSubscriber != null) {
          str = str + ".  Subscriber class:" + eventTopicSubscriber.getClass();
@@ -1999,7 +1948,7 @@ protected void onEventException(final String topic, final Object eventObj, Throw
 
    /** Called during event handling exceptions, calls handleException */
    protected void handleException(final Object event, Throwable e,
-           StackTraceElement[] callingStack, IEventSubscriber eventSubscriber) {
+           StackTraceElement[] callingStack, EventSubscriber eventSubscriber) {
       String str = "EventService subscriber:" + eventSubscriber;
       if (eventSubscriber != null) {
          str = str + ".  Subscriber class:" + eventSubscriber.getClass();
diff --git a/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java b/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
deleted file mode 100644
index 490303378..000000000
--- a/src/main/java/org/scijava/event/bushe/UseTheClassOfTheAnnotatedMethodsParameter.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.scijava.event.bushe;
-
-/**
- * This is a dummy class to get around a limitation with annotations.
- * <p/>
- * It's nice to use an @EventSubscriber annotation without any parameters.  For example:
- * <pre>
- * <code>@EventSubscriber public void onEvent(FooEvent event) { //do something } </code></pre> In this case, the method should
- * obviously be subscribed to the FooEvent class. Since the eventClass is not required, annotations require a default to
- * be supplied. A default of null is not allowed by the compiler since it is not a class literal. A default of
- * Object.class cannot be used, since it is legal to subscribe to Object. hence, this class was created which documents
- * the issue and provides decent feedback when using an IDE's parameter insight.
- */
-final class UseTheClassOfTheAnnotatedMethodsParameter {
-}
diff --git a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
deleted file mode 100644
index 3a6283fe0..000000000
--- a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicPatternSubscriber.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface VetoRuntimeTopicPatternSubscriber {
-    /**
-     * @return name of a method (which should return a String) and whose return value will become the subscription topic.
-     */
-    public abstract String methodName() default "getTopicPatternName";
-
-    /** @return Whether to subscribe weakly or strongly. */
-    public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-    /**
-     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
-     */
-    public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
-    public abstract int priority() default 0;
-
-    /** @return Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
-    public abstract boolean exact() default false;
-
-    /**
-     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
-     */
-    public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
deleted file mode 100644
index e5ce7d6eb..000000000
--- a/src/main/java/org/scijava/event/bushe/VetoRuntimeTopicSubscriber.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.scijava.event.bushe;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A veto subscriber to a topic that is determined at runtime.
- */
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface VetoRuntimeTopicSubscriber {
-    /**
-     * @return name of a method (that must return a String) and whose return value will become the subscription topic.
-     */
-    public abstract String methodName() default "getTopicName";
-
-    /** @return Whether to subscribe weakly or strongly. */
-    public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-    /**
-     * @return event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS.
-     */
-    public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-    /** @return Determines the order in which this subscriber is called, default is FIFO.*/
-    public abstract int priority() default 0;
-
-    /**
-     * @return Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the service needs to be created, it must have a default constructor.
-     */
-    public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/main/java/org/scijava/event/bushe/VetoSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
deleted file mode 100644
index e8172744e..000000000
--- a/src/main/java/org/scijava/event/bushe/VetoSubscriber.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An Annotation for adding VetoListener subscriptions to EventService Events.
- * <p>
- * This annotation simplifies much of the repetitive boilerplate used for adding veto listeners
- * (which in EventBus 2.0 will be called VetoSubscribers, thus this annotation name difference)
- * to EventService Events.  Example:
- * <p>
- * <pre>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EventSubscriber(eventClass=AppAppClosingEvent.class)
- *   public void onAppClosingEvent(AppClosingEvent appClosingEvent) {
- *      //close connections, close windows
- *   }
- * }
- *
- * public class MyDocumentController {
- *   &#64;VetoSubscriber(eventClass=AppAppClosingEvent.class)
- *   public boolean ensureDocumentIsSaved(AppAppClosingEvent appClosingEvent) {
- *      if (docHasUnsavedChanges()) {
- *         boolean answer = MyModalDialog.show("Are you sure you want to close and lose your changes?");
- *         if (answer == StandardButtonValues.Cancel) {
- *            //stop processing this event
- *            return true;
- *         }
- *      }
- *      //It's OK to close
- *      return false;
- *   }
- * }
- * </pre>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface VetoSubscriber {
-   /** The class to subscribe to, if not specified, a subscription is created for the type of the method parameter. */
-   public abstract Class eventClass() default UseTheClassOfTheAnnotatedMethodsParameter.class;
-
-   /** Determines the order in which this veto subscriber is called, default is FIFO.*/
-   public abstract int priority() default 0;
-
-   /** Whether or not to subscribe to the exact class or a class hierarchy, defaults to class hierarchy (false). */
-   public abstract boolean exact() default false;
-
-   /** Whether to subscribe weakly or strongly. */
-   public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-   /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
-    */
-   public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
deleted file mode 100644
index 72de5cbed..000000000
--- a/src/main/java/org/scijava/event/bushe/VetoTopicPatternSubscriber.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An Annotation for adding VetoTopicPatternListener subscriptions to EventService Events.
- * <p>
- * This annotation simplifies much of the repetitive boilerplate used for adding veto topic pattern listeners
- * (which in EventBus 2.0 will be called VetoTopicPatternSubscribers, thus this annotation name difference)
- * to EventService Events.  Example:
- * <p>
- * <pre>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EvenTopicSubscriber(topic="App.Close.*")
- *   public void onAppClosingEvent(String topic, Object payload) {
- *      //close connections, close windows
- *   }
- * }
- *
- * public class MyDocumentController {
- *   &#64;VetoTopicSubscriber(topic="App.Close.*")
- *   public boolean ensureDocumentIsSaved(String topic, Object payload) {
- *      if (docHasUnsavedChanges()) {
- *         boolean answer = MyModalDialog.show("Are you sure you want to close and lose your changes?");
- *         if (answer == StandardButtonValues.Cancel) {
- *            //stop processing this event
- *            return true;
- *         }
- *      }
- *      //It's OK to close
- *      return false;
- *   }
- * }
- * </pre>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface VetoTopicPatternSubscriber {
-   /** The topic to subscribe to */
-   public abstract String topicPattern();
-
-   /** Determines the order in which this veto subscriber is called, default is FIFO.*/
-   public abstract int priority() default 0;
-
-   /** Whether to subscribe weakly or strongly. */
-   public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-   /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
-    */
-   public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
deleted file mode 100644
index 81fbb7366..000000000
--- a/src/main/java/org/scijava/event/bushe/VetoTopicSubscriber.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An Annotation for adding VetoTopicListener subscriptions to EventService Events.
- * <p>
- * This annotation simplifies much of the repetitive boilerplate used for adding veto topic listeners
- * (which in EventBus 2.0 will be called VetoTopicSubscribers, thus this annotation name difference)
- * to EventService Events.  Example:
- * <p>
- * <pre>
- * public class MyAppController {
- *   public MyAppController {
- *       AnnotationProcessor.process(this);//this line can be avoided with a compile-time tool or an Aspect
- *   }
- *   &#64;EvenTopicSubscriber(topic="App.Close")
- *   public void onAppClosingEvent(String topic, Object payload) {
- *      //close connections, close windows
- *   }
- * }
- *
- * public class MyDocumentController {
- *   &#64;VetoTopicSubscriber(topic="App.Close")
- *   public boolean ensureDocumentIsSaved(String topic, Object payload) {
- *      if (docHasUnsavedChanges()) {
- *         boolean answer = MyModalDialog.show("Are you sure you want to close and lose your changes?");
- *         if (answer == StandardButtonValues.Cancel) {
- *            //stop processing this event
- *            return true;
- *         }
- *      }
- *      //It's OK to close
- *      return false;
- *   }
- * }
- * </pre>
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@interface VetoTopicSubscriber {
-   /** The topic to subscribe to */
-   String topic();
-
-   /** Determines the order in which this veto subscriber is called, default is FIFO.*/
-   public abstract int priority() default 0;
-
-   /** Whether to subscribe weakly or strongly. */
-   public abstract ReferenceStrength referenceStrength() default ReferenceStrength.WEAK;
-
-   /** The event service to subscribe to, default to the EventServiceLocator.SERVICE_NAME_EVENT_BUS. */
-   public abstract String eventServiceName() default EventServiceLocator.SERVICE_NAME_EVENT_BUS;
-
-   /**
-    * Whether or not to autocreate the event service if it doesn't exist on subscription, default is true. If the
-    * service needs to be created, it must have a default constructor.
-    */
-   public abstract Class<? extends EventService> autoCreateEventServiceClass() default ThreadSafeEventService.class;
-}
diff --git a/src/test/java/org/scijava/event/bushe/AbstractSubscriber.java b/src/test/java/org/scijava/event/bushe/AbstractSubscriber.java
deleted file mode 100644
index 1666a0e20..000000000
--- a/src/test/java/org/scijava/event/bushe/AbstractSubscriber.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.scijava.event.bushe;
-
-/**
- * Intended to answer this post:
- * https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=30702&forumID=1834
- */
-public abstract class AbstractSubscriber {
-    private String targetType;
-
-    abstract protected void initialize(String type);
-
-    @EventSubscriber(eventClass=MyData.class)
-    public void loadDocumentAnalysis(MyData data) {
-        System.out.println(data + " received by " + getClass().getName());
-        setTargetType(data.getClassification());
-        //getStatusCallback().startProgress(getClass().getCanonicalName(), true, null);
-        initialize(getTargetType());
-    }
-
-    public void setTargetType(String targetType) {
-        this.targetType = targetType;
-    }
-
-    public String getTargetType() {
-        return targetType;
-    }
-}
diff --git a/src/test/java/org/scijava/event/bushe/AnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/AnnotatedEventSubscriber.java
deleted file mode 100644
index 182e26e7a..000000000
--- a/src/test/java/org/scijava/event/bushe/AnnotatedEventSubscriber.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.awt.Color;
-import javax.swing.JComponent;
-import javax.swing.JToggleButton;
-
-/** Test class for class-based subscriptions */
-public class AnnotatedEventSubscriber {
-   static int timesColorChanged = 0;
-   static String lastCall = null;
-   static int timesCalled = 0;
-
-   public static int getTimesColorChanged() {
-      return timesColorChanged;
-   }
-
-   public static void setTimesColorChanged(int times) {
-      timesColorChanged = times;
-   }
-
-   public static int getTimesCalled() {
-      return timesCalled;
-   }
-
-   public static void setTimesCalled(int times) {
-      timesCalled = times;
-   }
-
-   public static String getLastCall() {
-      return lastCall;
-   }
-
-   public static void setLastCall(String call) {
-      lastCall = call;
-   }
-
-   @EventSubscriber
-   public void doColorChange(Color color) {
-      timesColorChanged++;
-      timesCalled++;
-   }
-
-   @EventSubscriber(eventClass = List.class)
-   public void doList(Collection collection) {
-      lastCall = "doList";
-      timesCalled++;
-   }
-
-   @EventSubscriber(eventClass = JToggleButton.class, exact = true)
-   public void doJToggleButtonExactly(JComponent list) {
-      lastCall = "doJToggleButtonExactly";
-      timesCalled++;
-   }
-
-   @EventSubscriber(eventClass = Iterator.class,
-           eventServiceName = "IteratorService",
-           autoCreateEventServiceClass = ThreadSafeEventService.class)
-   public void autoCreateEventServiceClass(Iterator it) {
-      lastCall = "autoCreateEventServiceClass";
-      timesCalled++;
-   }
-
-   @EventTopicSubscriber(topic = "File.Open")
-   public void simpleTopicOpenFile(String topic, File file) {
-      lastCall = "simpleTopicOpenFile";
-      timesCalled++;
-   }
-
-   @EventTopicSubscriber(topic = "Iterator",
-           eventServiceName = "IteratorService",
-           autoCreateEventServiceClass = ThreadSafeEventService.class)
-   public void autoCreateEventServiceTopic(String topic, Iterator it) {
-      lastCall = "autoCreateEventServiceClass";
-      timesCalled++;
-   }
-
-   @EventTopicPatternSubscriber(topicPattern = "IceCream.*",
-           eventServiceName = "IceCreamService")
-   public void doIceCream(String topic, String order) {
-      lastCall = "doIceCream";
-      timesCalled++;
-   }
-
-}
diff --git a/src/test/java/org/scijava/event/bushe/AnnotatedVetoSubscriber.java b/src/test/java/org/scijava/event/bushe/AnnotatedVetoSubscriber.java
deleted file mode 100644
index 817df28b7..000000000
--- a/src/test/java/org/scijava/event/bushe/AnnotatedVetoSubscriber.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.awt.Color;
-import javax.swing.JComponent;
-import javax.swing.JToggleButton;
-
-/** Test class for class-based subscriptions.
- * Does not like null, empty, red or cherry */
-public class AnnotatedVetoSubscriber {
-
-   @VetoSubscriber
-   public boolean vetoBlueColorChange(Color color) {
-      if (color == Color.RED) {
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-   @VetoSubscriber(eventClass = List.class)
-   public boolean doList(Collection collection) {
-      if (collection == null || collection.isEmpty()) {
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-   @VetoSubscriber(eventClass = JToggleButton.class, exact = true)
-   public boolean doJToggleButtonExactly(JComponent button) {
-      if (button.getForeground() == Color.RED) {
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-   @VetoSubscriber(eventClass = Iterator.class,
-           eventServiceName = "IteratorService",
-           autoCreateEventServiceClass = ThreadSafeEventService.class)
-   public boolean autoCreateEventServiceClass(Iterator it) {
-      if (it == null || !it.hasNext()) {
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-   @VetoTopicSubscriber(topic = "File.Open")
-   public boolean simpleTopicOpenFile(String topic, File file) {
-      if (file == null) {
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-   @VetoTopicSubscriber(topic = "Iterator",
-           eventServiceName = "IteratorService",
-           autoCreateEventServiceClass = ThreadSafeEventService.class)
-   public boolean autoCreateEventServiceTopic(String topic, Iterator it) {
-      if (it == null || !it.hasNext()) {
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-   @VetoTopicPatternSubscriber(topicPattern = "IceCream.*",
-           eventServiceName = "IceCreamService")
-   public boolean doIceCream(String topic, String order) {
-      if (topic.indexOf("Cherry") > -1) {
-         return true;
-      } else {
-         return false;
-      }
-   }
-
-}
diff --git a/src/test/java/org/scijava/event/bushe/AnotherAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/AnotherAnnotatedEventSubscriber.java
deleted file mode 100644
index 7f7f0c5e1..000000000
--- a/src/test/java/org/scijava/event/bushe/AnotherAnnotatedEventSubscriber.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.List;
-import java.util.Collection;
-import java.util.Iterator;
-import java.io.File;
-import java.awt.Color;
-import javax.swing.JToggleButton;
-import javax.swing.JComponent;
-
-/** Test class for class-based subscriptions */
-public class AnotherAnnotatedEventSubscriber {
-   static int timesColorChanged = 0;
-   static String lastCall = null;
-   static int timesCalled = 0;
-
-   public static int getTimesColorChanged() {
-      return timesColorChanged;
-   }
-
-   public static void setTimesColorChanged(int times) {
-      timesColorChanged = times;
-   }
-
-   public static int getTimesCalled() {
-      return timesCalled;
-   }
-
-   public static void setTimesCalled(int times) {
-      timesCalled = times;
-   }
-
-   public static String getLastCall() {
-      return lastCall;
-   }
-
-   public static void setLastCall(String call) {
-      lastCall = call;
-   }
-
-   @EventSubscriber(eventClass = List.class, referenceStrength = ReferenceStrength.STRONG)
-   public void doList(Collection collection) {
-      lastCall = "doList";
-      timesCalled++;
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/AnotherDoubleAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/AnotherDoubleAnnotatedEventSubscriber.java
deleted file mode 100644
index 928b67428..000000000
--- a/src/test/java/org/scijava/event/bushe/AnotherDoubleAnnotatedEventSubscriber.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.Collection;
-import java.util.List;
-
-/** Test class for class-based subscriptions */
-public class AnotherDoubleAnnotatedEventSubscriber {
-
-   static int timesCalled = 0;
-
-   public static int getTimesCalled() {
-      return timesCalled;
-   }
-
-   public static void setTimesCalled(int times) {
-      timesCalled = times;
-   }
-
-   @EventSubscriber(eventClass = List.class)
-   public void doList(Collection collection) {
-      timesCalled++;
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/BadEventService.java b/src/test/java/org/scijava/event/bushe/BadEventService.java
index 19cebe785..2046821a2 100644
--- a/src/test/java/org/scijava/event/bushe/BadEventService.java
+++ b/src/test/java/org/scijava/event/bushe/BadEventService.java
@@ -3,8 +3,8 @@
 public class BadEventService extends ThreadSafeEventService {
 
 
-   /** @see org.scijava.event.bushe.EventService#subscribe(String,org.scijava.event.bushe.IEventTopicSubscriber) */
-   public boolean subscribe(String topic, IEventTopicSubscriber eh) {
+   /** @see org.scijava.event.bushe.EventService#subscribe(String,org.scijava.event.bushe.EventTopicSubscriber) */
+   public boolean subscribe(String topic, EventTopicSubscriber eh) {
       throw new RuntimeException("For testing");
    }
 }
diff --git a/src/test/java/org/scijava/event/bushe/ConcreteSubscriber.java b/src/test/java/org/scijava/event/bushe/ConcreteSubscriber.java
deleted file mode 100644
index 129d71987..000000000
--- a/src/test/java/org/scijava/event/bushe/ConcreteSubscriber.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.scijava.event.bushe;
-
-/**
- * Intended to answer this post:
- * https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=30702&forumID=1834
- */
-public class ConcreteSubscriber extends AbstractSubscriber {
-    private boolean wasInitialized = false;
-
-    protected void initialize(String type) {
-        this.wasInitialized = true;
-    }
-
-    public boolean isInitialized() {
-        return wasInitialized;
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/DoubleAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/DoubleAnnotatedEventSubscriber.java
deleted file mode 100644
index 8448f28de..000000000
--- a/src/test/java/org/scijava/event/bushe/DoubleAnnotatedEventSubscriber.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.List;
-import java.util.Collection;
-import java.util.Iterator;
-import java.io.File;
-import java.awt.Color;
-import javax.swing.JToggleButton;
-import javax.swing.JComponent;
-
-/** Test class for class-based subscriptions */
-public class DoubleAnnotatedEventSubscriber {
-
-   static int timesCalled = 0;
-
-   public static int getTimesCalled() {
-      return timesCalled;
-   }
-
-   public static void setTimesCalled(int times) {
-      timesCalled = times;
-   }
-
-   @EventSubscriber(eventClass = List.class)
-   public void doList(Collection collection) {
-      timesCalled++;
-   }
-
-   @EventTopicSubscriber(topic="foo")
-   public void foo(String topic, Object o) {
-      timesCalled++;
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java b/src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java
deleted file mode 100644
index 8fb87e534..000000000
--- a/src/test/java/org/scijava/event/bushe/EventServiceLocatorTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/**
- * Cleans out the event service locators before each test
- */
-public class EventServiceLocatorTestCase extends TestCase {
-   public EventServiceLocatorTestCase(String name) {
-      super(name);
-   }
-
-   public void testEmptyTestCaseToAvoidWarning() {
-
-   }
-
-   @Override
-   public void setUp() throws Exception {
-      clearEventServiceLocator();
-   }
-
-   public static void clearEventServiceLocator() {
-      System.clearProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS);
-      System.clearProperty(EventServiceLocator.EVENT_BUS_CLASS);
-      EventServiceLocator.clearAll();
-   }
-
-   @Override
-   protected void tearDown() throws Exception {
-      clearEventServiceLocator();
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/Factory.java b/src/test/java/org/scijava/event/bushe/Factory.java
deleted file mode 100644
index 546c3fb49..000000000
--- a/src/test/java/org/scijava/event/bushe/Factory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.scijava.event.bushe;
-
-public class Factory {
-
-	public static SubscriberForTesting newRuntimeTopicSubscriber(String topic) {
-		return new RuntimeTopicSubscriber(topic);
-	}
-
-	public static SubscriberForTesting newRuntimeTopicPatternSubscriber(String topicPattern) {
-		return new RuntimeTopicPatternSubscriber(topicPattern);
-	}
-}
diff --git a/src/test/java/org/scijava/event/bushe/Issue15Subscriber.java b/src/test/java/org/scijava/event/bushe/Issue15Subscriber.java
deleted file mode 100644
index 8bb257efd..000000000
--- a/src/test/java/org/scijava/event/bushe/Issue15Subscriber.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.List;
-import javax.swing.SwingUtilities;
-
-/**
- *
- */
-public class Issue15Subscriber {
-   private long timesCalled;
-
-   public Issue15Subscriber() {
-        AnnotationProcessor.process(this);
-    }
-    
-    @EventSubscriber(eventClass = List.class)
-    public void handleClassSubscription(List c) {
-       timesCalled++;
-        if (c != null) {
-            System.out.println("In handleClassSubscription");
-            System.out.println("By class: " + c);
-            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
-            System.out.println();
-        }
-    }
-
-   /*
-    @EventTopicSubscriber(topic = "Topic1")
-    public void handleTopic1Subscription(String topic, Object o) {
-        if (o != null) {
-            System.out.println("In handleTopic1Subscription");
-            System.out.println("By topic: " + topic);
-            System.out.println("    for class: " + o.getClass());
-            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
-            System.out.println();
-        }
-    }
-
-
-    @EventTopicSubscriber(topic = "Topic2")
-    public void handleTopic2Subscription(String topic, Object o) {
-        if (o != null) {
-            System.out.println("In handleTopic2Subscription");
-            System.out.println("By topic: " + topic);
-            System.out.println("    for class: " + o.getClass());
-            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
-            System.out.println();
-        }
-    }
-    
-    
-    
-    @EventTopicPatternSubscriber(topicPattern = ".*")
-    public void handleAllTopicsSubscription(String topic, Object o) {
-        if (o != null) {
-            System.out.println("In handleAllTopicsSubscription");
-            System.out.println("By topic: " + topic);
-            System.out.println("    for class: " + o.getClass());
-            System.out.println("Is on EDT: " + SwingUtilities.isEventDispatchThread());
-            System.out.println();
-        }
-    }
-    */
-
-   public long getTimesCalled() {
-      return timesCalled;
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/Issue15Subscriber2.java b/src/test/java/org/scijava/event/bushe/Issue15Subscriber2.java
deleted file mode 100644
index 5fbc7a162..000000000
--- a/src/test/java/org/scijava/event/bushe/Issue15Subscriber2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JTextField;
-
-/**
- *
- */
-public class Issue15Subscriber2 extends JDialog {
-
-    private JTextField textField;
-   private long timesCalled;
-
-   /**
-     * A new setup has been selected.
-     * @param e
-     *      setup changed event notification
-     */
-    @EventSubscriber(eventClass = List.class)
-    public void handleEvent(List e) {
-         timesCalled++;
-        textField.setText(e+"");
-    }
-    
-    private ActionListener buttonListener = new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-            EventBus.publish(new ArrayList());
-        }
-    };
-    
-    public Issue15Subscriber2() {
-        super();
-        
-        AnnotationProcessor.process(this);
-        
-        setLayout(new GridLayout(1, 2));
-        
-        JButton button = new JButton("Push Me");
-        button.addActionListener(buttonListener);
-        textField = new JTextField("");
-        
-        add(button);
-        add(textField);
-    }
-    
-    public static void main(String args[]) {
-        
-        Issue15Subscriber s = new Issue15Subscriber();
-        
-        Issue15Subscriber2 dialog = new Issue15Subscriber2();
-        System.err.println(EventBus.getSubscribers(List.class).size());
-        dialog.setVisible(true);
-    }
-
-   public long getTimesCalled() {
-      return timesCalled;
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/RuntimeTopicPatternSubscriber.java b/src/test/java/org/scijava/event/bushe/RuntimeTopicPatternSubscriber.java
deleted file mode 100644
index 01af68b6b..000000000
--- a/src/test/java/org/scijava/event/bushe/RuntimeTopicPatternSubscriber.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.List;
-
-class RuntimeTopicPatternSubscriber implements SubscriberForTesting {
-	private final String topicPattern;
-	private long timesCalled;
-
-	public RuntimeTopicPatternSubscriber(String topicPattern) {
-		this.topicPattern = topicPattern;
-
-		AnnotationProcessor.process(this);
-	}
-
-	@RuntimeTopicPatternEventSubscriber
-	public void handleEvent(String topic, List<String> event) {
-		timesCalled++;
-	}
-
-   @RuntimeTopicPatternEventSubscriber
-   public boolean shouldVeto(String topic, List<String> e) {
-      return e == null;
-   }
-
-	public String getTopicPatternName() {
-		return topicPattern;
-	}
-
-	public long getTimesCalled() {
-		return timesCalled;
-	}
-}
diff --git a/src/test/java/org/scijava/event/bushe/RuntimeTopicSubscriber.java b/src/test/java/org/scijava/event/bushe/RuntimeTopicSubscriber.java
deleted file mode 100644
index 5cb27936a..000000000
--- a/src/test/java/org/scijava/event/bushe/RuntimeTopicSubscriber.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.List;
-
-class RuntimeTopicSubscriber implements SubscriberForTesting {
-	private long timesCalled;
-	private final String topic;
-
-	public RuntimeTopicSubscriber(String topic) {
-		this.topic = topic;
-		AnnotationProcessor.process(this);
-	}
-	
-	@RuntimeTopicEventSubscriber
-	public void handleEvent(String topic, List<String> e) {
-		timesCalled++;
-	}
-
-   @RuntimeTopicEventSubscriber
-   public boolean shouldVeto(String topic, List<String> e) {
-      return e == null;
-   }
-
-	public String getTopicName() {
-		return topic;
-	}
-
-	public long getTimesCalled() {
-		return timesCalled;
-	}
-}
diff --git a/src/test/java/org/scijava/event/bushe/StrongAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/StrongAnnotatedEventSubscriber.java
deleted file mode 100644
index 8ff4b5ffe..000000000
--- a/src/test/java/org/scijava/event/bushe/StrongAnnotatedEventSubscriber.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.io.File;
-
-public class StrongAnnotatedEventSubscriber {
-   static String lastCall = null;
-   static int timesCalled = 0;
-
-   public static int getTimesCalled() {
-      return timesCalled;
-   }
-
-   public static void setTimesCalled(int times) {
-      timesCalled = times;
-   }
-
-   public static String getLastCall() {
-      return lastCall;
-   }
-
-   public static void setLastCall(String call) {
-      lastCall = call;
-   }
-
-   @EventSubscriber(referenceStrength = ReferenceStrength.STRONG)
-   public void doStrong(File it) {
-      lastCall = "doStrong";
-      timesCalled++;
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/StrongClassAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/StrongClassAnnotatedEventSubscriber.java
deleted file mode 100644
index 3894195a5..000000000
--- a/src/test/java/org/scijava/event/bushe/StrongClassAnnotatedEventSubscriber.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.Collection;
-import java.util.List;
-
-/** Test class for class-based subscriptions */
-public class StrongClassAnnotatedEventSubscriber {
-   static int timesColorChanged = 0;
-   static String lastCall = null;
-   static int timesCalled = 0;
-
-   public static int getTimesCalled() {
-      return timesCalled;
-   }
-
-   public static void setTimesCalled(int times) {
-      timesCalled = times;
-   }
-
-   @EventSubscriber(eventClass = List.class, referenceStrength = ReferenceStrength.STRONG)
-   public void doList(Collection collection) {
-      timesCalled++;
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/SubscriberForTest.java b/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
index 4d683ce4f..2fac88e57 100644
--- a/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
+++ b/src/test/java/org/scijava/event/bushe/SubscriberForTest.java
@@ -6,7 +6,7 @@
  * @author Michael Bushe
  * @since Nov 19, 2005 11:01:06 PM
  */
-public class SubscriberForTest implements IEventSubscriber {
+public class SubscriberForTest implements EventSubscriber {
    private boolean throwException;
    private Long waitTime;
    private EBTestCounter testDefaultEventService;
diff --git a/src/test/java/org/scijava/event/bushe/TestAnnotationInAbstractClass.java b/src/test/java/org/scijava/event/bushe/TestAnnotationInAbstractClass.java
deleted file mode 100644
index 8f04ff56c..000000000
--- a/src/test/java/org/scijava/event/bushe/TestAnnotationInAbstractClass.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-import junit.framework.Assert;
-
-/**
- * Testing: 
- * https://eventbus.dev.java.net/servlets/ProjectForumMessageView?messageID=30702&forumID=1834
- */
-public class TestAnnotationInAbstractClass extends TestCase {
-    public void testAbstract() {
-        ConcreteSubscriber concrete = new ConcreteSubscriber();
-        AnnotationProcessor.process(concrete);
-        EventBus.publish(new MyData());
-        EDTUtil.waitForEDT();
-        Assert.assertTrue(concrete.isInitialized());
-    }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestContainerEventService.java b/src/test/java/org/scijava/event/bushe/TestContainerEventService.java
deleted file mode 100644
index 9537e4349..000000000
--- a/src/test/java/org/scijava/event/bushe/TestContainerEventService.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-import javax.swing.*;
-import java.awt.*;
-import java.util.ArrayList;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestContainerEventService extends TestCase {
-   private ArrayList subscribedEvents;
-   private Object aSource = new Object();
-   private JFrame frame;
-   private JPanel panel;
-   private Object lastEventObject;
-
-   public TestContainerEventService(String name) {
-      super(name);
-   }
-
-   protected void setUp() throws Exception {
-      subscribedEvents = new ArrayList();
-      frame = new JFrame();
-      panel = new JPanel();
-      frame.setContentPane(panel);
-   }
-
-   public void testContainerEventServiceFinder() {
-      JButton button = new JButton("Foo");
-      panel.add(button);
-      JButton barButton = new JButton("Bar");
-      panel.add(barButton);
-      EventService es = ContainerEventServiceFinder.getEventService(button);
-      assertTrue(EventBus.getGlobalEventService() != es);
-      EventService esBar = ContainerEventServiceFinder.getEventService(barButton);
-      assertEquals(esBar, es);
-      assertEquals(0, subscribedEvents.size());
-      es.subscribe("FooTopic", new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object evt) {
-            subscribedEvents.add(evt);
-         }
-      });
-      esBar.publish("FooTopic", "Foo");
-      EDTUtil.waitForEDT();
-      assertEquals(1, subscribedEvents.size());
-      subscribedEvents.clear();
-      Point location = frame.getLocation();
-      frame.setLocation(33, 33);
-      EDTUtil.waitForEDT();
-      assertTrue(subscribedEvents.size() == 0);
-   }
-
-   public void testContainerEventServiceSupplier() {
-      JButton button = new JButton("Foo");
-      JPanel subPanel = new JPanel();
-      subPanel.add(button);
-      panel.add(subPanel);
-      JButton barButton = new JButton("Bar");
-      JPanel subPanel2 = new ContainerEventServiceSupplierPanel();
-      subPanel2.add(barButton);
-      panel.add(subPanel2);
-      EventService es = ContainerEventServiceFinder.getEventService(button);
-      assertTrue(EventBus.getGlobalEventService() != es);
-      EventService esBar = ContainerEventServiceFinder.getEventService(barButton);
-      assertTrue(esBar != es);
-      assertEquals(0, subscribedEvents.size());
-      es.subscribe("FooTopic", new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object evt) {
-            subscribedEvents.add(evt);
-         }
-      });
-      esBar.publish("FooTopic", "Foo");
-      EDTUtil.waitForEDT();
-      assertEquals(0, subscribedEvents.size());
-   }
-
-   public void testContainerEventServiceRegistrar() {
-      //Set the lastEventObject whenever the event fires on the right Container Event Service
-      IEventTopicSubscriber buttonContainerTopicSubscriber = new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object data) {
-            System.out.println("topic=" + topic + ", data=" + data);
-            setLastEventObject(data);
-         }
-      };
-      //Set the lastEventObject whenever the event fires on the right Container Event Service
-      VetoTopicEventListener buttonContainerVetoTopicSubscriber = new VetoTopicEventListener() {
-          public boolean shouldVeto(String topic, Object data) {
-              return "VetoMe".equals(data);
-          }
-      };
-      //Set the lastEventObject whenever the event fires on the right Container Event Service
-      IEventSubscriber buttonContainerSubscriber = new IEventSubscriber() {
-          public void onEvent(Object data) {
-             System.out.println("class=" + data);
-             setLastEventObject(data);
-          }
-      };
-      //Set the lastEventObject whenever the event fires on the right Container Event Service
-      VetoEventListener buttonContainerVetoSubscriber = new VetoEventListener() {
-           public boolean shouldVeto(Object data) {
-               return "VetoMe".equals(data.toString());
-           }
-      };
-      JButton button = new JButton("Foo");
-
-      ContainerEventServiceRegistrar reg = new ContainerEventServiceRegistrar(button, buttonContainerTopicSubscriber,
-              "RegEvent");
-      EventService es = reg.getContainerEventService();
-      assertTrue(es != null);
-
-      ContainerEventServiceRegistrar reg2 = new ContainerEventServiceRegistrar(button, buttonContainerVetoTopicSubscriber,
-              "RegEvent");
-      EventService es4reg2 = reg2.getContainerEventService();
-      assertTrue(es4reg2 != null);
-
-      ContainerEventServiceRegistrar reg3 = new ContainerEventServiceRegistrar(button, buttonContainerSubscriber,
-              String.class);
-      EventService es4reg3 = reg3.getContainerEventService();
-      assertTrue(es4reg3 != null);
-
-      ContainerEventServiceRegistrar reg4 = new ContainerEventServiceRegistrar(button, buttonContainerVetoSubscriber,
-              String.class);
-      EventService es4reg4 = reg4.getContainerEventService();
-      assertTrue(es4reg4 != null);
-
-      //Publishing on the global event bus should not have an effect
-      EventBus.publish("RegEvent", "WrongBus");
-      assertEquals(getLastEventObject(), null);
-
-      //Make a container that has another container inside it that supplies a container event service
-      JPanel subPanel = new JPanel();
-      subPanel.add(button);
-      ContainerEventServiceSupplierPanel subPanel2 = new ContainerEventServiceSupplierPanel();
-      panel.add(subPanel);
-      panel.add(subPanel2);
-      EventService es2 = reg.getContainerEventService();
-      //the registrar kept up with the move
-      assertTrue(es2 != es);
-
-      EventBus.publish("RegEvent", "WrongBus");
-      assertEquals(getLastEventObject(), null);
-      EventBus.publish("StringClassEvent");
-      assertEquals(getLastEventObject(), null);
-
-      EventService topPanelES = ContainerEventServiceFinder.getEventService(panel);
-
-      topPanelES.publish("RegEvent", "TopLevelBus");
-      EDTUtil.waitForEDT();
-      assertEquals("TopLevelBus", getLastEventObject());
-
-      topPanelES.publish("Don'tVetoMe");
-      EDTUtil.waitForEDT();
-      assertEquals("Don'tVetoMe", getLastEventObject());
-
-      topPanelES.publish("VetoMe");
-      EDTUtil.waitForEDT();
-      assertEquals("Don'tVetoMe", getLastEventObject());//veto worked
-
-      topPanelES.publish("RegEvent", "TopLevelBus");
-      EDTUtil.waitForEDT();
-      assertEquals("TopLevelBus", getLastEventObject());
-
-      EventService subPanel2ES = subPanel2.getContainerEventService();
-      subPanel2ES.publish("RegEvent", "SuppliedBus");
-      EDTUtil.waitForEDT();
-      assertEquals("TopLevelBus", getLastEventObject());//still
-
-      subPanel2.add(button);
-      EDTUtil.waitForEDT();
-      subPanel2ES.publish("RegEvent", "SuppliedBus");
-      EDTUtil.waitForEDT();
-      assertEquals("SuppliedBus", getLastEventObject());//detected move
-
-      subPanel2ES.publish("RegEvent", "VetoMe");
-      EDTUtil.waitForEDT();
-      assertEquals("SuppliedBus", getLastEventObject());//veto moved
-
-      subPanel.add(button);
-      topPanelES.publish("RegEvent", "TopLevelBus");
-      EDTUtil.waitForEDT();
-      assertEquals("TopLevelBus", getLastEventObject());
-
-      subPanel2ES.publish("RegEvent", "SuppliedBus");
-      EDTUtil.waitForEDT();
-      assertEquals("TopLevelBus", getLastEventObject());
-   }
-
-   private synchronized void setLastEventObject(Object data) {
-      lastEventObject = data;
-   }
-
-   public synchronized Object getLastEventObject() {
-      return lastEventObject;
-   }
-
-   class ContainerEventServiceSupplierPanel extends JPanel implements ContainerEventServiceSupplier {
-      private EventService es = new SwingEventService();
-
-      public EventService getContainerEventService() {
-         return es;
-      }
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java b/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
deleted file mode 100644
index 975a491d1..000000000
--- a/src/test/java/org/scijava/event/bushe/TestDefaultEventService.java
+++ /dev/null
@@ -1,1394 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Collection;
-import java.util.Map;
-import java.util.regex.Pattern;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
-
-import java.awt.Container;
-import java.awt.Component;
-import javax.swing.JComponent;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestDefaultEventService extends TestCase {
-
-   private ThreadSafeEventService eventService = null;
-   private IEventSubscriber eventSubscriber = null;
-   private IEventTopicSubscriber eventTopicSubscriber;
-   private SubscriberTimingEvent timing;
-   private EBTestCounter testCounter = new EBTestCounter();
-
-   public TestDefaultEventService(String name) {
-      super(name);
-   }
-
-   protected void setUp() throws Exception {
-      eventService = new ThreadSafeEventService(null, false);
-      EventServiceLocatorTestCase.clearEventServiceLocator();
-   }
-
-   protected void tearDown() throws Exception {
-      eventService = null;
-      EventServiceLocatorTestCase.clearEventServiceLocator();
-   }
-
-   private EventServiceEvent createEvent() {
-      return new EventServiceEvent() {
-         public Object getSource() {
-            return "";
-         }
-      };
-   }
-
-   private Class getEventClass() {
-      return createEvent().getClass();
-   }
-
-   private IEventSubscriber createEventSubscriber(boolean throwException) {
-      return new SubscriberForTest(testCounter, throwException);
-   }
-
-   private IEventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
-      return new TopicSubscriberForTest(testCounter, throwException);
-   }
-
-   private IEventSubscriber createEventSubscriber(Long waitTime) {
-      return new SubscriberForTest(testCounter, waitTime);
-   }
-
-   private IEventSubscriber getEventSubscriber() {
-      return getEventSubscriber(true);
-   }
-
-   private IEventSubscriber getEventSubscriber(boolean throwException) {
-      if (eventSubscriber == null) {
-         eventSubscriber = createEventSubscriber(throwException);
-      }
-      return eventSubscriber;
-   }
-
-   private IEventTopicSubscriber getEventTopicSubscriber() {
-      if (eventTopicSubscriber == null) {
-         eventTopicSubscriber = createEventTopicSubscriber(false);
-      }
-      return eventTopicSubscriber;
-   }
-
-   public void testTyping() {
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      Double doub = 3.14;
-      Number numb = doub;
-      eventService.subscribe(Number.class, subscriber);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(doub);
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      eventService.publish(numb);
-      assertEquals("testPublish(total)", 2, testCounter.eventsHandledCount);
-      eventService.unsubscribe(Number.class, subscriber);
-      eventService.subscribe(Double.class, subscriber);
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(doub);
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      eventService.publish(numb);
-      assertEquals("testPublish(total)", 2, testCounter.eventsHandledCount);
-   }
-
-   public void testSubscribe() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber);
-      assertTrue("testSubscribe(new subscriber)", actualReturn);
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber);
-      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      try {
-         actualReturn = eventService.subscribe((Class) null, getEventSubscriber());
-         fail("subscribeStrongly(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = eventService.subscribe(getEventClass(), null);
-         fail("subscribeStrongly(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-   }
-
-   public void testSubscribeOrder() {
-      boolean actualReturn;
-      SubscriberForTest subscriber1 = (SubscriberForTest) createEventSubscriber(new Long(100));
-      SubscriberForTest subscriber2 = (SubscriberForTest) createEventSubscriber(new Long(100));
-      SubscriberForTest subscriber3 = (SubscriberForTest) createEventSubscriber(new Long(100));
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber1);
-      actualReturn = eventService.subscribe(getEventClass(), subscriber2);
-      actualReturn = eventService.subscribe(getEventClass(), subscriber3);
-
-      eventService.publish(createEvent());
-
-      assertTrue(subscriber1.callTime.before(subscriber2.callTime));
-      assertTrue(subscriber2.callTime.before(subscriber3.callTime));
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber1);
-      eventService.publish(createEvent());
-
-      assertTrue(subscriber2.callTime.before(subscriber3.callTime));
-      assertTrue(subscriber3.callTime.before(subscriber1.callTime));
-
-      List subscribers = eventService.getSubscribers(getEventClass());
-      assertEquals(3, subscribers.size());
-      for (int i = 0; i < subscribers.size(); i++) {
-         IEventSubscriber subscriber = (IEventSubscriber) subscribers.get(i);
-         eventService.unsubscribe(getEventClass(), subscriber);
-      }
-      eventService.subscribe(getEventClass(), (IEventSubscriber) subscribers.get(1));
-      eventService.subscribe(getEventClass(), (IEventSubscriber) subscribers.get(0));
-      eventService.subscribe(getEventClass(), (IEventSubscriber) subscribers.get(2));
-      eventService.publish(createEvent());
-      assertTrue(subscriber3.callTime.before(subscriber2.callTime));
-      assertTrue(subscriber2.callTime.before(subscriber1.callTime));
-   }
-
-   public void testSubscribeWeakly() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber);
-      assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber);
-      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-      subscriber = null;
-      System.gc();
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      try {
-         actualReturn = eventService.subscribeStrongly((Class) null, getEventSubscriber());
-         fail("subscribeStrongly(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = eventService.subscribeStrongly(getEventClass(), null);
-         fail("subscribeStrongly(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-   }
-
-   public void testSubscribeStrongly() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = eventService.subscribeStrongly(getEventClass(), subscriber);
-      assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
-
-      actualReturn = eventService.subscribeStrongly(getEventClass(), subscriber);
-      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-      subscriber = null;
-      System.gc();
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      try {
-         actualReturn = eventService.subscribeStrongly((Class) null, getEventSubscriber());
-         fail("subscribeStrongly(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = eventService.subscribeStrongly(getEventClass(), null);
-         fail("subscribeStrongly(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-   }
-
-
-   public void testIllegalArgs() {
-      try {
-         EventBus.subscribeVetoListenerStrongly((Class) null, new VetoEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.subscribeVetoListenerStrongly((String) null, new VetoTopicEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.subscribeVetoListenerStrongly("foo", null);
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.subscribeVetoListenerStrongly(getEventClass(), null);
-         fail();
-      } catch (Throwable t) {
-      }
-
-
-      try {
-         EventBus.unsubscribeVetoListener((Class) null, new VetoEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.unsubscribeVetoListener((String) null, new VetoTopicEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.unsubscribeVetoListener("foo", null);
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.unsubscribeVetoListener(getEventClass(), null);
-         fail();
-      } catch (Throwable t) {
-      }
-
-   }
-
-   public void testVeto() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber);
-
-      VetoEventListener vetoListener = new VetoEventListenerForTest();
-      actualReturn = eventService.subscribeVetoListener(getEventClass(), vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      eventService.unsubscribeVetoListener(getEventClass(), vetoListener);
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-   }
-
-   public void testVetoException() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber);
-
-      VetoEventListener vetoListener = new VetoEventListenerForTest(true);
-      actualReturn = eventService.subscribeVetoListenerStrongly(getEventClass(), vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      eventService.unsubscribeVetoListener(getEventClass(), vetoListener);
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 2, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-   }
-
-   public void testVetoTopic() {
-      boolean actualReturn;
-      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
-
-      actualReturn = eventService.subscribe("FooTopic", subscriber);
-
-      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
-         public boolean shouldVeto(String topic, Object data) {
-            return true;
-         }
-      };
-      actualReturn = eventService.subscribeVetoListenerStrongly("FooTopic", vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish("FooTopic", "Bar");
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      eventService.unsubscribeVetoListener("FooTopic", vetoListener);
-      eventService.publish("FooTopic", "Bar");
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-
-   public void testVetoWeak() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = eventService.subscribe(getEventClass(), subscriber);
-
-      VetoEventListener vetoListener = new VetoEventListener() {
-         public boolean shouldVeto(Object evt) {
-            return true;
-         }
-      };
-      actualReturn = eventService.subscribeVetoListener(getEventClass(), vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      vetoListener = null;
-      System.gc();
-      try {
-         Thread.sleep(1000);
-      } catch (InterruptedException e) {
-      }
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   public void testVetoTopicWeak() {
-      boolean actualReturn;
-      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
-
-      actualReturn = eventService.subscribe("FooTopic", subscriber);
-
-      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
-         public boolean shouldVeto(String topic, Object data) {
-            return true;
-         }
-      };
-      actualReturn = eventService.subscribeVetoListener("FooTopic", vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish("FooTopic", createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      vetoListener = null;
-      System.gc();
-      eventService.publish("FooTopic", createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-
-   public void testUnsubscribe() {
-      eventService.subscribe(getEventClass(), getEventSubscriber(false));
-
-      boolean actualReturn;
-
-      try {
-         actualReturn = eventService.unsubscribe((Class) null, getEventSubscriber());
-         fail("unsubscribe(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = eventService.unsubscribe(getEventClass(), null);
-         fail("unsubscribe(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      actualReturn = eventService.unsubscribe(getEventClass(), getEventSubscriber());
-      assertTrue("return value", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   public void testUnsubscribeTopic() {
-      IEventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
-      eventService.subscribe("FooTopic", eventTopicSubscriber);
-
-      boolean actualReturn;
-
-      try {
-         actualReturn = eventService.unsubscribe((String) null, eventTopicSubscriber);
-         fail("unsubscribe(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = eventService.unsubscribe("FooTopic", null);
-         fail("unsubscribe(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish("FooTopic", "Foo");
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      actualReturn = eventService.unsubscribe("FooTopic", eventTopicSubscriber);
-      assertTrue("return value", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish("FooTopic", "Foo");
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   /**
-    * Test that the publish method works and that exceptions thrown in event subscribers don't halt publishing. In the
-    * test 2 subscribers are good and 2 subscribers throw exceptions.
-    */
-   public void testPublish() {
-      try {
-         eventService.publish(null);
-         fail("publish(null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         eventService.publish((String) null, createEvent());
-         fail("publish(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      eventService.publish(createEvent());
-      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      eventService.publish("Foo", "Bar");
-      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      eventService.subscribe(getEventClass(), createEventSubscriber(true));
-      eventService.subscribe(getEventClass(), createEventSubscriber(false));
-      eventService.subscribe(getEventClass(), createEventSubscriber(true));
-      eventService.subscribe(getEventClass(), createEventSubscriber(false));
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      eventService.publish(createEvent());
-
-      //The test passes if 2 subscribers completed and 2 subscribers threw exception.
-      assertEquals("testPublish(completed)", 4, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 2, testCounter.subscribeExceptionCount);
-
-      EventBus.subscribe(ObjectEvent.class, createEventSubscriber(false));
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      ObjectEvent evt = new ObjectEvent("Foo", "Bar");
-      assertEquals(evt.getEventObject(), "Bar");
-      EventBus.publish(evt);
-      //Since we are using hte event bus from a non-awt thread, stay alive for a sec
-      //to give time for the EDT to start and post the message
-      try {
-         Thread.sleep(500);
-      } catch (InterruptedException e) {
-      }
-      assertEquals("testPublish(completed)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   public void testTimeHandling() {
-      eventService.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
-      final Boolean[] wasCalled = new Boolean[1];
-      eventService.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
-         public void onEvent(Object evt) {
-            wasCalled[0] = Boolean.TRUE;
-         }
-      });
-      eventService.publish(createEvent());
-      assertTrue(wasCalled[0] == null);
-      eventService = new ThreadSafeEventService(new Long(100), true);
-      eventService.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
-      final Boolean[] wasCalled2 = new Boolean[1];
-      eventService.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
-         public void onEvent(Object evt) {
-            wasCalled2[0] = Boolean.TRUE;
-            timing = (SubscriberTimingEvent) evt;
-         }
-      });
-      eventService.publish(createEvent());
-      assertTrue(wasCalled2[0] == Boolean.TRUE);
-      assertNotNull(timing.getSource());
-      assertNotNull(timing.getEnd());
-      assertNotNull(timing.getEvent());
-      assertNotNull(timing.getSubscriber());
-      assertNotNull(timing.getStart());
-      assertNotNull(timing.getTimeLimitMilliseconds());
-      assertFalse(timing.isEventHandlingExceeded());
-      assertFalse(timing.isVetoExceeded());
-      assertNull(timing.getVetoEventListener());
-   }
-
-   public void testEventLocator() {
-      EventServiceLocatorTestCase.clearEventServiceLocator();
-      EventService es = EventServiceLocator.getSwingEventService();
-      assertTrue(es instanceof SwingEventService);
-      es = new ThreadSafeEventService(null, false);
-      try {
-         EventServiceLocator.setEventService("foo", es);
-      } catch (EventServiceExistsException e) {
-         fail("First set should succeed.");
-      }
-      EventService es2 = EventServiceLocator.getEventService("foo");
-      assertTrue(es2 == es);
-      try {
-         es = new ThreadSafeEventService(null, false);
-         EventServiceLocator.setEventService("foo", es);
-         fail("Second set should fail.");
-      } catch (EventServiceExistsException e) {
-      }
-      es2 = EventServiceLocator.getEventService("foo");
-      assertFalse(es2 == es);
-      try {
-         EventServiceLocator.setEventService("foo", null);
-      } catch (EventServiceExistsException e) {
-         fail("Null should succeed.");
-      }
-      es2 = EventServiceLocator.getEventService("foo");
-      assertNull(es2);
-      assertEquals(EventServiceLocator.getSwingEventService(), EventBus.getGlobalEventService());
-   }
-
-   /**
-    * Test for ISSUE #1: If a class implements both subscriber interfaces I've seen a topic 'event' be published from a
-    * publish method with the correct (topic) signature, yet be subscribed at the wrong subscriber method (the one with
-    * the signature for real event classes, not topics
-    */
-   public void testSimultaneousTopicAndClass() {
-      DoubleSubscriber doubleSubscriber = new DoubleSubscriber();
-      eventService.subscribe(org.scijava.event.bushe.ObjectEvent.class, doubleSubscriber);
-      eventService.subscribe("org.scijava.event.bushe.ObjectEvent.class", doubleSubscriber);
-      ObjectEvent evt = new ObjectEvent("Foo", "Bar");
-      assertEquals(evt.getEventObject(), "Bar");
-      eventService.publish(evt);
-      assertEquals(1, doubleSubscriber.timesEventCalled);
-      assertEquals(0, doubleSubscriber.timesTopicCalled);
-      assertEquals(evt, doubleSubscriber.lastEvent);
-      assertEquals(null, doubleSubscriber.lastEventString);
-      eventService.publish("org.scijava.event.bushe.ObjectEvent.class", "Bar");
-      assertEquals(1, doubleSubscriber.timesEventCalled);
-      assertEquals(1, doubleSubscriber.timesTopicCalled);
-      assertEquals(evt, doubleSubscriber.lastEvent);
-      assertEquals("org.scijava.event.bushe.ObjectEvent.class", doubleSubscriber.lastEventString);
-   }
-
-   public void testRegex() {
-      DoubleSubscriber doubleSubscriber = new DoubleSubscriber();
-      Pattern pat = Pattern.compile("Foo[1-5]");
-      eventService.subscribe(pat, doubleSubscriber);
-      List subscribers = eventService.getSubscribersToPattern(pat);
-      assertNotNull(subscribers);
-      assertEquals(1, subscribers.size());
-      subscribers = eventService.getSubscribersByPattern("Foo1");
-      assertNotNull(subscribers);
-      assertEquals(1, subscribers.size());
-      subscribers = eventService.getSubscribers("Foo1");
-      assertNotNull(subscribers);
-      assertEquals(1, subscribers.size());
-
-      eventService.publish("Foo1", "Bar");
-      assertEquals(0, doubleSubscriber.timesEventCalled);
-      assertEquals(1, doubleSubscriber.timesTopicCalled);
-      assertEquals(null, doubleSubscriber.lastEvent);
-      assertEquals("Foo1", doubleSubscriber.lastEventString);
-      eventService.publish("Foo2", "Bar");
-      assertEquals(0, doubleSubscriber.timesEventCalled);
-      assertEquals(2, doubleSubscriber.timesTopicCalled);
-      assertEquals(null, doubleSubscriber.lastEvent);
-      assertEquals("Foo2", doubleSubscriber.lastEventString);
-   }
-
-   public void testTypeSubscription() {
-      DoubleSubscriber subscriber = new DoubleSubscriber();
-
-      eventService.subscribe(TopLevelEvent.class, subscriber);
-      List subscribers = eventService.getSubscribersToClass(TopLevelEvent.class);
-      assertNotNull(subscribers);
-      assertEquals(1, subscribers.size());
-      subscribers = eventService.getSubscribersToClass(DerivedEvent.class);
-      assertNotNull(subscribers);
-      assertEquals(1, subscribers.size());
-      subscribers = eventService.getSubscribers(DerivedEvent.class);
-      assertNotNull(subscribers);
-      assertEquals(1, subscribers.size());
-      subscribers = eventService.getSubscribers(TopLevelEvent.class);
-      assertNotNull(subscribers);
-      assertEquals(1, subscribers.size());
-
-      DerivedEvent derivedEvent = new DerivedEvent(this);
-      eventService.publish(derivedEvent);
-      assertEquals(1, subscriber.timesEventCalled);
-      assertEquals(0, subscriber.timesTopicCalled);
-      assertEquals(derivedEvent, subscriber.lastEvent);
-      assertEquals(null, subscriber.lastEventString);
-      TopLevelEvent topLevelEvent = new TopLevelEvent(this);
-      eventService.publish(topLevelEvent);
-      assertEquals(2, subscriber.timesEventCalled);
-      assertEquals(0, subscriber.timesTopicCalled);
-      assertEquals(topLevelEvent, subscriber.lastEvent);
-      assertEquals(null, subscriber.lastEventString);
-   }
-
-   //Parameterized Type
-   public void testParameterizedEvent() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {
-      final int[] timesCalled = new int[1];
-      ParameterizedEvent<String> stringRequestEvent = new ParameterizedEvent<String>();
-      ParameterizedEvent<Integer> integerRequestEvent = new ParameterizedEvent<Integer>();
-
-      TypeReference<ParameterizedEvent<String>> stringTypeReference = new TypeReference<ParameterizedEvent<String>>(){};
-      TypeReference<ParameterizedEvent<Integer>> integerTypeReference = new TypeReference<ParameterizedEvent<Integer>>(){};
-//      ParameterizedEvent<String> dre = stringTypeReference.newInstance();
-//      System.out.println("dre.getClass()"+dre.getClass());
-//      System.out.println("stringTypeReference"+ stringTypeReference);
-//      System.out.println("stringTypeReference.getType()"+ stringTypeReference.getType());
-
-//      You can't simply do this, the TypeReference's generic type is important here
-//      Type superclass = integerRequestEvent.getClass().getGenericSuperclass();
-//      Type type = ((ParameterizedType) superclass).getActualTypeArguments()[0];
-//      System.out.println("superclass="+superclass);
-//      System.out.println("type="+type);
-
-      eventService.subscribe(stringTypeReference.getType(), new IEventSubscriber() {
-         public void onEvent(Object event) {
-            timesCalled[0]++;
-         }
-      });
-      eventService.publish(stringTypeReference.getType(), stringRequestEvent);
-      eventService.publish(integerTypeReference.getType(), integerRequestEvent);
-      assertEquals(1, timesCalled[0]);
-   }
-
-   public void testParameterizedEventMultiParams() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {
-      final int[] timesCalled = new int[1];
-      DoublyParameterizedEvent<String, String> stringRequestEvent = new DoublyParameterizedEvent<String, String>();
-      DoublyParameterizedEvent<Integer, String> integerRequestEvent = new DoublyParameterizedEvent<Integer, String>();
-      DoublyParameterizedEvent<String, Integer> switchRequestEvent = new DoublyParameterizedEvent<String, Integer>();
-
-      TypeReference<DoublyParameterizedEvent<String, String>> stringTypeReference = new TypeReference<DoublyParameterizedEvent<String, String>>(){};
-      TypeReference<DoublyParameterizedEvent<Integer, String>> integerTypeReference = new TypeReference<DoublyParameterizedEvent<Integer, String>>(){};
-      TypeReference<DoublyParameterizedEvent<String, Integer>> switchTypeReference = new TypeReference<DoublyParameterizedEvent<String, Integer>>(){};
-
-      eventService.subscribe(stringTypeReference.getType(), new IEventSubscriber() {
-         public void onEvent(Object event) {
-            timesCalled[0]++;
-         }
-      });
-      eventService.subscribe(integerTypeReference.getType(), new IEventSubscriber() {
-         public void onEvent(Object event) {
-            timesCalled[0]++;
-         }
-      });
-      eventService.publish(stringTypeReference.getType(), stringRequestEvent);
-      assertEquals(1, timesCalled[0]);
-      eventService.publish(integerTypeReference.getType(), integerRequestEvent);
-      assertEquals(2, timesCalled[0]);
-      eventService.publish(switchTypeReference.getType(), switchRequestEvent);
-      assertEquals(2, timesCalled[0]);
-   }
-
-   public void testWildcardSubscription() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {
-      final int[] timesCalled = new int[1];
-      ParameterizedEvent<JComponent> jComponentRequestEvent = new ParameterizedEvent<JComponent>();
-
-      TypeReference<ParameterizedEvent<? extends Container>> containerWildcardTypeRef = new TypeReference<ParameterizedEvent<? extends Container>>(){};
-
-      eventService.subscribe(containerWildcardTypeRef.getType(), new IEventSubscriber() {
-         public void onEvent(Object event) {
-            timesCalled[0]++;
-         }
-      });
-      TypeReference<ParameterizedEvent<JComponent>> jComponentTypeRef = new TypeReference<ParameterizedEvent<JComponent>>(){};
-
-      eventService.publish(jComponentTypeRef.getType(), jComponentRequestEvent);
-      assertEquals(1, timesCalled[0]);
-
-      //publishing a Component should not hit the wildcard since it doesn't extend Component
-      TypeReference<ParameterizedEvent<Component>> componentTypeRef = new TypeReference<ParameterizedEvent<Component>>(){};
-      ParameterizedEvent<Component> componentRequestEvent = new ParameterizedEvent<Component>();
-      eventService.publish(componentTypeRef.getType(), componentRequestEvent);
-      assertEquals(1, timesCalled[0]);
-
-      //publish wildcards is a not yet supported
-      try {
-         eventService.publish(containerWildcardTypeRef.getType(), jComponentRequestEvent);
-         fail();
-      } catch (IllegalArgumentException ex) {
-      }
-      assertEquals(1, timesCalled[0]);
-
-      //Test super wildcard, should be opposite of above
-      eventService.clearAllSubscribers();
-      TypeReference<ParameterizedEvent<? super Container>> containerSuperWildcardTypeRef = new TypeReference<ParameterizedEvent<? super Container>>(){};
-      eventService.subscribe(containerSuperWildcardTypeRef.getType(), new IEventSubscriber() {
-         public void onEvent(Object event) {
-            timesCalled[0]++;
-         }
-      });
-      eventService.publish(jComponentTypeRef.getType(), jComponentRequestEvent);
-      assertEquals(1, timesCalled[0]);
-      eventService.publish(componentTypeRef.getType(), componentRequestEvent);
-      assertEquals(2, timesCalled[0]);
-
-      //Test exact matches
-   }
-
-   public class ParameterizedEvent<E> {
-      private Collection<E> data;
-      public Collection<E> getData() {
-         return data;
-      }
-   }
-
-   public class DoublyParameterizedEvent<E,F> {
-      private Map<E,F> data;
-      public Map<E,F> getData() {
-         return data;
-      }
-   }
-
-   class DoubleSubscriber implements IEventTopicSubscriber, IEventSubscriber {
-      public int timesTopicCalled = 0;
-      public int timesEventCalled = 0;
-      public String lastEventString;
-      public Object lastEvent;
-
-      public void onEvent(String topic, Object data) {
-         timesTopicCalled++;
-         lastEventString = topic;
-      }
-
-      public void onEvent(Object evt) {
-         timesEventCalled++;
-         lastEvent = evt;
-      }
-   }
-
-   class TopLevelEvent extends AbstractEventServiceEvent {
-      public TopLevelEvent(Object source) {
-         super(source);
-      }
-   }
-
-   class DerivedEvent extends TopLevelEvent {
-      public DerivedEvent(Object source) {
-         super(source);
-      }
-   }
-
-
-   /**
-    * Test match for generic type's of generic types
-    */
-   public void testGenericGeneric() {
-      final int[] timesCalled = new int[1];
-      DataRequestEvent<List<Integer>> request = new DataRequestEvent<List<Integer>>();
-      Type type = new TypeReference<DataRequestEvent<List<Integer>>>() {}.getType();
-      eventService.subscribe(type, new IEventSubscriber() {
-         public void onEvent(Object event) {
-            timesCalled[0]++;
-         }
-      });
-      eventService.publish(type, request);
-      assertEquals(1, timesCalled[0]);
-      DataRequestEvent<List<String>> stringRequest = new DataRequestEvent<List<String>>();
-      Type stringType = new TypeReference<DataRequestEvent<List<String>>>() {}.getType();
-      eventService.publish(stringType , stringRequest);
-      assertEquals(1, timesCalled[0]);
-   }
-
-   public void testTopicsCache() {
-      Object a1 = new Object();
-      //All of the above should be checked with topics.
-      //Topics should test that exact matches are preferred over pattern matches
-      //Test that a default setting does not cache
-      EventService es = new ThreadSafeEventService(null);
-      es.publish("IceCream.Vanilla", a1);
-      List events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNull(events);
-      Object lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertNull(lastEventObj);
-      assertEquals(0, es.getCacheSizeForTopic("IceCream.Vanilla"));
-      assertEquals(0, es.getDefaultCacheSizePerClassOrTopic());
-      //Test that changing the default to 1 caches 1
-      es.setDefaultCacheSizePerClassOrTopic(1);
-      assertEquals(1, es.getDefaultCacheSizePerClassOrTopic());
-      Object publishedEventObj = new Object();
-      es.publish("IceCream.Vanilla", publishedEventObj);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNotNull(events);
-      assertEquals(1, events.size());
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertTrue(lastEventObj == publishedEventObj);
-      assertEquals(1, es.getCacheSizeForTopic("IceCream.Vanilla"));
-      //subscribe and see if it still works and that the new event is cached
-      IEventTopicSubscriber sub = new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object data) {
-            System.out.println("Barrrr");
-         }
-      };
-      es.subscribe("IceCream.Vanilla", sub);
-      publishedEventObj = new Object();
-      es.publish("IceCream.Vanilla", publishedEventObj);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNotNull(events);
-      assertEquals(1, events.size());
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertTrue(lastEventObj == publishedEventObj);
-      assertEquals(1, es.getCacheSizeForTopic("IceCream.Vanilla"));
-
-      //Test that changing the default to 5 caches 5
-      es.setDefaultCacheSizePerClassOrTopic(5);
-      assertEquals(5, es.getDefaultCacheSizePerClassOrTopic());
-      Object publishedEventObj2 = new Object();
-      Object publishedEventObj3 = new Object();
-      Object publishedEventObj4 = new Object();
-      Object publishedEventObj5 = new Object();
-      es.publish("IceCream.Vanilla", publishedEventObj2);
-      es.publish("IceCream.Vanilla", publishedEventObj3);
-      es.publish("IceCream.Vanilla", publishedEventObj4);
-      es.publish("IceCream.Vanilla", publishedEventObj5);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNotNull(events);
-      assertEquals(5, events.size());
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertTrue(lastEventObj == publishedEventObj5);
-      assertEquals(5, es.getCacheSizeForTopic("IceCream.Vanilla"));
-      Object publishedEventObj6 = new Object();
-      es.publish("IceCream.Vanilla", publishedEventObj6);
-      assertEquals(5, events.size());
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertTrue(lastEventObj == publishedEventObj6);
-      assertEquals(5, es.getCacheSizeForTopic("IceCream.Vanilla"));
-
-      //Test that setting a topic cache with 10 caches 10 for that topic, but the default for the others
-      es.setCacheSizeForTopic("IceCream.Vanilla", 10);
-      Object publishedEventObjB1 = new Object();
-      Object publishedEventObjB2 = new Object();
-      Object publishedEventObjB3 = new Object();
-      Object publishedEventObjB4 = new Object();
-      Object publishedEventObjB5 = new Object();
-      Object publishedEventObjB6 = new Object();
-      es.publish("IceCream.Vanilla", publishedEventObj6);
-      es.publish("IceCream.Vanilla", publishedEventObj6);//see if reuse is OK
-      es.publish("IceCream.Blueberry", publishedEventObjB1);
-      es.publish("IceCream.Blueberry", publishedEventObjB2);
-      es.publish("IceCream.Blueberry", publishedEventObjB3);
-      es.publish("IceCream.Blueberry", publishedEventObjB4);
-      es.publish("IceCream.Blueberry", publishedEventObjB5);
-      es.publish("IceCream.Blueberry", publishedEventObjB6);
-      es.publish("IceCream.Vanilla", publishedEventObj6);
-      es.publish("IceCream.Vanilla", publishedEventObj6);
-      Object publishedEvent10 = new Object();
-      es.publish("IceCream.Vanilla", publishedEvent10);
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertTrue(lastEventObj == publishedEvent10);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNotNull(events);
-      assertEquals(10, events.size());
-      assertEquals(10, es.getCacheSizeForTopic("IceCream.Vanilla"));
-      assertTrue(publishedEvent10 == events.get(0));
-      assertTrue(publishedEventObj6 == events.get(1));
-      assertTrue(publishedEventObj6 == events.get(2));
-      assertTrue(publishedEventObj6 == events.get(3));
-      assertTrue(publishedEventObj6 == events.get(4));
-      assertTrue(publishedEventObj6 == events.get(5));
-      assertTrue(publishedEventObj5 == events.get(6));
-      assertTrue(publishedEventObj4 == events.get(7));
-      assertTrue(publishedEventObj3 == events.get(8));
-      assertTrue(publishedEventObj2 == events.get(9));
-      lastEventObj = es.getLastTopicData("IceCream.Blueberry");
-      assertTrue(lastEventObj == publishedEventObjB6);
-      events = es.getCachedTopicData("IceCream.Blueberry");
-      assertNotNull(events);
-      assertEquals(5, events.size());
-      assertEquals(5, es.getCacheSizeForTopic("IceCream.Blueberry"));
-      assertTrue(publishedEventObjB6 == events.get(0));
-      assertTrue(publishedEventObjB5 == events.get(1));
-      assertTrue(publishedEventObjB4 == events.get(2));
-      assertTrue(publishedEventObjB3 == events.get(3));
-      assertTrue(publishedEventObjB2 == events.get(4));
-      //this makes the cache resize to a smaller amount
-      es.setCacheSizeForTopic("IceCream.Vanilla", 1);
-      es.publish("IceCream.Vanilla", publishedEventObj4);
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertTrue(lastEventObj == publishedEventObj4);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNotNull(events);
-      assertEquals(1, events.size());
-      assertEquals(1, es.getCacheSizeForTopic("IceCream.Vanilla"));
-      es.publish("IceCream.Blueberry", publishedEventObjB4);
-      lastEventObj = es.getLastTopicData("IceCream.Blueberry");
-      assertTrue(lastEventObj == publishedEventObjB4);
-      events = es.getCachedTopicData("IceCream.Blueberry");
-      assertNotNull(events);
-      assertEquals(5, events.size());
-      assertEquals(5, es.getCacheSizeForTopic("IceCream.Blueberry"));
-      assertTrue(publishedEventObjB4 == events.get(0));
-      assertTrue(publishedEventObjB6 == events.get(1));
-      assertTrue(publishedEventObjB5 == events.get(2));
-      assertTrue(publishedEventObjB4 == events.get(3));
-      assertTrue(publishedEventObjB3 == events.get(4));
-
-      //Test pattern cache size works, but does not override a specific topic setting
-      Pattern pattern = Pattern.compile("IceCream.*");
-      es.setDefaultCacheSizePerClassOrTopic(5);
-      es.setCacheSizeForTopic(pattern, 2);
-      es.setCacheSizeForTopic("IceCream.Vanilla", 3);
-      Object publishedEventObjX1 = new Object();
-      Object publishedEventObjX2 = new Object();
-      Object publishedEventObjX3 = new Object();
-      Object publishedEventObjX4 = new Object();
-      Object publishedEventObjX5 = new Object();
-      Object publishedEventObjX6 = new Object();
-      Object publishedEventObjC1 = new Object();
-      Object publishedEventObjC2 = new Object();
-      Object publishedEventObjC3 = new Object();
-      Object publishedEventObjC4 = new Object();
-      es.publish("X", publishedEventObjX1);
-      es.publish("IceCream.Vanilla", publishedEventObj6);
-      es.publish("IceCream.Chocolate", publishedEventObjC1);
-      es.publish("X", publishedEventObjX2);//see if reuse is OK
-      es.publish("X", publishedEventObjX3);
-      es.publish("IceCream.Chocolate", publishedEventObjC2);
-      es.publish("X", publishedEventObjX4);
-      es.publish("IceCream.Vanilla", publishedEventObj4);
-      es.publish("IceCream.Vanilla", publishedEventObj5);
-      es.publish("IceCream.Vanilla", publishedEventObj6);
-      es.publish("X", publishedEventObjX5);
-      es.publish("IceCream.Chocolate", publishedEventObjC3);
-      es.publish("X", publishedEventObjX6);
-      es.publish("IceCream.Chocolate", publishedEventObjC4);
-
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertTrue(lastEventObj == publishedEventObj6);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNotNull(events);
-      assertEquals(3, events.size());
-      assertEquals(3, es.getCacheSizeForTopic("IceCream.Vanilla"));
-      lastEventObj = es.getLastTopicData("X");
-      assertTrue(lastEventObj == publishedEventObjX6);
-      events = es.getCachedTopicData("X");
-      assertNotNull(events);
-      assertEquals(5, events.size());
-      assertEquals(5, es.getCacheSizeForEventClass(EventX.class));
-      assertTrue(publishedEventObjX6 == events.get(0));
-      assertTrue(publishedEventObjX5 == events.get(1));
-      assertTrue(publishedEventObjX4 == events.get(2));
-      assertTrue(publishedEventObjX3 == events.get(3));
-      assertTrue(publishedEventObjX2 == events.get(4));
-      events = es.getCachedTopicData("IceCream.Chocolate");
-      assertNotNull(events);
-      assertEquals(2, events.size());
-      assertEquals(2, es.getCacheSizeForTopic("IceCream.Chocolate"));
-      assertTrue(publishedEventObjC4 == events.get(0));
-      assertTrue(publishedEventObjC3 == events.get(1));
-
-      es.clearCache("IceCream.Blueberry");
-      events = es.getCachedTopicData("IceCream.Blueberry");
-      assertNull(events);
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertNotNull(lastEventObj);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNotNull(events);
-      assertEquals(3, events.size());
-      lastEventObj = es.getLastTopicData("IceCream.Chocolate");
-      assertNotNull(lastEventObj);
-      events = es.getCachedTopicData("IceCream.Chocolate");
-      assertNotNull(events);
-      assertEquals(2, events.size());
-      lastEventObj = es.getLastTopicData("X");
-      assertNotNull(lastEventObj);
-      events = es.getCachedTopicData("X");
-      assertNotNull(events);
-      assertEquals(5, events.size());
-      es.clearCache(pattern);
-      events = es.getCachedTopicData("IceCream.Vanilla");
-      assertNull(events);
-      lastEventObj = es.getLastTopicData("IceCream.Chocolate");
-      assertNull(lastEventObj);
-      lastEventObj = es.getLastTopicData("X");
-      assertNotNull(lastEventObj);
-      events = es.getCachedTopicData("X");
-      assertNotNull(events);
-      assertEquals(5, events.size());
-
-      es.publish("X", publishedEventObjX6);
-      es.publish("IceCream.Blueberry", publishedEventObjB4);
-      es.publish("IceCream.Vanilla", publishedEvent10);
-      es.clearCache();
-      lastEventObj = es.getLastTopicData("IceCream.Vanilla");
-      assertNull(lastEventObj);
-      lastEventObj = es.getLastTopicData("IceCream.Blueberry");
-      assertNull(lastEventObj);
-      lastEventObj = es.getLastTopicData("IceCream.Chocolate");
-      assertNull(lastEventObj);
-      lastEventObj = es.getLastTopicData("X");
-      assertNull(lastEventObj);
-   }
-
-
-   public void testEventsCache() {
-      //Test that a default setting does not cache
-      EventService es = new ThreadSafeEventService(null);
-      es.publish(new EventA());
-      List<EventA> aEvents = es.getCachedEvents(EventA.class);
-      assertNull(aEvents);
-      EventA lastAEvent = es.getLastEvent(EventA.class);
-      assertNull(lastAEvent);
-      assertEquals(0, es.getCacheSizeForEventClass(EventA.class));
-      assertEquals(0, es.getDefaultCacheSizePerClassOrTopic());
-      //Test that changing the default to 1 caches 1
-      es.setDefaultCacheSizePerClassOrTopic(1);
-      assertEquals(1, es.getDefaultCacheSizePerClassOrTopic());
-      EventA publishedEvent = new EventA();
-      es.publish(publishedEvent);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNotNull(aEvents);
-      assertEquals(1, aEvents.size());
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertTrue(lastAEvent == publishedEvent);
-      assertEquals(1, es.getCacheSizeForEventClass(EventA.class));
-      //subscribe and see if it still works and that the new event is cached
-      IEventSubscriber sub = new IEventSubscriber() {
-         public void onEvent(Object evt) {
-            System.out.println("Fooo");
-         }
-      };
-      es.subscribe(EventA.class, sub);
-      publishedEvent = new EventA();
-      es.publish(publishedEvent);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNotNull(aEvents);
-      assertEquals(1, aEvents.size());
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertTrue(lastAEvent == publishedEvent);
-      assertEquals(1, es.getCacheSizeForEventClass(EventA.class));
-
-      //Test that changing the default to 5 caches 5
-      es.setDefaultCacheSizePerClassOrTopic(5);
-      assertEquals(5, es.getDefaultCacheSizePerClassOrTopic());
-      EventA publishedEvent2 = new EventA();
-      EventA publishedEvent3 = new EventA();
-      EventA publishedEvent4 = new EventA();
-      EventA publishedEvent5 = new EventA();
-      es.publish(publishedEvent2);
-      es.publish(publishedEvent3);
-      es.publish(publishedEvent4);
-      es.publish(publishedEvent5);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNotNull(aEvents);
-      assertEquals(5, aEvents.size());
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertTrue(lastAEvent == publishedEvent5);
-      assertEquals(5, es.getCacheSizeForEventClass(EventA.class));
-      EventA publishedEvent6 = new EventA();
-      es.publish(publishedEvent6);
-      assertEquals(5, aEvents.size());
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertTrue(lastAEvent == publishedEvent6);
-      assertEquals(5, es.getCacheSizeForEventClass(EventA.class));
-
-      //Test that overriding a single event class with 10 caches 10 for that event, but the default for the others
-      es.setCacheSizeForEventClass(EventA.class, 10);
-      EventB publishedEventB1 = new EventB();
-      EventB publishedEventB2 = new EventB();
-      EventB publishedEventB3 = new EventB();
-      EventB publishedEventB4 = new EventB();
-      EventB publishedEventB5 = new EventB();
-      EventB publishedEventB6 = new EventB();
-      es.publish(publishedEvent6);
-      es.publish(publishedEvent6);//see if reuse is OK
-      es.publish(publishedEventB1);
-      es.publish(publishedEventB2);
-      es.publish(publishedEventB3);
-      es.publish(publishedEventB4);
-      es.publish(publishedEventB5);
-      es.publish(publishedEventB6);
-      es.publish(publishedEvent6);
-      es.publish(publishedEvent6);
-      EventA publishedEvent10 = new EventA();
-      es.publish(publishedEvent10);
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertTrue(lastAEvent == publishedEvent10);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNotNull(aEvents);
-      assertEquals(10, aEvents.size());
-      assertEquals(10, es.getCacheSizeForEventClass(EventA.class));
-      assertTrue(publishedEvent10 == aEvents.get(0));
-      assertTrue(publishedEvent6 == aEvents.get(1));
-      assertTrue(publishedEvent6 == aEvents.get(2));
-      assertTrue(publishedEvent6 == aEvents.get(3));
-      assertTrue(publishedEvent6 == aEvents.get(4));
-      assertTrue(publishedEvent6 == aEvents.get(5));
-      assertTrue(publishedEvent5 == aEvents.get(6));
-      assertTrue(publishedEvent4 == aEvents.get(7));
-      assertTrue(publishedEvent3 == aEvents.get(8));
-      assertTrue(publishedEvent2 == aEvents.get(9));
-      EventB lastBEvent = es.getLastEvent(EventB.class);
-      assertTrue(lastBEvent == publishedEventB6);
-      List<EventB> bEvents = es.getCachedEvents(EventB.class);
-      assertNotNull(bEvents);
-      assertEquals(5, bEvents.size());
-      assertEquals(5, es.getCacheSizeForEventClass(EventB.class));
-      assertTrue(publishedEventB6 == bEvents.get(0));
-      assertTrue(publishedEventB5 == bEvents.get(1));
-      assertTrue(publishedEventB4 == bEvents.get(2));
-      assertTrue(publishedEventB3 == bEvents.get(3));
-      assertTrue(publishedEventB2 == bEvents.get(4));
-      //this makes the cache resize smaller
-      es.setCacheSizeForEventClass(EventA.class, 1);
-      es.publish(publishedEvent4);
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertTrue(lastAEvent == publishedEvent4);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNotNull(aEvents);
-      assertEquals(1, aEvents.size());
-      assertEquals(1, es.getCacheSizeForEventClass(EventA.class));
-      es.publish(publishedEventB4);
-      lastBEvent = es.getLastEvent(EventB.class);
-      assertTrue(lastBEvent == publishedEventB4);
-      bEvents = es.getCachedEvents(EventB.class);
-      assertNotNull(bEvents);
-      assertEquals(5, bEvents.size());
-      assertEquals(5, es.getCacheSizeForEventClass(EventB.class));
-      assertTrue(publishedEventB4 == bEvents.get(0));
-      assertTrue(publishedEventB6 == bEvents.get(1));
-      assertTrue(publishedEventB5 == bEvents.get(2));
-      assertTrue(publishedEventB4 == bEvents.get(3));
-      assertTrue(publishedEventB3 == bEvents.get(4));
-
-      //Test that overriding a subclass event class with 2 changes and a derived class with 5 ...
-      //caches 5 for the derived class
-      //caches 2 for the subclass
-      //caches 2 for another derived class
-      // and that interfaces only take effect if the cache size of a class or it's superclasses has been set.
-      es.setCacheSizeForEventClass(EventA.class, 2);
-      es.setCacheSizeForEventClass(EventX.class, 5);
-      es.setCacheSizeForEventClass(Serializable.class, 3);
-      EventX publishedEventX1 = new EventX();
-      EventX publishedEventX2 = new EventX();
-      EventX publishedEventX3 = new EventX();
-      EventX publishedEventX4 = new EventX();
-      EventX publishedEventX5 = new EventX();
-      EventX publishedEventX6 = new EventX();
-      EventC publishedEventC1 = new EventC();
-      EventC publishedEventC2 = new EventC();
-      EventC publishedEventC3 = new EventC();
-      EventC publishedEventC4 = new EventC();
-      es.publish(publishedEventX1);
-      es.publish(publishedEvent6);
-      es.publish(publishedEventC1);
-      es.publish(publishedEventX2);//see if reuse is OK
-      es.publish(publishedEventX3);
-      es.publish(publishedEventC2);
-      es.publish(publishedEventX4);
-      es.publish(publishedEvent4);
-      es.publish(publishedEventX5);
-      es.publish(publishedEventC3);
-      es.publish(publishedEventX6);
-      es.publish(publishedEventC4);
-
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertTrue(lastAEvent == publishedEvent4);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNotNull(aEvents);
-      assertEquals(2, aEvents.size());
-      assertEquals(2, es.getCacheSizeForEventClass(EventA.class));
-      lastAEvent = es.getLastEvent(EventX.class);
-      assertTrue(lastAEvent == publishedEventX6);
-      List<EventX> xEvents = es.getCachedEvents(EventX.class);
-      assertNotNull(xEvents);
-      assertEquals(5, xEvents.size());
-      assertEquals(5, es.getCacheSizeForEventClass(EventX.class));
-      assertTrue(publishedEventX6 == xEvents.get(0));
-      assertTrue(publishedEventX5 == xEvents.get(1));
-      assertTrue(publishedEventX4 == xEvents.get(2));
-      assertTrue(publishedEventX3 == xEvents.get(3));
-      assertTrue(publishedEventX2 == xEvents.get(4));
-      try {
-         Serializable serializableEvent = es.getLastEvent(Serializable.class);
-         fail("Shouldn't be able to pass an interface.");
-      } catch (IllegalArgumentException ex) {
-      }
-      EventC lastCEvent = es.getLastEvent(EventC.class);
-      assertTrue(lastCEvent == publishedEventC4);
-      try {
-         List<Serializable> serializableEvents = es.getCachedEvents(Serializable.class);
-         fail("Shouldn't be able to pass an interface.");
-      } catch (IllegalArgumentException ex) {
-      }
-      List<EventC> cEvents = es.getCachedEvents(EventC.class);
-      assertNotNull(cEvents);
-      assertEquals(3, cEvents.size());
-      assertEquals(3, es.getCacheSizeForEventClass(EventC.class));
-
-      es.clearCache(EventB.class);
-      bEvents = es.getCachedEvents(EventB.class);
-      assertNull(bEvents);
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertNotNull(lastAEvent);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNotNull(aEvents);
-      assertEquals(2, aEvents.size());
-      EventX lastXEvent = es.getLastEvent(EventX.class);
-      assertNotNull(lastXEvent);
-      xEvents = es.getCachedEvents(EventX.class);
-      assertNotNull(xEvents);
-      assertEquals(5, xEvents.size());
-      es.clearCache(EventA.class);
-      aEvents = es.getCachedEvents(EventA.class);
-      assertNull(aEvents);
-      lastXEvent = es.getLastEvent(EventX.class);
-      xEvents = es.getCachedEvents(EventX.class);
-      assertNull(lastXEvent);
-      assertNull(xEvents);
-
-      es.publish(publishedEventX6);
-      es.publish(publishedEventB4);
-      es.publish(publishedEvent10);
-      es.clearCache();
-      lastAEvent = es.getLastEvent(EventA.class);
-      assertNull(lastAEvent);
-      lastBEvent = es.getLastEvent(EventB.class);
-      assertNull(lastBEvent);
-      lastAEvent = es.getLastEvent(EventX.class);
-      assertNull(lastAEvent);
-   }
-
-
-   //Base
-   public static class EventA implements EventServiceEvent {
-      /** @return The issuer of the event. */
-      public Object getSource() {
-         return null;
-      }
-   }
-
-   //No relation
-   public static class EventB implements EventServiceEvent, Serializable {
-      /** @return The issuer of the event. */
-      public Object getSource() {
-         return null;
-      }
-   }
-
-   //No relation
-   public static class EventC implements EventServiceEvent, Serializable {
-      /** @return The issuer of the event. */
-      public Object getSource() {
-         return null;
-      }
-   }
-
-   //Derived 1
-   public static class EventX extends EventA {
-      /** @return The issuer of the event. */
-      public Object getSource() {
-         return null;
-      }
-   }
-
-   //Derived 2
-   public static class EventY extends EventA {
-      /** @return The issuer of the event. */
-      public Object getSource() {
-         return null;
-      }
-   }
-
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventAction.java b/src/test/java/org/scijava/event/bushe/TestEventAction.java
deleted file mode 100644
index 6c3eff80f..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventAction.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.util.ArrayList;
-import java.awt.event.ActionEvent;
-import javax.swing.Action;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventAction extends TestCase {
-   private ArrayList subscribedEvents;
-   private Object aSource = new Object();
-
-   private class MyEventServiceEvent extends AbstractEventServiceEvent {
-      private ActionEvent evt;
-
-      public MyEventServiceEvent(Object source, ActionEvent evt) {
-         super(source);
-         this.evt = evt;
-      }
-   }
-
-   public TestEventAction(String name) {
-      super(name);
-   }
-
-   protected void setUp() throws Exception {
-      subscribedEvents = new ArrayList();
-       System.clearProperty(EventServiceLocator.EVENT_BUS_CLASS);
-       System.clearProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS);
-   }
-
-   public void testEventBusTopicAction() {
-      EventBusAction action = new EventBusAction();
-      action.putValue(Action.ACTION_COMMAND_KEY, "FooAction");
-      IEventTopicSubscriber subscriber = new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object evt) {
-            subscribedEvents.add(evt);
-         }
-      };
-      EventBus.subscribeStrongly("FooAction", subscriber);
-      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
-      try {
-         Thread.sleep(500);//Calling hte EDT, need to slow this thread
-      } catch (InterruptedException e) {
-      }
-      assertEquals(1, subscribedEvents.size());
-      assertNotNull(action);//keeps it from being garbage collected
-   }
-
-   public void testEventBusTopicActionEventServiceValueFirst() {
-      EventBusAction action = new EventBusAction();
-      action.putValue(EventBusAction.EVENT_SERVICE_TOPIC_NAME, "FooAction");
-      action.putValue(Action.ACTION_COMMAND_KEY, "BarAction");
-      EventBus.subscribeStrongly("FooAction", new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object evt) {
-            subscribedEvents.add(evt);
-         }
-      });
-      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
-      try {
-         Thread.sleep(500);//Calling hte EDT, need to slow this thread
-      } catch (InterruptedException e) {
-      }
-      assertEquals(1, subscribedEvents.size());
-   }
-
-   public void testEventBusTopicActionIDValueFirst() {
-      EventBusAction action = new EventBusAction();
-      action.putValue("ID", "FooAction");
-      action.putValue(Action.ACTION_COMMAND_KEY, "BarAction");
-      EventBus.subscribeStrongly("FooAction", new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object evt) {
-            subscribedEvents.add(evt);
-         }
-      });
-      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
-      try {
-         Thread.sleep(500);//Calling hte EDT, need to slow this thread
-      } catch (InterruptedException e) {
-      }
-      assertEquals(1, subscribedEvents.size());
-   }
-
-   public void testEventBusTopicActionNameWorks() {
-      EventBusAction action = new EventBusAction();
-      action.putValue(Action.NAME, "FooAction");
-      EventBus.subscribeStrongly("FooAction", new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object evt) {
-            subscribedEvents.add(evt);
-         }
-      });
-      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
-      try {
-         Thread.sleep(500);//Calling hte EDT, need to slow this thread
-      } catch (InterruptedException e) {
-      }
-      assertEquals(1, subscribedEvents.size());
-   }
-
-   public void testEventBusEventAction() {
-      EventBusAction action = new EventBusAction("FooAction", null) {
-         protected Object getEventServiceEvent(ActionEvent evt) {
-            return new MyEventServiceEvent(aSource, evt);
-         }
-      };
-      EventBus.subscribe(MyEventServiceEvent.class, new IEventSubscriber() {
-         public void onEvent(Object evt) {
-            assertEquals(((EventServiceEvent) evt).getSource(), aSource);
-            subscribedEvents.add(evt);
-         }
-      });
-      action.setPublishesOnTopic(false);
-      action.actionPerformed(new ActionEvent(this, 0, "FooAction"));
-      try {
-         Thread.sleep(500);//Calling the EDT, need to slow this thread
-      } catch (InterruptedException e) {
-      }
-      assertEquals(1, subscribedEvents.size());
-   }
-
-
-   public void testContainerEventAction() {
-      JFrame frame = new JFrame();
-      JPanel panel = new JPanel();
-      frame.setContentPane(panel);
-      ContainerEventServiceAction action = new ContainerEventServiceAction("FooAction", null);
-      JButton button = new JButton(action);
-      panel.add(button);
-      EventService es = ContainerEventServiceFinder.getEventService(button);
-      assertTrue(EventBus.getGlobalEventService() != es);
-      assertEquals(0, subscribedEvents.size());
-      es.subscribe("FooAction", new IEventTopicSubscriber() {
-         public void onEvent(String topic, Object evt) {
-            subscribedEvents.add(evt);
-         }
-      });
-      button.doClick();
-      try {
-         Thread.sleep(500);//Calling hte EDT, need to slow this thread
-      } catch (InterruptedException e) {
-      }
-      assertEquals(1, subscribedEvents.size());
-   }
-
-   public void testContainerEventActionException() {
-      ContainerEventServiceAction action = new ContainerEventServiceAction("FooAction", null);
-      try {
-         action.actionPerformed(new ActionEvent(this, 0, "Foo"));
-         fail("Throws exception when no event service");
-      } catch (Throwable t) {
-      }
-      try {
-         action.actionPerformed(new ActionEvent(null, 0, "Foo"));
-         fail("Throws exception when no event service");
-      } catch (Throwable t) {
-      }
-      action.setThrowsExceptionOnNullEventService(false);
-      action.actionPerformed(new ActionEvent(this, 0, "Foo"));
-      assertTrue("Set to not throw exception when no event service", true);
-   }
-
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBus.java b/src/test/java/org/scijava/event/bushe/TestEventBus.java
deleted file mode 100644
index 487d0b277..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventBus.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.TypeVariable;
-import java.awt.EventQueue;
-
-import javax.swing.JComponent;
-
-import junit.framework.TestCase;
-
-public class TestEventBus extends TestCase {
-
-   private IEventSubscriber eventSubscriber = null;
-   private IEventTopicSubscriber eventTopicSubscriber;
-   private EBTestCounter testCounter = new EBTestCounter();
-
-   public TestEventBus(String name) {
-      super(name);
-   }
-
-   protected void setUp() throws Exception {
-      EventBus.getGlobalEventService().clearAllSubscribers();
-   }
-
-   protected void tearDown() throws Exception {
-   }
-
-   private EventServiceEvent createEvent() {
-      return new EventServiceEvent() {
-         public Object getSource() {
-            return "";
-         }
-      };
-   }
-
-   private Class getEventClass() {
-      return createEvent().getClass();
-   }
-
-   private IEventSubscriber createEventSubscriber(boolean throwException) {
-      SubscriberForTest test = new SubscriberForTest(testCounter, throwException);
-      return test;
-   }
-
-   private IEventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
-      return new TopicSubscriberForTest(testCounter, throwException);
-   }
-
-   private IEventSubscriber getEventSubscriber() {
-      return getEventSubscriber(true);
-   }
-
-   private IEventSubscriber getEventSubscriber(boolean throwException) {
-      if (eventSubscriber == null) {
-         eventSubscriber = createEventSubscriber(throwException);
-      }
-      return eventSubscriber;
-   }
-
-   public void testSubscribe() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
-      assertTrue("testSubscribe(new subscriber)", actualReturn);
-
-      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
-      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      try {
-         actualReturn = EventBus.subscribe((Class) null, getEventSubscriber());
-         fail("subscribeStrongly(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = EventBus.subscribe(getEventClass(), null);
-         fail("subscribeStrongly(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-   }
-   
-   public static class SwingThreadTestEventSubscriber implements IEventSubscriber {
-      public boolean wasOnSwingThread;
-
-      public void onEvent(Object event) {
-         wasOnSwingThread = EventQueue.isDispatchThread();
-      }
-   }
-
-   public void testSwingThreading() {   
-      SwingThreadTestEventSubscriber sub = new SwingThreadTestEventSubscriber();
-      EventBus.subscribe(Number.class, sub);
-      EventBus.publish(1);
-      EDTUtil.waitForEDT();
-      assertTrue("Expected the EventBus to dispatch on the EDT", sub.wasOnSwingThread);
-   }
-   
-   public void testSubscribeWeakly() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
-      assertTrue("testSubscribeWeakly(new subscriber)", actualReturn);
-
-      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
-      assertFalse("testSubscribe(duplicate subscriber)", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-      subscriber = null;
-      System.gc();
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      try {
-         actualReturn = EventBus.subscribeStrongly((Class) null, getEventSubscriber());
-         fail("subscribeStrongly(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = EventBus.subscribeStrongly(getEventClass(), null);
-         fail("subscribeStrongly(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-   }
-
-   public void testIllegalArgs() {
-      try {
-         EventBus.subscribeVetoListenerStrongly((Class) null, new VetoEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.subscribeVetoListenerStrongly((String) null, new VetoTopicEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.subscribeVetoListenerStrongly("foo", null);
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.subscribeVetoListenerStrongly(getEventClass(), null);
-         fail();
-      } catch (Throwable t) {
-      }
-
-
-      try {
-         EventBus.unsubscribeVetoListener((Class) null, new VetoEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.unsubscribeVetoListener((String) null, new VetoTopicEventListenerForTest());
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.unsubscribeVetoListener("foo", null);
-         fail();
-      } catch (Throwable t) {
-      }
-      try {
-         EventBus.unsubscribeVetoListener(getEventClass(), null);
-         fail();
-      } catch (Throwable t) {
-      }
-
-   }
-
-   public void testVeto() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
-
-      VetoEventListener vetoListener = new VetoEventListenerForTest();
-      actualReturn = EventBus.subscribeVetoListenerStrongly(getEventClass(), vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      EventBus.unsubscribeVetoListener(getEventClass(), vetoListener);
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-   }
-
-   public void testVetoException() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
-      assertTrue(actualReturn);
-      VetoEventListener vetoListener = new VetoEventListenerForTest(true);
-      actualReturn = EventBus.subscribeVetoListenerStrongly(getEventClass(), vetoListener);
-      assertTrue(actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      EventBus.unsubscribeVetoListener(getEventClass(), vetoListener);
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 2, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      System.out.println("Prevent garbage collection of subscriber by sys'outing it at the end:"+subscriber);
-   }
-
-   public void testVetoTopic() {
-      boolean actualReturn;
-      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
-
-      actualReturn = EventBus.subscribeStrongly("FooTopic", subscriber);
-
-      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
-         public boolean shouldVeto(String topic, Object data) {
-            return true;
-         }
-      };
-      actualReturn = EventBus.subscribeVetoListenerStrongly("FooTopic", vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish("FooTopic", "Bar");
-      EDTUtil.waitForEDT();
-
-      //The test passes if 0 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      EventBus.unsubscribeVetoListener("FooTopic", vetoListener);
-      EventBus.publish("FooTopic", "Bar");
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-
-   public void testVetoWeak() {
-      boolean actualReturn;
-      IEventSubscriber subscriber = createEventSubscriber(false);
-
-      actualReturn = EventBus.subscribe(getEventClass(), subscriber);
-
-      VetoEventListener vetoListener = new VetoEventListener() {
-         public boolean shouldVeto(Object evt) {
-            return true;
-         }
-      };
-      actualReturn = EventBus.subscribeVetoListener(getEventClass(), vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      vetoListener = null;
-      System.gc();
-      try {
-         Thread.sleep(1000);
-      } catch (InterruptedException e) {
-      }
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   public void testVetoTopicWeak() {
-      boolean actualReturn;
-      IEventTopicSubscriber subscriber = createEventTopicSubscriber(false);
-
-      actualReturn = EventBus.subscribeStrongly("FooTopic", subscriber);
-
-      VetoTopicEventListener vetoListener = new VetoTopicEventListener() {
-         public boolean shouldVeto(String topic, Object data) {
-            return true;
-         }
-      };
-      actualReturn = EventBus.subscribeVetoListener("FooTopic", vetoListener);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish("FooTopic", "Bar");
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-      vetoListener = null;
-      System.gc();
-      EventBus.publish("FooTopic", "Bar");
-      EDTUtil.waitForEDT();
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testVeto(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testVeto(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-
-   public void testUnsubscribe() {
-      EventBus.subscribe(getEventClass(), getEventSubscriber(false));
-
-      boolean actualReturn;
-
-      try {
-         actualReturn = EventBus.unsubscribe((Class) null, getEventSubscriber());
-         fail("unsubscribe(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = EventBus.unsubscribe(getEventClass(), null);
-         fail("unsubscribe(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      actualReturn = EventBus.unsubscribe(getEventClass(), getEventSubscriber());
-      assertTrue("return value", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   public void testUnsubscribeTopic() {
-      IEventTopicSubscriber eventTopicSubscriber = createEventTopicSubscriber(false);
-      EventBus.subscribeStrongly("FooTopic", eventTopicSubscriber);
-
-      boolean actualReturn;
-
-      try {
-         actualReturn = EventBus.unsubscribe((String) null, eventTopicSubscriber);
-         fail("unsubscribe(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         actualReturn = EventBus.unsubscribe("FooTopic", null);
-         fail("unsubscribe(x, null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish("FooTopic", "Foo");
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      actualReturn = EventBus.unsubscribe("FooTopic", eventTopicSubscriber);
-      assertTrue("return value", actualReturn);
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish("FooTopic", "Foo");
-      EDTUtil.waitForEDT();
-
-      //The test passes if 1 subscribers completed and 0 subscribers threw exception.
-      assertEquals("testPublish(total)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   /**
-    * Test that the publish method works and that exceptions thrown in event subscribers don't halt publishing. In the
-    * test 2 subscribers are good and 2 subscribers throw exceptions.
-    */
-   public void testPublish() {
-      try {
-         EventBus.publish(null);
-         EDTUtil.waitForEDT();
-         fail("publish(null) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      try {
-         EventBus.publish((String) null, createEvent());
-         EDTUtil.waitForEDT();
-         fail("publish(null, x) should have thrown exception");
-      } catch (Exception e) {
-      }
-
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      EventBus.publish("Foo", "Bar");
-      EDTUtil.waitForEDT();
-      assertEquals("testPublish(completed)", 0, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-
-      EventBus.subscribe(getEventClass(), createEventSubscriber(true));
-      EventBus.subscribe(getEventClass(), createEventSubscriber(false));
-      EventBus.subscribe(getEventClass(), createEventSubscriber(true));
-      EventBus.subscribe(getEventClass(), createEventSubscriber(false));
-
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-
-      //The test passes if 2 subscribers completed and 2 subscribers threw exception.
-      assertEquals("testPublish(completed)", 4, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 2, testCounter.subscribeExceptionCount);
-
-      IEventSubscriber eventSubscriber = createEventSubscriber(false);
-      EventBus.subscribe(ObjectEvent.class, eventSubscriber);
-      testCounter.eventsHandledCount = 0;
-      testCounter.subscribeExceptionCount = 0;
-      ObjectEvent evt = new ObjectEvent("Foo", "Bar");
-      assertEquals(evt.getEventObject(), "Bar");
-      EventBus.publish(evt);
-      EDTUtil.waitForEDT();
-      assertEquals("testPublish(completed)", 1, testCounter.eventsHandledCount);
-      assertEquals("testPublish(exceptions)", 0, testCounter.subscribeExceptionCount);
-   }
-
-   /**
-    * This tests whether the EventBus has a static method for each EventService method
-    */
-   public void testNumOfMethods() {
-      Method[] esMethods = EventService.class.getMethods();
-      Method[] ebMethods = EventBus.class.getMethods();
-      //Are all the es methods in the eb?
-      for (int i = 0; i < esMethods.length; i++) {
-         Method esMethod = esMethods[i];
-         boolean foundMatch = false;
-         nextMethod:
-         for (int j = 0; j < ebMethods.length; j++) {
-            Method ebMethod = ebMethods[j];
-            if (esMethod.getName().equals(ebMethod.getName())) {
-               TypeVariable<Method>[] esTypes = esMethod.getTypeParameters();
-               TypeVariable<Method>[] ebTypes = ebMethod.getTypeParameters();
-               if (esTypes.length != ebTypes.length) {
-                  break;
-               }
-               for (int typeCount = 0; typeCount < ebTypes.length; typeCount++) {
-                  TypeVariable<Method> esType = esTypes[typeCount];
-                  TypeVariable<Method> ebType = ebTypes[typeCount];
-                  if (!(ebType+"").equals((""+esType))) {
-                     continue nextMethod;
-                  }
-               }
-               Class[] esParams = esMethod.getParameterTypes();
-               Class[] ebParams = ebMethod.getParameterTypes();
-               if (esParams.length != ebParams.length) {
-                  continue nextMethod;
-               }
-               for (int typeCount = 0; typeCount < ebParams.length; typeCount++) {
-                  Class esType = esParams[typeCount];
-                  Class ebType = ebParams[typeCount];
-                  if (!ebType.equals(esType)) {
-                     continue nextMethod;
-                  }
-               }
-               foundMatch = true;
-            }
-         }
-         if (!foundMatch) {
-            System.out.println("No match for es method:" + esMethod.getName() + ", " + esMethod +", i="+i);
-         }
-         assertTrue(foundMatch);
-      }
-
-      //Are all the eb methods static?
-      ebMethods = EventBus.class.getDeclaredMethods();
-      for (int i = 0; i < ebMethods.length; i++) {
-         Method ebMethod = ebMethods[i];
-         int modifiers = ebMethod.getModifiers();
-         boolean isStatic = Modifier.isStatic(modifiers);
-         if (!isStatic) {
-            System.out.println("EventBus has a non-static method:" + ebMethod);
-         }
-         assertTrue(isStatic);
-      }
-   }
-
-   //Really a compilation test
-   public void testGeneric() {
-      EventBus.subscribe(String.class, new IEventSubscriber<JComponent>() {
-         public void onEvent(JComponent event) {
-         }
-      });
-      EventBus.subscribe("foo", new IEventTopicSubscriber<JComponent>() {
-         public void onEvent(String topic, JComponent data) {
-         }
-      });
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
deleted file mode 100644
index 49417097a..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClass.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.scijava.event.bushe;
-
-import javax.swing.JComponent;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventBusServiceClass extends TestCase {
-
-   public TestEventBusServiceClass(String name) {
-      super(name);
-   }
-
-   protected void setUp() throws Exception {
-      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, BadEventService.class.getName());
-   }
-
-   protected void tearDown() throws Exception {
-   }
-
-   public void testConfigurableEventService() {
-      try {
-         EventBus.subscribe("foo", new IEventTopicSubscriber() {
-            public void onEvent(String topic, Object data) {
-            }
-         });
-         fail("Expected runtime exception since the plugged in EventService is a bad one.");
-      } catch (Throwable ex) {
-         System.out.println("Got ex");
-      }
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java b/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
deleted file mode 100644
index 7d6dcb309..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventBusServiceClassBadType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventBusServiceClassBadType extends TestCase {
-
-   public TestEventBusServiceClassBadType(String name) {
-      super(name);
-   }
-
-   protected void setUp() throws Exception {
-      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, EventServiceLocator.class.getName());
-   }
-
-   protected void tearDown() throws Exception {
-   }
-
-   public void testConfigurableEventService() {
-      try {
-         EventBus.subscribe("foo", new IEventTopicSubscriber() {
-            public void onEvent(String topic, Object data) {
-            }
-         });
-         fail("Expected runtime exception since the plugged in EventService is a bad one.");
-      } catch (Throwable ex) {
-         System.out.println("Got ex");
-      }
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java b/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
deleted file mode 100644
index 27cb12c06..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventBusTiming.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventBusTiming extends EventServiceLocatorTestCase {
-
-   private IEventSubscriber eventSubscriber = null;
-   private IEventTopicSubscriber eventTopicSubscriber;
-   private SubscriberTimingEvent timing;
-   private EBTestCounter testCounter = new EBTestCounter();
-
-   public TestEventBusTiming(String name) {
-      super(name);
-   }
-
-   private EventServiceEvent createEvent() {
-      return new EventServiceEvent() {
-         public Object getSource() {
-            return "";
-         }
-      };
-   }
-
-   private Class getEventClass() {
-      return createEvent().getClass();
-   }
-
-   private IEventSubscriber createEventSubscriber(boolean throwException) {
-      return new SubscriberForTest(testCounter, throwException);
-   }
-
-   private IEventTopicSubscriber createEventTopicSubscriber(boolean throwException) {
-      return new TopicSubscriberForTest(testCounter, throwException);
-   }
-
-   private IEventSubscriber createEventSubscriber(Long waitTime) {
-      return new SubscriberForTest(testCounter, waitTime);
-   }
-
-   private IEventSubscriber getEventSubscriber() {
-      return getEventSubscriber(true);
-   }
-
-   private IEventSubscriber getEventSubscriber(boolean throwException) {
-      if (eventSubscriber == null) {
-         eventSubscriber = createEventSubscriber(throwException);
-      }
-      return eventSubscriber;
-   }
-
-   private IEventTopicSubscriber getEventTopicSubscriber() {
-      if (eventTopicSubscriber == null) {
-         eventTopicSubscriber = createEventTopicSubscriber(false);
-      }
-      return eventTopicSubscriber;
-   }
-
-   public void thisOnlyWorksSometimesNow_testTimeHandling() {
-      EventBus.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
-      final Boolean[] wasCalled = new Boolean[1];
-      EventBus.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
-         public void onEvent(Object evt) {
-            wasCalled[0] = Boolean.TRUE;
-         }
-      });
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-      assertTrue(wasCalled[0] == null);
-      EventBus.subscribe(getEventClass(), createEventSubscriber(new Long(200L)));
-      final Boolean[] wasCalled2 = new Boolean[1];
-      EventBus.subscribe(SubscriberTimingEvent.class, new IEventSubscriber() {
-         public void onEvent(Object evt) {
-            wasCalled2[0] = Boolean.TRUE;
-            timing = (SubscriberTimingEvent) evt;
-         }
-      });
-      EventBus.publish(createEvent());
-      EDTUtil.waitForEDT();
-      assertTrue(wasCalled2[0] == Boolean.TRUE);
-      assertNotNull(timing.getSource());
-      assertNotNull(timing.getEnd());
-      assertNotNull(timing.getEvent());
-      assertNotNull(timing.getSubscriber());
-      assertNotNull(timing.getStart());
-      assertNotNull(timing.getTimeLimitMilliseconds());
-      assertFalse(timing.isEventHandlingExceeded());
-      assertFalse(timing.isVetoExceeded());
-      assertNull(timing.getVetoEventListener());
-   }
-
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java
deleted file mode 100644
index 8b00962cf..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-public class TestEventServiceLocator extends EventServiceLocatorTestCase {
-   
-   public TestEventServiceLocator(String name) {
-      super(name);
-   }
-
-   public void testDefaultEventBusService() {
-      EventService ebs = EventServiceLocator.getEventBusService();
-      assertTrue(ebs instanceof SwingEventService);
-      EventService ses = EventServiceLocator.getSwingEventService();
-      assertTrue(ses == ebs);
-   }
-   public void testDefaultEventBusService2() {
-      EventService ses = EventServiceLocator.getSwingEventService();
-      assertTrue(ses instanceof SwingEventService);
-      EventService ebs = EventServiceLocator.getEventBusService();
-      assertTrue(ses == ebs);
-   }
-   public void testNamedEventBusService1() {
-      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
-      assertTrue(ses instanceof SwingEventService);
-      EventService ebs = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
-      assertTrue(ses == ebs);
-   }
-   public void testNamedEventBusService2() {
-      EventService ebs = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
-      assertTrue(ebs instanceof SwingEventService);
-      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
-      assertTrue(ses == ebs);
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java
deleted file mode 100644
index 138ec277a..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator2.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventServiceLocator2 extends EventServiceLocatorTestCase {
-   
-   public TestEventServiceLocator2(String name) {
-      super(name);
-   }
-
-   public void testSetEventBusService() {
-      EventService ebs = new ThreadSafeEventService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
-      assertTrue(eb instanceof ThreadSafeEventService);
-      assertTrue(eb == ebs);
-      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
-      assertTrue(ses != ebs);
-      assertTrue(ses instanceof SwingEventService);
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
-         fail("It already exist yet");
-      } catch (EventServiceExistsException e) {
-      }
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java
deleted file mode 100644
index 1cd9c4964..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator3.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-public class TestEventServiceLocator3 extends EventServiceLocatorTestCase {
-   public TestEventServiceLocator3(String name) {
-      super(name);
-   }
-
-   public void testSetEventBusService() {
-      EventService ebs = new SwingEventService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ebs);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
-      assertTrue(eb instanceof ThreadSafeEventService);
-      assertTrue(eb == ebs);
-      EventService ses = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
-      assertTrue(ses == ebs);
-      assertTrue(ses instanceof ThreadSafeEventService);
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ebs);
-         fail("It already exist yet");
-      } catch (EventServiceExistsException e) {
-      }
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java
deleted file mode 100644
index 99106419a..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator4.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-public class TestEventServiceLocator4 extends EventServiceLocatorTestCase {
-   
-   public TestEventServiceLocator4(String name) {
-      super(name);
-   }
-
-   public void testSetEventBusService() {
-      EventService ebs = new ThreadSafeEventService();
-      EventService ses = new SwingEventService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ses);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
-      EventService se = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
-      assertTrue(eb == ebs);
-      assertTrue(se == ses);
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java
deleted file mode 100644
index 421d0bc70..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator5.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-public class TestEventServiceLocator5 extends EventServiceLocatorTestCase {
-   public TestEventServiceLocator5(String name) {
-      super(name);
-   }
-
-   public void testSetEventBusService() {
-      EventService ebs = new ThreadSafeEventService();
-      EventService ses = new SwingEventService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ses);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      EventService se = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
-      EventService eb = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS);
-      assertTrue(eb == ebs);
-      assertTrue(se == ses);
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java
deleted file mode 100644
index 8e035348b..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator6.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-public class TestEventServiceLocator6 extends EventServiceLocatorTestCase {
-   
-   public TestEventServiceLocator6(String name) {
-      super(name);
-   }
-
-   public void testSetEventBusService() {
-      EventService ebs = new ThreadSafeEventService();
-      EventService ses = new SwingEventService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ses);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      EventService eb = EventServiceLocator.getEventBusService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
-         fail("It exists");
-      } catch (EventServiceExistsException e) {
-      }
-      EventService se = EventServiceLocator.getEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE);
-      assertTrue(se == ses);
-      assertTrue(eb == ses);
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java
deleted file mode 100644
index c345bf74d..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocator7.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2005 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-public class TestEventServiceLocator7 extends EventServiceLocatorTestCase {
-   
-   public TestEventServiceLocator7(String name) {
-      super(name);
-   }
-
-   public void testSetEventBusService() {
-      EventService ebs = new ThreadSafeEventService();
-      EventService ses = new SwingEventService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
-      } catch (EventServiceExistsException e) {
-         fail("It doesn't exist yet");
-      }
-      EventService se = EventServiceLocator.getSwingEventService();
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_EVENT_BUS, ebs);
-         fail("It exists");
-      } catch (EventServiceExistsException e) {
-      }
-      try {
-         EventServiceLocator.setEventService(EventServiceLocator.SERVICE_NAME_SWING_EVENT_SERVICE, ebs);
-         fail("It exists");
-      } catch (EventServiceExistsException e) {
-      }
-      EventService eb = EventServiceLocator.getEventBusService();
-      assertTrue(eb == ebs);
-      assertTrue(se != eb);
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java
deleted file mode 100644
index c7acd90b1..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventServiceLocatorConfiguration extends EventServiceLocatorTestCase {
-
-   public static class ES1 extends ThreadSafeEventService {
-
-   }
-
-   public static class ES2 extends ThreadSafeEventService {
-
-   }
-
-   public TestEventServiceLocatorConfiguration(String name) {
-      super(name);
-   }
-
-   public void testConfigurableEventService() {
-      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, ES1.class.getName());
-      System.setProperty(EventServiceLocator.EVENT_BUS_CLASS, ES2.class.getName());
-      EventService es = EventServiceLocator.getSwingEventService();
-      assertTrue(es instanceof ES1);
-      es = EventServiceLocator.getEventBusService();
-      assertTrue(es instanceof ES2);
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java
deleted file mode 100644
index aa4548b50..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventServiceLocatorConfiguration2 extends EventServiceLocatorTestCase {
-
-   public static class ES1 extends ThreadSafeEventService {
-
-   }
-
-   public static class ES2 extends ThreadSafeEventService {
-
-   }
-
-   public TestEventServiceLocatorConfiguration2(String name) {
-      super(name);
-   }
-
-   public void testConfigurableEventService1() {
-      System.setProperty(EventServiceLocator.SWING_EVENT_SERVICE_CLASS, ES1.class.getName());
-      EventService es = EventServiceLocator.getEventBusService();
-      assertTrue(es instanceof ThreadSafeEventService);
-      es = EventServiceLocator.getSwingEventService();
-      assertTrue(es instanceof ES1);
-   }
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java
deleted file mode 100644
index b79e1eb24..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration3.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventServiceLocatorConfiguration3 extends EventServiceLocatorTestCase {
-
-   public static class ES1 extends ThreadSafeEventService {
-
-   }
-
-   public static class ES2 extends ThreadSafeEventService {
-
-   }
-
-   public TestEventServiceLocatorConfiguration3(String name) {
-      super(name);
-   }
-
-   public void testConfigurableEventService3() {
-      System.setProperty(EventServiceLocator.EVENT_BUS_CLASS, ES2.class.getName());
-      EventService es = EventServiceLocator.getEventBusService();
-      assertTrue(es instanceof ES2);
-      es = EventServiceLocator.getSwingEventService();
-      assertTrue(es instanceof SwingEventService);
-   }
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java b/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java
deleted file mode 100644
index 0b5ba3ca8..000000000
--- a/src/test/java/org/scijava/event/bushe/TestEventServiceLocatorConfiguration4.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.TestCase;
-
-/** The DefaultEventService is NOT Swing-safe!  But it's easier to test... */
-public class TestEventServiceLocatorConfiguration4 extends EventServiceLocatorTestCase {
-
-   public static class ES1 extends ThreadSafeEventService {
-
-   }
-
-   public static class ES2 extends ThreadSafeEventService {
-
-   }
-
-   public TestEventServiceLocatorConfiguration4(String name) {
-      super(name);
-   }
-
-   public void testConfigurableEventService4() {
-      System.setProperty(EventServiceLocator.EVENT_BUS_CLASS, ES2.class.getName());
-      EventService es = EventServiceLocator.getSwingEventService();
-      assertTrue(es instanceof SwingEventService);
-      es = EventServiceLocator.getEventBusService();
-      assertTrue(es instanceof ES2);
-   }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scijava/event/bushe/TestPerformance.java b/src/test/java/org/scijava/event/bushe/TestPerformance.java
index f597ae488..a936200ee 100644
--- a/src/test/java/org/scijava/event/bushe/TestPerformance.java
+++ b/src/test/java/org/scijava/event/bushe/TestPerformance.java
@@ -12,12 +12,12 @@
  * For proving performance.
  */
 public class TestPerformance extends TestCase {
-    private IEventSubscriber doNothingSubscriber = new IEventSubscriber() {
+    private EventSubscriber doNothingSubscriber = new EventSubscriber() {
         public void onEvent(Object event) {
         }
     };
 
-    private IEventTopicSubscriber doNothingTopicSubscriber = new IEventTopicSubscriber() {
+    private EventTopicSubscriber doNothingTopicSubscriber = new EventTopicSubscriber() {
         public void onEvent(String topic, Object payload) {
         }
     };
diff --git a/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java b/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
deleted file mode 100644
index a02310228..000000000
--- a/src/test/java/org/scijava/event/bushe/TestPrioritizedSubscribers.java
+++ /dev/null
@@ -1,591 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Random;
-import java.util.Collections;
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
-import java.awt.Color;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the Prioritized interface va. normal FIFO order.
- */
-public class TestPrioritizedSubscribers extends TestCase {
-    private ThreadSafeEventService eventService = null;
-    private static final String EVENT_SERVICE_TEST_PRIORITY_ANNOTATION = "testPriorityAnnotation";
-
-
-    /**
-     * Base class that adds itself to the list it's given when told.  Nice for annotation subscribers.
-     */
-    class OrderRecorder {
-        private List listToRecordTo;
-
-        public OrderRecorder(List listToRecordTo) {
-            this.listToRecordTo = listToRecordTo;
-        }
-
-        public void record() {
-            listToRecordTo.add(this);
-        }
-    }
-
-    /**
-     * A subscriber that adds itself to a supplied list so that the order of calls is recorded.
-     */
-    class OrderRecorderSubscriber extends OrderRecorder implements IEventSubscriber {
-
-        OrderRecorderSubscriber(List listToRecordTo) {
-            super(listToRecordTo);
-        }
-
-        public void onEvent(Object event) {
-            record();
-        }
-    }
-
-    /**
-     * Ditto, for topics
-     */
-    class OrderRecorderTopicSubscriber extends OrderRecorder implements IEventTopicSubscriber {
-
-        OrderRecorderTopicSubscriber(List listToRecordTo) {
-            super(listToRecordTo);
-        }
-
-        public void onEvent(String topic, Object event) {
-            record();
-        }
-    }
-
-    class PrioritizedOrderRecorderSubscriber extends OrderRecorderSubscriber implements Prioritized {
-        private int priority;
-
-        public PrioritizedOrderRecorderSubscriber(int priority, List listToRecordTo) {
-            super(listToRecordTo);
-            this.priority = priority;
-        }
-
-        public int getPriority() {
-            return priority;
-        }
-    }
-
-    class PrioritizedOrderRecorderTopicSubscriber extends OrderRecorderTopicSubscriber implements Prioritized {
-        private int priority;
-
-        public PrioritizedOrderRecorderTopicSubscriber(int priority, List listToRecordTo) {
-            super(listToRecordTo);
-            this.priority = priority;
-        }
-
-        public int getPriority() {
-            return priority;
-        }
-    }
-
-    public TestPrioritizedSubscribers(String name) {
-        super(name);
-    }
-
-    protected void setUp() throws Exception {
-        eventService = new ThreadSafeEventService(null, false);
-        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, null);
-    }
-
-    protected void tearDown() throws Exception {
-        eventService = null;
-    }
-
-    public void testNormalFIFO() {
-        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
-        List<IEventSubscriber> originalOrder = new ArrayList<IEventSubscriber>();
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        //mixing an inner class into the test
-        IEventSubscriber inner = new IEventSubscriber() {
-            public void onEvent(Object event) {
-            }
-        };
-        //originalOrder.add(inner);
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        //add them all
-        for (IEventSubscriber eventSubscriber : originalOrder) {
-            eventService.subscribe(Color.class, eventSubscriber);
-        }
-        eventService.publish(Color.BLUE);
-        assertEquals(originalOrder, calledOrder);
-        System.out.println("inner sout to avoid garbage collection" + inner);
-    }
-
-    public void testNoPrioritizedWithZeroPrioritized() {
-        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
-        List<IEventSubscriber> originalOrder = new ArrayList<IEventSubscriber>();
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        //mixing an inner class into the test
-        PrioritizedEventSubscriber inner = new PrioritizedEventSubscriber() {
-            public void onEvent(Object event) {
-            }
-
-            public int getPriority() {
-                return 0;
-            }
-        };
-        //originalOrder.add(inner);
-        originalOrder.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
-        originalOrder.add(new OrderRecorderSubscriber(calledOrder));
-        //add them all
-        for (IEventSubscriber eventSubscriber : originalOrder) {
-            eventService.subscribe(Color.class, eventSubscriber);
-        }
-        eventService.publish(Color.BLUE);
-        assertEquals(originalOrder, calledOrder);
-        System.out.println("inner sout to avoid garbage collection" + inner);
-    }
-
-    public void testOnlyPrioritized() {
-        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
-        List<IEventSubscriber> originalOrder = new ArrayList<IEventSubscriber>();
-        for (int i = 0; i < 100; i++) {
-            Random random = new Random();
-            originalOrder.add(new PrioritizedOrderRecorderSubscriber(random.nextInt(10000) - 5000, calledOrder));
-        }
-        for (IEventSubscriber eventSubscriber : originalOrder) {
-            eventService.subscribe(Color.class, eventSubscriber);
-        }
-        eventService.publish(Color.BLUE);
-        int lastPriority = -5001;
-        for (IEventSubscriber eventSubscriber : calledOrder) {
-            int priority = ((PrioritizedOrderRecorderSubscriber) eventSubscriber).getPriority();
-            assertTrue(priority >= lastPriority);
-            lastPriority = priority;
-        }
-    }
-
-    public void testMixedOfPrioritizedNonPrioritizedAndPrioritized0() {
-        Random rand = new Random();
-        List<IEventSubscriber> calledOrder = new ArrayList<IEventSubscriber>();
-        List<IEventSubscriber> prioritized = new ArrayList<IEventSubscriber>();
-        //100 negative
-        for (int i = 0; i < 100; i++) {
-            Random random = new Random();
-            prioritized.add(new PrioritizedOrderRecorderSubscriber(random.nextInt(10000) * -1, calledOrder));
-        }
-        //100 positive
-        for (int i = 0; i < 100; i++) {
-            Random random = new Random();
-            prioritized.add(new PrioritizedOrderRecorderSubscriber(random.nextInt(10000), calledOrder));
-        }
-        Collections.shuffle(prioritized);
-        //100 fifo
-        List<IEventSubscriber> fifo = new ArrayList<IEventSubscriber>();
-        for (int i = 0; i < 100; i++) {
-            if (rand.nextBoolean()) {
-                fifo.add(new OrderRecorderSubscriber(calledOrder));
-            } else {
-                fifo.add(new PrioritizedOrderRecorderSubscriber(0, calledOrder));
-            }
-        }
-        List<IEventSubscriber> prioritizedCopy = new ArrayList(prioritized);
-        List<IEventSubscriber> fifoCopy = new ArrayList(fifo);
-        //Subscribe all, randomizing a fifo or prioritized
-        IEventSubscriber eventSubscriber;
-        int subscribeCount = 0;
-        int prioritizedSubscribeCount = 0;
-        int nonPrioritizedSubscribeCount = 0;
-        for (int i = 0; i < 300; i++) {
-            if (prioritizedCopy.isEmpty()) {
-                eventSubscriber = fifoCopy.remove(0);
-                nonPrioritizedSubscribeCount++;
-            } else if (fifoCopy.isEmpty()) {
-                eventSubscriber = prioritizedCopy.remove(0);
-                prioritizedSubscribeCount++;
-            } else {
-                if (rand.nextBoolean()) {
-                    eventSubscriber = fifoCopy.remove(0);
-                    nonPrioritizedSubscribeCount++;
-                } else {
-                    eventSubscriber = prioritizedCopy.remove(0);
-                    prioritizedSubscribeCount++;
-                }
-            }
-            subscribeCount++;
-            boolean success = eventService.subscribe(Color.class, eventSubscriber);
-            assertFalse(!success);
-        }
-
-        List subscribersToColor = eventService.getSubscribers(Color.class);
-        assertEquals(300, subscribersToColor.size());
-        assertEquals(100, nonPrioritizedSubscribeCount);
-        assertEquals(200, prioritizedSubscribeCount);
-        assertEquals(300, subscribeCount);
-        eventService.publish(Color.BLUE);
-        assertEquals(300, calledOrder.size());
-        int lastPriority = -10001;
-        for (int i = 0; i < 99; i++) {
-            IEventSubscriber subscriber = calledOrder.get(i);
-            assertTrue(subscriber instanceof PrioritizedOrderRecorderSubscriber);
-            PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
-            int priority = prioritizedOrderRecorderSubscriber.getPriority();
-            assertTrue(priority < 0);
-            assertTrue(priority >= lastPriority);
-            lastPriority = priority;
-        }
-        for (int i = 100; i < 199; i++) {
-            IEventSubscriber subscriber = calledOrder.get(i);
-            assertTrue(subscriber instanceof OrderRecorderSubscriber);
-            if (subscriber instanceof PrioritizedOrderRecorderSubscriber) {
-                PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
-                int priority = prioritizedOrderRecorderSubscriber.getPriority();
-                assertTrue(priority == 0);
-            }
-            assertEquals(subscriber, fifo.get(i - 100));
-        }
-        lastPriority = 0;
-        for (int i = 200; i < 299; i++) {
-            IEventSubscriber subscriber = calledOrder.get(i);
-            assertTrue(subscriber instanceof PrioritizedOrderRecorderSubscriber);
-            PrioritizedOrderRecorderSubscriber prioritizedOrderRecorderSubscriber = (PrioritizedOrderRecorderSubscriber) subscriber;
-            int priority = prioritizedOrderRecorderSubscriber.getPriority();
-            assertTrue(priority > 0);
-            assertTrue(priority >= lastPriority);
-            lastPriority = priority;
-        }
-        System.out.println(prioritized.size());
-        System.out.println(fifo.size());
-    }
-
-    public void testPriorityAnnotation() throws EventServiceExistsException {
-        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
-        List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
-        OrderRecorder sn100 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder sn50 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        PrioritizedOrderRecorderSubscriber spn30 = new PrioritizedOrderRecorderSubscriber(-30, calledOrder);
-        OrderRecorderSubscriber so_1 = new OrderRecorderSubscriber(calledOrder);
-        OrderRecorder s100 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder sn10 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s50 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s10 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
-            @EventSubscriber(eventClass = Color.class, eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(Object foo) {
-                record();
-            }
-        };
-        Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
-        List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
-        for (Object o : toAdd) {
-            if (o instanceof IEventSubscriber) {
-                eventService.subscribe(Color.class, (IEventSubscriber) o);
-            } else {
-                AnnotationProcessor.process(o);
-            }
-        }
-        eventService.publish(Color.BLUE);
-        assertEquals(expectedResult, calledOrder);
-    }
-
-    /**
-     * With more than one subscriber to the EventBus by class, if any of the
-     * subscribers are Prioritized with a negative priority, then no  FIFO subscribers
-     * are notified.
-     * <p/>
-     * This holds for non-Prioritized FIFO subscribers, and Prioritized subscribers
-     * with Priority of 0.
-     */
-    public void testIssue26OneNegOthersNormal() {
-        final List<Integer> calledOrder = new ArrayList<Integer>();
-        //non-Prioritized FIFO subscribers
-        IEventSubscriber sub1 = new IEventSubscriber() {
-            public void onEvent(Object event) {
-                calledOrder.add(1);
-            }
-        };
-        IEventSubscriber sub0 = new PrioritizedEventSubscriber() {
-            public void onEvent(Object event) {
-                calledOrder.add(-1);
-            }
-            public int getPriority() {
-                return -1;
-            }
-        };
-        IEventSubscriber sub2 = new IEventSubscriber() {
-            public void onEvent(Object event) {
-                calledOrder.add(2);
-            }
-        };
-
-        eventService.subscribe(Color.class, sub1);
-        eventService.subscribe(Color.class, sub0);
-        eventService.subscribe(Color.class, sub2);
-        eventService.publish(Color.BLUE);
-        assertEquals(calledOrder.get(0).intValue(), -1);
-        assertEquals(calledOrder.get(1).intValue(), 1);
-        assertEquals(calledOrder.get(2).intValue(), 2);
-        System.out.println("to avoid garbage collection:"+sub1+sub2+sub0);
-    }
-
-    /**
-     * With more than one subscriber to the EventBus by class, if any of the
-     * subscribers are Prioritized with a negative priority, then no  FIFO subscribers
-     * are notified.
-     * <p/>
-     * This holds for non-Prioritized FIFO subscribers, and Prioritized subscribers
-     * with Priority of 0.
-     */
-    public void testOnePosOthersNormal() {
-        final List<Integer> calledOrder = new ArrayList<Integer>();
-        //non-Prioritized FIFO subscribers
-        IEventSubscriber sub1 = new IEventSubscriber() {
-            public void onEvent(Object event) {
-                calledOrder.add(1);
-            }
-        };
-        IEventSubscriber sub0 = new PrioritizedEventSubscriber() {
-            public void onEvent(Object event) {
-                calledOrder.add(11);
-            }
-            public int getPriority() {
-                return 11;
-            }
-        };
-        IEventSubscriber sub2 = new IEventSubscriber() {
-            public void onEvent(Object event) {
-                calledOrder.add(2);
-            }
-        };
-
-        eventService.subscribe(Color.class, sub1);
-        eventService.subscribe(Color.class, sub0);
-        eventService.subscribe(Color.class, sub2);
-        eventService.publish(Color.BLUE);
-        assertEquals(1, calledOrder.get(0).intValue());
-        assertEquals(2, calledOrder.get(1).intValue());
-        assertEquals(11, calledOrder.get(2).intValue());
-        System.out.println("to avoid garbage collection:"+sub1+sub2+sub0);
-    }
-
-    /**
-     * shameless copy and paste test, only the subscriber type was changed
-     */
-    public void testPriorityTopicAnnotation() throws EventServiceExistsException {
-        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
-        List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
-        OrderRecorder sn100 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder sn50 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        PrioritizedOrderRecorderTopicSubscriber spn30 = new PrioritizedOrderRecorderTopicSubscriber(-30, calledOrder);
-        OrderRecorderTopicSubscriber so_1 = new OrderRecorderTopicSubscriber(calledOrder);
-        OrderRecorder s100 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder sn10 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s50 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s10 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
-            @EventTopicSubscriber(topic = "Color", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
-        List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
-        for (Object o : toAdd) {
-            if (o instanceof IEventTopicSubscriber) {
-                eventService.subscribe("Color", (IEventTopicSubscriber) o);
-            } else {
-                AnnotationProcessor.process(o);
-            }
-        }
-        eventService.publish("Color", Color.BLUE);
-        assertEquals(expectedResult, calledOrder);
-    }
-
-
-    /**
-     * Another shameless copy and paste test, only the subscriber type was changed
-     */
-    public void testPriorityTopicPatternAnnotation() throws EventServiceExistsException {
-        EventServiceLocator.setEventService(EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, eventService);
-        List<OrderRecorder> calledOrder = new ArrayList<OrderRecorder>();
-        OrderRecorder sn100 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -100)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder sn50 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -50)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        PrioritizedOrderRecorderTopicSubscriber spn30 = new PrioritizedOrderRecorderTopicSubscriber(-30, calledOrder);
-        OrderRecorderTopicSubscriber so_1 = new OrderRecorderTopicSubscriber(calledOrder);
-        OrderRecorder s100 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 100)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder sn10 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = -10)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_2 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 0)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_3 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s50 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 50)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_4 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s10 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION, priority = 10)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        OrderRecorder s0_5 = new OrderRecorder(calledOrder) {
-            @EventTopicPatternSubscriber(topicPattern = "Col[a-z]+", eventServiceName = EVENT_SERVICE_TEST_PRIORITY_ANNOTATION)
-            public void annotateMe(String topic, Object foo) {
-                record();
-            }
-        };
-        Object[] toAdd = {sn100, s100, so_1, spn30, s0_2, s50, s0_3, sn10, sn50, s0_4, s10, s0_5};
-        List expectedResult = Arrays.asList(sn100, sn50, spn30, sn10, so_1, s0_2, s0_3, s0_4, s0_5, s10, s50, s100);
-        for (Object o : toAdd) {
-            if (o instanceof OrderRecorderTopicSubscriber) {
-                Pattern pattern = Pattern.compile("Col[a-z]+");
-                eventService.subscribe(pattern, (IEventTopicSubscriber) o);
-            } else {
-                AnnotationProcessor.process(o);
-            }
-        }
-        eventService.publish("Color", Color.BLUE);
-        assertEquals(expectedResult, calledOrder);
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TestPublicationStates.java b/src/test/java/org/scijava/event/bushe/TestPublicationStates.java
deleted file mode 100644
index 71f7c02e8..000000000
--- a/src/test/java/org/scijava/event/bushe/TestPublicationStates.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.scijava.event.bushe;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * Tests the implementation of publication states
- */
-public class TestPublicationStates extends TestCase {
-   List stuffHappens = new ArrayList();
-   ObjectEvent event = new ObjectEvent(null, null) {
-      @Override
-      public void setPublicationStatus(PublicationStatus status) {
-         super.setPublicationStatus(status);
-         stuffHappens.add(status);
-      }
-   };
-   IEventSubscriber subscriber = new IEventSubscriber() {
-      public void onEvent(Object event) {
-         stuffHappens.add(this);
-      }
-   };
-
-   EventService es = new ThreadSafeEventService() {
-      @Override
-      protected void setStatus(PublicationStatus status, Object event, String topic, Object eventObj) {
-         super.setStatus(status, event, topic, eventObj);
-      }
-   };
-
-   public void testStates() {
-      stuffHappens.clear();
-      es.subscribe(ObjectEvent.class, subscriber);
-      es.publish(event);
-      List expected = new ArrayList();
-      expected.add(PublicationStatus.Initiated);
-      expected.add(PublicationStatus.Queued);
-      expected.add(PublicationStatus.Publishing);
-      expected.add(subscriber);
-      expected.add(PublicationStatus.Completed);
-      Assert.assertEquals(expected.size(), stuffHappens.size());
-      for (int i = 0; i < expected.size(); i++) {
-         Assert.assertEquals(expected.get(i), stuffHappens.get(i));
-      }
-   }
-
-   public void testVetoStates() {
-      stuffHappens.clear();
-      es.subscribe(ObjectEvent.class, subscriber);
-      es.subscribeVetoListener(ObjectEvent.class, new VetoEventListener() {
-         public boolean shouldVeto(Object event) {
-            return true;
-         }
-      });
-      es.publish(event);
-      List expected = new ArrayList();
-      expected.add(PublicationStatus.Initiated);
-      expected.add(PublicationStatus.Vetoed);
-      Assert.assertEquals(expected.size(), stuffHappens.size());
-      for (int i = 0; i < expected.size(); i++) {
-         Assert.assertEquals(expected.get(i), stuffHappens.get(i));
-      }
-   }
-}
diff --git a/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java b/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
index 3109681d1..3b7836df8 100644
--- a/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
+++ b/src/test/java/org/scijava/event/bushe/TopicSubscriberForTest.java
@@ -4,7 +4,7 @@
  * @author Michael Bushe
  * @since Nov 19, 2005 11:00:53 PM
  */
-public class TopicSubscriberForTest implements IEventTopicSubscriber {
+public class TopicSubscriberForTest implements EventTopicSubscriber {
    private boolean throwException;
    private Long waitTime;
    private EBTestCounter testDefaultEventService;
diff --git a/src/test/java/org/scijava/event/bushe/WeakClassAnnotatedEventSubscriber.java b/src/test/java/org/scijava/event/bushe/WeakClassAnnotatedEventSubscriber.java
deleted file mode 100644
index 6d821a6ec..000000000
--- a/src/test/java/org/scijava/event/bushe/WeakClassAnnotatedEventSubscriber.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.scijava.event.bushe;
-
-import java.util.Collection;
-import java.util.List;
-
-/** Test class for class-based subscriptions */
-public class WeakClassAnnotatedEventSubscriber {
-   static int timesColorChanged = 0;
-   static String lastCall = null;
-   static int timesCalled = 0;
-
-   public static int getTimesCalled() {
-      return timesCalled;
-   }
-
-   public static void setTimesCalled(int times) {
-      timesCalled = times;
-   }
-
-   @EventSubscriber(eventClass = List.class, referenceStrength = ReferenceStrength.WEAK)
-   public void doList(Collection collection) {
-      timesCalled++;
-   }
-}

From 0988a1d4e34fef05c2ace8d99466b99c8fddb0c0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 12:56:06 -0500
Subject: [PATCH 1105/1208] Remove org.bushe:eventbus CleanupEvent logic

We do not need to monitor these events.
Removing it simplifies the codebase and avoids a hack.
---
 .../org/scijava/event/DefaultEventBus.java    | 28 ---------
 .../org/scijava/event/bushe/CleanupEvent.java | 62 -------------------
 .../event/bushe/ThreadSafeEventService.java   |  8 +--
 3 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 src/main/java/org/scijava/event/bushe/CleanupEvent.java

diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 365102949..9d71eb8f3 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -34,7 +34,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.scijava.event.bushe.CleanupEvent;
 import org.scijava.event.bushe.ThreadSafeEventService;
 import org.scijava.log.LogService;
 import org.scijava.service.Service;
@@ -116,33 +115,6 @@ public void publishLater(final String topicName, final Object eventObj) {
 
 	@Override
 	public void publish(final Object event) {
-		// HACK: Work around a deadlock problem caused by ThreadSafeEventService:
-
-		// 1) The ThreadSafeEventService superclass has a special cleanup thread
-		// that takes care of cleaning up stale references. Every time it runs, it
-		// publishes some CleanupEvents using publish(Object) to announce that this
-		// is occurring. Normally, such publication delegates to
-		// publishNow, which calls ThreadService#invoke, which calls
-		// EventQueue.invokeAndWait, which queues the publication for execution on
-		// the EDT and then blocks until publication is complete.
-
-		// 2) When the ThreadSafeEventService publishes the CleanupEvents, it does
-		// so inside a synchronized block that locks on a "listenerLock" object.
-
-		// 3) Unfortunately, since the CleanupEvent publication is merely *queued*,
-		// any other pending operations on the EDT happen first. If one such
-		// operation meanwhile calls e.g.
-		// ThreadSafeEventService#getSubscribers(Class<T>), it will deadlock because
-		// those getter methods are also synchronized on the listenerLock object.
-
-		// Hence, our hack workaround is to instead use publishLater for the
-		// CleanupEvents, since no one really cares about them anyway. ;-)
-
-		if (event instanceof CleanupEvent) {
-			publishLater(event);
-			return;
-		}
-
 		publishNow(event);
 	}
 
diff --git a/src/main/java/org/scijava/event/bushe/CleanupEvent.java b/src/main/java/org/scijava/event/bushe/CleanupEvent.java
deleted file mode 100644
index c233e1dc0..000000000
--- a/src/main/java/org/scijava/event/bushe/CleanupEvent.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright 2007 Bushe Enterprises, Inc., Hopkinton, MA, USA, www.bushe.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.scijava.event.bushe;
-
-/**
- * Published when the ThreadSafeEventService cleans up stale subscribers.
- * @author Michael Bushe
- */
-public class CleanupEvent {
-
-   /** The status of the cleanup.*/
-   public enum Status {
-      /** Timer has started the cleanup task. Will be followed by at least one more CleanupEvent.*/
-      STARTING,
-      /** Task has determined there's cleanup to do.*/
-      OVER_STOP_THRESHOLD_CLEANING_BEGUN, 
-      /** Task has determined there's no cleanup to do.*/
-      UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, 
-      /** Finished cleaning up task.*/
-      FINISHED_CLEANING;
-   }
-   
-   private Status status;
-   private int totalWeakRefsAndProxies;
-   private Integer numStaleSubscribersCleaned;
-   
-   public CleanupEvent(Status status, int totalWeakRefsAndProxies, Integer numStaleSubscribersCleaned) {
-      this.status = status;
-      this.totalWeakRefsAndProxies = totalWeakRefsAndProxies;
-      this.numStaleSubscribersCleaned = numStaleSubscribersCleaned;
-   }
-
-   public Status getStatus() {
-      return status;
-   }
-
-   /** Total weak refs and ProxySubscribers subscribed. */
-   public int getTotalWeakRefsAndProxies() {
-      return totalWeakRefsAndProxies;
-   }
-
-   /**
-    * Null unless status is FINISHED_CLEANING.
-    * @return the number of stale subscribers cleaned during the cleanup run.
-    */
-   public Integer getNumStaleSubscribersCleaned() {
-      return numStaleSubscribersCleaned;
-   }
-}
diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
index 685af6b42..97c4a54cc 100644
--- a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -122,8 +122,6 @@
  * to <tt>CLEANUP_STOP_THRESHOLD_DEFAULT</tt> (100) by default.  The default is overridable in the constructor or via 
  * #setCleanupStopThreshhold(Integer).  If set to null or 0, cleanup will not stop if it is ever started.  
  * <p/>
- * Cleanup can be monitored by subscribing to the {@link CleanupEvent} class. 
- * <p/>
  * All cleanup parameters are tunable "live" and checked after each subscription and after each cleanup cycle.
  * To make cleanup never run, set cleanupStartThreshhold to Integer.MAX_VALUE and cleanupPeriodMS to null.
  * To get cleanup to run continuously, set set cleanupStartThreshhold to 0 and cleanupPeriodMS to some reasonable value,
@@ -137,7 +135,7 @@
  * @todo (param) a JMS-like selector (can be done in base classes by implements like a commons filter
  * @see EventService for a complete description of the API
  */
-@SuppressWarnings({"unchecked", "ForLoopReplaceableByForEach"})
+@SuppressWarnings({"unchecked"})
 public class ThreadSafeEventService implements EventService {
    public static final Integer CLEANUP_START_THRESHOLD_DEFAULT = 250;
    public static final Integer CLEANUP_STOP_THRESHOLD_DEFAULT = 100;
@@ -2057,17 +2055,14 @@ class CleanupTimerTask extends TimerTask {
       @Override
       public void run() {
          synchronized(listenerLock) {
-            ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.STARTING, weakRefPlusProxySubscriberCount, null));
             if (weakRefPlusProxySubscriberCount <= cleanupStopThreshold) {
                this.cancel();
                cleanupTimer = null;
                cleanupTimerTask = null;
                LOG.debug("Cancelled scheduled weak reference and proxy cleanup.");
-               ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.UNDER_STOP_THRESHOLD_CLEANING_CANCELLED, weakRefPlusProxySubscriberCount, null));
                return;
             }
             LOG.debug("Starting a weak reference and proxy cleanup.");
-            ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.OVER_STOP_THRESHOLD_CLEANING_BEGUN, weakRefPlusProxySubscriberCount, null));               
             List<Map> allSubscriberMaps = new ArrayList<Map>();
             allSubscriberMaps.add(subscribersByEventType);
             allSubscriberMaps.add(subscribersByEventClass);
@@ -2093,7 +2088,6 @@ public void run() {
                   }
                }
             }
-            ThreadSafeEventService.this.publish(new CleanupEvent(CleanupEvent.Status.FINISHED_CLEANING, weakRefPlusProxySubscriberCount, staleCount));
          }         
       }      
    }

From f49e711c4142c7c8da8770d9ea7e33927847a753 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 13:09:44 -0500
Subject: [PATCH 1106/1208] Add EventService#subscribe(EventSubscriber) method

Otherwise, there is no way to register an EventSubscriber,
because the DefaultEventBus is not publicly accessible.
---
 pom.xml                                        |  2 +-
 .../org/scijava/event/DefaultEventService.java |  5 +++++
 .../java/org/scijava/event/EventService.java   | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d2abba36d..e6d854490 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.93.2-SNAPSHOT</version>
+	<version>2.94.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 074a20bad..0047c42f5 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -138,6 +138,11 @@ public List<EventSubscriber<?>> subscribe(final Object o) {
 		return subscribers;
 	}
 
+	@Override
+	public void subscribe(final EventSubscriber<?> subscriber) {
+		eventBus.subscribe(subscriber.getClass(), subscriber);
+	}
+
 	@Override
 	public void unsubscribe(final Collection<EventSubscriber<?>> subscribers) {
 		for (final EventSubscriber<?> subscriber : subscribers) {
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 5c143e18d..cc9f89d17 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -125,6 +125,24 @@ public interface EventService extends SciJavaService {
 	 */
 	List<EventSubscriber<?>> subscribe(Object o);
 
+	/**
+	 * Subscribes the given {@link EventSubscriber} to its associated event class.
+	 * Its {@link EventSubscriber#onEvent} method will be called whenever an event
+	 * of the matching type is published.
+	 * <p>
+	 * <strong>Important note:</strong> The event service does <em>not</em> keep a
+	 * strong reference to the subscriber! If you use this method, you are also
+	 * responsible for keeping a reference to the subscriber, or else it is likely
+	 * to be garbage collected, and thus no longer respond to events as intended.
+	 * One simple way to force a strong reference to exist is to add it to
+	 * SciJava's {@link org.scijava.object.ObjectService} via
+	 * {@link org.scijava.object.ObjectService#addObject}.
+	 * </p>
+	 * 
+	 * @param subscriber the event subscriber to register
+	 */
+	void subscribe(EventSubscriber<?> subscriber);
+
 	/**
 	 * Removes all the given subscribers; they will no longer be notified when
 	 * events are published.

From d94ffcfc920a36d4e82bf9e0d7bc597772c7f3b5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 14:27:08 -0500
Subject: [PATCH 1107/1208] Fix javadoc errors in org.bushe:eventbus code

---
 .../org/scijava/event/bushe/EventService.java | 193 ++++++++++++------
 .../event/bushe/EventTopicSubscriber.java     |   3 +-
 .../java/org/scijava/event/bushe/Logger.java  |   9 +-
 .../scijava/event/bushe/SwingException.java   |  10 +-
 .../event/bushe/ThreadSafeEventService.java   |  98 ++++++---
 .../event/bushe/VetoEventListener.java        |   3 +-
 .../event/bushe/VetoTopicEventListener.java   |   3 +-
 7 files changed, 209 insertions(+), 110 deletions(-)

diff --git a/src/main/java/org/scijava/event/bushe/EventService.java b/src/main/java/org/scijava/event/bushe/EventService.java
index 6b07fb777..3a88aff2b 100644
--- a/src/main/java/org/scijava/event/bushe/EventService.java
+++ b/src/main/java/org/scijava/event/bushe/EventService.java
@@ -22,7 +22,7 @@
 /**
  * The core interface.  An EventService provides publish/subscribe services to a single JVM using Class-based and
  * String-based (i.e. "topic") publications and subscriptions.
- * <p/>
+ * <p>
  * In class-based pub/sub, {@link EventSubscriber}s subscribe to a type on an {@link EventService}, such
  * as the {@link org.scijava.event.bushe.EventBus}, by providing a class, interface or generic type.  The EventService
  * notifies subscribers when objects are published on the EventService with a matching type.  Full class semantics are
@@ -32,14 +32,17 @@
  * subscribe "exactly" using  {@link #subscribeExactly(Class, EventSubscriber)} so that they are notified only if an
  * object of the exact class is published (and will not be notified if subclasses are published, since this would not
  * be "exact")
- * <p/>
+ * </p>
+ * <p>
  * In topic-based pub/sub, an object "payload" is published on a topic name (String).  {@link EventTopicSubscriber}s subscribe
  * to either the exact name of the topic or they may subscribe using a Regular Expression that is used to match topic
  * names.
- * <p/>
+ * </p>
+ * <p>
  * See the <a href="../../../../overview-summary.html#overview_description">overview</a> for an general introduction
  * and <a href="package-summary.html">package documentation</a> for usage details and examples.
- * <p/>
+ * </p>
+ * <p>
  * A single subscriber cannot subscribe more than once to an event or topic name.  EventService implementations should
  * handle double-subscription requests by returning false on subscribe().  A single EventSubscriber can subscribe to more
  * than one event class, and a single EventTopicSubscriber can subscribe to more than one topic name or pattern. A
@@ -50,15 +53,18 @@
  * subclasses using subscribe() and again to a class of the same type using subscribeExactly(), this is considered two
  * different subscriptions and the subscriber will be called twice for the publication for a single event of the exact
  * type.
- * <p/>
+ * </p>
+ * <p>
  * By default the EventService only holds WeakReferences to subscribers.  If a subscriber has no references to it, then
  * it can be garbage collected.  This avoids memory leaks in exchange for the risk of accidentally adding a listener and
  * have it disappear unexpectedly.  If you want to subscribe a subscriber that will have no other reference to it, then
  * use one of the subscribeStrongly() methods, which will prevent garbage collection.
- * <p/>
+ * </p>
+ * <p>
  * Unless garbage collected, EventSubscribers will remain subscribed until they are passed to one of the unsubscribe()
  * methods with the event class or topic name to which there are subscribed.
- * <p/>
+ * </p>
+ * <p>
  * Subscribers are called in the order in which they are subscribed by default (FIFO), unless subscribers implement
  * {@link Prioritized}.  Those subscribers that implement Prioritized and return a negative priority are moved to the
  * front of the list (the more negative, the more to the front).  Those subscribers that implement Prioritized and return
@@ -71,16 +77,19 @@
  * the order of priority, no matter the call or the resulting mix of subscribers.  All ordering rules apply to all
  * types subscribers: class, topic, pattern, veto, etc.  For Swing users, note that FIFO is
  * the opposite of Swing, where event listeners are called in the reverse order of when they were subscribed (FILO).    
- * <p/>
+ * </p>
+ * <p>
  * Publication on a class or topic name can be vetoed by a {@link VetoEventListener}. All VetoEventListeners are checked
  * before any EventSubscribers or EventTopicSubscribers are called. This is unlike the JavaBean's
  * VetoPropertyEventListener which can leave side effects and half-propogated events. VetoEventListeners are subscribed
  * in the same manner as EventSubscribers and EventTopicSubscribers.
- * <p/>
+ * </p>
+ * <p>
  * The state of a published event can be tracked if an event or a topic's payload object implements the
  * {@link org.scijava.event.bushe.PublicationStatus} interface.  EventServices are required to set such objects'
  * {@link org.scijava.event.bushe.PublicationStatus} at the appropriate times during publication.
- * <p/>
+ * </p>
+* <p>
  * This simple example prints "Hello World"
  * <pre>
  * EventService eventService = new ThreadSafeEventService();
@@ -94,7 +103,8 @@
  * eventService.publish("Hello", "World");
  * System.out.println(subscriber + " Since the reference is used after it is subscribed, it doesn't get garbage collected, this is not necessary if you use subscribeStrongly()");
  * </pre>
- * <p/>
+ * </p>
+ * <p>
  * Events and/or topic data can be cached, but are not by default.  To cache events or topic data, call
  * {@link #setDefaultCacheSizePerClassOrTopic(int)}, {@link #setCacheSizeForEventClass(Class, int)}, or
  * {@link #setCacheSizeForTopic(String, int)}, {@link #setCacheSizeForTopic(Pattern, int)}.  Retrieve cached values
@@ -104,9 +114,11 @@
  * the EDT in a single-threaded manner). In multithreaded applications, you never know if your subscriber has handled
  * an event while it was being subscribed (before the subscribe() method returned) that is newer or older than the
  * retrieved cached value (taken before or after subscribe() respectively).
- * <p/>
+ * </p>
+ * <p>
  * There is nothing special about the term "Event," this could just as easily be called a "Message" Service, this term
  * is already taken by the JMS, which is similar, but is used across processes and networks.
+ * </p>
  *
  * @author Michael Bushe michael@bushe.com
  * @see {@link ThreadSafeEventService} for the default implementation
@@ -139,7 +151,7 @@ interface EventService {
     * trades.add(trade);
     * EventBus.publish(publishingTypeReference.getType(), trades);
     * </pre>
-    * <p>
+    * </p>
     * @param genericType the generified type of the published object.  
     * @param event The event that occurred
     */
@@ -157,20 +169,25 @@ interface EventService {
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type.  Only a <b>WeakReference</b> to
     * the subscriber is held by the EventService.
-    * <p/>
+    * </p>
+    * <p>
     * Subscribing to a class means the subscriber will be called when objects of that class are published, when
     * objects of subclasses of the class are published, when objects implementing any of the interfaces of the
     * class are published, or when generic types are published with the class' raw type.
-    * <p/>
+    * </p>
+    * <p>
     * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
     * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
     * the subscriber has not been garbage collected, then onEvent(Object) will be called normally.  If the hard
     * reference has been garbage collected, the service will unsubscribe it's WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
     * immediately.
-    * <p/>
+    * </p>
+    * <p>
     * The service will create the WeakReference on behalf of the caller.
+    * </p>
     *
     * @param eventClass the class of published objects to subscriber listen to
     * @param subscriber The subscriber that will accept the events of the event class when published.
@@ -197,7 +214,7 @@ interface EventService {
    * trades.add(trade);
    * EventBus.publish(publishingTypeReference.getType(), trades);
    * </pre>
-   * <p>
+   * </p>
    * @param type the generic type to subscribe to
    * @param subscriber the subscriber to the type
    * @return true if a new subscription is made, false if it already existed
@@ -207,16 +224,19 @@ interface EventService {
    /**
     * Subscribes an EventSubscriber to the publication of objects exactly matching a type.  Only a <b>WeakReference</b>
     * to the subscriber is held by the EventService.
-    * <p/>
+    * <p>
     * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
     * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
     * the subscriber has not been garbage collected, then the onEvent will be called normally.  If the hard reference
     * has been garbage collected, the service will unsubscribe it's WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
     * immediately.
-    * <p/>
+    * </p>
+    * <p>
     * The service will create the WeakReference on behalf of the caller.
+    * </p>
     *
     * @param eventClass the class of published objects to listen to
     * @param subscriber The subscriber that will accept the events when published.
@@ -228,15 +248,16 @@ interface EventService {
    /**
     * Subscribes an EventTopicSubscriber to the publication of a topic name.  Only a <b>WeakReference</b>
     * to the subscriber is held by the EventService.
-    * <p/>
+    * <p>
     * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
     * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
     * the subscriber has not been garbage collected, then the onEvent will be called normally.  If the hard reference
     * has been garbage collected, the service will unsubscribe it's WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
     * immediately.
-    * <p/>
+    * </p>
     *
     * @param topic the name of the topic listened to
     * @param subscriber The topic subscriber that will accept the events when published.
@@ -248,15 +269,16 @@ interface EventService {
    /**
     * Subscribes an EventSubscriber to the publication of all the topic names that match a RegEx Pattern.  Only a
     * <b>WeakReference</b> to the subscriber is held by the EventService.
-    * <p/>
+    * <p>
     * Subscription is weak by default to avoid having to call unsubscribe(), and to avoid the memory leaks that would
     * occur if unsubscribe was not called.  The service will respect the WeakReference semantics.  In other words, if
     * the subscriber has not been garbage collected, then the onEvent will be called normally.  If the hard reference
     * has been garbage collected, the service will unsubscribe it's WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * It's allowable to call unsubscribe() with the same EventSubscriber hard reference to stop a subscription
     * immediately.
-    * <p/>
+    * </p>
     *
     * @param topicPattern pattern that matches to the name of the topic published to
     * @param subscriber The topic subscriber that will accept the events when published.
@@ -267,11 +289,13 @@ interface EventService {
 
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type.
-    * <p/>
+    * <p>
     * The semantics are the same as {@link #subscribe(Class, EventSubscriber)}, except that the EventService holds
     * a regularly reference, not a WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
+    * </p>
     *
     * @param eventClass the class of published objects to listen to
     * @param subscriber The subscriber that will accept the events when published.
@@ -282,11 +306,13 @@ interface EventService {
 
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type exactly.
-    * <p/>
+    * <p>
     * The semantics are the same as {@link #subscribeExactly(Class, EventSubscriber)}, except that the EventService
     * holds a regularly reference, not a WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * The subscriber will remain subscribed until {@link #unsubscribe(Class,EventSubscriber)}  is called.
+    * </p>
     *
     * @param eventClass the class of published objects to listen to
     * @param subscriber The subscriber that will accept the events when published.
@@ -297,11 +323,13 @@ interface EventService {
 
    /**
     * Subscribes a subscriber to an event topic name.
-    * <p/>
+    * <p>
     * The semantics are the same as {@link #subscribe(String, EventTopicSubscriber)}, except that the EventService
     * holds a regularly reference, not a WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
+    * </p>
     *
     * @param topic the name of the topic listened to
     * @param subscriber The topic subscriber that will accept the events when published.
@@ -312,11 +340,13 @@ interface EventService {
 
    /**
     * Subscribes a subscriber to all the event topic names that match a RegEx expression.
-    * <p/>
+    * <p>
     * The semantics are the same as {@link #subscribe(java.util.regex.Pattern, EventTopicSubscriber)}, except that the
     * EventService holds a regularly reference, not a WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * The subscriber will remain subscribed until {@link #unsubscribe(String,EventTopicSubscriber)}  is called.
+    * </p>
     *
     * @param topicPattern the name of the topic listened to
     * @param subscriber The topic subscriber that will accept the events when published.
@@ -368,16 +398,19 @@ interface EventService {
    /**
     * Subscribes a VetoEventListener to publication of event matching a class.  Only a <b>WeakReference</b> to the 
     * VetoEventListener is held by the EventService.
-    * <p/>
+    * <p>
     * Use this method to avoid having to call unsubscribe(), though with care since garbage collection semantics is
     * indeterminate.  The service will respect the WeakReference semantics.  In other words, if the vetoListener has not
     * been garbage collected, then the onEvent will be called normally.  If the hard reference has been garbage
     * collected, the service will unsubscribe it's WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * It's allowable to call unsubscribe() with the same VetoEventListener hard reference to stop a subscription
     * immediately.
-    * <p/>
+    * </p>
+    * <p>
     * The service will create the WeakReference on behalf of the caller.
+    * </p>
     *
     * @param eventClass the class of published objects that can be vetoed
     * @param vetoListener The VetoEventListener that can determine whether an event is published.
@@ -389,16 +422,19 @@ interface EventService {
    /**
     * Subscribes a VetoEventListener to publication of an exact event class.  Only a <b>WeakReference</b> to the 
     * VetoEventListener is held by the EventService.
-    * <p/>
+    * <p>
     * Use this method to avoid having to call unsubscribe(), though with care since garbage collection semantics is
     * indeterminate.  The service will respect the WeakReference semantics.  In other words, if the vetoListener has not
     * been garbage collected, then the onEvent will be called normally.  If the hard reference has been garbage
     * collected, the service will unsubscribe it's WeakReference.
-    * <p/>
+    * </p>
+    * <p>
     * It's allowable to call unsubscribe() with the same VetoEventListener hard reference to stop a subscription
     * immediately.
-    * <p/>
+    * </p>
+    * <p>
     * The service will create the WeakReference on behalf of the caller.
+    * </p>
     *
     * @param eventClass the class of published objects that can be vetoed
     * @param vetoListener The vetoListener that can determine whether an event is published.
@@ -432,9 +468,10 @@ interface EventService {
    /**
     * Subscribes a VetoEventListener for an event class and its subclasses.  Only a <b>WeakReference</b> to the
     * VetoEventListener is held by the EventService.
-    * <p/>
+    * <p>
     * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(Class,VetoEventListener)} is
     * called.
+    * </p>
     *
     * @param eventClass the class of published objects to listen to
     * @param vetoListener The vetoListener that will accept the events when published.
@@ -445,9 +482,10 @@ interface EventService {
 
    /**
     * Subscribes a VetoEventListener for an event class (but not its subclasses).
-    * <p/>
+    * <p>
     * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(Class,VetoEventListener)} is
     * called.
+    * </p>
     *
     * @param eventClass the class of published objects to listen to
     * @param vetoListener The vetoListener that will accept the events when published.
@@ -458,9 +496,10 @@ interface EventService {
 
    /**
     * Subscribes a VetoEventListener to a topic name.
-    * <p/>
+    * <p>
     * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(String,VetoTopicEventListener)} is
     * called.
+    * </p>
     *
     * @param topic the name of the topic listened to
     * @param vetoListener The topic vetoListener that will accept or reject publication.
@@ -473,9 +512,10 @@ interface EventService {
 
    /**
     * Subscribes a VetoTopicEventListener to a set of topics that match a RegEx expression.
-    * <p/>
+    * <p>
     * The VetoEventListener will remain subscribed until {@link #unsubscribeVetoListener(Pattern,VetoTopicEventListener)} is
     * called.
+    * </p>
     *
     * @param topicPattern the RegEx pattern that matches the name of the topics listened to
     * @param vetoListener The topic vetoListener that will accept or reject publication.
@@ -677,13 +717,15 @@ interface EventService {
 
    /**
     * Sets the default cache size for each kind of event, default is 0 (no caching).
-    * <p/>
+    * <p>
     * If this value is set to a positive number, then when an event is published, the EventService caches the event or
     * topic payload data for later retrieval.  This allows subscribers to find out what has most recently happened
     * before they subscribed.  The cached event(s) are returned from #getLastEvent(Class), #getLastTopicData(String),
     * #getCachedEvents(Class), or #getCachedTopicData(String)
-    * <p/>
+    * </p>
+    * <p>
     * The default can be overridden on a by-event-class or by-topic basis.
+    * </p>
     *
     * @param defaultCacheSizePerClassOrTopic the cache size per event
     */
@@ -697,17 +739,20 @@ interface EventService {
 
    /**
     * Set the number of events cached for a particular class of event.  By default, no events are cached.
-    * <p/>
+    * <p>
     * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
-    * <p/>
+    * </p>
+    * <p>
     * Class hierarchy semantics are respected.  That is, if there are three events, A, X and Y, and X and Y are both
     * derived from A, then setting the cache size for A applies the cache size for all three.  Setting the cache size
     * for X applies to X and leaves the settings for A and Y in tact.  Interfaces can be passed to this method, but they
     * only take effect if the cache size of a class or it's superclasses has been set. Just like Class.getInterfaces(),
     * if multiple cache sizes are set, the interface names declared earliest in the implements clause of the eventClass
     * takes effect.
-    * <p/>
+    * </p>
+    * <p>
     * The cache for an event is not adjusted until the next event of that class is published.
+    * </p>
     *
     * @param eventClass the class of event
     * @param cacheSize the number of published events to cache for this event
@@ -716,9 +761,10 @@ interface EventService {
 
    /**
     * Returns the number of events cached for a particular class of event.  By default, no events are cached.
-    * <p/>
+    * <p>
     * This result is computed for a particular class from the values passed to #setCacheSizeForEventClass(Class, int),
     * and respects the class hierarchy.
+    * </p>
     *
     * @param eventClass the class of event
     *
@@ -730,12 +776,15 @@ interface EventService {
 
    /**
     * Set the number of published data objects cached for a particular event topic.  By default, no data are cached.
-    * <p/>
+    * <p>
     * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
-    * <p/>
+    * </p>
+    * <p>
     * Exact topic names take precedence over pattern matching.
-    * <p/>
+    * </p>
+    * <p>
     * The cache for a topic is not adjusted until the next publication on that topic.
+    * </p>
     *
     * @param topicName the topic name
     * @param cacheSize the number of published data Objects to cache for this topic
@@ -744,12 +793,15 @@ interface EventService {
 
    /**
     * Set the number of published data objects cached for a topics matching a pattern.  By default, no data are cached.
-    * <p/>
+    * <p>
     * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
-    * <p/>
+    * </p>
+    * <p>
     * Exact topic names take precedence over pattern matching.
-    * <p/>
+    * </p>
+    * <p>
     * The cache for a topic is not adjusted until the next publication on that topic.
+    * </p>
     *
     * @param pattern the pattern matching topic names
     * @param cacheSize the number of data Objects to cache for this topic
@@ -758,9 +810,10 @@ interface EventService {
 
    /**
     * Returns the number of cached data objects published on a particular topic.
-    * <p/>
+    * <p>
     * This result is computed for a particular class from the values passed to #setCacheSizeForEventClass(Class, int),
     * and respects the class hierarchy.
+    * </p>
     *
     * @param topic the topic name
     *
@@ -830,9 +883,10 @@ interface EventService {
 
    /**
     * Stop a subscription for an object that is subscribed with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param eventClass class this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
@@ -842,9 +896,10 @@ interface EventService {
 
    /**
     * Stop a subscription for an object that is subscribed exactly with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param eventClass class this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
@@ -854,9 +909,10 @@ interface EventService {
 
    /**
     * Stop a subscription for an object that is subscribed to a topic with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param topic the topic this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
@@ -867,9 +923,10 @@ interface EventService {
    /**
     * When using annotations, an object may be subscribed by proxy.  This unsubscribe method will unsubscribe an object
     * that is subscribed with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param pattern the RegEx expression this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
@@ -879,9 +936,10 @@ interface EventService {
 
    /**
     * Stop a veto subscription for an object that is subscribed with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements VetoSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param eventClass class this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
@@ -891,9 +949,10 @@ interface EventService {
 
    /**
     * Stop a veto subscription for an object that is subscribed exactly with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements VetoSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param eventClass class this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
@@ -903,9 +962,10 @@ interface EventService {
 
    /**
     * Stop a veto subscription for an object that is subscribed to a topic with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param topic the topic this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
@@ -916,9 +976,10 @@ interface EventService {
    /**
     * When using annotations, an object may be subscribed by proxy.  This unsubscribe method will unsubscribe an object
     * that is subscribed with a ProxySubscriber.
-    * <p/>
+    * <p>
     * If an object is subscribed by proxy and it implements EventSubscriber, then the normal unsubscribe methods will
     * still unsubscribe the object.
+    * </p>
     *
     * @param pattern the RegEx expression this object is subscribed to by proxy
     * @param subscribedByProxy object subscribed by proxy
diff --git a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
index 54510621d..37bf575e4 100644
--- a/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/EventTopicSubscriber.java
@@ -24,12 +24,13 @@ interface EventTopicSubscriber<T> {
 
    /**
     * Handle an event published on a topic.
-    * <p/>
+    * <p>
     * The EventService calls this method on each publication on a matching topic name passed to one of the
     * EventService's topic-based subscribe methods, specifically, {@link EventService#subscribe(String,
     *EventTopicSubscriber)} {@link EventService#subscribe(java.util.regex.Pattern,EventTopicSubscriber)} {@link
     * EventService#subscribeStrongly(String,EventTopicSubscriber)} and {@link EventService#subscribeStrongly(java.util.regex.Pattern,
     *EventTopicSubscriber)}.
+    * </p>
     *
     * @param topic the name of the topic published on
     * @param data the data object published on the topic
diff --git a/src/main/java/org/scijava/event/bushe/Logger.java b/src/main/java/org/scijava/event/bushe/Logger.java
index bc7476d31..f2de3981b 100644
--- a/src/main/java/org/scijava/event/bushe/Logger.java
+++ b/src/main/java/org/scijava/event/bushe/Logger.java
@@ -7,17 +7,20 @@
 
 /**
  * Central Logging class.  Shields code from Logging implementation.
- * <p/>
+ * <p>
  * The EventBus allows operation in two modes - using java.util.logging so that
  * the EventBus can be deployed in its own jar or using any logging system supported
  * by apache commons logging, which of course requires other jars.
- * <p/>
+ * </p>
+ * <p>
  * The EventBus logging uses the names of its classes as the log, primarily
  * "org.scijava.event.bushe.EventService".  This aids in debugging which subscription and publication issues.
- * <p/>
+ * </p>
+ * <p>
  * Implementation note: There are no imports in this class to make things
  * explicit.  There is also no explicit use of classes outside java.util,
  * anything else is used by reflection to avoid NoClassDefFound errors on class load.
+ * </p>
  */
 class Logger {
    private java.util.logging.Logger utilLogger;
diff --git a/src/main/java/org/scijava/event/bushe/SwingException.java b/src/main/java/org/scijava/event/bushe/SwingException.java
index f46dd321e..d236c2121 100644
--- a/src/main/java/org/scijava/event/bushe/SwingException.java
+++ b/src/main/java/org/scijava/event/bushe/SwingException.java
@@ -21,18 +21,21 @@
 /**
  * Aids in troubleshooting Swing application exceptions or any exception where the caller's stack may not be the
  * exception stack (such as producer-consumer patterns that cross threads).
- * <p/>
+ * <p>
  * Swing exceptions usually occur on the Swing Event Dispatch Thread, and often occur when code puts events on the EDT.
  * This code is often in a non-EDT thread such as a thread that is receiving data from a server.  If the non-EDT threads
  * puts a call on the EDT and that EDT call causes and exception, the stack trace of the exception is lost, and it often
  * difficult or impossible to determine where the non-EDT call came from.
- * <p/>
+ * </p>
+ * <p>
  * This Exception class is used to handle exceptions that occur when events are posted on the Swing EDT or occur on
  * another thread from the Swing EDT. It includes a "swing" call stack to record from where the event occurred, and
  * overrides so that the exception and the swing calling stack print nicely to logs.
- * <p/>
+ * </p>
+ * <p>
  * The swing calling stack is different from the cause of the exception since it is gathered before the exception occurs
  * in a different stack from the cause and used after the exception in a new thread occurs.
+ * </p>
  *
  * @author Michael Bushe michael@bushe.com
  * @todo in SwingUtils, make an invokeLater() method that saves the calling stack and catches all exceptions from a
@@ -66,7 +69,6 @@ public SwingException(String message, Throwable cause) {
 
    /**
     * Preferred constructor.
-    * <p/>
     *
     * @param message The message of exception
     * @param cause The cause of the exception in the same call stack
diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
index 97c4a54cc..10395de4d 100644
--- a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -38,20 +38,23 @@
 /**
  * A thread-safe EventService implementation.
  * <h2>Multithreading</h2> 
- * <p/>
+ * <p>
  * This implementation is <b>not Swing thread-safe</b>.  If publication occurs on a thread other than the Swing
  * EventDispatchThread, subscribers will receive the event on the calling thread, and not the EDT.  Swing components
  * should use the SwingEventService instead, which is the implementation used by the EventBus.
- * <p/>
+ * </p>
+ * <p>
  * Two threads may be accessing the ThreadSafeEventService at the same time, one unsubscribing a
  * listener for topic "A" and the other publishing on topic "A".  If the unsubscribing thread gets the lock first,
  * then it is unsubscribed, end of story.  If the publisher gets the lock first, then a snapshot copy of the current
  * subscribers is made during the publication, the lock is released and the subscribers are called.  Between the time
  * the lock is released and the time that the listener is called, the unsubscribing thread can unsubscribe, resulting
  * in an unsubscribed object receiving notification of the event after it was unsubscribed (but just once).
- * <p/>
+ * </p>
+ * <p>
  * On event publication, subscribers are called in the order in which they subscribed.
- * <p/>
+ * </p>
+ * <p>
  * Events and/or topic data can be cached, but are not by default.  To cache events or topic data, call
  * {@link #setDefaultCacheSizePerClassOrTopic(int)}, {@link #setCacheSizeForEventClass(Class, int)}, or
  * {@link #setCacheSizeForTopic(String, int)}, {@link #setCacheSizeForTopic(Pattern, int)}.  Retrieve cached values
@@ -61,29 +64,33 @@
  * Swing applications since both happen on the EDT in a single-threaded manner). In multithreaded applications, you
  * never know if your subscriber has handled an event while it was being subscribed (before the subscribe() method
  * returned) that is newer or older than the retrieved cached value (taken before or after subscribe() respectively).
- * <p/>
+ * </p>
+ * <p>
  * To deal with subscribers that take too long (a concern in Swing applications), the EventService can be made to issue
  * {@link SubscriberTimingEvent}s when subscribers exceed a certain time.  This does not interrupt subscriber processing
  * and is published after the subscriber finishes.  The service can log a warning for SubscriberTimingEvents, see the
  * constructor {@link ThreadSafeEventService (long, boolean)}.  The timing is checked for veto subscribers too.
- * <p/>
+ * </p>
  * <h2>Logging</h2> 
- * <p/>                       
+ * <p>
  * All logging goes through the {@link Logger}.  The Logger is configurable and supports multiple logging systems.
- * <p/>
+ * </p>
+ * <p>
  * Exceptions are logged by default, override {@link #handleException(String,Object,String,Object,Throwable,
  * StackTraceElement[],String)} to handleException exceptions in another way.  Each call to a subscriber is wrapped in
  * a try block to ensure one listener does not interfere with another.
- * <p/>
+ * </p>
  * <h2>Cleanup of Stale WeakReferences and Stale Annotation Proxies</h2> 
- * <p/>
+ * <p>
  * The EventService may need to clean up stale WeakReferences and ProxySubscribers created for EventBus annotations.  (Aside: EventBus 
  * Annotations are handled by the creation of proxies to the annotated objects.  Since the annotations create weak references 
  * by default, annotation proxies must held strongly by the EventService, otherwise the proxy is garbage collected.)  When 
  * a WeakReference's referent or an ProxySubscriber's proxiedObject (the annotated object) is claimed by the garbage collector, 
  * the EventService still holds onto the actual WeakReference or ProxySubscriber subscribed to the EventService (which are pretty tiny).  
- * <p/>
+ * </p>
+ * <p>
  * There are two ways that these stale WeakReferences and ProxySubscribers are cleaned up.  
+ * </p>
  * <ol>
  * <li>On every publish, subscribe and unsubscribe, every subscriber and veto subscriber to a class or topic is checked to see 
  * if it is a stale WeakReference or a stale ProxySubscriber (one whose getProxySubscriber() returns null).  If the subscriber 
@@ -95,6 +102,7 @@
  * of the cleanup thread follows.
  * </ol>
  * <h3>The Cleanup Thread</h3>
+ * <p>
  * If a topic or class is never published to again, WeakReferences and ProxySubscribers can be left behind if they 
  * are not cleaned up.  To prevent loitering stale subscribers, the ThreadSafeEventService may periodically run through 
  * all the EventSubscribers and VetoSubscribers for all topics and classes and clean up stale proxies.  Proxies for 
@@ -103,33 +111,38 @@
  * one caveat: If getProxiedSubscriber() returns null, even for a ProxySubscriber with a STRONG reference strength, that proxy 
  * is cleaned up as it is assumed it is stale or just wrong.  This would not occur normally in EventBus usage, but only 
  * if someone is implementing their own custom ProxySubscriber and/or AnnotationProcessor.)
- * <p/>
+ * </p>
+ * <p>
  * Cleanup is pretty rare in general.  Not only are stale subscribers cleaned up with regular usage, stale 
  * subscribers on abandoned topics and classes do not take up a lot of memory, hence, they are allowed to build up to a certain degree.
  * Cleanup does not occur until the number of WeakReferences and SubscriptionsProxy's with WeakReference strength
  * subscribed to an EventService for all the EventService's subscriptions in total exceed the <tt>cleanupStartThreshhold</tt>, 
  * which is set to <tt>CLEANUP_START_THRESHOLD_DEFAULT</tt> (500) by default.  The default is overridable in the constructor 
  * or via #setCleanupStartThreshhold(Integer).  If set to null, cleanup will never start.  
- * <p/>
+ * </p>
+ * <p>
  * Once the cleanup start threshold is exceeded, a <tt>java.util.Timer</tt> is started to clean up stale subscribers periodically 
  * in another thread.  The timer will fire every <tt>cleanupPeriodMS</tt> milliseconds, which is set to the 
  * <tt>CLEANUP_PERIOD_MS_DEFAULT<tt> (20 minutes) by default.  The default is overridable in the constructor or 
  * via #setCleanupPeriodMS(Integer).  If set to null, cleanup will not start.  This is implemented with a <tt>java.util.Timer</tt>,
  * so Timer's warnings apply - setting this too low will cause cleanups to bunch up and hog the cleanup thread.
- * <p/>
+ * </p>
+ * <p>
  * After a cleanup cycle completes, if the number of stale subscribers falls at or below the <tt>cleanupStopThreshhold</tt> 
  * cleanup stops until the <tt>cleanupStartThreshhold</tt> is exceeded again. The <tt>cleanupStopThreshhold</tt> is set 
  * to <tt>CLEANUP_STOP_THRESHOLD_DEFAULT</tt> (100) by default.  The default is overridable in the constructor or via 
  * #setCleanupStopThreshhold(Integer).  If set to null or 0, cleanup will not stop if it is ever started.  
- * <p/>
+ * </p>
+ * <p>
  * All cleanup parameters are tunable "live" and checked after each subscription and after each cleanup cycle.
  * To make cleanup never run, set cleanupStartThreshhold to Integer.MAX_VALUE and cleanupPeriodMS to null.
  * To get cleanup to run continuously, set set cleanupStartThreshhold to 0 and cleanupPeriodMS to some reasonable value,
  * perhaps 1000 (1 second) or so (not recommended, cleanup is conducted with regular usage and the cleanup thread is
  * rarely created or invoked).
- * <p/>
+ * </p>
+ * <p>
  * Cleanup is not run in a daemon thread, and thus will not stop the JVM from exiting.
- * <p/>
+ * </p>
  * 
  * @author Michael Bushe michael@bushe.com
  * @todo (param) a JMS-like selector (can be done in base classes by implements like a commons filter
@@ -557,8 +570,9 @@ protected boolean subscribeVetoListener(final Object subscription, final Map vet
     * All subscribe methods call this method, including veto subscriptions.  
     * Extending classes only have to override this method to subscribe all
     * subscriber subscriptions.
-    * <p/>
+    * <p>
     * Overriding this method is only for the adventurous.  This basically gives you just enough rope to hang yourself.
+    * </p>
     *
     * @param classTopicOrPatternWrapper the topic String, event Class, or PatternWrapper to subscribe to
     * @param subscriberMap the internal map of subscribers to use (by topic or class)
@@ -1066,8 +1080,9 @@ private void logEvent(Object event, String topic, Object eventObj) {
    /**
     * Adds an event to the event cache, if appropriate.  This method is called just before publication to listeners,
     * after the event passes any veto listeners.
-    * <p/>
+    * <p>
     * Using protected visibility to open the caching to other implementations.
+    * </p>
     *
     * @param event the event about to be published, null if topic is non-null
     * @param topic the topic about to be published to, null if the event is non-null
@@ -1595,13 +1610,15 @@ private List createCopyOfContentsRemoveWeakRefs(Collection subscribersOrVetoList
 
    /**
     * Sets the default cache size for each kind of event, default is 0 (no caching).
-    * <p/>
+    * <p>
     * If this value is set to a positive number, then when an event is published, the EventService caches the event or
     * topic payload data for later retrieval.  This allows subscribers to find out what has most recently happened
     * before they subscribed.  The cached event(s) are returned from #getLastEvent(Class), #getLastTopicData(String),
     * #getCachedEvents(Class), or #getCachedTopicData(String)
-    * <p/>
+    * </p>
+    * <p>
     * The default can be overridden on a by-event-class or by-topic basis.
+    * </p>
     *
     * @param defaultCacheSizePerClassOrTopic
     */
@@ -1620,17 +1637,20 @@ public int getDefaultCacheSizePerClassOrTopic() {
 
    /**
     * Set the number of events cached for a particular class of event.  By default, no events are cached.
-    * <p/>
+    * <p>
     * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
-    * <p/>
+    * </p>
+    * <p>
     * Class hierarchy semantics are respected.  That is, if there are three events, A, X and Y, and X and Y are both
     * derived from A, then setting the cache size for A applies the cache size for all three.  Setting the cache size
     * for X applies to X and leaves the settings for A and Y in tact.  Interfaces can be passed to this method, but they
     * only take effect if the cache size of a class or it's superclasses has been set. Just like Class.getInterfaces(),
     * if multiple cache sizes are set, the interface names declared earliest in the implements clause of the eventClass
     * takes effect.
-    * <p/>
+    * </p>
+    * <p>
     * The cache for an event is not adjusted until the next event of that class is published.
+    * </p>
     *
     * @param eventClass the class of event
     * @param cacheSize the number of published events to cache for this event
@@ -1647,9 +1667,10 @@ public void setCacheSizeForEventClass(Class eventClass, int cacheSize) {
 
    /**
     * Returns the number of events cached for a particular class of event.  By default, no events are cached.
-    * <p/>
+    * <p>
     * This result is computed for a particular class from the values passed to #setCacheSizeForEventClass(Class, int),
     * and respects the class hierarchy.
+    * </p>
     *
     * @param eventClass the class of event
     *
@@ -1706,12 +1727,15 @@ public int getCacheSizeForEventClass(Class eventClass) {
 
    /**
     * Set the number of published data objects cached for a particular event topic.  By default, no caching is done.
-    * <p/>
+    * <p>
     * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
-    * <p/>
+    * </p>
+    * <p>
     * Settings for exact topic names take precedence over pattern matching.
-    * <p/>
+    * </p>
+    * <p>
     * The cache for a topic is not adjusted until the next publication on that topic.
+    * </p>
     *
     * @param topicName the topic name
     * @param cacheSize the number of published data Objects to cache for this topic
@@ -1728,13 +1752,16 @@ public void setCacheSizeForTopic(String topicName, int cacheSize) {
 
    /**
     * Set the number of published data objects cached for topics matching a pattern.  By default, caching is done.
-    * <p/>
+    * <p>
     * This overrides any setting for the DefaultCacheSizePerClassOrTopic.
-    * <p/>
+    * </p>
+    * <p>
     * Settings for exact topic names take precedence over pattern matching.  If a topic matches the cache settings for
     * more than one pattern, the cache size chosen is an undetermined one from one of the matched pattern settings.
-    * <p/>
+    * </p>
+    * <p>
     * The cache for a topic is not adjusted until the next publication on that topic.
+    * </p>
     *
     * @param pattern the pattern matching topic names
     * @param cacheSize the number of data Objects to cache for this topic
@@ -1752,9 +1779,10 @@ public void setCacheSizeForTopic(Pattern pattern, int cacheSize) {
 
    /**
     * Returns the number of cached data objects published on a particular topic.  By default, no caching is performed.
-    * <p/>
+    * <p>
     * This result is computed for a particular topic from the values passed to #setCacheSizeForTopic(String, int) and
     * #setCacheSizeForTopic(Pattern, int).
+    * </p>
     *
     * @param topic the topic name
     *
@@ -1971,17 +1999,19 @@ protected void handleException(final String action, final Object event, final St
    /**
     * Unsubscribe a subscriber if it is a stale ProxySubscriber. Used during subscribe() and
     * in the cleanup Timer.  See the class javadoc.
-    * <p/>
+    * <p>
     * Not private since I don't claim I'm smart enough to anticipate all needs, but I
     * am smart enough to doc the rules you must follow to override this method.  Those
     * rules may change (changes will be doc'ed), override at your own risk.
-    * <p/>
+    * </p>
+    * <p>
     * Overriders MUST call iterator.remove() to unsubscribe the proxy if the subscriber is
     * a ProxySubscriber and is stale and should be cleaned up.  If the ProxySubscriber
     * is unsubscribed, then implementers MUST also call proxyUnsubscribed() on the subscriber.
     * Overriders MUST also remove the proxy from the weakProxySubscriber list by calling
     * removeStaleProxyFromList.  Method assumes caller is holding the listenerList 
     * lock (else how can you pass the iterator?).
+    * </p>
     * @param iterator current iterator
     * @param existingSubscriber the current value of the iterator
     * @return the real value of the param, or the proxied subscriber of the param if 
diff --git a/src/main/java/org/scijava/event/bushe/VetoEventListener.java b/src/main/java/org/scijava/event/bushe/VetoEventListener.java
index 0c20a3c4f..4b377c1c1 100644
--- a/src/main/java/org/scijava/event/bushe/VetoEventListener.java
+++ b/src/main/java/org/scijava/event/bushe/VetoEventListener.java
@@ -24,11 +24,12 @@ interface VetoEventListener<T> {
 
    /**
     * Determine whether an event should be vetoed or published.
-    * <p/>
+    * <p>
     * The EventService calls this method <b>before</b> class-based publication of objects.  If any of the
     * VetoEventListeners return true, then none of the subscribers for that event are called. <p>Prerequisite:
     * VetoEventListener has to be subscribed with the EventService for the event object's class.</p> <p>Guaranteed to be
     * called in the SwingEventThread when using the SwingEventService (EventBus). See {@link EventService}</p>
+    * </p>
     *
     * @param event The event object to veto or allow to be published.
     *
diff --git a/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java b/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
index a1dd81a80..f44d9693a 100644
--- a/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
+++ b/src/main/java/org/scijava/event/bushe/VetoTopicEventListener.java
@@ -9,11 +9,12 @@ interface VetoTopicEventListener<T> {
 
    /**
     * Determine whether a topic publication should be vetoed or allowed.
-    * <p/>
+    * <p>
     * The EventService calls this method <b>before</b> publication of on a topic name.  If any of the
     * VetoTopicEventListeners return true, then none of the subscribers to that topic are called. <p>Prerequisite:
     * VetoTopicEventListener has to be subscribed with the EventService for the topic name.</p> <p>Guaranteed to be
     * called in the SwingEventThread when using the SwingEventService (EventBus). See {@link EventService}</p>
+    * </p>
     *
     * @param topic The topic name the data object is published on.
     * @param data The data object being published on the topic.

From da1841da1e9c649b0adc502ec494d86a238fa4c2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 14:29:03 -0500
Subject: [PATCH 1108/1208] Add EventBus to the NOTICE of third-party code

---
 NOTICE.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 78b8ce335..5b605b01d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,7 +1,8 @@
 This project contains code adapted from Apache Commons Lang
 (https://commons.apache.org/proper/commons-lang/) version 3.4,
 as well as GenTyRef (https://github.com/coekie/gentyref) version 1.1.0,
-both of which are licensed under the Apache 2.0 license, as follows:
+and EventBus (https://github.com/michaelbushe/EventBus) version 1.4,
+each of which is licensed under the Apache 2.0 license, as follows:
 
                                  Apache License
                            Version 2.0, January 2004

From 86abfc09d5734d323fc2f263a0570b3e4bc580ab Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 14:40:26 -0500
Subject: [PATCH 1109/1208] Fix more javadoc errors

---
 src/main/java/org/scijava/event/bushe/EventService.java  | 5 ++---
 .../java/org/scijava/event/bushe/SwingException.java     | 2 --
 .../org/scijava/event/bushe/ThreadSafeEventService.java  | 9 +--------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/scijava/event/bushe/EventService.java b/src/main/java/org/scijava/event/bushe/EventService.java
index 3a88aff2b..c2d41e9bb 100644
--- a/src/main/java/org/scijava/event/bushe/EventService.java
+++ b/src/main/java/org/scijava/event/bushe/EventService.java
@@ -139,6 +139,7 @@ interface EventService {
     * <p>
     * Due to generic type erasure, the type must be supplied by the caller.  You can get a declared object's
     * type by using the {@link org.scijava.event.bushe.TypeReference} class.  For Example:
+    * </p>
     * <pre>
     * TypeReference&#60;List&#60;Trade&#62;&#62; subscribingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
     * EventBus.subscribe(subscribingTypeReference.getType(), mySubscriber);
@@ -151,7 +152,6 @@ interface EventService {
     * trades.add(trade);
     * EventBus.publish(publishingTypeReference.getType(), trades);
     * </pre>
-    * </p>
     * @param genericType the generified type of the published object.  
     * @param event The event that occurred
     */
@@ -169,7 +169,6 @@ interface EventService {
    /**
     * Subscribes an EventSubscriber to the publication of objects matching a type.  Only a <b>WeakReference</b> to
     * the subscriber is held by the EventService.
-    * </p>
     * <p>
     * Subscribing to a class means the subscriber will be called when objects of that class are published, when
     * objects of subclasses of the class are published, when objects implementing any of the interfaces of the
@@ -202,6 +201,7 @@ interface EventService {
    * <p>
    * Due to generic type erasure, the type must be supplied by the publisher.  You can get a declared object's
    * type by using the {@link org.scijava.event.bushe.TypeReference} class.  For Example:
+   * </p>
    * <pre>
    * TypeReference&#60;List&#60;Trade&#62;&#62; subscribingTypeReference = new TypeReference&#60;List&#60;Trade&#62;&#62;(){};
    * EventBus.subscribe(subscribingTypeReference.getType(), mySubscriber);
@@ -214,7 +214,6 @@ interface EventService {
    * trades.add(trade);
    * EventBus.publish(publishingTypeReference.getType(), trades);
    * </pre>
-   * </p>
    * @param type the generic type to subscribe to
    * @param subscriber the subscriber to the type
    * @return true if a new subscription is made, false if it already existed
diff --git a/src/main/java/org/scijava/event/bushe/SwingException.java b/src/main/java/org/scijava/event/bushe/SwingException.java
index d236c2121..f36fc36d6 100644
--- a/src/main/java/org/scijava/event/bushe/SwingException.java
+++ b/src/main/java/org/scijava/event/bushe/SwingException.java
@@ -38,8 +38,6 @@
  * </p>
  *
  * @author Michael Bushe michael@bushe.com
- * @todo in SwingUtils, make an invokeLater() method that saves the calling stack and catches all exceptions from a
- * subsequent call to SwingUtilities.invokeLater(), then throws a Swing Exception so the calling stack is saved.
  */
 class SwingException extends Exception {
    protected StackTraceElement[] callingStackTrace;
diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
index 10395de4d..920d0add4 100644
--- a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -65,12 +65,6 @@
  * never know if your subscriber has handled an event while it was being subscribed (before the subscribe() method
  * returned) that is newer or older than the retrieved cached value (taken before or after subscribe() respectively).
  * </p>
- * <p>
- * To deal with subscribers that take too long (a concern in Swing applications), the EventService can be made to issue
- * {@link SubscriberTimingEvent}s when subscribers exceed a certain time.  This does not interrupt subscriber processing
- * and is published after the subscriber finishes.  The service can log a warning for SubscriberTimingEvents, see the
- * constructor {@link ThreadSafeEventService (long, boolean)}.  The timing is checked for veto subscribers too.
- * </p>
  * <h2>Logging</h2> 
  * <p>
  * All logging goes through the {@link Logger}.  The Logger is configurable and supports multiple logging systems.
@@ -123,7 +117,7 @@
  * <p>
  * Once the cleanup start threshold is exceeded, a <tt>java.util.Timer</tt> is started to clean up stale subscribers periodically 
  * in another thread.  The timer will fire every <tt>cleanupPeriodMS</tt> milliseconds, which is set to the 
- * <tt>CLEANUP_PERIOD_MS_DEFAULT<tt> (20 minutes) by default.  The default is overridable in the constructor or 
+ * <tt>CLEANUP_PERIOD_MS_DEFAULT</tt> (20 minutes) by default.  The default is overridable in the constructor or 
  * via #setCleanupPeriodMS(Integer).  If set to null, cleanup will not start.  This is implemented with a <tt>java.util.Timer</tt>,
  * so Timer's warnings apply - setting this too low will cause cleanups to bunch up and hog the cleanup thread.
  * </p>
@@ -145,7 +139,6 @@
  * </p>
  * 
  * @author Michael Bushe michael@bushe.com
- * @todo (param) a JMS-like selector (can be done in base classes by implements like a commons filter
  * @see EventService for a complete description of the API
  */
 @SuppressWarnings({"unchecked"})

From 1282e8889b2fb9d71cec343d93dba753a0c3c51d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 14:47:01 -0500
Subject: [PATCH 1110/1208] POM: update parent to pom-scijava 35.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e6d854490..d2d3da86d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>34.1.0</version>
+		<version>35.0.0</version>
 		<relativePath />
 	</parent>
 

From 2beccfa858267cfb0da68296f663f4cfee83d71a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 17 May 2023 14:54:21 -0500
Subject: [PATCH 1111/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d2d3da86d..38f9e2296 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.94.0-SNAPSHOT</version>
+	<version>2.94.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 8293f84d287ab6ffcb672b9c297a56171a497c00 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Fri, 19 May 2023 12:39:23 -0500
Subject: [PATCH 1112/1208] First cut: Find scripts in base script directory

---
 src/main/java/org/scijava/script/ScriptFinder.java     | 7 +++++--
 src/test/java/org/scijava/script/ScriptFinderTest.java | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index ea438791e..3df65dd61 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -41,6 +41,7 @@
 
 import org.scijava.AbstractContextual;
 import org.scijava.Context;
+import org.scijava.MenuEntry;
 import org.scijava.MenuPath;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -178,8 +179,10 @@ private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
 			// friendlyPath = "File/Import/Movie File..."
 			// menuPath = File > Import > Movie File...
 
-			// NB: Ignore base-level scripts (not nested in any menu).
-			if (menuPath.size() == 1) continue;
+			// Place base-level scripts in the "Scripts" submenu
+			if (menuPath.size() == 1){
+				menuPath.add(0, new MenuEntry("Scripts"));
+			}
 
 			final URL url = scriptMap.get(path);
 
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index f3301fec1..8c51cc25e 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -66,7 +66,7 @@ public class ScriptFinderTest {
 	public static void setUp() throws IOException {
 		scriptsDir = TestUtils.createTemporaryDirectory("script-finder-");
 		final String[] scriptPaths = { //
-			"ignored.foo", //
+			"script_in_base_dir.foo", //
 			"Scripts/quick.foo", //
 			"Scripts/brown.foo", //
 			"Scripts/fox.foo", //
@@ -108,6 +108,7 @@ public void testFindScripts() {
 			"Math > multiply", //
 			"Math > pow", //
 			"Scripts > quick", //
+			"Scripts > script in base dir", //
 			"Math > Trig > sin", //
 			"Math > subtract", //
 			"Math > Trig > tan", //
@@ -139,10 +140,10 @@ public void testMenuPrefixes() {
 			"Foo > Bar > Math > Trig > cos", //
 			"Foo > Bar > Math > divide", //
 			"Foo > Bar > Scripts > fox", //
-			"Foo > Bar > ignored", //
 			"Foo > Bar > Math > multiply", //
 			"Math > pow", //
 			"Foo > Bar > Scripts > quick", //
+			"Foo > Bar > script in base dir", //
 			"Foo > Bar > Math > Trig > sin", //
 			"Foo > Bar > Math > subtract", //
 			"Foo > Bar > Math > Trig > tan", //
@@ -177,6 +178,7 @@ public void testOverlappingDirectories() {
 			"Math > multiply", //
 			"Math > pow", //
 			"Plugins > quick", //
+			"Scripts > script in base dir", //
 			"Math > Trig > sin", //
 			"Math > subtract", //
 			"Math > Trig > tan", //

From 14892562cea06ad65c8dbbcf682732d02010b68c Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 22 May 2023 12:09:53 -0500
Subject: [PATCH 1113/1208] Place base-level scripts in plugins>scripts

---
 src/main/java/org/scijava/script/ScriptFinder.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 3df65dd61..23701ea99 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -179,9 +179,10 @@ private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
 			// friendlyPath = "File/Import/Movie File..."
 			// menuPath = File > Import > Movie File...
 
-			// Place base-level scripts in the "Scripts" submenu
+			// Place base-level scripts in the "Plugins>Scripts" submenu
 			if (menuPath.size() == 1){
-				menuPath.add(0, new MenuEntry("Scripts"));
+				menuPath.add(0, new MenuEntry("Plugins"));
+				menuPath.add(1, new MenuEntry("Scripts"));
 			}
 
 			final URL url = scriptMap.get(path);

From 763f4166d4b8676b3f41efa3dd35291afb08e197 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Mon, 22 May 2023 12:23:59 -0500
Subject: [PATCH 1114/1208] Change tests to reflect Plugins>Scripts path

---
 src/test/java/org/scijava/script/ScriptFinderTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 8c51cc25e..e28869372 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -108,7 +108,7 @@ public void testFindScripts() {
 			"Math > multiply", //
 			"Math > pow", //
 			"Scripts > quick", //
-			"Scripts > script in base dir", //
+			"Plugins > Scripts > script in base dir", //
 			"Math > Trig > sin", //
 			"Math > subtract", //
 			"Math > Trig > tan", //
@@ -178,7 +178,7 @@ public void testOverlappingDirectories() {
 			"Math > multiply", //
 			"Math > pow", //
 			"Plugins > quick", //
-			"Scripts > script in base dir", //
+			"Plugins > Scripts > script in base dir", //
 			"Math > Trig > sin", //
 			"Math > subtract", //
 			"Math > Trig > tan", //

From 52c63c71a7260d6498abbb503d84bf57dff10ee0 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Tue, 23 May 2023 15:05:46 -0500
Subject: [PATCH 1115/1208] Bump to pom-scijava 35.1.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 38f9e2296..dee00fcfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>35.0.0</version>
+		<version>35.1.0</version>
 		<relativePath />
 	</parent>
 

From bea8f8c992e4dfc265d3a6bb6d2d2e44168e1a37 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Tue, 23 May 2023 15:09:22 -0500
Subject: [PATCH 1116/1208] Bump to next development cycle

Signed-off-by: hinerm <hinerm@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dee00fcfa..29e3dcc48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.94.1-SNAPSHOT</version>
+	<version>2.94.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From bc500e1f754ea8b17d0058f65e8c0e2691c63c9c Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Thu, 6 Jul 2023 09:59:16 -0500
Subject: [PATCH 1117/1208] Bump pom-scijava to 35.1.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 29e3dcc48..844441cec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>35.1.0</version>
+		<version>35.1.1</version>
 		<relativePath />
 	</parent>
 

From de330f3a8c34c6643f8acd8c5cd62851c812880d Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Thu, 6 Jul 2023 10:00:51 -0500
Subject: [PATCH 1118/1208] Bump to next development cycle

Signed-off-by: hinerm <hinerm@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 844441cec..9f587a995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.94.2-SNAPSHOT</version>
+	<version>2.94.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From a32977f3638cdfb6270ad5c225f231b31790dcf0 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 12 Jul 2023 12:58:43 -0500
Subject: [PATCH 1119/1208] Manage the active UI in a better way

Thanks to the HeadlessUI, we now always have at least one UI available
to SciJava Common. This commit introduces the concept internally of an
*active* UI: the one that will be used when UI-centric operations are
performed via the UIService (rather than directly on a UserInterface).

The logic is as follows:
* If an active UI already exists and is currently visible, use it again.
* Otherwise, make the first visible UI the active one, and use it.
* If none, make the default UI the active one, and use it.
---
 .../java/org/scijava/ui/DefaultUIService.java | 71 ++++++++-----------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 60fc08693..cda97ec0b 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -117,6 +117,9 @@ public final class DefaultUIService extends AbstractService implements
 	/** The default user interface to use, if one is not explicitly specified. */
 	private UserInterface defaultUI;
 
+	/** The last UI used when performing UI operations via the service. */
+	private UserInterface activeUI;
+
 	/**
 	 * When true, {@link #isHeadless()} will return true regardless of the value
 	 * of the {@code java.awt.headless} system property. When false, {@link
@@ -143,18 +146,12 @@ public void addUI(final String name, final UserInterface ui) {
 	@Override
 	public void showUI() {
 		if (disposed) return;
-		final UserInterface ui = getDefaultUI();
-		if (ui == null) {
-			throw new IllegalStateException("No UIs available. " +
-				"Please add a component containing a UIPlugin " +
-				"(e.g., scijava-ui-swing) to your class-path.");
-		}
-		showUI(ui);
+		showUI(activeUI());
 	}
 
 	@Override
 	public void showUI(final String name) {
-		final UserInterface ui = uiMap().get(name);
+		final UserInterface ui = getUI(name);
 		if (ui == null) {
 			throw new IllegalArgumentException("No such user interface: " + name);
 		}
@@ -174,14 +171,12 @@ public void showUI(final UserInterface ui) {
 
 	@Override
 	public boolean isVisible() {
-		final UserInterface ui = getDefaultUI();
-		if (ui == null) return false;
-		return ui.isVisible();
+		return activeUI().isVisible();
 	}
 
 	@Override
 	public boolean isVisible(final String name) {
-		final UserInterface ui = uiMap().get(name);
+		final UserInterface ui = getUI(name);
 		return ui != null && ui.isVisible();
 	}
 
@@ -200,7 +195,7 @@ public boolean isHeadless() {
 	@Override
 	public UserInterface getDefaultUI() {
 		if (!initialized) discoverUIs();
-		if (isHeadless()) return uiMap().get(HeadlessUI.NAME);
+		if (isHeadless()) return getUI(HeadlessUI.NAME);
 		if (defaultUI != null) return defaultUI;
 		return uiList().isEmpty() ? null : uiList().get(0);
 	}
@@ -244,17 +239,17 @@ public List<PluginInfo<DisplayViewer<?>>> getViewerPlugins() {
 
 	@Override
 	public void show(final Object o) {
-		getVisibleUI(true).show(o);
+		activeUI().show(o);
 	}
 
 	@Override
 	public void show(final String name, final Object o) {
-		getVisibleUI(true).show(name, o);
+		activeUI().show(name, o);
 	}
 
 	@Override
 	public void show(final Display<?> display) {
-		getVisibleUI(true).show(display);
+		activeUI().show(display);
 	}
 
 	@Override
@@ -309,44 +304,38 @@ public DialogPrompt.Result showDialog(final String message,
 		final String title, final DialogPrompt.MessageType messageType,
 		final DialogPrompt.OptionType optionType)
 	{
-		UserInterface ui = getVisibleUI(false);
-		if (ui == null) return null;
-		final DialogPrompt dialogPrompt = ui.dialogPrompt(message, title, messageType, optionType);
+		final DialogPrompt dialogPrompt = //
+			activeUI().dialogPrompt(message, title, messageType, optionType);
 		return dialogPrompt == null ? null : dialogPrompt.prompt();
 	}
 
 	@Override
 	public File chooseFile(final File file, final String style) {
-		final UserInterface ui = getVisibleUI(true);
-		return ui == null ? null : ui.chooseFile(file, style);
+		return activeUI().chooseFile(file, style);
 	}
 
 	@Override
 	public File
 		chooseFile(final String title, final File file, final String style)
 	{
-		final UserInterface ui = getVisibleUI(true);
-		return ui == null ? null : ui.chooseFile(title, file, style);
+		return activeUI().chooseFile(title, file, style);
 	}
 
 	@Override
 	public File[] chooseFiles(File parent, File[] files, FileFilter filter, String style) {
-		final UserInterface ui = getVisibleUI(true);
-		return ui == null ? null : ui.chooseFiles(parent, files, filter, style);
+		return activeUI().chooseFiles(parent, files, filter, style);
 	}
 	
 	@Override
 	public List<File> chooseFiles(File parent, List<File> fileList, FileFilter filter, String style) {
-		final UserInterface ui = getVisibleUI(true);
-		return ui == null ? null : ui.chooseFiles(parent, fileList, filter, style);
+		return activeUI().chooseFiles(parent, fileList, filter, style);
 	}
 
 	@Override
 	public void showContextMenu(final String menuRoot, final Display<?> display,
 		final int x, final int y)
 	{
-		final UserInterface ui = getVisibleUI(true);
-		if (ui != null) ui.showContextMenu(menuRoot, display, x, y);
+		activeUI().showContextMenu(menuRoot, display, x, y);
 	}
 
 	@Override
@@ -542,20 +531,16 @@ private String getTitle() {
 		return appService.getApp().getTitle();
 	}
 
-	private UserInterface getVisibleUI(final boolean forceShow) {
-		// finds the first (highest priority) VISIBLE UserInterface
-		// if none are visible, then we show default UI if the caller indicated so.
-		UserInterface defaultUI = getDefaultUI();
-		if (defaultUI == null) return null;
-		if (defaultUI.isVisible()) return defaultUI;
-		else if(getVisibleUIs().size() > 0) {
-			return getVisibleUIs().get(0);
-		}
+	/** Gets the UI to use when performing UI operations via the service. */
+	private UserInterface activeUI() {
+		// If a particular UI is already active and still visible, use that one.
+		if (activeUI != null && activeUI.isVisible()) return activeUI;
 
-		if (forceShow) {
-			showUI(defaultUI);
-			return defaultUI;
-		}
-		return null;
+		// If a UI is visible, use it.
+		final List<UserInterface> visibleUIs = getVisibleUIs();
+		if (visibleUIs.size() > 0) return activeUI = visibleUIs.get(0);
+
+		// No UI is visible, so use the default one.
+		return activeUI = getDefaultUI();
 	}
 }

From 0f3bf4449bbcb5bcce5ec5362e2d92bae39619b4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Jul 2023 19:23:14 -0500
Subject: [PATCH 1120/1208] ScriptREPL: generalize input and output streams

The use of InputStream and OutputStream was natural, but those are heavy
abstract classes, not lightweight interfaces. It is more flexible to
allow specifying a Supplier from which to draw the REPL input, and/or a
Consumer to receive the REPL output. This will be useful e.g. from
Python via JPype, which allows to implement Java interfaces in Python
backed by proxies. But you cannot proxy an abstract class like
InputStream or OutputStream. Nonetheless, the ability to simply use
InputStream/OutputStream like System.in+System.out is also nice,
so we keep those method signatures as well.
---
 pom.xml                                       |   2 +-
 .../java/org/scijava/script/ScriptREPL.java   | 174 +++++++++++-------
 2 files changed, 109 insertions(+), 67 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9f587a995..12b513cab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.94.3-SNAPSHOT</version>
+	<version>2.95.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 8c4944766..1d1e875e2 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -30,6 +30,7 @@
 package org.scijava.script;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -38,6 +39,8 @@
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import javax.script.Bindings;
 import javax.script.ScriptException;
@@ -67,9 +70,9 @@ public class ScriptREPL {
 	@Parameter(required = false)
 	private PluginService pluginService;
 
-	private final PrintStream out;
+	private final Consumer<String> out;
 
-	private String languagePreference = null;
+	private String languagePreference;
 
 	/** List of interpreter-friendly script languages. */
 	private List<ScriptLanguage> languages;
@@ -84,19 +87,26 @@ public ScriptREPL(final Context context) {
 		this(context, System.out);
 	}
 
+	public ScriptREPL(final Context context, final String language) {
+		this(context, language, System.out);
+	}
+
 	public ScriptREPL(final Context context, final OutputStream out) {
-		context.inject(this);
-		this.out = out instanceof PrintStream ?
-			(PrintStream) out : new PrintStream(out);
+		this(context, null, out);
 	}
 
-	public ScriptREPL(final Context context, final String language) {
-		this(context, language, System.out);
+	public ScriptREPL(final Context context, final String language,
+		final OutputStream out)
+	{
+		this(context, language, outputStreamConsumer(out));
 	}
 
-	public ScriptREPL(final Context context, final String language, final OutputStream out) {
-		this(context, out);
+	public ScriptREPL(final Context context, final String language,
+		final Consumer<String> out)
+	{
+		context.inject(this);
 		languagePreference = language;
+		this.out = out;
 	}
 
 	/**
@@ -132,11 +142,39 @@ public void loop() throws IOException {
 	 * @param in Input stream from which commands are read.
 	 */
 	public void loop(final InputStream in) throws IOException {
-		initialize();
 		final BufferedReader bin = new BufferedReader(new InputStreamReader(in));
+		try {
+			loop(() -> {
+				try {
+					return bin.readLine();
+				}
+				catch (final IOException exc) {
+					throw new RuntimeException(exc);
+				}
+			});
+		}
+		catch (final RuntimeException exc) {
+			// NB: This convolution lets us throw IOException from inside a
+			// Supplier.get implementation, by wrapping in a RuntimeException.
+			// We then unwrap it again and throw it here, where we said we would.
+			final Throwable cause = exc.getCause();
+			if (cause instanceof IOException) throw (IOException) cause;
+			else throw exc;
+		}
+	}
+
+	/**
+	 * Starts a Read-Eval-Print-Loop from the given source, returning when
+	 * the loop terminates.
+	 *
+	 * @param in Source from which commands are read.
+	 */
+	public void loop(final Supplier<?> in) {
+		initialize();
 		while (true) {
 			prompt();
-			final String line = bin.readLine();
+			final Object input = in.get();
+			final String line = input == null ? null : input.toString();
 			if (line == null) break;
 			if (!evaluate(line)) return;
 		}
@@ -157,54 +195,40 @@ public void initialize() {
 	 */
 	public void initialize(final boolean verbose) {
 		if (verbose) {
-			out.println("Welcome to the SciJava REPL!");
-			out.println();
+			println("Welcome to the SciJava REPL!");
+			println();
 			help();
 		}
 		final List<ScriptLanguage> langs = getInterpretedLanguages();
 		if (verbose) {
 			if (langs.isEmpty()) {
-				out.println("--------------------------------------------------------------");
-				out.println("Uh oh! There are no SciJava script languages available!");
-				out.println("Are any on your classpath? E.g.: org.scijava:scripting-groovy?");
-				out.println("--------------------------------------------------------------");
-				out.println();
+				println("--------------------------------------------------------------");
+				println("Uh oh! There are no SciJava script languages available!");
+				println("Are any on your classpath? E.g.: org.scijava:scripting-groovy?");
+				println("--------------------------------------------------------------");
+				println();
 				return;
 			}
-			out.println("Have fun!");
-			out.println();
-
-			if(languagePreference != null) {
-			    selectPreferredLanguage(langs);
-			} else {
-				lang(langs.get(0).getLanguageName());
-			}
+			println("Have fun!");
+			println();
 		}
-		else if (!langs.isEmpty()) {
-			if(languagePreference != null) {
-				selectPreferredLanguage(langs);
-			} else {
-				lang(langs.get(0));
-			}
+		if (!langs.isEmpty()) {
+			if (languagePreference != null) selectPreferredLanguage(langs);
+			else lang(langs.get(0));
 		}
-
 		populateBindings(interpreter.getBindings());
 	}
 
 	private void selectPreferredLanguage(List<ScriptLanguage> langs) {
-		final ScriptLanguage preference = langs
-				.stream().filter(lang -> languagePreference.equals(lang.getLanguageName()))
-				.findAny().orElse(null);
-		if(preference != null) {
-			lang(preference);
-		} else {
-			lang(langs.get(0).getLanguageName());
-		}
+		final ScriptLanguage preference = langs.stream()
+				.filter(lang -> languagePreference.equals(lang.getLanguageName()))
+				.findFirst().orElse(langs.get(0));
+		lang(preference);
 	}
 
 	/** Outputs the prompt. */
 	public void prompt() {
-		out.print(interpreter == null || interpreter.isReady() ? "> " : "\\ ");
+		print(interpreter == null || interpreter.isReady() ? "> " : "\\ ");
 	}
 
 	/**
@@ -230,22 +254,22 @@ public boolean evaluate(final String line) {
 				// pass the input to the current interpreter for evaluation
 				final Object result = interpreter.interpret(line);
 				if (result != ScriptInterpreter.MORE_INPUT_PENDING) {
-					out.println(s(result));
+					println(s(result));
 				}
 			}
 		}
 		catch (final ScriptException exc) {
 			// NB: Something went wrong interpreting the line of code.
 			// Let's just display the error message, unless we are in debug mode.
-			if (debug) exc.printStackTrace(out);
+			if (debug) printStackTrace(exc);
 			else {
 				final String msg = exc.getMessage();
-				out.println(msg == null ? exc.getClass().getName() : msg);
+				println(msg == null ? exc.getClass().getName() : msg);
 			}
 		}
 		catch (final Throwable exc) {
 			// NB: Something unusual went wrong. Dump the whole exception always.
-			exc.printStackTrace(out);
+			printStackTrace(exc);
 		}
 		return true;
 	}
@@ -254,17 +278,17 @@ public boolean evaluate(final String line) {
 
 	/** Prints a usage guide. */
 	public void help() {
-		out.println("Available built-in commands:");
-		out.println();
-		out.println("  :help           | this handy list of commands");
-		out.println("  :vars           | dump a list of variables");
-		out.println("  :lang <name>    | switch the active language");
-		out.println("  :langs          | list available languages");
-		out.println("  :debug          | toggle full stack traces");
-		out.println("  :quit           | exit the REPL");
-		out.println();
-		out.println("Or type a statement to evaluate it with the active language.");
-		out.println();
+		println("Available built-in commands:");
+		println();
+		println("  :help           | this handy list of commands");
+		println("  :vars           | dump a list of variables");
+		println("  :lang <name>    | switch the active language");
+		println("  :langs          | list available languages");
+		println("  :debug          | toggle full stack traces");
+		println("  :quit           | exit the REPL");
+		println();
+		println("Or type a statement to evaluate it with the active language.");
+		println();
 	}
 
 	/** Lists variables in the script context. */
@@ -294,11 +318,11 @@ public void lang(final String langName) {
 		// create the new interpreter
 		final ScriptLanguage language = scriptService.getLanguageByName(langName);
 		if (language == null) {
-			out.println("No such language: " + langName);
+			println("No such language: " + langName);
 			return;
 		}
 		lang(language);
-		out.println("language -> " + interpreter.getLanguage().getLanguageName());
+		println("language -> " + interpreter.getLanguage().getLanguageName());
 	}
 
 	/**
@@ -316,7 +340,7 @@ public void lang(final ScriptLanguage language) {
 			copyBindings(interpreter, newInterpreter);
 		}
 		catch (final Throwable t) {
-			t.printStackTrace(out);
+			printStackTrace(t);
 		}
 		interpreter = newInterpreter;
 	}
@@ -335,7 +359,7 @@ public void langs() {
 
 	public void debug() {
 		debug = !debug;
-		out.println("debug mode -> " + debug);
+		println("debug mode -> " + debug);
 	}
 
 	// -- Main method --
@@ -417,7 +441,7 @@ private List<Gateway> gateways() {
 				gateways.add(gateway);
 			}
 			catch (final Throwable t) {
-				t.printStackTrace(out);
+				printStackTrace(t);
 			}
 		}
 		return gateways;
@@ -442,6 +466,17 @@ private String type(final Object value) {
 		return "[" + decoded.getClass().getName() + "]";
 	}
 
+	private static final String NL = System.getProperty("line.separator");
+	private void print(String s) { out.accept(s); }
+	private void println() { print(NL); }
+	private void println(final String s) { print(s + NL); }
+
+	private void printStackTrace(final Throwable t) {
+		final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		t.printStackTrace(new PrintStream(baos));
+		println(baos.toString());
+	}
+
 	private void printColumns(final List<?>... columns) {
 		final int pad = 2;
 
@@ -456,18 +491,26 @@ private void printColumns(final List<?>... columns) {
 		}
 
 		// output the columns
+		final StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < columns[0].size(); i++) {
+			sb.setLength(0);
 			for (int c = 0; c < columns.length; c++) {
 				final String s = s(columns[c].get(i));
-				out.print(s);
+				sb.append(s);
 				for (int p = s.length(); p < widths[c] + pad; p++) {
-					out.print(' ');
+					sb.append(' ');
 				}
 			}
-			out.println();
+			println(sb.toString());
 		}
 	}
 
+	private static Consumer<String> outputStreamConsumer(final OutputStream out) {
+		final PrintStream ps = out instanceof PrintStream ?
+			(PrintStream) out : new PrintStream(out);
+		return s -> { ps.print(s); ps.flush(); };
+	}
+
 	private static String lowerCamelCase(final String s) {
 		final StringBuilder sb = new StringBuilder(s);
 		for (int i=0; i<sb.length(); i++) {
@@ -481,5 +524,4 @@ private static String lowerCamelCase(final String s) {
 	private static String s(final Object o) {
 		return o == null ? NULL : o.toString();
 	}
-
 }

From 4b5ba301c8ae15dbe8d4324e87becfd99b5c0aa2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Jul 2023 21:32:46 -0500
Subject: [PATCH 1121/1208] ScriptREPL: do not trail spaces after last column

---
 src/main/java/org/scijava/script/ScriptREPL.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 1d1e875e2..d09dc7eab 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -497,8 +497,10 @@ private void printColumns(final List<?>... columns) {
 			for (int c = 0; c < columns.length; c++) {
 				final String s = s(columns[c].get(i));
 				sb.append(s);
-				for (int p = s.length(); p < widths[c] + pad; p++) {
-					sb.append(' ');
+				if (c < columns.length - 1) {
+					for (int p = s.length(); p < widths[c] + pad; p++) {
+						sb.append(' ');
+					}
 				}
 			}
 			println(sb.toString());

From dacd7b19e1b9d5157a1a09f8c7f48ff2a9576d3e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 20 Jul 2023 13:30:43 -0700
Subject: [PATCH 1122/1208] DefaultModuleService: make LogService optional

---
 .../scijava/module/DefaultModuleService.java  | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index 12b2c19b4..e2c03c0cc 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -74,7 +74,7 @@ public class DefaultModuleService extends AbstractService implements
 	ModuleService
 {
 
-	@Parameter
+	@Parameter(required = false)
 	private LogService log;
 
 	@Parameter
@@ -170,7 +170,7 @@ public Module createModule(final ModuleInfo info) {
 			return module;
 		}
 		catch (final ModuleException exc) {
-			log.error("Cannot create module: " + info.getDelegateClassName(), exc);
+			if (log != null) log.error("Cannot create module: " + info.getDelegateClassName(), exc);
 		}
 		return null;
 	}
@@ -251,10 +251,10 @@ public <M extends Module> M waitFor(final Future<M> future) {
 			return future.get();
 		}
 		catch (final InterruptedException e) {
-			log.error("Module execution interrupted", e);
+			if (log != null) log.error("Module execution interrupted", e);
 		}
 		catch (final ExecutionException e) {
-			log.error("Error during module execution", e);
+			if (log != null) log.error("Error during module execution", e);
 		}
 		return null;
 	}
@@ -392,8 +392,10 @@ private Module getRegisteredModuleInstance(final ModuleInfo info) {
 		}
 		if (objects.size() > 1) {
 			// there are multiple instances; it's not clear which one to use
-			log.warn("Ignoring multiple candidate module instances for class: " +
-				type.getName());
+			if (log != null) {
+				log.warn("Ignoring multiple candidate module instances for class: " +
+					type.getName());
+			}
 			return null;
 		}
 		// found exactly one instance; return it!
@@ -416,7 +418,7 @@ private Map<String, Object> createMap(final Object[] values) {
 			final Map<?, ?> valueMap = (Map<?, ?>) values[0];
 			for (final Object key : valueMap.keySet()) {
 				if (!(key instanceof String)) {
-					log.error("Invalid input name: " + key);
+					if (log != null) log.error("Invalid input name: " + key);
 					continue;
 				}
 				final String name = (String) key;
@@ -427,7 +429,7 @@ private Map<String, Object> createMap(final Object[] values) {
 		}
 
 		if (values.length % 2 != 0) {
-			log.error("Ignoring extraneous argument: " + values[values.length - 1]);
+			if (log != null) log.error("Ignoring extraneous argument: " + values[values.length - 1]);
 		}
 
 		// loop over list of key/value pairs
@@ -436,7 +438,7 @@ private Map<String, Object> createMap(final Object[] values) {
 			final Object key = values[2 * i];
 			final Object value = values[2 * i + 1];
 			if (!(key instanceof String)) {
-				log.error("Invalid input name: " + key);
+				if (log != null) log.error("Invalid input name: " + key);
 				continue;
 			}
 			final String name = (String) key;
@@ -459,7 +461,7 @@ private void assignInputs(final Module module,
 			if (input == null) {
 				// inputs whose name starts with a dot are implicitly known by convention
 				if (!name.startsWith(".")) {
-					log.warn("Unmatched input: " + name);
+					if (log != null) log.warn("Unmatched input: " + name);
 				}
 				converted = value;
 			}
@@ -467,8 +469,10 @@ private void assignInputs(final Module module,
 				final Class<?> type = input.getType();
 				converted = convertService.convert(value, type);
 				if (value != null && converted == null) {
-					log.error("For input " + name + ": incompatible object " +
-						value.getClass().getName() + " for type " + type.getName());
+					if (log != null) {
+						log.error("For input " + name + ": incompatible object " +
+							value.getClass().getName() + " for type " + type.getName());
+					}
 					continue;
 				}
 			}

From f7b78a880106c8c3e4ece310d066882fdebd417f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 27 Jul 2023 08:18:27 -0500
Subject: [PATCH 1123/1208] TaskEventTest: reduce wait time overhead

We can terminate as soon as all tasks finish, before 5s elapses.
---
 src/test/java/org/scijava/task/TaskEventTest.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
index 9360fc6ad..6e83d81be 100644
--- a/src/test/java/org/scijava/task/TaskEventTest.java
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -72,7 +72,13 @@ public void testManyTasks() throws InterruptedException {
         for (int i=0;i<nTasks;i++) {
             createTask(taskService, "Task_"+i, 100, 10, 100);
         }
-        Thread.sleep(5000);
+        // Wait up to a few seconds for all tasks to complete.
+        long start = System.currentTimeMillis();
+        long maxWaitTime = 5000;
+        while (System.currentTimeMillis() - start < maxWaitTime) {
+          if (eventListener.tasks.isEmpty()) break; // done!
+          Thread.sleep(10);
+        }
         assertEquals(0, eventListener.getLeftOvers().size());
     }
 

From 883417c887189d17543bc355ccb360d204afe5b4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 27 Jul 2023 08:41:11 -0500
Subject: [PATCH 1124/1208] ModuleErroredEventTest: do not dump stack trace

It's confusing to see the "Yay!" stack trace in the test output.
We can consume the event to prevent it from being emitted, while
still testing that the exception is reported via the EventService.
---
 .../java/org/scijava/module/event/ModuleErroredEventTest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
index 340d6e73d..fa5eabe19 100644
--- a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
+++ b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
@@ -75,6 +75,7 @@ public void testModuleErroredEvent() {
 			@EventHandler
 			void onEvent(final ModuleErroredEvent e) {
 				caughtException[0] = e.getException();
+				e.consume(); // Prevent exception from being emitted to stderr.
 			}
 		};
 		es.subscribe(interestedParty);

From 1d685ab9874a01b856acb1ada88e2f3347979833 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 3 Aug 2023 10:36:14 -0500
Subject: [PATCH 1125/1208] POM: update parent to pom-scijava 36.0.0

And pin maven-surefire-plugin to the newest working version for now.
---
 pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 12b513cab..135a39b49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>35.1.1</version>
+		<version>36.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -168,6 +168,9 @@
 		<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>
 		<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
 		<license.excludes>**/bushe/**</license.excludes>
+
+		<!-- NB: Avoid various strange test failures on Linux with surefire 3.x. -->
+		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 	</properties>
 
 	<dependencies>

From f55a5a87a4797ed785b91839eb95d94cccbe0a0d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 3 Aug 2023 10:41:50 -0500
Subject: [PATCH 1126/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 135a39b49..8f91c21b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.95.0-SNAPSHOT</version>
+	<version>2.95.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From b3b432672d7594a74ac6138ab5e137a5e96eb787 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 4 Aug 2023 11:39:49 -0500
Subject: [PATCH 1127/1208] Fix generics of ReadBufferDataHandle

Otherwise, you cannot instantiate it in a type-safe way.
---
 .../java/org/scijava/io/handle/ReadBufferDataHandle.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index ffbf10f41..d93f2d6b3 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -44,7 +44,7 @@
  * Read-only buffered {@link DataHandle}. It buffers the underlying handle into
  * a fixed number of pages, swapping them out when necessary.
  */
-public class ReadBufferDataHandle extends AbstractHigherOrderHandle<Location> {
+public class ReadBufferDataHandle<L extends Location> extends AbstractHigherOrderHandle<L> {
 
 	private static final int DEFAULT_PAGE_SIZE = 10_000;
 	private static final int DEFAULT_NUM_PAGES = 10;
@@ -67,7 +67,7 @@ public class ReadBufferDataHandle extends AbstractHigherOrderHandle<Location> {
 	 * @param handle
 	 *            the handle to wrap
 	 */
-	public ReadBufferDataHandle(final DataHandle<Location> handle) {
+	public ReadBufferDataHandle(final DataHandle<L> handle) {
 		this(handle, DEFAULT_PAGE_SIZE);
 	}
 
@@ -80,7 +80,7 @@ public ReadBufferDataHandle(final DataHandle<Location> handle) {
 	 * @param pageSize
 	 *            the size of the used pages
 	 */
-	public ReadBufferDataHandle(final DataHandle<Location> handle, final int pageSize) {
+	public ReadBufferDataHandle(final DataHandle<L> handle, final int pageSize) {
 		this(handle, pageSize, DEFAULT_NUM_PAGES);
 	}
 
@@ -94,7 +94,7 @@ public ReadBufferDataHandle(final DataHandle<Location> handle, final int pageSiz
 	 * @param numPages
 	 *            the number of pages to use
 	 */
-	public ReadBufferDataHandle(final DataHandle<Location> handle, final int pageSize, final int numPages) {
+	public ReadBufferDataHandle(final DataHandle<L> handle, final int pageSize, final int numPages) {
 		super(handle);
 		this.pageSize = pageSize;
 

From 9e6a5aa8f21f0275ff8dc6948d30271990f7730f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 4 Aug 2023 11:54:32 -0500
Subject: [PATCH 1128/1208] ReadBufferDataHandle: cache length for performance

Closes #467.
---
 .../org/scijava/io/handle/ReadBufferDataHandle.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index d93f2d6b3..d05f6507d 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -55,6 +55,12 @@ public class ReadBufferDataHandle<L extends Location> extends AbstractHigherOrde
 	private final LRUReplacementStrategy replacementStrategy;
 	private final Map<Integer, Integer> pageToSlot;
 
+	/**
+	 * Cached length value, for performance. When reading data, length is not
+	 * expected to change, but querying it (e.g. via native filesystem access)
+	 * can be slow, and we need to query the length frequently.
+	 */
+	private long length = -1;
 	private long offset = 0l;
 	private byte[] currentPage;
 	private int currentPageID = -1;
@@ -190,6 +196,12 @@ public void seek(final long pos) throws IOException {
 		this.offset = pos;
 	}
 
+	@Override
+	public long length() throws IOException {
+		if (length < 0) length = super.length();
+		return length;
+	}
+
 	@Override
 	public int read(final byte[] b, final int targetOffset, final int len)
 		throws IOException

From 72bffe0da55435dcf524b485399b3ca0e7600cce Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 4 Aug 2023 12:41:36 -0500
Subject: [PATCH 1129/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8f91c21b1..0dc48eff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.95.1-SNAPSHOT</version>
+	<version>2.95.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 0f0cc605dc93ca99b934089df4d8ced68798d380 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 6 Aug 2023 15:53:34 -0500
Subject: [PATCH 1130/1208] Add constructors taking wrapped location directly

---
 pom.xml                                              | 2 +-
 src/main/java/org/scijava/io/handle/BytesHandle.java | 8 ++++++++
 src/main/java/org/scijava/io/handle/DummyHandle.java | 8 ++++++++
 src/main/java/org/scijava/io/handle/FileHandle.java  | 8 ++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0dc48eff8..c721e7c83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.95.2-SNAPSHOT</version>
+	<version>2.96.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 4ab42965f..971ecd56d 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -48,6 +48,14 @@ public class BytesHandle extends AbstractDataHandle<BytesLocation> {
 
 	private long offset = 0;
 
+	// -- Constructors --
+
+	public BytesHandle() { }
+
+	public BytesHandle(final BytesLocation location) {
+		set(location);
+	}
+
 	// -- DataHandle methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index ed53272ea..35116cf47 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -48,6 +48,14 @@ public class DummyHandle extends AbstractDataHandle<DummyLocation> {
 	private long offset;
 	private long length;
 
+	// -- Constructors --
+
+	public DummyHandle() { }
+
+	public DummyHandle(final DummyLocation location) {
+		set(location);
+	}
+
 	// -- DataHandle methods --
 
 	@Override
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 029447600..54580b71b 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -58,6 +58,14 @@ public class FileHandle extends AbstractDataHandle<FileLocation> {
 	/** True iff the {@link #close()} has already been called. */
 	private boolean closed;
 
+	// -- Constructors --
+
+	public FileHandle() { }
+
+	public FileHandle(final FileLocation location) {
+		set(location);
+	}
+
 	// -- FileHandle methods --
 
 	/**

From 9abafb2d50ec2df75edd90811ead26e47b25f0fa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 6 Aug 2023 15:55:33 -0500
Subject: [PATCH 1131/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c721e7c83..713caeef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.96.0-SNAPSHOT</version>
+	<version>2.96.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 61e98d7cdc820cf85f8957f11b93ebb1dc2115d8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Oct 2023 14:36:58 +0200
Subject: [PATCH 1132/1208] Support enum parameters with custom labels

With this change, an enum class can implement toString()
to control how it is presented in the user interface.
---
 pom.xml                                       |  2 +-
 .../org/scijava/convert/DefaultConverter.java |  2 +-
 src/main/java/org/scijava/util/Types.java     | 60 ++++++++++++++++++-
 src/test/java/org/scijava/util/TypesTest.java | 47 ++++++++++++++-
 4 files changed, 105 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 713caeef4..924d8e4af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.96.1-SNAPSHOT</version>
+	<version>2.97.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 00d4e1a50..975c88f82 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -135,7 +135,7 @@ public Object convert(final Object src, final Type dest) {
 			// special case for conversion to enum
 			if (saneDest.isEnum()) {
 				try {
-					return Types.enumValue(s, saneDest);
+					return Types.enumFromString(s, saneDest);
 				}
 				catch (final IllegalArgumentException exc) {
 					// NB: No action needed.
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 12f46115c..8a4369a05 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -780,8 +780,10 @@ public static <T> T cast(final Object src, final Class<T> dest) {
 	}
 
 	/**
-	 * Converts the given string value to an enumeration constant of the specified
-	 * type.
+	 * Converts the given string <em>value</em> to an enumeration constant of the
+	 * specified type. For example, {@code enumValue("APPLE", Fruit.class)}
+	 * returns {@code Fruit.APPLE} if such a value is among those of the
+	 * requested enum class.
 	 *
 	 * @param name The value to convert.
 	 * @param dest The type of the enumeration constant.
@@ -798,6 +800,60 @@ public static <T> T enumValue(final String name, final Class<T> dest) {
 		return typedResult;
 	}
 
+	/**
+	 * Converts the given string <em>label</em> to an enumeration constant of the
+	 * specified type. An enum label is the string returned by the enum constant's
+	 * {@link Object#toString()} method. For example,
+	 * {@code enumFromLabel("Apple", Fruit.class)} returns {@code Fruit.APPLE} if
+	 * {@code Fruit.APPLE.toString()} is implemented to return {@code "Apple"}.
+	 *
+	 * @param label The {@code toString()} result of the desired enum value.
+	 * @param dest The type of the enumeration constant.
+	 * @return The matching enumeration constant.
+	 * @throws IllegalArgumentException if the type is not an enumeration type, or
+	 *           has no constant with the given label.
+	 */
+	public static <T> T enumFromLabel(final String label, final Class<T> dest) {
+		final T[] values = dest.getEnumConstants();
+		if (values == null) throw iae("Not an enum type: " + name(dest));
+		for (T value : values) {
+			if (Objects.equals(label, value.toString())) return value;
+		}
+		throw iae("Enum class " + dest.getName() + " has no such label: " + label);
+	}
+
+	/**
+	 * Converts the given string value or label to an enumeration constant of the
+	 * specified type.
+	 * <p>
+	 * If the string matches one of the enum values directly, that value will be
+	 * returned via {@link #enumValue(String, Class)}. Otherwise, the result of
+	 * {@link #enumFromLabel} is returned.
+	 * </p>
+	 *
+	 * @param s The name or label of the desired enum value.
+	 * @param dest The type of the enumeration constant.
+	 * @return The matching enumeration constant.
+	 * @throws IllegalArgumentException if the type is not an enumeration type,
+	 *           or has no such constant with the given name nor label.
+	 */
+	public static <T> T enumFromString(final String s, final Class<T> dest) {
+		if (!dest.isEnum()) throw iae("Not an enum type: " + name(dest));
+		try {
+			return enumValue(s, dest);
+		}
+		catch (final IllegalArgumentException exc) {
+			// NB: No action needed.
+		}
+		try {
+			return enumFromLabel(s, dest);
+		}
+		catch (final IllegalArgumentException exc) {
+			// NB: No action needed.
+		}
+		throw iae("Enum class " + dest.getName() + " has no such value nor label: " + s);
+	}
+
 	/**
 	 * Creates a new {@link ParameterizedType} of the given class together with
 	 * the specified type arguments.
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 4edebf7ff..24c6b5657 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -593,7 +593,7 @@ public void testEnumValue() {
 	/** Tests {@link Types#enumValue(String, Class)} for invalid value. */
 	@Test(expected = IllegalArgumentException.class)
 	public void testEnumValueNoConstant() {
-		Types.enumValue("NONE", Words.class);
+		Types.enumValue("OMG", Words.class);
 	}
 
 	/** Tests {@link Types#enumValue(String, Class)} for non-enum class. */
@@ -602,6 +602,38 @@ public void testEnumValueNonEnum() {
 		Types.enumValue("HOOYAH", String.class);
 	}
 
+	/** Tests {@link Types#enumFromLabel(String, Class)}. */
+	@Test
+	public void testEnumFromLabel() {
+		final Words foo = Types.enumFromLabel("Foo", Words.class);
+		assertSame(Words.FOO, foo);
+		final Words bar = Types.enumFromLabel("Bar", Words.class);
+		assertSame(Words.BAR, bar);
+		final Words fubar = Types.enumFromLabel("OMG", Words.class);
+		assertSame(Words.FUBAR, fubar);
+	}
+
+	/** Tests {@link Types#enumFromString(String, Class)}. */
+	@Test
+	public void testEnumFromString() {
+		{
+			final Words foo = Types.enumFromString("FOO", Words.class);
+			assertSame(Words.FOO, foo);
+			final Words bar = Types.enumFromString("BAR", Words.class);
+			assertSame(Words.BAR, bar);
+			final Words fubar = Types.enumFromString("FUBAR", Words.class);
+			assertSame(Words.FUBAR, fubar);
+		}
+		{
+			final Words foo = Types.enumFromString("Foo", Words.class);
+			assertSame(Words.FOO, foo);
+			final Words bar = Types.enumFromString("Bar", Words.class);
+			assertSame(Words.BAR, bar);
+			final Words fubar = Types.enumFromString("OMG", Words.class);
+			assertSame(Words.FUBAR, fubar);
+		}
+	}
+
 	/** Tests {@link Types#parameterize(Class, Map)}. */
 	@Test
 	public void testParameterizeMap() {
@@ -644,7 +676,18 @@ private static class ComplexThing<T extends Serializable & Cloneable> extends
 
 	/** Enumeration for testing conversion to enum types. */
 	public static enum Words {
-		FOO, BAR, FUBAR
+		FOO("Foo"), BAR("Bar"), FUBAR("OMG");
+
+		private final String label;
+
+		private Words(final String label) {
+			this.label = label;
+		}
+
+		@Override
+		public String toString() {
+			return label;
+		}
 	}
 
 	private interface TestTypes<T extends Number> {

From f892d3db98e4256d9f5e02a16aea4c88f917b3a7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Oct 2023 16:07:39 +0200
Subject: [PATCH 1133/1208] Change 0xcafebabe to 0xc0ffee in tests

---
 .../java/org/scijava/options/OptionsTest.java |  8 ++--
 .../org/scijava/util/DigestUtilsTest.java     | 46 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index eb144eebc..e49c70abb 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -94,14 +94,14 @@ public void testPersistence() {
 			assertEquals(0, fooOptions.getBar());
 
 			// verify that we can set bar to a desired value at all
-			fooOptions.setBar(0xcafebabe);
-			assertEquals(0xcafebabe, fooOptions.getBar());
+			fooOptions.setBar(0xc0ffee);
+			assertEquals(0xc0ffee, fooOptions.getBar());
 
 			// verify that save and load work as expected in the same context
 			fooOptions.save();
 			fooOptions.setBar(0xdeadbeef);
 			fooOptions.load();
-			assertEquals(0xcafebabe, fooOptions.getBar());
+			assertEquals(0xc0ffee, fooOptions.getBar());
 
 			// throw away the 1st context
 			optionsService.getContext().dispose();
@@ -112,7 +112,7 @@ public void testPersistence() {
 			final FooOptions fooOptions = optionsService.getOptions(FooOptions.class);
 
 			// verify that persisted values are loaded correctly in a new context
-			assertEquals(0xcafebabe, fooOptions.getBar());
+			assertEquals(0xc0ffee, fooOptions.getBar());
 
 			// clean up for next time
 			fooOptions.reset(); // FIXME: If this test fails, reset will not happen!
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 8f145181a..4c42955d4 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -41,11 +41,11 @@
  */
 public class DigestUtilsTest {
 
-	private static final byte[] CAFEBABE_SHA1 = { 20, 101, -38, -47, 38, -45, 43,
-		-9, -86, 93, 59, -107, -91, -57, -61, 49, -51, -1, 52, -33 };
+	private static final byte[] COFFEE_SHA1 = { -71, 2, 27, -126, -23, -70, -89,
+		35, -65, -15, -108, 66, 72, 113, 29, -32, -12, -42, -49, 6 };
 
-	private static final byte[] CAFEBABE_MD5 = { 45, 27, -67, -30, -84, -84, 10,
-		-3, 7, 100, 109, -104, 21, 79, 64, 46 };
+	private static final byte[] COFFEE_MD5 = { -39, -98, 9, -40, -39, 44, 31,
+		-62, 23, 9, 38, 101, 85, -57, 121, -110 };
 
 	private static final byte[] HELLO_WORLD_SHA1 = { 123, 80, 44, 58, 31, 72,
 		-56, 96, -102, -30, 18, -51, -5, 99, -99, -18, 57, 103, 63, 94 };
@@ -53,14 +53,14 @@ public class DigestUtilsTest {
 	private static final String HELLO_WORLD_SHA1_HEX =
 		"7b502c3a1f48c8609ae212cdfb639dee39673f5e";
 
-	private static final String CAFEBABE_SHA1_HEX =
-		"1465dad126d32bf7aa5d3b95a5c7c331cdff34df";
+	private static final String COFFEE_SHA1_HEX =
+		"b9021b82e9baa723bff1944248711de0f4d6cf06";
 
 	private static final String HELLO_WORLD_SHA1_BASE64 =
 		"e1AsOh9IyGCa4hLN+2Od7jlnP14=";
 
-	private static final String CAFEBABE_SHA1_BASE64 =
-		"FGXa0SbTK/eqXTuVpcfDMc3/NN8=";
+	private static final String COFFEE_SHA1_BASE64 =
+		"uQIbgum6pyO/8ZRCSHEd4PTWzwY=";
 
 	/** Tests {@link DigestUtils#bytes(String)}. */
 	@Test
@@ -75,15 +75,15 @@ public void testBytesString() {
 	/** Tests {@link DigestUtils#bytes(int)}. */
 	@Test
 	public void testBytesInt() {
-		final byte[] bytes = DigestUtils.bytes(0xcafebabe);
-		final byte[] expected = { -54, -2, -70, -66 };
+		final byte[] bytes = DigestUtils.bytes(0xc0ffee);
+		final byte[] expected = { 0, -64, -1, -18 };
 		assertArrayEquals(expected, bytes);
 	}
 
 	/** Tests {@link DigestUtils#hex(byte[])}. */
 	@Test
 	public void testHex() {
-		assertEquals("cafebabe", DigestUtils.hex(DigestUtils.bytes(0xcafebabe)));
+		assertEquals("00c0ffee", DigestUtils.hex(DigestUtils.bytes(0xc0ffee)));
 		assertEquals("deadbeef", DigestUtils.hex(DigestUtils.bytes(0xdeadbeef)));
 		assertEquals("00000000", DigestUtils.hex(DigestUtils.bytes(0x00000000)));
 		assertEquals("ffffffff", DigestUtils.hex(DigestUtils.bytes(0xffffffff)));
@@ -92,7 +92,7 @@ public void testHex() {
 	/** Tests {@link DigestUtils#base64(byte[])}. */
 	@Test
 	public void testBase64() {
-		assertEquals("yv66vg==", DigestUtils.base64(DigestUtils.bytes(0xcafebabe)));
+		assertEquals("AMD/7g==", DigestUtils.base64(DigestUtils.bytes(0xc0ffee)));
 		assertEquals("3q2+7w==", DigestUtils.base64(DigestUtils.bytes(0xdeadbeef)));
 		assertEquals("AAAAAA==", DigestUtils.base64(DigestUtils.bytes(0x00000000)));
 		assertEquals("/////w==", DigestUtils.base64(DigestUtils.bytes(0xffffffff)));
@@ -118,23 +118,23 @@ public void testHashBytes() {
 	/** Tests {@link DigestUtils#sha1(byte[])}. */
 	@Test
 	public void testSHA1() {
-		final byte[] bytes = DigestUtils.bytes(0xcafebabe);
+		final byte[] bytes = DigestUtils.bytes(0xc0ffee);
 		final byte[] sha1 = DigestUtils.sha1(bytes);
-		assertArrayEquals(CAFEBABE_SHA1, sha1);
+		assertArrayEquals(COFFEE_SHA1, sha1);
 	}
 
 	/** Tests {@link DigestUtils#md5(byte[])}. */
 	@Test
 	public void testMD5() {
-		final byte[] bytes = DigestUtils.bytes(0xcafebabe);
+		final byte[] bytes = DigestUtils.bytes(0xc0ffee);
 		final byte[] md5 = DigestUtils.md5(bytes);
-		assertArrayEquals(CAFEBABE_MD5, md5);
+		assertArrayEquals(COFFEE_MD5, md5);
 	}
 
 	/** Tests {@link DigestUtils#digest(String, byte[])}. */
 	@Test
 	public void testDigest() {
-		final byte[] bytes = DigestUtils.bytes(0xcafebabe);
+		final byte[] bytes = DigestUtils.bytes(0xc0ffee);
 
 		final byte[] sha1 = DigestUtils.digest("SHA-1", bytes);
 		final byte[] expectedSHA1 = DigestUtils.sha1(bytes);
@@ -155,9 +155,9 @@ public void testBestString() {
 	/** Tests {@link DigestUtils#best(byte[])}. */
 	@Test
 	public void testBestBytes() {
-		final byte[] bytes = DigestUtils.bytes(0xcafebabe);
+		final byte[] bytes = DigestUtils.bytes(0xc0ffee);
 		final byte[] best = DigestUtils.best(bytes);
-		assertArrayEquals(CAFEBABE_SHA1, best);
+		assertArrayEquals(COFFEE_SHA1, best);
 	}
 
 	/** Tests {@link DigestUtils#bestHex(String)}. */
@@ -169,8 +169,8 @@ public void testBestHexString() {
 	/** Tests {@link DigestUtils#hex(byte[])}. */
 	@Test
 	public void testBestHexBytes() {
-		final byte[] bytes = DigestUtils.bytes(0xcafebabe);
-		assertEquals(CAFEBABE_SHA1_HEX, DigestUtils.bestHex(bytes));
+		final byte[] bytes = DigestUtils.bytes(0xc0ffee);
+		assertEquals(COFFEE_SHA1_HEX, DigestUtils.bestHex(bytes));
 	}
 
 	/** Tests {@link DigestUtils#bestBase64(String)}. */
@@ -182,8 +182,8 @@ public void testBestBase64String() {
 	/** Tests {@link DigestUtils#bestBase64(byte[])}. */
 	@Test
 	public void testBestBase64Bytes() {
-		final byte[] bytes = DigestUtils.bytes(0xcafebabe);
-		assertEquals(CAFEBABE_SHA1_BASE64, DigestUtils.bestBase64(bytes));
+		final byte[] bytes = DigestUtils.bytes(0xc0ffee);
+		assertEquals(COFFEE_SHA1_BASE64, DigestUtils.bestBase64(bytes));
 	}
 
 }

From 7bdb3c78a04c6bce6f779a3185fdb8f63f6921e4 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Oct 2023 16:10:44 +0200
Subject: [PATCH 1134/1208] CI: combine dual workflows into one

---
 .github/workflows/build-pr.yml                | 23 -------------------
 .../workflows/{build-main.yml => build.yml}   |  3 +++
 README.md                                     |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/build-pr.yml
 rename .github/workflows/{build-main.yml => build.yml} (94%)

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
deleted file mode 100644
index 925b57658..000000000
--- a/.github/workflows/build-pr.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: build PR
-
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Java
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'zulu'
-          cache: 'maven'
-      - name: Set up CI environment
-        run: .github/setup.sh
-      - name: Execute the build
-        run: .github/build.sh
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build.yml
similarity index 94%
rename from .github/workflows/build-main.yml
rename to .github/workflows/build.yml
index 5ef569202..2fa1522d3 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: build
 
 on:
+  pull_request:
+    branches:
+      - master
   push:
     branches:
       - master
diff --git a/README.md b/README.md
index 6a69bf198..ba1f15173 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![](https://img.shields.io/maven-central/v/org.scijava/scijava-common.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22scijava-common%22)
-[![](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-common/actions/workflows/build-main.yml)
+[![](https://github.com/scijava/scijava-common/actions/workflows/build.yml/badge.svg)](https://github.com/scijava/scijava-common/actions/workflows/build.yml)
 [![developer chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://imagesc.zulipchat.com/#narrow/stream/327237-SciJava)
 
 SciJava Common is a common library for SciJava software. It provides a

From fa5133b8e30a744e3b5d5922ac5ec10a8b02ff03 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 11 Oct 2023 16:12:46 +0200
Subject: [PATCH 1135/1208] CI: test the build on Windows and macOS, too

---
 .github/workflows/build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2fa1522d3..118e6ac74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    name: build-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - uses: actions/checkout@v2

From 49f495000dd8242e43812401b708b5e87a858172 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Jan 2017 12:53:57 -0600
Subject: [PATCH 1136/1208] DefaultWidgetModel: guard against null conversions

When the conversion fails, it returns null. In that case, we should
treat the converted value as identical to the original value.
---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index ea878b162..daa6b8ee6 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -156,6 +156,7 @@ public void setValue(final Object value) {
 
 		// Pass the value through the convertService
 		convertedInput = convertService.convert(value, item.getType());
+		if (convertedInput == null) convertedInput = value;
 
 		// If we get a different (converted) value back, cache it weakly.
 		if (convertedInput != value) {

From 8794f7adf2b33caf70b7d251e2a5f99588f0d37e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Jan 2017 12:55:23 -0600
Subject: [PATCH 1137/1208] WidgetModel: deprecate getChoices & move to iface

The getChoices() method always converts the choices to strings.
We cannot always go back from string to original object -- e.g.,
for enums which override toString() to print something nice.

Better to just use the original choices from getItem().getChoices().

This also makes the getChoices method more concise.
---
 .../org/scijava/widget/DefaultWidgetModel.java     | 11 -----------
 src/main/java/org/scijava/widget/WidgetModel.java  | 14 +++++++-------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index daa6b8ee6..e8c84ac50 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -219,17 +219,6 @@ public Number getStepSize() {
 		return NumberUtils.toNumber("1", item.getType());
 	}
 
-	@Override
-	public String[] getChoices() {
-		final List<?> choicesList = item.getChoices();
-		if (choicesList == null) return null;
-		final String[] choices = new String[choicesList.size()];
-		for (int i = 0; i < choices.length; i++) {
-			choices[i] = objectService.getName(choicesList.get(i));
-		}
-		return choices;
-	}
-
 	@Override
 	public String getText() {
 		final Object value = getValue();
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 97ccad278..2c5ed296e 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -134,13 +134,13 @@ public interface WidgetModel extends Contextual {
 	 */
 	Number getStepSize();
 
-	/**
-	 * Gets the multiple choice list for the module input.
-	 * 
-	 * @return The available choices, or an empty list if not multiple choice.
-	 * @see ChoiceWidget
-	 */
-	String[] getChoices();
+	/** @deprecated Use {@code getItem().getChoices()} instead. */
+	@Deprecated
+	default String[] getChoices() {
+		return getItem().getChoices().stream() //
+			.map(choice -> choice.toString()) //
+			.toArray(String[]::new);
+	}
 
 	/**
 	 * Gets the input's value rendered as a string.

From 01fc93f33a02a6beb65543511cdd25539f1cfcfb Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Jan 2017 12:57:37 -0600
Subject: [PATCH 1138/1208] DefaultWidgetModel: use choices, not string labels

See also the previous commit.
---
 src/main/java/org/scijava/widget/DefaultWidgetModel.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index e8c84ac50..dda3e361c 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -29,7 +29,6 @@
 
 package org.scijava.widget;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -279,11 +278,10 @@ public boolean isInitialized() {
 	/**
 	 * For multiple choice widgets, ensures the value is a valid choice.
 	 * 
-	 * @see #getChoices()
 	 * @see ChoiceWidget
 	 */
 	private Object ensureValidChoice(final Object value) {
-		return ensureValid(value, Arrays.asList(getChoices()));
+		return ensureValid(value, getItem().getChoices());
 	}
 
 	/**

From fcffe20e19017f9391f7a74686f662a1fc5df9b5 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Jan 2017 13:37:07 -0600
Subject: [PATCH 1139/1208] AbstractInputHarvester: fix generic type hackery

---
 .../java/org/scijava/widget/AbstractInputHarvester.java  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 9a82ea33f..73fdf7b53 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -128,13 +128,10 @@ private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,
 	}
 
 	/** Asks the object service and convert service for valid choices */
-	@SuppressWarnings("unchecked")
-	private List<?> getObjects(final Class<?> type) {
-		@SuppressWarnings("rawtypes")
-		Set compatibleInputs =
-				new HashSet(convertService.getCompatibleInputs(type));
+	private List<Object> getObjects(final Class<?> type) {
+		Set<Object> compatibleInputs =
+				new HashSet<>(convertService.getCompatibleInputs(type));
 		compatibleInputs.addAll(objectService.getObjects(type));
 		return new ArrayList<>(compatibleInputs);
 	}
-
 }

From 3239804efd5085435bb7a9226d3fe492c4438baa Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 12 Oct 2023 11:18:03 +0200
Subject: [PATCH 1140/1208] Bump to next development cycle

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 924d8e4af..921efab7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.97.0-SNAPSHOT</version>
+	<version>2.97.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 43469c9a3d1d3f133223f6f389f4560061e6fccd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 12 Oct 2023 14:07:24 +0200
Subject: [PATCH 1141/1208] Revert "WidgetModel: deprecate getChoices & move to
 iface"

This reverts commit 8794f7adf2b33caf70b7d251e2a5f99588f0d37e.

This change broke scijava-ui-swing, because item.getChoices() can
return null. However, even when guarding against null, there is
another problem: the current implementation in DefaultWidgetModel
leans on the ObjectService, which is not accessible at the
WidgetModel interface level. So for now, let's just revert this
change. All seems to work fine without meddling here.
---
 .../org/scijava/widget/DefaultWidgetModel.java     | 11 +++++++++++
 src/main/java/org/scijava/widget/WidgetModel.java  | 14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index dda3e361c..e8e7c7631 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -218,6 +218,17 @@ public Number getStepSize() {
 		return NumberUtils.toNumber("1", item.getType());
 	}
 
+	@Override
+	public String[] getChoices() {
+		final List<?> choicesList = getItem().getChoices();
+		if (choicesList == null) return null;
+		final String[] choices = new String[choicesList.size()];
+		for (int i = 0; i < choices.length; i++) {
+			choices[i] = objectService.getName(choicesList.get(i));
+		}
+		return choices;
+	}
+
 	@Override
 	public String getText() {
 		final Object value = getValue();
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 2c5ed296e..97ccad278 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -134,13 +134,13 @@ public interface WidgetModel extends Contextual {
 	 */
 	Number getStepSize();
 
-	/** @deprecated Use {@code getItem().getChoices()} instead. */
-	@Deprecated
-	default String[] getChoices() {
-		return getItem().getChoices().stream() //
-			.map(choice -> choice.toString()) //
-			.toArray(String[]::new);
-	}
+	/**
+	 * Gets the multiple choice list for the module input.
+	 * 
+	 * @return The available choices, or an empty list if not multiple choice.
+	 * @see ChoiceWidget
+	 */
+	String[] getChoices();
 
 	/**
 	 * Gets the input's value rendered as a string.

From a8a7e4fa028fd9c79d39286ce32b5334c0b5aae8 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 12 Oct 2023 14:13:03 +0200
Subject: [PATCH 1142/1208] POM: update parent to pom-scijava 37.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 921efab7e..4535b2eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>36.0.0</version>
+		<version>37.0.0</version>
 		<relativePath />
 	</parent>
 

From c1c5e2493c6bed7c659965f2260c61510bd12abf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 12 Oct 2023 14:14:37 +0200
Subject: [PATCH 1143/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4535b2eff..aede49815 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.97.1-SNAPSHOT</version>
+	<version>2.97.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 9960d51acf339b17179d4b3694bf0d891b584dc6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Oct 2023 10:38:38 +0200
Subject: [PATCH 1144/1208] Add a ContextCreatedEvent

So that services can respond with behavior as soon as their context is
fully done initializing.
---
 pom.xml                                       |  2 +-
 src/main/java/org/scijava/Context.java        |  5 +++
 .../scijava/event/ContextCreatedEvent.java    | 38 +++++++++++++++++++
 .../java/org/scijava/ContextCreationTest.java | 22 +++++++++++
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/scijava/event/ContextCreatedEvent.java

diff --git a/pom.xml b/pom.xml
index aede49815..4b91cb7b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.97.2-SNAPSHOT</version>
+	<version>2.98.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 63ade880d..d6b777d46 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -38,6 +38,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.scijava.event.ContextCreatedEvent;
 import org.scijava.event.ContextDisposingEvent;
 import org.scijava.event.EventHandler;
 import org.scijava.event.EventService;
@@ -293,6 +294,10 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 
 		// If JVM shuts down with context still active, clean up after ourselves.
 		Runtime.getRuntime().addShutdownHook(new Thread(() -> doDispose(false)));
+
+		// Publish an event to indicate that context initialization is complete.
+		final EventService eventService = getService(EventService.class);
+		if (eventService != null) eventService.publish(new ContextCreatedEvent());
 	}
 
 	// -- Context methods --
diff --git a/src/main/java/org/scijava/event/ContextCreatedEvent.java b/src/main/java/org/scijava/event/ContextCreatedEvent.java
new file mode 100644
index 000000000..7ca7d529b
--- /dev/null
+++ b/src/main/java/org/scijava/event/ContextCreatedEvent.java
@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2023 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.event;
+
+/**
+ * Event to be published immediately after a context has been fully created
+ * with all services initialized.
+ * 
+ * @author Curtis Rueden
+ */
+public class ContextCreatedEvent extends SciJavaEvent { }
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index b177a75c7..db4e76ea7 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -42,6 +42,8 @@
 import java.util.List;
 
 import org.junit.Test;
+import org.scijava.event.ContextCreatedEvent;
+import org.scijava.event.EventHandler;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.PluginIndex;
 import org.scijava.plugin.PluginInfo;
@@ -149,6 +151,14 @@ public void testSciJavaServices() {
 		}
 	}
 
+	/** Tests that {@link ContextCreatedEvent} is published as expected. */
+	@Test
+	public void testContextCreatedEvent() {
+		assertEquals(0, ServiceNoticingContextCreated.created);
+		final Context context = new Context(ServiceNoticingContextCreated.class);
+		assertEquals(1, ServiceNoticingContextCreated.created);
+	}
+
 	/**
 	 * Tests that dependent {@link Service}s are automatically created and
 	 * populated in downstream {@link Service} classes.
@@ -441,6 +451,18 @@ private PluginIndex pluginIndex(final Class<?>... plugins) {
 
 	// -- Helper classes --
 
+	/** A service that notices when {@link ContextCreatedEvent} is published. */
+	public static class ServiceNoticingContextCreated extends AbstractService {
+
+		public static int created = 0;
+
+		@EventHandler
+		public void onEvent(final ContextCreatedEvent evt) {
+			created++;
+		}
+
+	}
+
 	/** A service which requires a {@link BarService}. */
 	public static class FooService extends AbstractService {
 

From 06f52dbfc10e169b4c355ac5aa76fd9f8b1faa64 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Oct 2023 13:28:49 +0200
Subject: [PATCH 1145/1208] DigestUtils: use Base64, not DatatypeConverter

Unlike java.util.Base64, the DatatypeConverter class is in
the javax.xml.bind package, which is not part of java.base.
---
 src/main/java/org/scijava/util/DigestUtils.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 92472445f..54014b709 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -32,8 +32,7 @@
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
 
 /**
  * Utility class for computing cryptographic hashes.
@@ -98,7 +97,7 @@ public static String hex(final byte[] bytes) {
 
 	/** Converts the given byte array to a base64 string. */
 	public static String base64(final byte[] bytes) {
-		return DatatypeConverter.printBase64Binary(bytes);
+		return new String(Base64.getEncoder().encode(bytes));
 	}
 
 	/**

From 47f2d2b4e466dac309e50f72c93bdfef1bb80385 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Oct 2023 13:29:13 +0200
Subject: [PATCH 1146/1208] Remove reference to javax.xml.ws.Service class

There is no strong reason we need to link it here,
and it won't compile as written with Java 11,
due to changes in Java's ServiceLoader mechanism.
---
 src/main/java/org/scijava/util/ServiceCombiner.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index e976f6846..a24cf6abb 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -40,12 +40,10 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.ws.Service;
-
 import org.scijava.Context;
 
 /**
- * Combines {@link Service} information from all JAR files on the classpath.
+ * Combines {@code Service} information from all JAR files on the classpath.
  * 
  * @author Johannes Schindelin
  * @author Mark Hiner

From 5e8fb31373197fc0fc74d73f017404ec6927063c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 13 Oct 2023 14:19:03 +0200
Subject: [PATCH 1147/1208] ConsoleServiceTest: keep ref to plugin instance

---
 src/test/java/org/scijava/console/ConsoleServiceTest.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 432feb8e0..64692143f 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -83,9 +83,12 @@ public void testProcessArgs() {
 	 */
 	@Test
 	public void testInfiniteLoopAvoidance() {
-		assertFalse(consoleService.getInstance(BrokenArgument.class).argsHandled);
+		final BrokenArgument broken = //
+			consoleService.getInstance(BrokenArgument.class);
+		assertNotNull(broken);
+		assertFalse(broken.argsHandled);
 		consoleService.processArgs("--broken");
-		assertTrue(consoleService.getInstance(BrokenArgument.class).argsHandled);
+		assertTrue(broken.argsHandled);
 	}
 
 	/**

From 41f31366618fb6ab6ba5e612e61b5c9755d8dd43 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 19 Oct 2023 10:06:48 +0200
Subject: [PATCH 1148/1208] Only register one single shutdown hook

Registering one shutdown hook Thread object per Context ever created
eventually causes the JVM to start throwing around OutOfMemoryErrors.
---
 src/main/java/org/scijava/Context.java | 28 ++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index d6b777d46..421ad2b36 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -33,10 +33,13 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.scijava.event.ContextCreatedEvent;
 import org.scijava.event.ContextDisposingEvent;
@@ -73,6 +76,14 @@ public class Context implements Disposable, AutoCloseable {
 	 */
 	public static final String STRICT_PROPERTY = "scijava.context.strict";
 
+	/** Set of currently active (not disposed) application contexts. */
+	private static final Map<Context, Boolean> CONTEXTS =
+		new ConcurrentHashMap<>(); // NB: ConcurrentHashMap disallows nulls.
+
+	// -- Static fields --
+
+	private static Thread shutdownThread = null;
+
 	// -- Fields --
 
 	/** Index of the application context's services. */
@@ -293,7 +304,20 @@ public Context(final Collection<Class<? extends Service>> serviceClasses,
 		}
 
 		// If JVM shuts down with context still active, clean up after ourselves.
-		Runtime.getRuntime().addShutdownHook(new Thread(() -> doDispose(false)));
+		if (shutdownThread == null) {
+			synchronized (Context.class) {
+				if (shutdownThread == null) {
+					shutdownThread = new Thread(() -> {
+						final List<Context> contexts = new ArrayList<>(CONTEXTS.keySet());
+						for (final Context context : contexts) {
+							context.doDispose(false);
+						}
+					});
+					Runtime.getRuntime().addShutdownHook(shutdownThread);
+				}
+			}
+		}
+		CONTEXTS.put(this, true);
 
 		// Publish an event to indicate that context initialization is complete.
 		final EventService eventService = getService(EventService.class);
@@ -432,7 +456,6 @@ public boolean isInjectable(final Class<?> type) {
 
 	@Override
 	public void dispose() {
-		if (disposed) return;
 		doDispose(true);
 	}
 
@@ -589,6 +612,7 @@ private String createMissingServiceMessage(
 	private synchronized void doDispose(final boolean announce) {
 		if (disposed) return;
 		disposed = true;
+		CONTEXTS.remove(this);
 		if (announce) {
 			final EventService eventService = getService(EventService.class);
 			if (eventService != null) eventService.publish(new ContextDisposingEvent());

From 4133ac73119f00c3ba8b75266d58389f442fb572 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 4 Nov 2023 09:36:52 -0500
Subject: [PATCH 1149/1208] ObjectIndexTest: make tests pass with OpenJDK 12

Closes #474.
---
 .../org/scijava/object/ObjectIndexTest.java   | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 00be93314..dfd4978f1 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -36,6 +36,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -209,15 +210,25 @@ public void testToString() {
 		objectIndex.add(new Integer(5));
 		objectIndex.add(new Float(2.5f));
 		objectIndex.add(new Integer(3));
-		final String[] expected =
-			{ "java.io.Serializable: {5, 2.5, 3}",
-				"java.lang.Comparable: {5, 2.5, 3}", "java.lang.Float: {2.5}",
-				"java.lang.Integer: {5, 3}", "java.lang.Number: {5, 2.5, 3}",
-				"java.lang.Object: {5, 2.5, 3}",
-				"org.scijava.object.ObjectIndex$All: {5, 2.5, 3}" };
+
+		final List<String> expected = new ArrayList<>();
+		expected.addAll(Arrays.asList(
+			"java.io.Serializable: {5, 2.5, 3}",
+			"java.lang.Comparable: {5, 2.5, 3}", "java.lang.Float: {2.5}",
+			"java.lang.Integer: {5, 3}", "java.lang.Number: {5, 2.5, 3}",
+			"java.lang.Object: {5, 2.5, 3}"
+		));
+		final String[] javaVersion = System.getProperty("java.version").split("\\.");
+		final int majorVersion = Integer.parseInt(javaVersion[0]);
+		if (majorVersion >= 12) {
+			expected.add("java.lang.constant.Constable: {5, 2.5, 3}");
+			expected.add("java.lang.constant.ConstantDesc: {5, 2.5, 3}");
+		}
+		expected.add("org.scijava.object.ObjectIndex$All: {5, 2.5, 3}");
+
 		final String[] actual =
 			objectIndex.toString().split(System.getProperty("line.separator"));
-		assertArrayEquals(expected, actual);
+		assertArrayEquals(expected.toArray(), actual);
 	}
 
 }

From dc4be9bc8f8ee5893a26133463f90b2e84495f59 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 4 Nov 2023 09:38:36 -0500
Subject: [PATCH 1150/1208] ObjectIndexTest: fix line wrapping

---
 src/test/java/org/scijava/object/ObjectIndexTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index dfd4978f1..2a0870776 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -214,8 +214,10 @@ public void testToString() {
 		final List<String> expected = new ArrayList<>();
 		expected.addAll(Arrays.asList(
 			"java.io.Serializable: {5, 2.5, 3}",
-			"java.lang.Comparable: {5, 2.5, 3}", "java.lang.Float: {2.5}",
-			"java.lang.Integer: {5, 3}", "java.lang.Number: {5, 2.5, 3}",
+			"java.lang.Comparable: {5, 2.5, 3}",
+			"java.lang.Float: {2.5}",
+			"java.lang.Integer: {5, 3}",
+			"java.lang.Number: {5, 2.5, 3}",
 			"java.lang.Object: {5, 2.5, 3}"
 		));
 		final String[] javaVersion = System.getProperty("java.version").split("\\.");

From 43164babd71c2429e4fa2e8f59f7eda767ebe120 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 7 Nov 2023 11:21:07 -0600
Subject: [PATCH 1151/1208] CI: only deploy build artifacts on the Linux node

---
 .github/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/build.sh b/.github/build.sh
index 7da42622b..44a7909d1 100755
--- a/.github/build.sh
+++ b/.github/build.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
-sh ci-build.sh
+# NB: Only the Linux CI node should deploy build artifacts.
+NO_DEPLOY=$(test "$(uname)" = Linux || echo 1) sh ci-build.sh

From 3dc99c9173f50d9818afc5674e4e11150186387a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 7 Nov 2023 11:27:23 -0600
Subject: [PATCH 1152/1208] CI: use bash shell even when building on Windows

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 118e6ac74..876a620a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,7 @@ jobs:
         run: .github/setup.sh
       - name: Execute the build
         run: .github/build.sh
+        shell: bash
         env:
           GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

From c7b6dc414debe41ef1166c071af034d65a51ff62 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 26 Jan 2024 09:42:47 -0600
Subject: [PATCH 1153/1208] Happy New Year 2024

---
 src/it/apt-test/pom.xml                                         | 2 +-
 src/it/apt-test/setup.bsh                                       | 2 +-
 .../src/main/java/org/scijava/annotation/its/Annotated.java     | 2 +-
 .../main/java/org/scijava/annotation/its/CustomAnnotation.java  | 2 +-
 src/it/apt-test/verify.bsh                                      | 2 +-
 src/it/settings.xml                                             | 2 +-
 src/main/java/org/scijava/AbstractBasicDetails.java             | 2 +-
 src/main/java/org/scijava/AbstractContextual.java               | 2 +-
 src/main/java/org/scijava/AbstractGateway.java                  | 2 +-
 src/main/java/org/scijava/AbstractUIDetails.java                | 2 +-
 src/main/java/org/scijava/BasicDetails.java                     | 2 +-
 src/main/java/org/scijava/Cancelable.java                       | 2 +-
 src/main/java/org/scijava/Context.java                          | 2 +-
 src/main/java/org/scijava/Contextual.java                       | 2 +-
 src/main/java/org/scijava/Disposable.java                       | 2 +-
 src/main/java/org/scijava/Gateway.java                          | 2 +-
 src/main/java/org/scijava/Identifiable.java                     | 2 +-
 src/main/java/org/scijava/Initializable.java                    | 2 +-
 src/main/java/org/scijava/Instantiable.java                     | 2 +-
 src/main/java/org/scijava/InstantiableException.java            | 2 +-
 src/main/java/org/scijava/ItemIO.java                           | 2 +-
 src/main/java/org/scijava/ItemVisibility.java                   | 2 +-
 src/main/java/org/scijava/Locatable.java                        | 2 +-
 src/main/java/org/scijava/MenuEntry.java                        | 2 +-
 src/main/java/org/scijava/MenuPath.java                         | 2 +-
 src/main/java/org/scijava/Named.java                            | 2 +-
 src/main/java/org/scijava/NoSuchServiceException.java           | 2 +-
 src/main/java/org/scijava/NullContextException.java             | 2 +-
 src/main/java/org/scijava/Optional.java                         | 2 +-
 src/main/java/org/scijava/Prioritized.java                      | 2 +-
 src/main/java/org/scijava/Priority.java                         | 2 +-
 src/main/java/org/scijava/SciJava.java                          | 2 +-
 src/main/java/org/scijava/Typed.java                            | 2 +-
 src/main/java/org/scijava/UIDetails.java                        | 2 +-
 src/main/java/org/scijava/Validated.java                        | 2 +-
 src/main/java/org/scijava/ValidityProblem.java                  | 2 +-
 src/main/java/org/scijava/Versioned.java                        | 2 +-
 src/main/java/org/scijava/annotations/AbstractIndexWriter.java  | 2 +-
 src/main/java/org/scijava/annotations/AnnotationCombiner.java   | 2 +-
 src/main/java/org/scijava/annotations/AnnotationProcessor.java  | 2 +-
 src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java     | 2 +-
 src/main/java/org/scijava/annotations/DirectoryIndexer.java     | 2 +-
 src/main/java/org/scijava/annotations/EclipseHelper.java        | 2 +-
 src/main/java/org/scijava/annotations/Index.java                | 2 +-
 src/main/java/org/scijava/annotations/IndexItem.java            | 2 +-
 src/main/java/org/scijava/annotations/IndexReader.java          | 2 +-
 src/main/java/org/scijava/annotations/Indexable.java            | 2 +-
 src/main/java/org/scijava/annotations/legacy/LegacyReader.java  | 2 +-
 src/main/java/org/scijava/app/AbstractApp.java                  | 2 +-
 src/main/java/org/scijava/app/App.java                          | 2 +-
 src/main/java/org/scijava/app/AppService.java                   | 2 +-
 src/main/java/org/scijava/app/DefaultAppService.java            | 2 +-
 src/main/java/org/scijava/app/DefaultStatusService.java         | 2 +-
 src/main/java/org/scijava/app/SciJavaApp.java                   | 2 +-
 src/main/java/org/scijava/app/StatusService.java                | 2 +-
 src/main/java/org/scijava/app/event/StatusEvent.java            | 2 +-
 src/main/java/org/scijava/cache/CacheService.java               | 2 +-
 src/main/java/org/scijava/cache/DefaultCacheService.java        | 2 +-
 src/main/java/org/scijava/command/Command.java                  | 2 +-
 src/main/java/org/scijava/command/CommandInfo.java              | 2 +-
 src/main/java/org/scijava/command/CommandModule.java            | 2 +-
 src/main/java/org/scijava/command/CommandModuleItem.java        | 2 +-
 src/main/java/org/scijava/command/CommandService.java           | 2 +-
 src/main/java/org/scijava/command/ContextCommand.java           | 2 +-
 src/main/java/org/scijava/command/DefaultCommandService.java    | 2 +-
 src/main/java/org/scijava/command/DynamicCommand.java           | 2 +-
 src/main/java/org/scijava/command/DynamicCommandInfo.java       | 2 +-
 src/main/java/org/scijava/command/Inputs.java                   | 2 +-
 src/main/java/org/scijava/command/Interactive.java              | 2 +-
 src/main/java/org/scijava/command/InteractiveCommand.java       | 2 +-
 src/main/java/org/scijava/command/ModuleCommand.java            | 2 +-
 src/main/java/org/scijava/command/Previewable.java              | 2 +-
 src/main/java/org/scijava/command/UnimplementedCommand.java     | 2 +-
 src/main/java/org/scijava/command/console/RunArgument.java      | 2 +-
 src/main/java/org/scijava/command/run/CommandCodeRunner.java    | 2 +-
 src/main/java/org/scijava/console/AbstractConsoleArgument.java  | 2 +-
 src/main/java/org/scijava/console/ConsoleArgument.java          | 2 +-
 src/main/java/org/scijava/console/ConsoleService.java           | 2 +-
 src/main/java/org/scijava/console/ConsoleUtils.java             | 2 +-
 src/main/java/org/scijava/console/DefaultConsoleService.java    | 2 +-
 src/main/java/org/scijava/console/MultiOutputStream.java        | 2 +-
 src/main/java/org/scijava/console/MultiPrintStream.java         | 2 +-
 src/main/java/org/scijava/console/OutputEvent.java              | 2 +-
 src/main/java/org/scijava/console/OutputListener.java           | 2 +-
 src/main/java/org/scijava/console/SystemPropertyArgument.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConvertService.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConverter.java        | 2 +-
 .../java/org/scijava/convert/AbstractDelegateConverter.java     | 2 +-
 src/main/java/org/scijava/convert/ArrayConverters.java          | 2 +-
 src/main/java/org/scijava/convert/ArrayToStringConverter.java   | 2 +-
 src/main/java/org/scijava/convert/CastingConverter.java         | 2 +-
 src/main/java/org/scijava/convert/ConversionRequest.java        | 2 +-
 src/main/java/org/scijava/convert/ConvertService.java           | 2 +-
 src/main/java/org/scijava/convert/Converter.java                | 2 +-
 src/main/java/org/scijava/convert/DefaultConvertService.java    | 2 +-
 src/main/java/org/scijava/convert/DefaultConverter.java         | 2 +-
 src/main/java/org/scijava/convert/FileListConverters.java       | 2 +-
 src/main/java/org/scijava/convert/FileToPathConverter.java      | 2 +-
 src/main/java/org/scijava/convert/NullConverter.java            | 2 +-
 src/main/java/org/scijava/convert/NumberConverters.java         | 2 +-
 .../java/org/scijava/convert/NumberToBigDecimalConverter.java   | 2 +-
 .../java/org/scijava/convert/NumberToBigIntegerConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToDoubleConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToFloatConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToIntegerConverter.java | 2 +-
 src/main/java/org/scijava/convert/NumberToLongConverter.java    | 2 +-
 src/main/java/org/scijava/convert/NumberToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToShortConverter.java   | 2 +-
 src/main/java/org/scijava/convert/PathToFileConverter.java      | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java  | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java    | 2 +-
 src/main/java/org/scijava/convert/StringToArrayConverter.java   | 2 +-
 src/main/java/org/scijava/convert/StringToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/display/AbstractDisplay.java          | 2 +-
 .../java/org/scijava/display/ActiveDisplayPreprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DefaultDisplay.java           | 2 +-
 src/main/java/org/scijava/display/DefaultDisplayService.java    | 2 +-
 src/main/java/org/scijava/display/DefaultTextDisplay.java       | 2 +-
 src/main/java/org/scijava/display/Display.java                  | 2 +-
 src/main/java/org/scijava/display/DisplayPostprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DisplayService.java           | 2 +-
 src/main/java/org/scijava/display/Displayable.java              | 2 +-
 src/main/java/org/scijava/display/TextDisplay.java              | 2 +-
 .../java/org/scijava/display/event/DisplayActivatedEvent.java   | 2 +-
 .../java/org/scijava/display/event/DisplayCreatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/DisplayDeletedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/DisplayEvent.java       | 2 +-
 .../java/org/scijava/display/event/DisplayUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/InputEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/KyPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/KyReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyTypedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsButtonEvent.java     | 2 +-
 .../java/org/scijava/display/event/input/MsClickedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsDraggedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsEnteredEvent.java    | 2 +-
 src/main/java/org/scijava/display/event/input/MsEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/MsExitedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/MsMovedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/MsWheelEvent.java | 2 +-
 .../org/scijava/display/event/window/WinActivatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinClosedEvent.java   | 2 +-
 .../java/org/scijava/display/event/window/WinClosingEvent.java  | 2 +-
 .../org/scijava/display/event/window/WinDeactivatedEvent.java   | 2 +-
 .../org/scijava/display/event/window/WinDeiconifiedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/window/WinEvent.java    | 2 +-
 .../org/scijava/display/event/window/WinIconifiedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinOpenedEvent.java   | 2 +-
 src/main/java/org/scijava/download/DefaultDownloadService.java  | 2 +-
 src/main/java/org/scijava/download/DiskLocationCache.java       | 2 +-
 src/main/java/org/scijava/download/Download.java                | 2 +-
 src/main/java/org/scijava/download/DownloadService.java         | 2 +-
 src/main/java/org/scijava/download/LocationCache.java           | 2 +-
 src/main/java/org/scijava/download/MultiWriteHandle.java        | 2 +-
 src/main/java/org/scijava/event/ContextCreatedEvent.java        | 2 +-
 src/main/java/org/scijava/event/ContextDisposingEvent.java      | 2 +-
 src/main/java/org/scijava/event/DefaultEventBus.java            | 2 +-
 src/main/java/org/scijava/event/DefaultEventHistory.java        | 2 +-
 src/main/java/org/scijava/event/DefaultEventService.java        | 2 +-
 src/main/java/org/scijava/event/EventDetails.java               | 2 +-
 src/main/java/org/scijava/event/EventHandler.java               | 2 +-
 src/main/java/org/scijava/event/EventHistory.java               | 2 +-
 src/main/java/org/scijava/event/EventHistoryListener.java       | 2 +-
 src/main/java/org/scijava/event/EventService.java               | 2 +-
 src/main/java/org/scijava/event/EventSubscriber.java            | 2 +-
 src/main/java/org/scijava/event/SciJavaEvent.java               | 2 +-
 src/main/java/org/scijava/input/Accelerator.java                | 2 +-
 src/main/java/org/scijava/input/DefaultInputService.java        | 2 +-
 src/main/java/org/scijava/input/InputModifiers.java             | 2 +-
 src/main/java/org/scijava/input/InputService.java               | 2 +-
 src/main/java/org/scijava/input/KeyCode.java                    | 2 +-
 src/main/java/org/scijava/input/MouseCursor.java                | 2 +-
 src/main/java/org/scijava/io/AbstractIOPlugin.java              | 2 +-
 src/main/java/org/scijava/io/AbstractTypedIOService.java        | 2 +-
 src/main/java/org/scijava/io/ByteArrayByteBank.java             | 2 +-
 src/main/java/org/scijava/io/ByteBank.java                      | 2 +-
 src/main/java/org/scijava/io/DefaultIOService.java              | 2 +-
 src/main/java/org/scijava/io/DefaultRecentFileService.java      | 2 +-
 src/main/java/org/scijava/io/IOPlugin.java                      | 2 +-
 src/main/java/org/scijava/io/IOService.java                     | 2 +-
 src/main/java/org/scijava/io/RecentFileService.java             | 2 +-
 src/main/java/org/scijava/io/TypedIOService.java                | 2 +-
 src/main/java/org/scijava/io/console/OpenArgument.java          | 2 +-
 src/main/java/org/scijava/io/event/DataOpenedEvent.java         | 2 +-
 src/main/java/org/scijava/io/event/DataSavedEvent.java          | 2 +-
 src/main/java/org/scijava/io/event/IOEvent.java                 | 2 +-
 src/main/java/org/scijava/io/handle/AbstractDataHandle.java     | 2 +-
 .../java/org/scijava/io/handle/AbstractHigherOrderHandle.java   | 2 +-
 .../org/scijava/io/handle/AbstractSeekableStreamHandle.java     | 2 +-
 src/main/java/org/scijava/io/handle/AbstractStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/BytesHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/DataHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleInputStream.java  | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleOutputStream.java | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleService.java      | 2 +-
 src/main/java/org/scijava/io/handle/DataHandles.java            | 2 +-
 .../java/org/scijava/io/handle/DefaultDataHandleService.java    | 2 +-
 src/main/java/org/scijava/io/handle/DummyHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/FileHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/ResettableStreamHandle.java | 2 +-
 src/main/java/org/scijava/io/handle/SeekableStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/StreamHandle.java           | 2 +-
 src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java  | 2 +-
 src/main/java/org/scijava/io/location/AbstractLocation.java     | 2 +-
 .../java/org/scijava/io/location/AbstractLocationResolver.java  | 2 +-
 .../java/org/scijava/io/location/AbstractRemoteLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BrowsableLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BytesLocation.java        | 2 +-
 .../java/org/scijava/io/location/DefaultLocationService.java    | 2 +-
 src/main/java/org/scijava/io/location/DummyLocation.java        | 2 +-
 src/main/java/org/scijava/io/location/FileLocation.java         | 2 +-
 src/main/java/org/scijava/io/location/FileLocationResolver.java | 2 +-
 src/main/java/org/scijava/io/location/Location.java             | 2 +-
 src/main/java/org/scijava/io/location/LocationResolver.java     | 2 +-
 src/main/java/org/scijava/io/location/LocationService.java      | 2 +-
 src/main/java/org/scijava/io/location/RemoteLocation.java       | 2 +-
 src/main/java/org/scijava/io/location/URILocation.java          | 2 +-
 src/main/java/org/scijava/io/location/URLLocation.java          | 2 +-
 src/main/java/org/scijava/io/nio/ByteBufferByteBank.java        | 2 +-
 src/main/java/org/scijava/io/nio/DefaultNIOService.java         | 2 +-
 src/main/java/org/scijava/io/nio/NIOService.java                | 2 +-
 src/main/java/org/scijava/log/AbstractLogService.java           | 2 +-
 src/main/java/org/scijava/log/CallingClassUtils.java            | 2 +-
 src/main/java/org/scijava/log/DefaultLogger.java                | 2 +-
 .../java/org/scijava/log/DefaultUncaughtExceptionHandler.java   | 2 +-
 src/main/java/org/scijava/log/IgnoreAsCallingClass.java         | 2 +-
 src/main/java/org/scijava/log/LogLevel.java                     | 2 +-
 src/main/java/org/scijava/log/LogListener.java                  | 2 +-
 src/main/java/org/scijava/log/LogMessage.java                   | 2 +-
 src/main/java/org/scijava/log/LogService.java                   | 2 +-
 src/main/java/org/scijava/log/LogSource.java                    | 2 +-
 src/main/java/org/scijava/log/Logged.java                       | 2 +-
 src/main/java/org/scijava/log/Logger.java                       | 2 +-
 src/main/java/org/scijava/log/StderrLogService.java             | 2 +-
 src/main/java/org/scijava/main/DefaultMainService.java          | 2 +-
 src/main/java/org/scijava/main/MainService.java                 | 2 +-
 src/main/java/org/scijava/main/console/MainArgument.java        | 2 +-
 src/main/java/org/scijava/main/run/MainCodeRunner.java          | 2 +-
 src/main/java/org/scijava/menu/AbstractMenuCreator.java         | 2 +-
 src/main/java/org/scijava/menu/DefaultMenuService.java          | 2 +-
 src/main/java/org/scijava/menu/MenuConstants.java               | 2 +-
 src/main/java/org/scijava/menu/MenuCreator.java                 | 2 +-
 src/main/java/org/scijava/menu/MenuService.java                 | 2 +-
 src/main/java/org/scijava/menu/ShadowMenu.java                  | 2 +-
 src/main/java/org/scijava/menu/ShadowMenuIterator.java          | 2 +-
 src/main/java/org/scijava/menu/event/MenuEvent.java             | 2 +-
 src/main/java/org/scijava/menu/event/MenusAddedEvent.java       | 2 +-
 src/main/java/org/scijava/menu/event/MenusRemovedEvent.java     | 2 +-
 src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/module/AbstractModule.java            | 2 +-
 src/main/java/org/scijava/module/AbstractModuleInfo.java        | 2 +-
 src/main/java/org/scijava/module/AbstractModuleItem.java        | 2 +-
 src/main/java/org/scijava/module/DefaultModuleService.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModule.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleInfo.java  | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleItem.java  | 2 +-
 src/main/java/org/scijava/module/MethodCallException.java       | 2 +-
 src/main/java/org/scijava/module/MethodRef.java                 | 2 +-
 src/main/java/org/scijava/module/Module.java                    | 2 +-
 src/main/java/org/scijava/module/ModuleCanceledException.java   | 2 +-
 src/main/java/org/scijava/module/ModuleException.java           | 2 +-
 src/main/java/org/scijava/module/ModuleIndex.java               | 2 +-
 src/main/java/org/scijava/module/ModuleInfo.java                | 2 +-
 src/main/java/org/scijava/module/ModuleItem.java                | 2 +-
 src/main/java/org/scijava/module/ModuleRunner.java              | 2 +-
 src/main/java/org/scijava/module/ModuleService.java             | 2 +-
 src/main/java/org/scijava/module/MutableModule.java             | 2 +-
 src/main/java/org/scijava/module/MutableModuleInfo.java         | 2 +-
 src/main/java/org/scijava/module/MutableModuleItem.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleCanceledEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModuleErroredEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleEvent.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleExecutedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModuleExecutingEvent.java     | 2 +-
 .../java/org/scijava/module/event/ModuleExecutionEvent.java     | 2 +-
 src/main/java/org/scijava/module/event/ModuleFinishedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModulePostprocessEvent.java   | 2 +-
 .../java/org/scijava/module/event/ModulePreprocessEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModuleProcessEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleStartedEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModulesAddedEvent.java   | 2 +-
 src/main/java/org/scijava/module/event/ModulesListEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModulesRemovedEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java | 2 +-
 .../org/scijava/module/process/AbstractPostprocessorPlugin.java | 2 +-
 .../org/scijava/module/process/AbstractPreprocessorPlugin.java  | 2 +-
 .../scijava/module/process/AbstractSingleInputPreprocessor.java | 2 +-
 .../org/scijava/module/process/CheckInputsPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/DebugPostprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/DebugPreprocessor.java | 2 +-
 .../org/scijava/module/process/DefaultValuePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/GatewayPreprocessor.java    | 2 +-
 src/main/java/org/scijava/module/process/InitPreprocessor.java  | 2 +-
 .../java/org/scijava/module/process/LoadInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/ModulePostprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ModulePreprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/ModuleProcessor.java   | 2 +-
 .../java/org/scijava/module/process/PostprocessorPlugin.java    | 2 +-
 .../java/org/scijava/module/process/PreprocessorPlugin.java     | 2 +-
 .../java/org/scijava/module/process/SaveInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/ServicePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ValidityPreprocessor.java   | 2 +-
 src/main/java/org/scijava/module/run/ModuleCodeRunner.java      | 2 +-
 src/main/java/org/scijava/object/DefaultObjectService.java      | 2 +-
 src/main/java/org/scijava/object/LazyObjects.java               | 2 +-
 src/main/java/org/scijava/object/NamedObjectIndex.java          | 2 +-
 src/main/java/org/scijava/object/ObjectIndex.java               | 2 +-
 src/main/java/org/scijava/object/ObjectService.java             | 2 +-
 src/main/java/org/scijava/object/SortedObjectIndex.java         | 2 +-
 src/main/java/org/scijava/object/event/ListEvent.java           | 2 +-
 src/main/java/org/scijava/object/event/ObjectCreatedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectDeletedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectEvent.java         | 2 +-
 src/main/java/org/scijava/object/event/ObjectModifiedEvent.java | 2 +-
 src/main/java/org/scijava/object/event/ObjectsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/object/event/ObjectsListEvent.java    | 2 +-
 src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/options/DefaultOptionsService.java    | 2 +-
 src/main/java/org/scijava/options/OptionsPlugin.java            | 2 +-
 src/main/java/org/scijava/options/OptionsService.java           | 2 +-
 src/main/java/org/scijava/options/event/OptionsEvent.java       | 2 +-
 src/main/java/org/scijava/parse/DefaultParseService.java        | 2 +-
 src/main/java/org/scijava/parse/Item.java                       | 2 +-
 src/main/java/org/scijava/parse/Items.java                      | 2 +-
 src/main/java/org/scijava/parse/ParseService.java               | 2 +-
 src/main/java/org/scijava/platform/AbstractPlatform.java        | 2 +-
 src/main/java/org/scijava/platform/AppEventService.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultAppEventService.java  | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatform.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatformService.java  | 2 +-
 src/main/java/org/scijava/platform/Platform.java                | 2 +-
 src/main/java/org/scijava/platform/PlatformService.java         | 2 +-
 src/main/java/org/scijava/platform/event/AppAboutEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppFocusEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppMenusCreatedEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java | 2 +-
 .../java/org/scijava/platform/event/AppPreferencesEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppPrintEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppQuitEvent.java      | 2 +-
 src/main/java/org/scijava/platform/event/AppReOpenEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppScreenSleepEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppSleepEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppSystemSleepEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppUserSessionEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppVisibleEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/ApplicationEvent.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerService.java    | 2 +-
 src/main/java/org/scijava/plugin/AbstractPTService.java         | 2 +-
 src/main/java/org/scijava/plugin/AbstractRichPlugin.java        | 2 +-
 src/main/java/org/scijava/plugin/AbstractSingletonService.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedPlugin.java       | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedService.java      | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperService.java    | 2 +-
 src/main/java/org/scijava/plugin/Attr.java                      | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginFinder.java       | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginService.java      | 2 +-
 src/main/java/org/scijava/plugin/HandlerPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/HandlerService.java            | 2 +-
 src/main/java/org/scijava/plugin/HasPluginInfo.java             | 2 +-
 src/main/java/org/scijava/plugin/Menu.java                      | 2 +-
 src/main/java/org/scijava/plugin/PTService.java                 | 2 +-
 src/main/java/org/scijava/plugin/Parameter.java                 | 2 +-
 src/main/java/org/scijava/plugin/Plugin.java                    | 2 +-
 src/main/java/org/scijava/plugin/PluginFinder.java              | 2 +-
 src/main/java/org/scijava/plugin/PluginIndex.java               | 2 +-
 src/main/java/org/scijava/plugin/PluginInfo.java                | 2 +-
 src/main/java/org/scijava/plugin/PluginService.java             | 2 +-
 src/main/java/org/scijava/plugin/RichPlugin.java                | 2 +-
 src/main/java/org/scijava/plugin/SciJavaPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/SingletonPlugin.java           | 2 +-
 src/main/java/org/scijava/plugin/SingletonService.java          | 2 +-
 src/main/java/org/scijava/plugin/SortablePlugin.java            | 2 +-
 src/main/java/org/scijava/plugin/TypedPlugin.java               | 2 +-
 src/main/java/org/scijava/plugin/TypedService.java              | 2 +-
 src/main/java/org/scijava/plugin/WrapperPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/WrapperService.java            | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsListEvent.java    | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/prefs/AbstractPrefService.java        | 2 +-
 src/main/java/org/scijava/prefs/DefaultPrefService.java         | 2 +-
 src/main/java/org/scijava/prefs/PrefService.java                | 2 +-
 src/main/java/org/scijava/run/AbstractCodeRunner.java           | 2 +-
 src/main/java/org/scijava/run/CodeRunner.java                   | 2 +-
 src/main/java/org/scijava/run/DefaultRunService.java            | 2 +-
 src/main/java/org/scijava/run/RunService.java                   | 2 +-
 src/main/java/org/scijava/run/console/RunArgument.java          | 2 +-
 src/main/java/org/scijava/script/AbstractAutoCompleter.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptContext.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptEngine.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptHeader.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptLanguage.java    | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptEngine.java       | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptLanguage.java     | 2 +-
 src/main/java/org/scijava/script/AutoCompleter.java             | 2 +-
 src/main/java/org/scijava/script/AutoCompletionResult.java      | 2 +-
 src/main/java/org/scijava/script/CodeGenerator.java             | 2 +-
 src/main/java/org/scijava/script/CodeGeneratorJava.java         | 2 +-
 src/main/java/org/scijava/script/DefaultAutoCompleter.java      | 2 +-
 .../java/org/scijava/script/DefaultScriptHeaderService.java     | 2 +-
 src/main/java/org/scijava/script/DefaultScriptInterpreter.java  | 2 +-
 src/main/java/org/scijava/script/DefaultScriptService.java      | 2 +-
 src/main/java/org/scijava/script/InvocationObject.java          | 2 +-
 src/main/java/org/scijava/script/ParameterObject.java           | 2 +-
 src/main/java/org/scijava/script/ScriptCLI.java                 | 2 +-
 src/main/java/org/scijava/script/ScriptFinder.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeader.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeaderService.java       | 2 +-
 src/main/java/org/scijava/script/ScriptInfo.java                | 2 +-
 src/main/java/org/scijava/script/ScriptInterpreter.java         | 2 +-
 src/main/java/org/scijava/script/ScriptLanguage.java            | 2 +-
 src/main/java/org/scijava/script/ScriptLanguageIndex.java       | 2 +-
 src/main/java/org/scijava/script/ScriptModule.java              | 2 +-
 src/main/java/org/scijava/script/ScriptREPL.java                | 2 +-
 src/main/java/org/scijava/script/ScriptService.java             | 2 +-
 src/main/java/org/scijava/script/console/RunScriptArgument.java | 2 +-
 src/main/java/org/scijava/script/io/ScriptIOPlugin.java         | 2 +-
 .../scijava/script/process/DefaultScriptProcessorService.java   | 2 +-
 .../org/scijava/script/process/DirectiveScriptProcessor.java    | 2 +-
 .../org/scijava/script/process/ParameterScriptProcessor.java    | 2 +-
 src/main/java/org/scijava/script/process/ScriptCallback.java    | 2 +-
 .../scijava/script/process/ScriptDirectiveScriptProcessor.java  | 2 +-
 src/main/java/org/scijava/script/process/ScriptProcessor.java   | 2 +-
 .../java/org/scijava/script/process/ScriptProcessorService.java | 2 +-
 .../java/org/scijava/script/process/ShebangScriptProcessor.java | 2 +-
 src/main/java/org/scijava/script/run/ScriptCodeRunner.java      | 2 +-
 src/main/java/org/scijava/service/AbstractService.java          | 2 +-
 src/main/java/org/scijava/service/SciJavaService.java           | 2 +-
 src/main/java/org/scijava/service/Service.java                  | 2 +-
 src/main/java/org/scijava/service/ServiceHelper.java            | 2 +-
 src/main/java/org/scijava/service/ServiceIndex.java             | 2 +-
 .../java/org/scijava/service/event/ServicesLoadedEvent.java     | 2 +-
 src/main/java/org/scijava/startup/DefaultStartupService.java    | 2 +-
 src/main/java/org/scijava/startup/StartupService.java           | 2 +-
 src/main/java/org/scijava/task/DefaultTask.java                 | 2 +-
 src/main/java/org/scijava/task/DefaultTaskService.java          | 2 +-
 src/main/java/org/scijava/task/Task.java                        | 2 +-
 src/main/java/org/scijava/task/TaskService.java                 | 2 +-
 src/main/java/org/scijava/task/event/TaskEvent.java             | 2 +-
 src/main/java/org/scijava/test/TestUtils.java                   | 2 +-
 src/main/java/org/scijava/text/AbstractTextFormat.java          | 2 +-
 src/main/java/org/scijava/text/DefaultTextService.java          | 2 +-
 src/main/java/org/scijava/text/TextFormat.java                  | 2 +-
 src/main/java/org/scijava/text/TextService.java                 | 2 +-
 src/main/java/org/scijava/text/io/DefaultTextIOService.java     | 2 +-
 src/main/java/org/scijava/text/io/TextIOPlugin.java             | 2 +-
 src/main/java/org/scijava/text/io/TextIOService.java            | 2 +-
 src/main/java/org/scijava/thread/DefaultThreadService.java      | 2 +-
 src/main/java/org/scijava/thread/ThreadService.java             | 2 +-
 src/main/java/org/scijava/tool/AbstractTool.java                | 2 +-
 src/main/java/org/scijava/tool/CustomDrawnTool.java             | 2 +-
 src/main/java/org/scijava/tool/DefaultToolService.java          | 2 +-
 src/main/java/org/scijava/tool/DummyTool.java                   | 2 +-
 src/main/java/org/scijava/tool/IconDrawer.java                  | 2 +-
 src/main/java/org/scijava/tool/IconService.java                 | 2 +-
 src/main/java/org/scijava/tool/Tool.java                        | 2 +-
 src/main/java/org/scijava/tool/ToolService.java                 | 2 +-
 src/main/java/org/scijava/tool/event/ToolActivatedEvent.java    | 2 +-
 src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java  | 2 +-
 src/main/java/org/scijava/tool/event/ToolEvent.java             | 2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java                     | 2 +-
 src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java  | 2 +-
 src/main/java/org/scijava/ui/AbstractUIInputWidget.java         | 2 +-
 src/main/java/org/scijava/ui/AbstractUserInterface.java         | 2 +-
 src/main/java/org/scijava/ui/ApplicationFrame.java              | 2 +-
 src/main/java/org/scijava/ui/Arrangeable.java                   | 2 +-
 src/main/java/org/scijava/ui/CloseConfirmable.java              | 2 +-
 src/main/java/org/scijava/ui/DefaultUIService.java              | 2 +-
 src/main/java/org/scijava/ui/Desktop.java                       | 2 +-
 src/main/java/org/scijava/ui/DialogPrompt.java                  | 2 +-
 src/main/java/org/scijava/ui/FileListPreprocessor.java          | 2 +-
 src/main/java/org/scijava/ui/FilePreprocessor.java              | 2 +-
 src/main/java/org/scijava/ui/StatusBar.java                     | 2 +-
 src/main/java/org/scijava/ui/SystemClipboard.java               | 2 +-
 src/main/java/org/scijava/ui/ToolBar.java                       | 2 +-
 src/main/java/org/scijava/ui/UIPreprocessor.java                | 2 +-
 src/main/java/org/scijava/ui/UIService.java                     | 2 +-
 src/main/java/org/scijava/ui/UserInterface.java                 | 2 +-
 src/main/java/org/scijava/ui/console/AbstractConsolePane.java   | 2 +-
 src/main/java/org/scijava/ui/console/ConsolePane.java           | 2 +-
 src/main/java/org/scijava/ui/console/HeadlessArgument.java      | 2 +-
 src/main/java/org/scijava/ui/console/ShowUIArgument.java        | 2 +-
 src/main/java/org/scijava/ui/console/UIArgument.java            | 2 +-
 src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java   | 2 +-
 .../java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java     | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropData.java           | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropService.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/MIMEType.java                  | 2 +-
 .../java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java   | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java      | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DropEvent.java           | 2 +-
 src/main/java/org/scijava/ui/event/UIEvent.java                 | 2 +-
 src/main/java/org/scijava/ui/event/UIShownEvent.java            | 2 +-
 .../java/org/scijava/ui/headless/HeadlessDisplayViewer.java     | 2 +-
 src/main/java/org/scijava/ui/headless/HeadlessUI.java           | 2 +-
 src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java         | 2 +-
 src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayPanel.java           | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayViewer.java          | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayWindow.java          | 2 +-
 .../org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java   | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java | 2 +-
 src/main/java/org/scijava/util/AbstractPrimitiveArray.java      | 2 +-
 src/main/java/org/scijava/util/AppUtils.java                    | 2 +-
 src/main/java/org/scijava/util/ArrayUtils.java                  | 2 +-
 src/main/java/org/scijava/util/BoolArray.java                   | 2 +-
 src/main/java/org/scijava/util/ByteArray.java                   | 2 +-
 src/main/java/org/scijava/util/Bytes.java                       | 2 +-
 src/main/java/org/scijava/util/CharArray.java                   | 2 +-
 src/main/java/org/scijava/util/CheckSezpoz.java                 | 2 +-
 src/main/java/org/scijava/util/ClassUtils.java                  | 2 +-
 src/main/java/org/scijava/util/ColorRGB.java                    | 2 +-
 src/main/java/org/scijava/util/ColorRGBA.java                   | 2 +-
 src/main/java/org/scijava/util/Colors.java                      | 2 +-
 src/main/java/org/scijava/util/CombineAnnotations.java          | 2 +-
 src/main/java/org/scijava/util/Combiner.java                    | 2 +-
 src/main/java/org/scijava/util/ConversionUtils.java             | 2 +-
 src/main/java/org/scijava/util/DebugUtils.java                  | 2 +-
 src/main/java/org/scijava/util/DefaultTreeNode.java             | 2 +-
 src/main/java/org/scijava/util/DigestUtils.java                 | 2 +-
 src/main/java/org/scijava/util/DoubleArray.java                 | 2 +-
 src/main/java/org/scijava/util/FileUtils.java                   | 2 +-
 src/main/java/org/scijava/util/FloatArray.java                  | 2 +-
 src/main/java/org/scijava/util/GenericUtils.java                | 2 +-
 src/main/java/org/scijava/util/IntArray.java                    | 2 +-
 src/main/java/org/scijava/util/IntCoords.java                   | 2 +-
 src/main/java/org/scijava/util/IntRect.java                     | 2 +-
 src/main/java/org/scijava/util/IteratorPlus.java                | 2 +-
 src/main/java/org/scijava/util/LastRecentlyUsed.java            | 2 +-
 src/main/java/org/scijava/util/LineOutputStream.java            | 2 +-
 src/main/java/org/scijava/util/ListUtils.java                   | 2 +-
 src/main/java/org/scijava/util/LongArray.java                   | 2 +-
 src/main/java/org/scijava/util/Manifest.java                    | 2 +-
 src/main/java/org/scijava/util/MersenneTwisterFast.java         | 2 +-
 src/main/java/org/scijava/util/MetaInfCombiner.java             | 2 +-
 src/main/java/org/scijava/util/MirrorWebsite.java               | 2 +-
 src/main/java/org/scijava/util/MiscUtils.java                   | 2 +-
 src/main/java/org/scijava/util/NumberUtils.java                 | 2 +-
 src/main/java/org/scijava/util/ObjectArray.java                 | 2 +-
 src/main/java/org/scijava/util/POM.java                         | 2 +-
 src/main/java/org/scijava/util/PlatformUtils.java               | 2 +-
 src/main/java/org/scijava/util/Prefs.java                       | 2 +-
 src/main/java/org/scijava/util/PrimitiveArray.java              | 2 +-
 src/main/java/org/scijava/util/ProcessUtils.java                | 2 +-
 src/main/java/org/scijava/util/Query.java                       | 2 +-
 src/main/java/org/scijava/util/ReadInto.java                    | 2 +-
 src/main/java/org/scijava/util/RealCoords.java                  | 2 +-
 src/main/java/org/scijava/util/RealRect.java                    | 2 +-
 src/main/java/org/scijava/util/ReflectException.java            | 2 +-
 src/main/java/org/scijava/util/ReflectedUniverse.java           | 2 +-
 src/main/java/org/scijava/util/ServiceCombiner.java             | 2 +-
 src/main/java/org/scijava/util/ShortArray.java                  | 2 +-
 src/main/java/org/scijava/util/Sizable.java                     | 2 +-
 src/main/java/org/scijava/util/SizableArrayList.java            | 2 +-
 src/main/java/org/scijava/util/StringMaker.java                 | 2 +-
 src/main/java/org/scijava/util/StringUtils.java                 | 2 +-
 src/main/java/org/scijava/util/Timing.java                      | 2 +-
 src/main/java/org/scijava/util/TreeNode.java                    | 2 +-
 src/main/java/org/scijava/util/TunePlayer.java                  | 2 +-
 src/main/java/org/scijava/util/Types.java                       | 2 +-
 src/main/java/org/scijava/util/UnitUtils.java                   | 2 +-
 src/main/java/org/scijava/util/VersionUtils.java                | 2 +-
 src/main/java/org/scijava/util/XML.java                         | 2 +-
 src/main/java/org/scijava/welcome/DefaultWelcomeService.java    | 2 +-
 src/main/java/org/scijava/welcome/WelcomeService.java           | 2 +-
 src/main/java/org/scijava/welcome/event/WelcomeEvent.java       | 2 +-
 src/main/java/org/scijava/widget/AbstractInputHarvester.java    | 2 +-
 src/main/java/org/scijava/widget/AbstractInputPanel.java        | 2 +-
 src/main/java/org/scijava/widget/AbstractInputWidget.java       | 2 +-
 src/main/java/org/scijava/widget/Button.java                    | 2 +-
 src/main/java/org/scijava/widget/ButtonWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ChoiceWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ColorWidget.java               | 2 +-
 src/main/java/org/scijava/widget/DateWidget.java                | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetModel.java        | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetService.java      | 2 +-
 src/main/java/org/scijava/widget/FileListWidget.java            | 2 +-
 src/main/java/org/scijava/widget/FileWidget.java                | 2 +-
 src/main/java/org/scijava/widget/InputHarvester.java            | 2 +-
 src/main/java/org/scijava/widget/InputPanel.java                | 2 +-
 src/main/java/org/scijava/widget/InputWidget.java               | 2 +-
 src/main/java/org/scijava/widget/MessageWidget.java             | 2 +-
 src/main/java/org/scijava/widget/NumberWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ObjectWidget.java              | 2 +-
 src/main/java/org/scijava/widget/TextWidget.java                | 2 +-
 src/main/java/org/scijava/widget/ToggleWidget.java              | 2 +-
 src/main/java/org/scijava/widget/UIComponent.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetModel.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetService.java             | 2 +-
 src/main/java/org/scijava/widget/WidgetStyle.java               | 2 +-
 src/test/java/org/scijava/ContextCreationTest.java              | 2 +-
 src/test/java/org/scijava/ContextDisposalTest.java              | 2 +-
 src/test/java/org/scijava/ContextInjectionTest.java             | 2 +-
 src/test/java/org/scijava/SciJavaTest.java                      | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedA.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedB.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedC.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedD.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedInnerClass.java  | 2 +-
 src/test/java/org/scijava/annotations/Complex.java              | 2 +-
 src/test/java/org/scijava/annotations/DirectoryIndexerTest.java | 2 +-
 src/test/java/org/scijava/annotations/EclipseHelperTest.java    | 2 +-
 src/test/java/org/scijava/annotations/Fruit.java                | 2 +-
 src/test/java/org/scijava/annotations/LegacyTest.java           | 2 +-
 src/test/java/org/scijava/annotations/Simple.java               | 2 +-
 src/test/java/org/scijava/app/StatusServiceTest.java            | 2 +-
 .../java/org/scijava/command/CommandArrayConverterTest.java     | 2 +-
 src/test/java/org/scijava/command/CommandInfoTest.java          | 2 +-
 src/test/java/org/scijava/command/CommandModuleTest.java        | 2 +-
 src/test/java/org/scijava/command/CommandServiceTest.java       | 2 +-
 src/test/java/org/scijava/command/InputsTest.java               | 2 +-
 src/test/java/org/scijava/command/InvalidCommandTest.java       | 2 +-
 .../java/org/scijava/command/run/CommandCodeRunnerTest.java     | 2 +-
 src/test/java/org/scijava/console/ConsoleServiceTest.java       | 2 +-
 .../java/org/scijava/console/SystemPropertyArgumentTest.java    | 2 +-
 .../java/org/scijava/convert/AbstractNumberConverterTests.java  | 2 +-
 .../java/org/scijava/convert/ArrayToStringConverterTest.java    | 2 +-
 .../scijava/convert/BigIntegerToBigDecimalConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ByteToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToBigIntegerConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToDoubleConverterTest.java     | 2 +-
 src/test/java/org/scijava/convert/ByteToFloatConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToIntegerConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/ByteToLongConverterTest.java  | 2 +-
 src/test/java/org/scijava/convert/ByteToShortConverterTest.java | 2 +-
 src/test/java/org/scijava/convert/ConvertServiceTest.java       | 2 +-
 src/test/java/org/scijava/convert/ConverterTest.java            | 2 +-
 src/test/java/org/scijava/convert/DefaultConverterTest.java     | 2 +-
 src/test/java/org/scijava/convert/DelegateConverterTest.java    | 2 +-
 .../org/scijava/convert/DoubleToBigDecimalConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileListConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileToPathConversionTest.java | 2 +-
 .../org/scijava/convert/FloatToBigDecimalConverterTest.java     | 2 +-
 .../java/org/scijava/convert/FloatToDoubleConverterTest.java    | 2 +-
 .../org/scijava/convert/IntegerToBigDecimalConverterTest.java   | 2 +-
 .../org/scijava/convert/IntegerToBigIntegerConverterTest.java   | 2 +-
 .../java/org/scijava/convert/IntegerToDoubleConverterTest.java  | 2 +-
 .../java/org/scijava/convert/IntegerToLongConverterTest.java    | 2 +-
 .../java/org/scijava/convert/LongToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/LongToBigIntegerConverterTest.java | 2 +-
 .../org/scijava/convert/ShortToBigDecimalConverterTest.java     | 2 +-
 .../org/scijava/convert/ShortToBigIntegerConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToDoubleConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ShortToFloatConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToIntegerConverterTest.java   | 2 +-
 src/test/java/org/scijava/convert/ShortToLongConverterTest.java | 2 +-
 .../java/org/scijava/convert/StringToArrayConverterTest.java    | 2 +-
 .../java/org/scijava/convert/StringToNumberConverterTest.java   | 2 +-
 src/test/java/org/scijava/display/DisplayTest.java              | 2 +-
 src/test/java/org/scijava/download/DownloadServiceTest.java     | 2 +-
 src/test/java/org/scijava/event/EventServiceTest.java           | 2 +-
 src/test/java/org/scijava/io/ByteArrayByteBankTest.java         | 2 +-
 src/test/java/org/scijava/io/ByteBankTest.java                  | 2 +-
 src/test/java/org/scijava/io/IOServiceTest.java                 | 2 +-
 src/test/java/org/scijava/io/TypedIOServiceTest.java            | 2 +-
 src/test/java/org/scijava/io/event/DataEventTest.java           | 2 +-
 src/test/java/org/scijava/io/handle/BytesHandleTest.java        | 2 +-
 .../java/org/scijava/io/handle/DataHandleEdgeCaseTests.java     | 2 +-
 src/test/java/org/scijava/io/handle/DataHandleTest.java         | 2 +-
 src/test/java/org/scijava/io/handle/DataHandlesTest.java        | 2 +-
 src/test/java/org/scijava/io/handle/FileHandleTest.java         | 2 +-
 .../org/scijava/io/handle/ReadBufferDataHandleMockTest.java     | 2 +-
 .../java/org/scijava/io/handle/ReadBufferDataHandleTest.java    | 2 +-
 .../java/org/scijava/io/handle/WriteBufferDataHandleTest.java   | 2 +-
 src/test/java/org/scijava/io/location/BytesLocationTest.java    | 2 +-
 .../java/org/scijava/io/location/FileLocationResolverTest.java  | 2 +-
 src/test/java/org/scijava/io/location/FileLocationTest.java     | 2 +-
 src/test/java/org/scijava/io/location/LocationServiceTest.java  | 2 +-
 src/test/java/org/scijava/io/location/URILocationTest.java      | 2 +-
 src/test/java/org/scijava/io/location/URLLocationTest.java      | 2 +-
 src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java    | 2 +-
 src/test/java/org/scijava/log/CallingClassUtilsTest.java        | 2 +-
 src/test/java/org/scijava/log/DefaultLoggerTest.java            | 2 +-
 src/test/java/org/scijava/log/LogMessageTest.java               | 2 +-
 src/test/java/org/scijava/log/LogServiceTest.java               | 2 +-
 src/test/java/org/scijava/log/LogSourceTest.java                | 2 +-
 src/test/java/org/scijava/log/StderrLogServiceTest.java         | 2 +-
 src/test/java/org/scijava/log/TestLogListener.java              | 2 +-
 src/test/java/org/scijava/main/MainServiceTest.java             | 2 +-
 src/test/java/org/scijava/main/run/MainCodeRunnerTest.java      | 2 +-
 src/test/java/org/scijava/menu/MenuServiceTest.java             | 2 +-
 src/test/java/org/scijava/menu/ShadowMenuTest.java              | 2 +-
 src/test/java/org/scijava/module/ModuleServiceTest.java         | 2 +-
 .../java/org/scijava/module/event/ModuleErroredEventTest.java   | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessorTest.java | 2 +-
 src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java  | 2 +-
 src/test/java/org/scijava/object/NamedObjectIndexTest.java      | 2 +-
 src/test/java/org/scijava/object/ObjectIndexTest.java           | 2 +-
 src/test/java/org/scijava/object/ObjectServiceTest.java         | 2 +-
 src/test/java/org/scijava/object/SortedObjectIndexTest.java     | 2 +-
 src/test/java/org/scijava/options/OptionsTest.java              | 2 +-
 src/test/java/org/scijava/parse/ParseServiceTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginFinderTest.java          | 2 +-
 src/test/java/org/scijava/plugin/PluginIndexTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginInfoTest.java            | 2 +-
 src/test/java/org/scijava/plugin/SingletonServiceTest.java      | 2 +-
 src/test/java/org/scijava/prefs/PrefServiceTest.java            | 2 +-
 src/test/java/org/scijava/run/RunServiceTest.java               | 2 +-
 .../java/org/scijava/script/AbstractScriptLanguageTest.java     | 2 +-
 src/test/java/org/scijava/script/ScriptEngineTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptFinderTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptInfoTest.java            | 2 +-
 src/test/java/org/scijava/script/ScriptServiceTest.java         | 2 +-
 .../scijava/script/process/ParameterScriptProcessorTest.java    | 2 +-
 src/test/java/org/scijava/service/ServiceIndexTest.java         | 2 +-
 src/test/java/org/scijava/task/TaskEventTest.java               | 2 +-
 src/test/java/org/scijava/task/TaskServiceTest.java             | 2 +-
 src/test/java/org/scijava/test/AbstractSciJavaTest.java         | 2 +-
 src/test/java/org/scijava/test/TestUtilsTest.java               | 2 +-
 src/test/java/org/scijava/text/TextServiceTest.java             | 2 +-
 src/test/java/org/scijava/thread/ThreadServiceTest.java         | 2 +-
 src/test/java/org/scijava/ui/UIServiceTest.java                 | 2 +-
 src/test/java/org/scijava/util/AppUtilsTest.java                | 2 +-
 src/test/java/org/scijava/util/ArrayUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/BoolArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ByteArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/CharArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ClassUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/ColorRGBTest.java                | 2 +-
 src/test/java/org/scijava/util/ConversionUtilsTest.java         | 2 +-
 src/test/java/org/scijava/util/DigestUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/DoubleArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/FileUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/FloatArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/GenericArrayTypesTest.java       | 2 +-
 src/test/java/org/scijava/util/IntArrayTest.java                | 2 +-
 src/test/java/org/scijava/util/LastRecentlyUsedTest.java        | 2 +-
 src/test/java/org/scijava/util/LongArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/NumberUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/ObjectArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/POMTest.java                     | 2 +-
 src/test/java/org/scijava/util/PrimitiveArrayTest.java          | 2 +-
 src/test/java/org/scijava/util/ProcessUtilsTest.java            | 2 +-
 src/test/java/org/scijava/util/ShortArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/StringUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/TypesTest.java                   | 2 +-
 src/test/java/org/scijava/util/UnitUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/VersionUtilsTest.java            | 2 +-
 src/test/java/org/scijava/widget/WidgetStyleTest.java           | 2 +-
 755 files changed, 755 insertions(+), 755 deletions(-)

diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 514f2c7d7..0ce0ce63c 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2023 SciJava developers.
+  Copyright (C) 2009 - 2024 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 245d04040..fed9016f3 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index 0f899650e..86df895da 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index bad45ed0b..451e17e42 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index 399db31d8..a91b6f012 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index fb751e065..69b227865 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2023 SciJava developers.
+  Copyright (C) 2009 - 2024 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index f3b30998c..cea966d7b 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index b550ae26f..23a9076ba 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 766597967..d6ee9b0fb 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index d6afda127..7fd19bfdd 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index e6c96fbf1..de28e93bd 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 74aef720e..4b2122560 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 421ad2b36..561b53fc5 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 6862b19b8..9b41674da 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index 6c1f51276..7b3db0a86 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 657a7faa4..fdb8a624d 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index 5d7b4301d..5e1063ee9 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index b8c4bd430..972a192c9 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index f51ea2e32..f5dbf14dd 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index de5d6db8e..087f2321c 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index bb9b0be69..afcfff5be 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index 764d67bac..d1d025569 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index ed9212310..1cba5940a 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index 236cdbe35..7cecc891c 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index cab9983d8..c81406db5 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index e0f508e94..ce2a9c689 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 24fb01c00..412ac0e67 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index f411e951d..58f5862fb 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 4433057a9..04d28e792 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index cc3e20661..4031ab296 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 65ce6c237..7b579848b 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index 11f0d5743..a95841ce0 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index f40ca469b..93d9c6339 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 07c444bbd..c20e67efb 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index f90043370..9873e589b 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index 82e8ac134..8efd392d4 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index 446e91cda..c146f41ed 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 54cfac128..12f29e5fc 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 66c1d3566..7588b762b 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 518e29d64..8e4e1fc65 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 4de2c6e53..10682ca6a 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 1af1b118d..ab0024069 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 00a320e6a..0d4765e9e 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index 98bcf4033..a7a760df2 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index 3cfa75dd7..dcefa9f88 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index 63ec749d3..74dd5c65d 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index 7b7f040a8..f1c386bcc 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 733a29125..ce6619f24 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 7901ee792..96b62626a 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index 72990e5f9..a18f8366e 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index e15d3c869..c6ec110b6 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 12e203ab0..2906b72bb 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 44a871f9f..f93bbba71 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index d8f8a2d71..4af7d69c5 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 82ef4b7f2..3a28d4a52 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index 7b57ce3e2..cabc032f8 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index 15b8d82f3..afc2a4a6e 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index a150bf86b..4fddf6734 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index fa462633b..456736f68 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index b5aaba8d1..78913df7a 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 702b1a561..0d8201e18 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index 253c92332..ec30d678a 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 10772f7f9..6d1495ebb 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index bc3b6e520..3588dffac 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index 1ca12204e..00275c0c1 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index bda553db7..8fccd9f20 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index d67417a04..9d85a1235 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index 9c30dffaa..18272bbbb 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index a940e4257..b1f3f999d 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index ea3cce37b..49925091a 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index bfe715895..ac5b780b7 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 3b9ea160c..da9308f5a 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index cf1d828ee..eb8804716 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index d0cea8435..86ffa6df7 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index 2c1816b3c..5b843323e 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 9ed6165a5..811dabf8c 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index d4bdec30a..edfa4ea0c 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index fdc600b31..23c5b9a24 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 40de75132..6314e737e 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 74cce7d56..535deb088 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 02e4fb5ac..043e5b439 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index 3f0109138..e1f2a11c2 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index 843a6f20d..762b7f249 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index 44000d87a..640a9dbc7 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index 39c100c92..40590ccd0 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 15f7812c8..0388e601c 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index 7a7a429f6..c80d2fbef 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index df0853005..909c6f0da 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 7f885d1ee..ab9cb24a8 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index c9dc10014..1cf448747 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index e9455c214..27915c40d 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 3f8c4d5cd..3486e9a5f 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 6bce9a48b..14e65bae2 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 4280789ff..3191be092 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index f36d9fd9e..434940368 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 975c88f82..15064c8d7 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index d9cc1173f..ed3da126e 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileToPathConverter.java b/src/main/java/org/scijava/convert/FileToPathConverter.java
index 70a295bdb..7d091b9e0 100644
--- a/src/main/java/org/scijava/convert/FileToPathConverter.java
+++ b/src/main/java/org/scijava/convert/FileToPathConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 0ea6e9f97..9719d6afe 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index ed8481463..05aa71c7c 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index 73fffeecc..889cf75e9 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 5dd8bdc71..80196b63a 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 23c26b62b..751badc6b 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index 56620787b..19579a857 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index 897fb807f..149962f42 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index 1b2af346c..7f7eef462 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index f99af2e1a..d3b3102fe 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 96c2fbc36..aed496f49 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PathToFileConverter.java b/src/main/java/org/scijava/convert/PathToFileConverter.java
index 3b793ae8e..6c221f905 100644
--- a/src/main/java/org/scijava/convert/PathToFileConverter.java
+++ b/src/main/java/org/scijava/convert/PathToFileConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index 5fb595290..514077e15 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index 33441c806..dedcc8092 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 18c581b32..18e6a38d6 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToNumberConverter.java b/src/main/java/org/scijava/convert/StringToNumberConverter.java
index 6fbebd2cf..817c0c37a 100644
--- a/src/main/java/org/scijava/convert/StringToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/StringToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index c9ff7f702..02a44cd6d 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index c0e26c205..488cc2249 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index fb2f95d39..b7058f5e9 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index 946b63cc0..f91dddc14 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index abdd3f960..df16c01cc 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index 3df3b4115..77921d195 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 1f654e213..9a69d7f8e 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 2d09285e4..23acbf0e0 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index f0afe8879..ae875c217 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 4a4f72b41..29eb39843 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 8457a85aa..0c6a12a07 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index 44e1736c3..bd6f77560 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index 3a866ec4d..c1420e4d5 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 35cf6026e..95e90c7cb 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index 540812981..1be4cb353 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index 86008a0c6..d515f9c0a 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index a8b6ae9b9..ddc2f3046 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index d5456b715..6cafacc77 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 278c75e1d..acc1bdf9d 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index 932e1ef9e..398fe027b 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index 34d49434b..ed1d4eae4 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index a6c4ba199..62f9bd622 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index ddf8fd2b8..ec6595127 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index 7c65762d6..de13c50ee 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index ef6bca8dd..3836bb65c 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index fc6b542ba..28584e4e1 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index 25b18bf23..f8be96df2 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index 38fbf57d9..c45b5991d 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 7f7a90e98..2ad017f9c 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 25e2c8fd5..0c723db58 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index cefba6238..a51e7132b 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 8767b0c3b..b54bae090 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index 402f42d01..4bf578d83 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index e1b136e70..baceef2f0 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index beae46170..882058c7a 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index c1c50b74b..75a4714ea 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 3fb4e8f12..731cae148 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index f943b0f59..4ac6abb44 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index 749c05497..6775b0bc0 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index 1a957214b..eb9f1f8a1 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index 2ca41a754..313bc5840 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index 3e9c8d2d3..7410aa1c5 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index 1e961bf5a..30da5a620 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index 8f565a3ff..b6a7c6e1d 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextCreatedEvent.java b/src/main/java/org/scijava/event/ContextCreatedEvent.java
index 7ca7d529b..8f6de90ee 100644
--- a/src/main/java/org/scijava/event/ContextCreatedEvent.java
+++ b/src/main/java/org/scijava/event/ContextCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index cdd8a7814..4f161ce33 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 9d71eb8f3..8d3f91745 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 3245d9014..0847b9b7f 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 0047c42f5..5059046db 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index be0700965..be2bd9494 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index a3d5a4bba..628e9a7a4 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index de7d48be0..f1b49e309 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index 5a8e4b139..a0da0e664 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index cc9f89d17..2a7f6d95b 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index a36181639..7bcef12d3 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index d6bdd2f39..b4c8343d3 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index 200167c44..ffa6ca9ae 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 7a6ad862a..3f9f9b03b 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index 6adec0eb7..dc1fd6095 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index 92ce58ad5..8bb2ea10a 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 9e817ad4b..c7207eeb3 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index 76144f32f..1ade50c90 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index f1d483810..954e77258 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 3160c4246..520441e43 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index f74659702..196ba64c8 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index 058a9cc40..1bb062b54 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 32f5e5b27..a5199e76e 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index c2e0b94d7..299f3f387 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index a6c2536a4..2c12ccd6a 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 72655ab39..26cd44836 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index 2f91937bb..7c549fe8b 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index 5664ec3bb..746311f6a 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index 4e929d9c1..efe0fe257 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index 22f9fd4d0..a034e574f 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index 67a8b21ad..d2fb9e03e 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 1147039b3..593cdf721 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index 33a369a5c..dcafd62cd 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index c1276a092..853bc4098 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
index 542b29f2c..ac7318347 100644
--- a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
index 463eefe59..30af9f6a0 100644
--- a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 971ecd56d..4b0051372 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 5497d97b8..61d413382 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index bbf9bc183..7613b17be 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index d1a8b4791..4e8259a8b 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index 37a6e6cfa..e55cdfd3f 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index ff2928911..a8976f3fa 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index cf7c8db92..66428855f 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 35116cf47..61fe0bdf5 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 54580b71b..029c0c6b2 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index d05f6507d..35841320b 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
index b5114ca29..6a1022e9a 100644
--- a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
index b57ef34d8..fa4e1666d 100644
--- a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
index e2e683b08..c33eccdab 100644
--- a/src/main/java/org/scijava/io/handle/StreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
index 280457b21..4f3a7d818 100644
--- a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index f1c01a2da..d93e29fa9 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
index 0771e095a..d05ad4c9b 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index ecd40cb78..78e66e53b 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
index e3f03f912..68bbf0be3 100644
--- a/src/main/java/org/scijava/io/location/BrowsableLocation.java
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 2ac731595..74bc91843 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index 5f010073b..46dd034ba 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index 1a2058b42..1235ff829 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index d86d0e6ae..ef8b8950e 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
index 498ca6d37..9c02c4a8f 100644
--- a/src/main/java/org/scijava/io/location/FileLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index 74fd05a65..efb45542f 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
index 1759f180b..dac41d9bd 100644
--- a/src/main/java/org/scijava/io/location/LocationResolver.java
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index b06c6201f..ff29ce6e0 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index 6a1ca7bde..ce5760565 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 02c3e61d7..3bc2789aa 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index e96afcb7d..37619be4f 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 8e3d9afb9..92ccd5a1f 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 832ce5e06..655580146 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index b56330b00..4bdb6be3e 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 74e620f2e..de30db3da 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index 4216120e7..c29516b91 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index e8bbfdce6..0cf99f33e 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index b866c447c..e59cc2c93 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index fc0043dc8..0b18fac9f 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index 0b0211f3b..0172ed524 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index 502a54c8e..b2e8dad4b 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 771fe28d9..4a621b261 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index c4068d1ff..335abb8f6 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index 30bdca5b5..b44c48556 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index 59c1f5c5a..c12e4fe13 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 4c066b310..0db237f70 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index e67c97132..9801bb746 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 1be25c6bc..79dea58cf 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index 2230a6d4e..d8b190de1 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index e1548f46c..0125781da 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index bbf3cc36a..6ff737b2b 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index 8ad7ba7d4..d28e3fa73 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index af6eee927..73471d5c9 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index f15311579..78f71535a 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index 0be942d50..20249f21b 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index 2625caee8..1023a5fd6 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index 95bcd409a..f6b6e53db 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index 2d35a8d2b..4ac49edb9 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index db950826c..c8ef4a79d 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index 7b2595af5..299b7f68e 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index 008d2784d..205c13229 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index ff0ea6cd6..ea69e3833 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 4dbae4407..4fd0aacf3 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 9fed0102c..29379b44e 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index 3f8c7c09c..f61cfcc54 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index e2c03c0cc..e4461f236 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 3ab26d90f..768d6c663 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index bdb3b0c4b..859fe0d9b 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index fc7cd35d0..3e3eb139c 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index f42988331..eca6e5e5c 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index b20c2d714..758f8d390 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 9df7cfda9..16f555a48 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index 85c20a202..c39147745 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 5b9a3495d..0b4339108 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index 04f0d4de8..30f53e048 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index b7ae95bab..d95a56335 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 1f1f39003..cec5cb5e2 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 8fa173225..7de66702f 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index f19ae1df3..ad1ae76d3 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 1624c726d..487c98f00 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index ee7c00232..7dd5bffdd 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 3ac251f50..73f952a7e 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index d090600cb..4ad43d60d 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleErroredEvent.java b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
index 9fe97438c..ce0fd6924 100644
--- a/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index ee5c721c1..d00c7ca09 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index 66b8a8c29..eecd5c063 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index d00bb48a4..2cd97f867 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 81ff94ee1..c19ba0535 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index 6c7c2d543..9bc5604b3 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 4587ba475..f92330682 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index e4f228907..92e1ab81e 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 6519874f4..3588bc103 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index aa31745a0..5da7e5fe7 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index 0b0844e94..b32385ae3 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index fb5fc5199..5f6cca8c3 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index 00f2d276f..f8a9a9780 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index eb20e9431..075f1f826 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index d7a025dd6..575fec9b3 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index 1824c8b39..53cbac997 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index 59b9b77a6..0e30c3935 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index 87526ac1a..545261ffc 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 7fbfb10df..af8bd28c2 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index 0cb62640c..8e33d1088 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 272f8580d..28c951188 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index 4d0a71616..b59b8c8cf 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 629501688..89c6af4d7 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index 773096c99..228058fac 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 439ae43e6..7f4b5531e 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index 93a017750..ee9a06864 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index f0cbe88b9..a90e04b8f 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 003d0b2c7..67284b0a1 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index f60dc8cfc..21eccd05f 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index 357ca6612..fb8765a20 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 742cb870e..c92e54bb8 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 44f7060ac..75c66526e 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index 88c35a9d6..47c523036 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 4cafd1220..15faa89ce 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 8063f9709..7efa98f4b 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 12a53afc1..8d90f18b0 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index 8e3712e4a..a37c1eff1 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index 10220b1f3..3bc0567b0 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 687fabdfe..7fce98b07 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 2a9f12e44..bb233bf26 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index 58ad375df..84f8026a8 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index 597953762..7e35c68e4 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index d033c7d5a..fc5e237b6 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index 17446edf9..6730e23d1 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 8459e1a0d..33b1291d1 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index fb173a3a0..1ec22cb3a 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index 6039ba504..d77e8f3cd 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 2d6e3a997..938b55b8e 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 9967aa887..03379d9d8 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 1994745d8..c86b0f34d 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index d0e49bc8c..69353a5eb 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index 49d676898..42e5cd1b7 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index 1257be932..b8d46f0f8 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index e531fad34..3ef55bcf4 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index 9cc462972..1b9ac7dd1 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 2f8a5ed1a..19a705bcf 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index d192753f2..73710dfc2 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index c8e51bf5d..b10605b52 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index ebc753143..55b276774 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 35c756bdc..fbd7e67f0 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index 5dd7ffe6b..5804a11a4 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index fd3b71e6d..948024f61 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 99eaf6612..c8e796e7f 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 1b1390e93..b266a20bb 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 5aafe2b91..4f65243fd 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 5603e085d..94244046e 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index aa33f9e15..6a51cf9da 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index 73a123737..650200905 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index 03be243a9..7325f24cc 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index f2398c75f..002192a48 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index 674f3b340..f5657e7b2 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index a82b0c20a..678e2e839 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index b70c05442..c8e102725 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index 4cbfa99f3..5fe8a7286 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index 3a48d5a5e..bd99e0c74 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index e99c60d37..45a9fb4e2 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index e5af9d7bd..0038af03f 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 91448fa9b..b0e475b68 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index e17ba3be7..f2562e9ae 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 76b268b65..5170d256e 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 4b61e1b9f..5f804afa7 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index 28885726a..fe51559aa 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index cb479c299..40929cf32 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index d2ab714a7..67fe4a669 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index d2324ccd3..525fd50c3 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index 69fa49c20..c05cb94ad 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index e828d2f2b..4287edcc0 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 9b2041484..0b16c9d58 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 7e73d3e2c..c904ffb73 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index b08fad223..f2fe8aaf8 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 8a5942493..168f977d1 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 971201198..3f6cfaf1e 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index 3c3b0706a..d25e7fc0a 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index ad63b6919..191c8064a 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index f922c23c8..1ed64c82d 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index d2aabba95..5a8fbc5cb 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index ccf96ee6a..450af2428 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 944133d38..b1ae59bd4 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 6629cdb80..dc127f074 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index 3b8ccea3e..e85bf76db 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index 29fc580af..8f5eb862b 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index bdbe7df70..b7bc4c919 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 28c9dbd60..79de0e2e0 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 7f2363307..3ba80f8ca 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index 84da9b16c..257afa423 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index 1e583d42a..a3f6033ca 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 9629620e6..868144629 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index bfb036898..2cf9a517c 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index c42d27caf..3225df43b 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index ed682367c..6a1fe60fe 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index af1505342..0f28602fc 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index a302db020..978a4e2de 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 084df69de..7c1b98cba 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index dfc9b9fa8..f174db6c0 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index c5761b178..30c91aa6e 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 4d7eb067a..5d02b3634 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index 06b626881..d1def7ea2 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index eab573481..883f52e10 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 4d815098d..3fd6cb61e 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 80b9cd073..373da220d 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index fe843eff8..effad4d7f 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index 67c0d3fee..bc2290a23 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index 5826abf07..b62aa5c2f 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 8779ac1dc..03306775e 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index 3ead99983..f99cba338 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index e08f84ff7..3144c16af 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index b29910428..084256755 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index 18783f1e3..190dddd80 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index 7a495fe7c..5d65a3f36 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index 16ee156d4..ae578fb40 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 7f022c097..69a038be1 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index f4fcf2f75..18ebb0dcb 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index f81c1cdaa..fd34edbd6 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index c365ae33f..664ccc300 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index e7fcc6e73..e7f1f0e61 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index e4de7ae54..1e768a057 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index 6b883fe95..df2374beb 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptCLI.java b/src/main/java/org/scijava/script/ScriptCLI.java
index ab6383b19..db53036a3 100644
--- a/src/main/java/org/scijava/script/ScriptCLI.java
+++ b/src/main/java/org/scijava/script/ScriptCLI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 23701ea99..55aad7ed5 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index 3fef71dbf..fbaff7497 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index 20ea362fa..c1e167ade 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index cd664397d..f643e0a54 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index 098ca57c8..491847136 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 5c532bd38..f841f32c1 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index 05bdddadd..fe138cd28 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index 824e47e67..dedf744f4 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index d09dc7eab..2a93a92c1 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index f8764d7da..c1a61044d 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index 145ea53ea..b78065ee2 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index 208ac521d..b6b30209f 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index ebdf8483b..ded8f418d 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
index dfc68ca99..4dfa5ff38 100644
--- a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index 446f633a2..2e0dfd703 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index b458da421..445dd157e 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index dc6ae85c1..fffc58568 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index 36d053963..415f51826 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 1ce80c5af..811ab47d4 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index db05e71b9..f7edef985 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index 5c8e47659..8d4a4a61c 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index bf20248a4..841c8c468 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index fc0e005b0..869ce3269 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index f078de931..392a6dc08 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 4f1031efa..d7ad8003e 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index 24d693aa9..962952d3e 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index bb5fd2258..2b9e9a119 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index 197cf4774..356437eb4 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
index 0f100ff8a..6a47f97d1 100644
--- a/src/main/java/org/scijava/startup/StartupService.java
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 94d817c53..c14d7ad54 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
index f550585c9..5ad770f25 100644
--- a/src/main/java/org/scijava/task/DefaultTaskService.java
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index be1197d77..a91cdcf6b 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
index 3cacfac9b..5bf0cb2f8 100644
--- a/src/main/java/org/scijava/task/TaskService.java
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
index 097c9346c..4173c3bc5 100644
--- a/src/main/java/org/scijava/task/event/TaskEvent.java
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 54c3061e7..692b4fd25 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 55ab02b6b..3bb2edc9e 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index 5836c4e19..a81ed7c0e 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 076039e9a..05ec572c7 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index c8c2219a0..75bae744a 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
index cba64c9bf..d27ec4657 100644
--- a/src/main/java/org/scijava/text/io/DefaultTextIOService.java
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index d5ce2850a..16e9ba34f 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
index 12f629b91..a218aec0f 100644
--- a/src/main/java/org/scijava/text/io/TextIOService.java
+++ b/src/main/java/org/scijava/text/io/TextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 168f9a991..6f48f9e34 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index 0d272b87d..aeec0d1ba 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index 95f89ccc4..4ec4bd878 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 1ec0e78ff..10aafc9db 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index 4f2e8d168..e59976a8f 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index d155ef30a..6dc220279 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index e3f108a4d..2493b7880 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index 67ddf9033..0d6349818 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index e345c253f..31adad6d6 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 0a84ae96b..8fe2855f9 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 9bdb75a60..e2eabdf0d 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index a197eca41..5b668aa23 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index c4c058393..553fd83e1 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index 4c9b60709..b30d9df8f 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index f3db6253a..b29383470 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index a5e1ec829..606864da0 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index decf671af..fd9cc24d1 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index f4ecf39ea..98a2ce24d 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index ad95bb784..19c8cd3a3 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index c92b2a9f3..729a15ed5 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index cda97ec0b..fe787ad5c 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index 114b512cc..e851e6634 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index f21ab726e..7a14960e2 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index a8feefe5d..1f3227731 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index 44eff1194..2076665ec 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index cfef18eff..1d2c39232 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index 421aa24c6..1a362d55e 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index c294cdb23..c7e4de97b 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index b22a20a6f..eb7780a4f 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 53debcf43..0f3958698 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index a0588256c..54dbfb767 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index 0512d725d..b9de2570f 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index 02e2b5b24..3db7788d4 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index dca137c3b..601b3d3ed 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index 10fd2e6b7..3c4cd4a7a 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index 05bee6855..40ee7986f 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index e098a2367..dfc445dca 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index d578688ad..53b24aae6 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index 9634c477a..fc7f00803 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index 3bc3de22e..5a15efe09 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index a4cd7a258..8cc4e082f 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index a81e25f6c..0377f1f03 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index 0d2b3ae38..2319a5c41 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index e8f6090c2..336c94e20 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index d36a10797..42c2490c4 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 037e3916a..db21cac88 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index af9f53015..a5e0cb5b6 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index e460f58b7..aa8f3c624 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index 3b85bb254..b221fdadc 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index c51a4b3c4..268b9b0c9 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index 4545f24e2..fd93d52eb 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index 49331480c..a4a6ac4fe 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index d2b7fd7b8..92f876cd3 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index 23f55be2d..c5e1fb2e3 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index df5e0cc93..2dfa036da 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 3f658df97..63cb32d5c 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 257753e9d..d3f48f2fc 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index ab552f6d0..e705cbbb7 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index 0ab9b1df1..c51213d04 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index d8ea0193a..de99dfc95 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index 55b3b842c..2a45a3427 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index ac0c67d16..a737da1f5 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 683fdbd26..9ca4ae5be 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 517bdb9cf..fe8343711 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index 28bfefc67..6c1a720b2 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 48519a328..4dd310c6a 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index 6ce46c43e..db6efcdbf 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 3edf088a8..3ea2bee18 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index 07e724fb1..f5eda9f65 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index ac6637797..759383d73 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index 1550ec875..cdfa1de15 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index 7f5643b76..235db46fd 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 5543ce7bb..8569b4bd6 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 4e10cd8c4..cfc211e04 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index fb89ccb72..e78221623 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index cc115dc75..2f616b838 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index 993a03445..dddf6046d 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index feb0b1774..7b107d0fb 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index b3662eaa2..7a01ba31f 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 06c26b168..78f84c6fa 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
index 1d1231702..e16bf02e5 100644
--- a/src/main/java/org/scijava/util/DefaultTreeNode.java
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 54014b709..c63b035fb 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index bf76fdb7b..71aaaece8 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index e9424cef0..73099aacc 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index 593d22131..3c3bd00ce 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index 978af3f54..d470580e3 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 66de4c87e..32f2f027d 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index bc689e341..23d3bc238 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index 9791697e3..4c224be75 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index da8bae3db..da2c28dad 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 2e485bf22..0714ce49c 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index c37318242..c3d95997d 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index f868a9af2..79c857461 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index f190a2049..ee9a4a453 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index f57983e31..e5f7fab67 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index bf176347b..089299ee0 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 6380901ad..4cb22cb05 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index fff9366d3..4bd72155a 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 3c0f5b0be..667e7560a 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 704e0bc8c..77137ecbe 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index 44e4dfce3..486313d8c 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index ea0feacbc..afd4771a0 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index 21ffc6475..8e67ec1a3 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index 8519017c4..4044f6762 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index addc4d016..35a6c7498 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index cf8914033..9f97a24d0 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index c8b6d525b..39914f518 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 37daf4857..3aafebae3 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index dbb39a44e..7b49819fe 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index 7f6867df6..b149ba1d5 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index 701e8362e..aa3e18849 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 4c9fd953f..54ce3cd65 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index a24cf6abb..2a069ef5c 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 8a3985006..1f903b532 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index c1172b1dc..9c9d34a7a 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index b132a87f7..89fa00b66 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index ac4db3873..3b2d1839c 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 0fdba3900..5d72f80bd 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 1bf79ddd4..aec5a6d1e 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
index 833832642..a827556f9 100644
--- a/src/main/java/org/scijava/util/TreeNode.java
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index f12969725..d14fd40b4 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index 8a4369a05..d112b2114 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 6f1848da9..d93471c25 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index 2bbb2e25d..b5306c1de 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index aac4a396b..732b0ee0c 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index bc7bdd726..817fc44f1 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index 68da22375..a2819123f 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index 90b70c8d6..f6f046b81 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 73fdf7b53..2c259c400 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index 0efb95586..e2accd1af 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 9c6aede1e..420fb43ae 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index e9e73f59a..174c30d2c 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index 9c278c243..8b43645a4 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index 6ca640cb9..202a6e346 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 17de750c9..fdbe7a7f5 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index 8a7db46cf..5a849f966 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index e8e7c7631..b1ed1cd47 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 19111288c..380746ad7 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index f99c66ee2..87401b27f 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index da4632c79..a4322554d 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 25ce4c5e8..30735f457 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 664ade0ab..6e1396e0f 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index bdcb27c2d..6499314bc 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 117b08aeb..f096f4116 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index b6b81e6c9..67d4c1030 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index 839b5272b..5c8b2ed81 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index 34dd871bf..4f555d8c1 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index 829dd0c94..336e75cd1 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 943daa7ee..20dd35301 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 97ccad278..9f0f1b634 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index 8f02d6603..047657acb 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index 9dedf5aaf..d9c186b0c 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index db4e76ea7..614e4a019 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextDisposalTest.java b/src/test/java/org/scijava/ContextDisposalTest.java
index e47fcbc7b..e3834d3a2 100644
--- a/src/test/java/org/scijava/ContextDisposalTest.java
+++ b/src/test/java/org/scijava/ContextDisposalTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index bff5bf657..b5f948041 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
index c8a0fd499..1279f8861 100644
--- a/src/test/java/org/scijava/SciJavaTest.java
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 9e1ca7982..799eea92f 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index 41047039a..a14106e1d 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index b2221e5bd..589a49e5f 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index 4c534202a..f6e23eac6 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index c431acec2..6f46d5864 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index c5f1b24bb..b0c7d879e 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 6ba1f5cde..81a96747d 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index 9a809785b..24daca561 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index 547d39793..cf484cb20 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index 47336653e..a9aaf12a8 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index 9641955f1..193803c00 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index b1d4feb43..1e2eed9d3 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
index 406f5f604..b2a34200e 100644
--- a/src/test/java/org/scijava/command/CommandArrayConverterTest.java
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 8de905e99..492945766 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index bbdb25270..cfa70fe45 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index e13622351..fb1fda971 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index 2c6556644..db55f9c3e 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index b0d311083..2687d056a 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index 557de6a28..6e488c1f7 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 64692143f..cb4728630 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index c7c0a9185..b073e504c 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 7922b3cb6..7b899bd4f 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 17ec928f5..a1a1bb10a 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index ee40655af..0535224eb 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 504165eca..d63cb3743 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index 5fe0aeda9..e179deff1 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index 1e577f141..472e42702 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 3f0c755de..7674190ca 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 890953eed..1d1747098 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 0feab666a..53f552f1c 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index cec43a6e4..b2fd5281b 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index e870723e8..96dbe1bdf 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index 27ae140b3..ddb0f6c9f 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DefaultConverterTest.java b/src/test/java/org/scijava/convert/DefaultConverterTest.java
index 06394fafe..b1c810d83 100644
--- a/src/test/java/org/scijava/convert/DefaultConverterTest.java
+++ b/src/test/java/org/scijava/convert/DefaultConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
index 00bd9baae..b506e9e2d 100644
--- a/src/test/java/org/scijava/convert/DelegateConverterTest.java
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index 57c4e8cba..aa85644ab 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index cd6b011e6..0276fe63a 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileToPathConversionTest.java b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
index 3b6f554c1..ef8829e07 100644
--- a/src/test/java/org/scijava/convert/FileToPathConversionTest.java
+++ b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index db194c80b..546a649c0 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index cbb142ed8..5aaf070cc 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 4d59c5a23..48d54b3d6 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index e75975687..e1430131c 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 79f4e4b5f..3581c5c48 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index bf8057129..5aa0f3b9c 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 3c3989bb8..56e6da876 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 3483ab5a3..57527734a 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index cfc350b18..fd65d1a31 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index ef713a05c..7ff413922 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index aadd59fbb..0a71d5092 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index 0cbeb21fd..cc93bd4c3 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index d74f7d81f..11c514c59 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index 8f8d6543e..f396697fd 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index d9d912451..35b45f19b 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
index 879e9ffc8..779850213 100644
--- a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index c8502c237..07cf2967f 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index 722a3325c..390f06f68 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index 7d80cd56d..2d0215f41 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index a8c43184c..1f184071a 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index 7861b3920..fdc00f86c 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index a109c85e8..ecfed72ad 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index b17bca169..734924839 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index 6ceb42e2e..5a56f2fcd 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index 865cd327f..4b2d05db0 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
index 7115af445..deba27821 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 15730d404..b12a7592b 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
index 9a91d56c0..09ff0e012 100644
--- a/src/test/java/org/scijava/io/handle/DataHandlesTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index d690ed710..551769c30 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index f7cb24182..20a637f3e 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index 61c7c9b41..8196c9128 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index fd813e326..813a5ab46 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index e2900a9c6..1217c23ff 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
index 62def039e..62ec48db0 100644
--- a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index cf98dcfa1..3ce55ea53 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index ade1122ba..cede48501 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index 6e23d6fd9..9df45d181 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index 3f15988c0..0075c79dd 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 13c3c0a6b..8685dc322 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index e8b2d8ed5..a88c970a1 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index c8143017e..14cc55b77 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 20cbe8d76..f08f6ec18 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 9ab4f15bd..2d3d3b46f 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index 65d5813f4..c5dda19d7 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index b28503b32..95429dd25 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
index ef92de0d5..e7f2bce82 100644
--- a/src/test/java/org/scijava/log/TestLogListener.java
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index 8152f13c6..b5d09ac31 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index 03872538f..ea049cf18 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index 604db06c3..aad47bb73 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 3c8ff6874..2c9660b2d 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index b9e6ab4f5..e8844f086 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
index fa5eabe19..4524254df 100644
--- a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
+++ b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index 40461b497..16e5e7e6d 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index b5db1288c..9a2dcc0c4 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
index 0e8e510f8..4a76b6962 100644
--- a/src/test/java/org/scijava/object/NamedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 2a0870776..62c2e4071 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
index 7e179c0bf..bdb18ce5d 100644
--- a/src/test/java/org/scijava/object/ObjectServiceTest.java
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 86c38ecfd..ad5e0e14c 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index e49c70abb..78b4e182a 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index f09d33308..5a7cdb164 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index 32514f731..a5562f3bb 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 6452fffba..7453aba96 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index 49c7fa8bf..eb8507f43 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index ca6e5a331..18242910f 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index ff5de6fde..63249b4e5 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index f7e908154..ae3506c8c 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index 9b8415054..192232351 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index b10c6d3e8..3df84bf5a 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index e28869372..dce377a2d 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 06231bb0e..47951dd75 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index b548ea74a..1cf9ae9ff 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
index dbc1e0674..578cfe617 100644
--- a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 44dc0c11e..2629c8195 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
index 6e83d81be..eb939fbf0 100644
--- a/src/test/java/org/scijava/task/TaskEventTest.java
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index 5f64642c0..a8c99505f 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index b11a6e1d6..5f8dab9a0 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index fd25f1cff..3bba34708 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/text/TextServiceTest.java b/src/test/java/org/scijava/text/TextServiceTest.java
index aa4b714c2..e969da2aa 100644
--- a/src/test/java/org/scijava/text/TextServiceTest.java
+++ b/src/test/java/org/scijava/text/TextServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 918dc33ea..83e5dd336 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 89def4290..7a53b6e58 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index 7018581b2..2bce17e08 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index befbf0697..15e953adc 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index c578dd824..2da00516f 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index f4fa06ec5..ab862f915 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 2063c0a88..9aa855f27 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 11b469757..0e8e022f1 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index e461780a5..d09e01721 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index a6a49d3b3..3daac3f50 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 4c42955d4..0b1e15f24 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index 8f8c4aece..6d382c09c 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index ebea6008c..dd240f593 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index cfa9d7f24..a76c12349 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/GenericArrayTypesTest.java b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
index 651b6b437..fee6a2504 100644
--- a/src/test/java/org/scijava/util/GenericArrayTypesTest.java
+++ b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index 449621017..7536716d3 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index a543f9830..8eeb5c5db 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index 04401d197..a18997343 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/NumberUtilsTest.java b/src/test/java/org/scijava/util/NumberUtilsTest.java
index 2180767af..5ce6b3780 100644
--- a/src/test/java/org/scijava/util/NumberUtilsTest.java
+++ b/src/test/java/org/scijava/util/NumberUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index 8bf3cae7e..1c96cec41 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index b24fee5dc..86a800515 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index cb76fac7c..0fde7de05 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index 8b19a7cf7..dc529b96b 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index cad66c41d..3626aa063 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 30f99e02f..86555e910 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 24c6b5657..3ffa1edea 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index bfc2aa681..96f54eae7 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index a924049f8..35554427b 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
index 78f9c203d..2391ecb8a 100644
--- a/src/test/java/org/scijava/widget/WidgetStyleTest.java
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2023 SciJava developers.
+ * Copyright (C) 2009 - 2024 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From fd951509484d337b505799ee4cfcf1bc05546a3f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 26 Jan 2024 09:43:33 -0600
Subject: [PATCH 1154/1208] ScriptService: don't alias plugins w/ noAlias flag

---
 src/main/java/org/scijava/script/DefaultScriptService.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index e7f1f0e61..f8bd5e952 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -385,7 +385,10 @@ private void addAliases(final HashMap<String, Class<?>> map,
 	}
 
 	private Class<?>[] pluginClasses(final Class<? extends SciJavaPlugin> type) {
-		return pluginService.getPluginsOfType(type).stream().map(info -> {
+		return pluginService.getPluginsOfType(type).stream() //
+			.filter(info -> !info.is("noAlias")) //
+			.map(info ->
+		{
 			try {
 				return info.loadClass();
 			}

From 4632c641a4219bbfd9738bc5a0f44cb9cfde556d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 12 Feb 2024 16:11:21 -0600
Subject: [PATCH 1155/1208] Fix enormous bug in subscribe(EventSubscriber)

Thanks to Gabriel Selzer for pointing it out.
---
 src/main/java/org/scijava/event/DefaultEventService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 5059046db..30194744d 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -140,7 +140,7 @@ public List<EventSubscriber<?>> subscribe(final Object o) {
 
 	@Override
 	public void subscribe(final EventSubscriber<?> subscriber) {
-		eventBus.subscribe(subscriber.getClass(), subscriber);
+		eventBus.subscribe(subscriber.getEventClass(), subscriber);
 	}
 
 	@Override

From 11ba2a4f23307a1e02bc0e25363dcfbeb9f93636 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Feb 2024 11:38:44 -0600
Subject: [PATCH 1156/1208] Happy New Year 2024 to LICENSE.txt, too

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index aaee970f7..e37abf5e1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2023, SciJava developers.
+Copyright (c) 2009 - 2024, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

From 3f0e32f14aa7c6f64f206d79af14c47c6aac0249 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 16 Feb 2024 11:39:58 -0600
Subject: [PATCH 1157/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4b91cb7b3..92b6764a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.98.0-SNAPSHOT</version>
+	<version>2.98.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 661d92a0e9d86ea27cea024c8d032837bfc21390 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Thu, 9 May 2024 10:14:54 -0500
Subject: [PATCH 1158/1208] Create simple utility for property map I/O

This helper reads and writes maps to/from plain text files, storing
entries in "key=value" pairs.
---
 .../org/scijava/util/PropertiesHelper.java    |  72 +++++++++
 .../scijava/util/PropertiesHelperTest.java    | 138 ++++++++++++++++++
 2 files changed, 210 insertions(+)
 create mode 100644 src/main/java/org/scijava/util/PropertiesHelper.java
 create mode 100644 src/test/java/org/scijava/util/PropertiesHelperTest.java

diff --git a/src/main/java/org/scijava/util/PropertiesHelper.java b/src/main/java/org/scijava/util/PropertiesHelper.java
new file mode 100644
index 000000000..64c2336df
--- /dev/null
+++ b/src/main/java/org/scijava/util/PropertiesHelper.java
@@ -0,0 +1,72 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2024 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.util;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Simple utility for reading and writing a property map to/from plain text.
+ */
+public final class PropertiesHelper {
+
+	public static Map<String, String> get(File filename) {
+		Map<String, String> map = new HashMap<>();
+		try (BufferedReader reader = new BufferedReader(new FileReader(filename))) {
+			String line;
+			while ((line = reader.readLine()) != null) {
+				String[] parts = line.split("=", 2);
+				if (parts.length == 2) {
+					map.put(parts[0], parts[1]);
+				}
+			}
+		}
+		catch (FileNotFoundException e) {
+			throw new RuntimeException(e);
+		}
+		catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		return map;
+	}
+
+	public static void put(Map<String, String> properties, File filename) {
+		try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) {
+			for (Map.Entry<String, String> entry : properties.entrySet()) {
+				writer.write(entry.getKey() + "=" + entry.getValue());
+				writer.newLine();
+			}
+		}
+		catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}
diff --git a/src/test/java/org/scijava/util/PropertiesHelperTest.java b/src/test/java/org/scijava/util/PropertiesHelperTest.java
new file mode 100644
index 000000000..f4d655ef8
--- /dev/null
+++ b/src/test/java/org/scijava/util/PropertiesHelperTest.java
@@ -0,0 +1,138 @@
+/*-
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2024 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.util;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests for {@link PropertiesHelper}
+ */
+public class PropertiesHelperTest {
+
+	private static final String EXPECTED_1 = "a=b";
+	private static final String EXPECTED_2 = "hello=goodbye";
+
+	private Map<String, String> props;
+	private File temp;
+
+	@Before
+	public void setup() throws IOException {
+		temp = File.createTempFile("PropertiesHelper", "txt");
+		props = new HashMap<>();
+		props.put("a", "b");
+		props.put("hello", "goodbye");
+	}
+
+	@After
+	public void cleanup() {
+		temp.delete();
+	}
+
+	@Test
+	public void testWrite() throws IOException {
+		PropertiesHelper.put(props, temp);
+
+		int count = 0;
+		boolean saw1 = false, saw2 = false;
+
+		try (BufferedReader reader = new BufferedReader(new FileReader(temp))) {
+			String line;
+			while ((line = reader.readLine()) != null) {
+				if (line.equals(EXPECTED_1)) {
+					saw1 = true;
+				}
+				if (line.equals(EXPECTED_2)) {
+					saw2 = true;
+				}
+				count++;
+			}
+		}
+		assertTrue(saw1);
+		assertTrue(saw2);
+		assertEquals(2, count);
+	}
+
+	@Test
+	public void testRead() throws IOException {
+		try (BufferedWriter writer = new BufferedWriter(new FileWriter(temp))) {
+			writer.write(EXPECTED_1);
+			writer.newLine();
+			writer.write(EXPECTED_2);
+			writer.newLine();
+		}
+
+		Map<String, String> propsMap = PropertiesHelper.get(temp);
+		assertTrue(props.equals(propsMap));
+	}
+
+	@Test
+	public void testIO() throws IOException {
+		PropertiesHelper.put(props, temp);
+		Map<String, String> propsMap = PropertiesHelper.get(temp);
+		assertTrue(props.equals(propsMap));
+	}
+
+	@Test
+	public void testMultipleEquals() throws IOException {
+		props.clear();
+		final String K = "hello", V = "world=true";
+		props.put(K, V);
+		PropertiesHelper.put(props, temp);
+		Map<String, String> propsMap = PropertiesHelper.get(temp);
+		assertEquals(1, propsMap.size());
+		assertEquals(props.get(K), propsMap.get(K));
+	}
+
+	@Test
+	public void testOverwrite() throws IOException {
+		PropertiesHelper.put(props, temp);
+		props.put("myname", "jonas");
+		PropertiesHelper.put(props, temp);
+		Map<String, String> loadedProps = PropertiesHelper.get(temp);
+		assertEquals(3, loadedProps.size());
+		int count = 0;
+		try (BufferedReader reader = new BufferedReader(new FileReader(temp))) {
+			String line;
+			while ((line = reader.readLine()) != null) {
+				count++;
+			}
+		}
+		assertEquals(3, count);
+	}
+}

From e9552bc0fa9115d053dad1376e0627909ac23fb6 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Tue, 4 Jun 2024 11:33:09 -0500
Subject: [PATCH 1159/1208] Bump minor version for new API

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 92b6764a7..468e5842d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.98.1-SNAPSHOT</version>
+	<version>2.99.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From d4ab47a1d41d9f7c0e593afb6a7959119c14249e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 10 Jun 2024 19:37:43 -0500
Subject: [PATCH 1160/1208] DefaultTask: fix up class javadoc

---
 src/main/java/org/scijava/task/DefaultTask.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index c14d7ad54..a275c3505 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -39,9 +39,9 @@
  * Default implementation of {@link Task}. Throughout the task (or job),
  * {@link Task#setProgressValue(long)} can be called to inform
  * how the job is progressing.
- *
+ * <p>
  * Asynchronous case:
- * - A job (runnable) is sent for execution to the linked {@link ThreadService}.
+ * A job (runnable) is sent for execution to the linked {@link ThreadService}.
  * It reports status updates via the linked {@link EventService}.
  * A {@link org.scijava.task.event.TaskEvent} is sent before the job
  * is started and when finished.
@@ -50,9 +50,10 @@
  * by calling {@link Future#cancel(boolean)}.
  * This default behaviour can be supplemented by an additional
  * custom callback which can be set in {@link Task#setCancelCallBack(Runnable)}.
- *
+ * </p>
+ * <p>
  * Synchronous case:
- * - A job that reports its status in between calls of {@link Task#start()},
+ * A job that reports its status in between calls of {@link Task#start()},
  * and {@link Task#finish()}. It also reports its status via
  * the linked {@link EventService}.
  * Start and finish calls allow publishing proper {@link org.scijava.task.event.TaskEvent}
@@ -60,8 +61,10 @@
  * Upon cancellation of a synchronous task, it is the responsibility
  * of the synchronous task to handle its own cancellation through
  * a custom callback which can be set via {@link Task#setCancelCallBack(Runnable)}.
+ * </p>
  *
- * @author Curtis Rueden, Nicolas Chiaruttini
+ * @author Curtis Rueden
+ * @author Nicolas Chiaruttini
  */
 public class DefaultTask implements Task {
 

From d476e5cb36ccbf5735742b6b623919ffe3f5bce2 Mon Sep 17 00:00:00 2001
From: Stefan Hahmann <stefan.hahmann@tu-dresden.de>
Date: Thu, 27 Jun 2024 14:47:29 +0200
Subject: [PATCH 1161/1208] Ignore empty Strings during String to FileArray
 conversion

* The current state of the code is that an empty String, is converted to a new File("") object with an empty String
* A File object instantiated by this will be a File object with an absolute Path that is equivalent to the Path from which the application was started
* The result of this is relatively unpredictable
* Thus empty String should not be converted to File object and not be added to the output
---
 src/main/java/org/scijava/convert/FileListConverters.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index ed3da126e..47a81053c 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -82,6 +82,8 @@ public <T> T convert(final Object src, final Class<T> dest) {
 			final String[] tokens = StringUtils.splitUnquoted((String) src, ",");
 			final List<File> fileList = new ArrayList<>();
 			for (final String filePath : tokens) {
+				if ( filePath.isEmpty() )
+					continue;
 				fileList.add(new File(filePath.replaceAll("^\"|\"$", "")));
 			}
 			return (T) fileList.toArray(new File[fileList.size()]);

From 8dc4c0e4146f779fd05c068974ad0b450bdc47bf Mon Sep 17 00:00:00 2001
From: Stefan Hahmann <stefan.hahmann@tu-dresden.de>
Date: Thu, 27 Jun 2024 15:33:44 +0200
Subject: [PATCH 1162/1208] Add assertion of 0 length File array in case of an
 empty String provided for String to File Array conversion

---
 src/test/java/org/scijava/convert/FileListConverterTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index 0276fe63a..71afaa2dc 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -69,6 +69,7 @@ public void testStringToFileArrayConverter() {
 				conv.convert(path, File[].class)[0]);
 		assertEquals("Wrong file name", new File("C:\\temp"),
 				conv.convert(path, File[].class)[1]);
+		assertEquals( 0, conv.convert( "", File[].class ).length );
 	}
 
 	@Test

From 00512f5554090cfc878936deb9156712400a44df Mon Sep 17 00:00:00 2001
From: Christian Tischer <christian.tischer@embl.de>
Date: Thu, 27 Jun 2024 23:46:47 +0200
Subject: [PATCH 1163/1208] Add FileWidget.FILE_AND_DIRECTORY_STYLE

---
 pom.xml                                          | 5 +++++
 src/main/java/org/scijava/ui/UserInterface.java  | 2 ++
 src/main/java/org/scijava/widget/FileWidget.java | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/pom.xml b/pom.xml
index 468e5842d..f1b9aec33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,11 @@
 			<url>https://imagej.net/people/jaywarrick</url>
 			<properties><id>jaywarrick</id></properties>
 		</contributor>
+		<contributor>
+			<name>Christian Tischer</name>
+			<url>https://imagej.net/people/tischi</url>
+			<properties><id>tischi</id></properties>
+		</contributor>
 	</contributors>
 
 	<mailingLists>
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 54dbfb767..938a5663a 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -163,6 +163,7 @@ default File chooseFile(final File file, final String style) {
 		// TODO use a utility class for style handling, e.g. StyleUtils.isStyle(style, ...)
 		if (style == null) title = "Choose a file";
 		else if (style.toLowerCase().contains(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
+		else if (style.toLowerCase().contains(FileWidget.FILE_AND_DIRECTORY_STYLE )) title = "Choose a file or directory";
 		else if (style.toLowerCase().contains(FileWidget.OPEN_STYLE)) title = "Open";
 		else if (style.toLowerCase().contains(FileWidget.SAVE_STYLE)) title = "Save";
 		else title = "Choose a file";
@@ -180,6 +181,7 @@ default File chooseFile(final File file, final String style) {
 	 *          <li>{@link FileWidget#OPEN_STYLE}</li>
 	 *          <li>{@link FileWidget#SAVE_STYLE}</li>
 	 *          <li>{@link FileWidget#DIRECTORY_STYLE}</li>
+	 *          <li>{@link FileWidget#FILE_AND_DIRECTORY_STYLE}</li>
 	 *          </ul>
 	 * @return The {@link File} chosen by the user, or null if prompt is not
 	 *         available
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index a4322554d..e72d41c37 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -59,4 +59,11 @@ public interface FileWidget<U> extends InputWidget<File, U> {
 	 */
 	String DIRECTORY_STYLE = "directory";
 
+	/**
+	 * Widget style for directory chooser dialogs.
+	 *
+	 * @see org.scijava.plugin.Parameter#style()
+	 */
+	String FILE_AND_DIRECTORY_STYLE = "both";
+
 }

From 79a92d832f773bbefe0c8f44da840017b36e5ebb Mon Sep 17 00:00:00 2001
From: Jan Eglinger <jan.eglinger@fmi.ch>
Date: Mon, 1 Jul 2024 11:20:31 +0200
Subject: [PATCH 1164/1208] Use WidgetStyle.isStyle for style logic

---
 src/main/java/org/scijava/ui/UserInterface.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 938a5663a..f4c6d0c70 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -41,6 +41,7 @@
 import org.scijava.ui.console.ConsolePane;
 import org.scijava.ui.viewer.DisplayWindow;
 import org.scijava.widget.FileWidget;
+import org.scijava.widget.WidgetStyle;
 
 /**
  * An end-user SciJava application user interface.
@@ -160,12 +161,11 @@ DialogPrompt dialogPrompt(String message, String title,
 	default File chooseFile(final File file, final String style) {
 		final String title;
 		// style can be a string with multiple comma-separated keywords
-		// TODO use a utility class for style handling, e.g. StyleUtils.isStyle(style, ...)
 		if (style == null) title = "Choose a file";
-		else if (style.toLowerCase().contains(FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
-		else if (style.toLowerCase().contains(FileWidget.FILE_AND_DIRECTORY_STYLE )) title = "Choose a file or directory";
-		else if (style.toLowerCase().contains(FileWidget.OPEN_STYLE)) title = "Open";
-		else if (style.toLowerCase().contains(FileWidget.SAVE_STYLE)) title = "Save";
+		else if (WidgetStyle.isStyle(style, FileWidget.DIRECTORY_STYLE)) title = "Choose a directory";
+		else if (WidgetStyle.isStyle(style, FileWidget.FILE_AND_DIRECTORY_STYLE)) title = "Choose a file or directory";
+		else if (WidgetStyle.isStyle(style, FileWidget.OPEN_STYLE)) title = "Open";
+		else if (WidgetStyle.isStyle(style, FileWidget.SAVE_STYLE)) title = "Save";
 		else title = "Choose a file";
 
 		return chooseFile(title, file, style);

From 88d5fd5ac3e350f7565e8e3db310723e186d0f29 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 8 Jul 2024 12:50:06 -0500
Subject: [PATCH 1165/1208] Appease the license-maven-plugin

---
 src/main/java/org/scijava/util/PropertiesHelper.java     | 4 ++--
 src/test/java/org/scijava/util/PropertiesHelperTest.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/util/PropertiesHelper.java b/src/main/java/org/scijava/util/PropertiesHelper.java
index 64c2336df..f56189d8c 100644
--- a/src/main/java/org/scijava/util/PropertiesHelper.java
+++ b/src/main/java/org/scijava/util/PropertiesHelper.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
diff --git a/src/test/java/org/scijava/util/PropertiesHelperTest.java b/src/test/java/org/scijava/util/PropertiesHelperTest.java
index f4d655ef8..35202c9f5 100644
--- a/src/test/java/org/scijava/util/PropertiesHelperTest.java
+++ b/src/test/java/org/scijava/util/PropertiesHelperTest.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

From 0eb119360bb7f9c946aa98e25cdd01a13b28088d Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 8 Jul 2024 14:27:22 -0500
Subject: [PATCH 1166/1208] CI: add OSSRH_USER as configured env var

We need it now in order to deploy to OSS Sonatype.
---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 876a620a3..b11b4f1a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,5 +36,6 @@ jobs:
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+          OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
           SIGNING_ASC: ${{ secrets.SIGNING_ASC }}

From 37abc7e94672532348dc4673f07f60b30293019f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 8 Jul 2024 14:34:52 -0500
Subject: [PATCH 1167/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 468e5842d..9eece0c91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.99.0-SNAPSHOT</version>
+	<version>2.99.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 3074675da4f3cf27544c8241fe674ae87b73468c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 16 Jul 2024 10:14:59 -0500
Subject: [PATCH 1168/1208] If UI is already created, don't createUI() again

---
 src/main/java/org/scijava/ui/AbstractUserInterface.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index fd9cc24d1..a3894158b 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -79,6 +79,7 @@ public abstract class AbstractUserInterface extends AbstractRichPlugin
 
 	@Override
 	public void show() {
+		if (visible) return;
 		createUI();
 		visible = true;
 	}

From 96827bf5ea2400b605cacad5e6dbf9984441c06f Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Mon, 22 Jul 2024 10:33:08 -0500
Subject: [PATCH 1169/1208] Show UI on EDT if required

UserInterfaces have a requiresEDT flag. If this is set, the UIService
should show them on the EDT when showUI is called.
---
 .../java/org/scijava/ui/DefaultUIService.java | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index fe787ad5c..ff5663f91 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -32,6 +32,7 @@
 import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.io.FileFilter;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -161,10 +162,25 @@ public void showUI(final String name) {
 	@Override
 	public void showUI(final UserInterface ui) {
 		log.debug("Launching user interface: " + ui.getClass().getName());
-		ui.show();
-		// NB: Also show all the current displays.
-		for (final Display<?> display : displayService.getDisplays()) {
-			ui.show(display);
+		Runnable showUI = () -> {
+			ui.show();
+			// NB: Also show all the current displays.
+			for (final Display<?> display : displayService.getDisplays()) {
+				ui.show(display);
+			}
+		};
+
+		// Dispatch on EDT if necessary
+		if (ui.requiresEDT()) {
+			try {
+				threadService.invoke(showUI);
+			}
+			catch (InterruptedException | InvocationTargetException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		else {
+			showUI.run();
 		}
 		eventService.publish(new UIShownEvent(ui));
 	}

From 055a449826c6a541d84c458575a8497e952d31c6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 24 Jul 2024 12:00:02 -0500
Subject: [PATCH 1170/1208] CI: Tweak Linux-only deployment logic

---
 .github/build.sh            | 3 +--
 .github/setup.sh            | 7 +++++++
 .github/workflows/build.yml | 7 ++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/build.sh b/.github/build.sh
index 44a7909d1..7da42622b 100755
--- a/.github/build.sh
+++ b/.github/build.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
-# NB: Only the Linux CI node should deploy build artifacts.
-NO_DEPLOY=$(test "$(uname)" = Linux || echo 1) sh ci-build.sh
+sh ci-build.sh
diff --git a/.github/setup.sh b/.github/setup.sh
index f359bbeeb..d06d5a746 100755
--- a/.github/setup.sh
+++ b/.github/setup.sh
@@ -1,3 +1,10 @@
 #!/bin/sh
 curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
 sh ci-setup-github-actions.sh
+
+# Let the Linux build handle artifact deployment.
+if [ "$(uname)" != Linux ]
+then
+  echo "No deploy -- non-Linux build"
+  echo "NO_DEPLOY=1" >> $GITHUB_ENV
+fi
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b11b4f1a2..64b606407 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,14 +1,14 @@
 name: build
 
 on:
-  pull_request:
-    branches:
-      - master
   push:
     branches:
       - master
     tags:
       - "*-[0-9]+.*"
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
@@ -28,6 +28,7 @@ jobs:
           cache: 'maven'
       - name: Set up CI environment
         run: .github/setup.sh
+        shell: bash
       - name: Execute the build
         run: .github/build.sh
         shell: bash

From 0d9534095735cb75e06adfe42d902de1ac3d5662 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 Aug 2024 10:33:52 -0500
Subject: [PATCH 1171/1208] LocationService: fall back to FileLocation more

Specifically: if the URI resolution returns null, rather than actually
returning null, let's wrap the string into a FileLocation as a fallback.

See imagej/pyimagej#285.
---
 .../scijava/io/location/LocationService.java  |  5 +++--
 .../io/location/LocationServiceTest.java      | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index ff29ce6e0..08aa30759 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -56,14 +56,15 @@ public interface LocationService extends HandlerService<URI, LocationResolver>,
 	 */
 	default Location resolve(final String uriString) throws URISyntaxException {
 	    try {
-	        return resolve(new URI(uriString));
+	        Location loc = resolve(new URI(uriString));
+	        if (loc != null) return loc;
 	    }
 	    catch (final URISyntaxException exc) {
 	        // In general, filenames are not valid URI strings.
 	        // Particularly on Windows, there are backslashes, which are invalid in URIs.
 	        // So we explicitly turn this string into a file if an error happens above.
-	        return resolve(new File(uriString).toURI());
 	    }
+	    return resolve(new File(uriString).toURI());
 	}
 
 	/**
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index cede48501..fb917a694 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -30,6 +30,7 @@
 package org.scijava.io.location;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -43,6 +44,7 @@
  * Tests {@link LocationService}.
  * 
  * @author Gabriel Einsdorf
+ * @author Curtis Rueden
  */
 public class LocationServiceTest {
 
@@ -60,6 +62,23 @@ public void testResolve() throws URISyntaxException {
 		assertEquals(uri, loc.resolve(uri.toString()).getURI());
 	}
 
+	@Test
+	public void testResolveWindowsPath() throws URISyntaxException {
+		final Context ctx = new Context(LocationService.class);
+		final LocationService loc = ctx.getService(LocationService.class);
+
+		String pSlash = "C:/Windows/FilePath/image.tif";
+		final Location locSlash = loc.resolve(pSlash);
+		assertTrue(locSlash instanceof FileLocation);
+
+		String pBackslash = pSlash.replace('/', '\\');
+		final Location locBackslash = loc.resolve(pBackslash);
+		assertTrue(locBackslash instanceof FileLocation);
+
+		final Location locSlashURI = loc.resolve(new URI(pSlash));
+		assertNull(locSlashURI);
+	}
+
 	@Test
 	public void testFallBack() throws URISyntaxException {
 		final Context ctx = new Context(LocationService.class);

From f5230f6fce88c268072fb4a55d33544cbb12d011 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Tue, 10 Sep 2024 15:07:30 -0500
Subject: [PATCH 1172/1208] De-duplicate widget inputs by String comparison

When populating potential items for an input widget, we now prefer
existing objects of a given input type to potentially convertiable
types.

Further, for convertibles we now avoid considering them if they share a
toString with any other potential input. Candidates are prioritized in
order returned by ConvertService.getCompatibleInputs.

This mitigates the potential for duplicate entries in input harvesters
when multiple input instances are convertible to the same effective
output instance.
---
 .../widget/AbstractInputHarvester.java        | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 2c259c400..d1515bd17 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -30,9 +30,10 @@
 package org.scijava.widget;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.scijava.AbstractContextual;
 import org.scijava.convert.ConvertService;
@@ -129,9 +130,24 @@ private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,
 
 	/** Asks the object service and convert service for valid choices */
 	private List<Object> getObjects(final Class<?> type) {
-		Set<Object> compatibleInputs =
-				new HashSet<>(convertService.getCompatibleInputs(type));
-		compatibleInputs.addAll(objectService.getObjects(type));
-		return new ArrayList<>(compatibleInputs);
+		// Start with the known, unconverted objects of the desired type
+		List<Object> objects = new ArrayList<>(objectService.getObjects(type));
+
+		// Get all the known objects that can be converted to the destination type
+		Collection<Object> compatibleInputs = convertService.getCompatibleInputs(type);
+
+		// HACK: Add each convertible object that doesn't share a name with any other object
+		// Our goal here is to de-duplicate by avoiding similar inputs that could be converted
+		// to the same effective output (e.g. an ImageDisplay and a Dataset that map to the same
+		// ImgPlus)
+		Set<String> knownNames = objects.stream().map(Object::toString).collect(Collectors.toSet());
+		for (Object o : compatibleInputs) {
+			final String s = o.toString();
+			if (!knownNames.contains(s)) {
+				objects.add(o);
+				knownNames.add(s);
+			}
+		}
+		return objects;
 	}
 }

From 7ac4926d72f3ce3051787629a021d5f3f3adfdf2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 15 Oct 2024 15:12:32 -0500
Subject: [PATCH 1173/1208] ShadowMenu: load icon resources more robustly

The Types.load method may not use the correct class loader.
---
 src/main/java/org/scijava/menu/ShadowMenu.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index f6b6e53db..ce5d8e3cc 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -230,9 +230,8 @@ public URL getIconURL() {
 			if (isLeaf()) iconPath = DEFAULT_ICON_PATH;
 			else return null;
 		}
-		final String className = moduleInfo.getDelegateClassName();
 		try {
-			final Class<?> c = Types.load(className, false);
+			final Class<?> c = moduleInfo.loadDelegateClass();
 			final URL iconURL = c.getResource(iconPath);
 			if (iconURL == null) {
 				if (log != null) log.error("Could not load icon: " + iconPath);
@@ -240,7 +239,8 @@ public URL getIconURL() {
 			return iconURL;
 		}
 		catch (final IllegalArgumentException exc) {
-			final String message = "Could not load icon for class: " + className;
+			final String message = "Could not load icon for class: " +
+				moduleInfo.getDelegateClassName();
 			if (log.isDebug()) log.debug(message, exc);
 			else log.error(message);
 			return null;

From 1b25c5802e42d1061645b3597c18242cfda3b879 Mon Sep 17 00:00:00 2001
From: hinerm <hinerm@gmail.com>
Date: Tue, 3 Dec 2024 10:28:10 -0600
Subject: [PATCH 1174/1208] ShadowMenu: fix compilation error

---
 src/main/java/org/scijava/menu/ShadowMenu.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index ce5d8e3cc..f97ab4800 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -238,6 +238,13 @@ public URL getIconURL() {
 			}
 			return iconURL;
 		}
+		catch (final ClassNotFoundException exc) {
+			final String message = "Failed to load class: " +
+					moduleInfo.getDelegateClassName();
+			if (log.isDebug()) log.debug(message, exc);
+			else log.error(message);
+			return null;
+		}
 		catch (final IllegalArgumentException exc) {
 			final String message = "Could not load icon for class: " +
 				moduleInfo.getDelegateClassName();

From dbd6ce5c83b2379d07d530350382b6bf448624bf Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 12 May 2025 16:31:33 -0500
Subject: [PATCH 1175/1208] Improve native classifier regex

* Handle more architecture labels including arm64.
* Recognize both macosx and macos as OS prefixes.
---
 src/main/java/org/scijava/util/FileUtils.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 73099aacc..f98e76f69 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -729,8 +729,9 @@ private static String classifiers() {
 			"sources",
 			"javadoc",
 			"natives?-?\\w*",
-			"(natives-)?(android|linux|macosx|solaris|windows)-" +
-				"(aarch64|amd64|arm|armv6|armv6hf|i586|universal|x86|x86_64)",
+			"(natives-)?(android|linux|macosx|macos|solaris|windows)-" +
+				"(aarch64|amd64|arm64|armv6hf|armv6|arm|" +
+				"i386|i486|i586|i686|universal|x86[_-]32|x86[_-]64|x86)",
 		};
 		final StringBuilder sb = new StringBuilder("(");
 		for (final String classifier : classifiers) {

From 4fc2b14f72ac173827764bcfbd756a820a72b87f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 12 May 2025 16:32:35 -0500
Subject: [PATCH 1176/1208] Update copyright blurbs for 2025

---
 src/it/apt-test/pom.xml                                         | 2 +-
 src/it/apt-test/setup.bsh                                       | 2 +-
 .../src/main/java/org/scijava/annotation/its/Annotated.java     | 2 +-
 .../main/java/org/scijava/annotation/its/CustomAnnotation.java  | 2 +-
 src/it/apt-test/verify.bsh                                      | 2 +-
 src/it/settings.xml                                             | 2 +-
 src/main/java/org/scijava/AbstractBasicDetails.java             | 2 +-
 src/main/java/org/scijava/AbstractContextual.java               | 2 +-
 src/main/java/org/scijava/AbstractGateway.java                  | 2 +-
 src/main/java/org/scijava/AbstractUIDetails.java                | 2 +-
 src/main/java/org/scijava/BasicDetails.java                     | 2 +-
 src/main/java/org/scijava/Cancelable.java                       | 2 +-
 src/main/java/org/scijava/Context.java                          | 2 +-
 src/main/java/org/scijava/Contextual.java                       | 2 +-
 src/main/java/org/scijava/Disposable.java                       | 2 +-
 src/main/java/org/scijava/Gateway.java                          | 2 +-
 src/main/java/org/scijava/Identifiable.java                     | 2 +-
 src/main/java/org/scijava/Initializable.java                    | 2 +-
 src/main/java/org/scijava/Instantiable.java                     | 2 +-
 src/main/java/org/scijava/InstantiableException.java            | 2 +-
 src/main/java/org/scijava/ItemIO.java                           | 2 +-
 src/main/java/org/scijava/ItemVisibility.java                   | 2 +-
 src/main/java/org/scijava/Locatable.java                        | 2 +-
 src/main/java/org/scijava/MenuEntry.java                        | 2 +-
 src/main/java/org/scijava/MenuPath.java                         | 2 +-
 src/main/java/org/scijava/Named.java                            | 2 +-
 src/main/java/org/scijava/NoSuchServiceException.java           | 2 +-
 src/main/java/org/scijava/NullContextException.java             | 2 +-
 src/main/java/org/scijava/Optional.java                         | 2 +-
 src/main/java/org/scijava/Prioritized.java                      | 2 +-
 src/main/java/org/scijava/Priority.java                         | 2 +-
 src/main/java/org/scijava/SciJava.java                          | 2 +-
 src/main/java/org/scijava/Typed.java                            | 2 +-
 src/main/java/org/scijava/UIDetails.java                        | 2 +-
 src/main/java/org/scijava/Validated.java                        | 2 +-
 src/main/java/org/scijava/ValidityProblem.java                  | 2 +-
 src/main/java/org/scijava/Versioned.java                        | 2 +-
 src/main/java/org/scijava/annotations/AbstractIndexWriter.java  | 2 +-
 src/main/java/org/scijava/annotations/AnnotationCombiner.java   | 2 +-
 src/main/java/org/scijava/annotations/AnnotationProcessor.java  | 2 +-
 src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java     | 2 +-
 src/main/java/org/scijava/annotations/DirectoryIndexer.java     | 2 +-
 src/main/java/org/scijava/annotations/EclipseHelper.java        | 2 +-
 src/main/java/org/scijava/annotations/Index.java                | 2 +-
 src/main/java/org/scijava/annotations/IndexItem.java            | 2 +-
 src/main/java/org/scijava/annotations/IndexReader.java          | 2 +-
 src/main/java/org/scijava/annotations/Indexable.java            | 2 +-
 src/main/java/org/scijava/annotations/legacy/LegacyReader.java  | 2 +-
 src/main/java/org/scijava/app/AbstractApp.java                  | 2 +-
 src/main/java/org/scijava/app/App.java                          | 2 +-
 src/main/java/org/scijava/app/AppService.java                   | 2 +-
 src/main/java/org/scijava/app/DefaultAppService.java            | 2 +-
 src/main/java/org/scijava/app/DefaultStatusService.java         | 2 +-
 src/main/java/org/scijava/app/SciJavaApp.java                   | 2 +-
 src/main/java/org/scijava/app/StatusService.java                | 2 +-
 src/main/java/org/scijava/app/event/StatusEvent.java            | 2 +-
 src/main/java/org/scijava/cache/CacheService.java               | 2 +-
 src/main/java/org/scijava/cache/DefaultCacheService.java        | 2 +-
 src/main/java/org/scijava/command/Command.java                  | 2 +-
 src/main/java/org/scijava/command/CommandInfo.java              | 2 +-
 src/main/java/org/scijava/command/CommandModule.java            | 2 +-
 src/main/java/org/scijava/command/CommandModuleItem.java        | 2 +-
 src/main/java/org/scijava/command/CommandService.java           | 2 +-
 src/main/java/org/scijava/command/ContextCommand.java           | 2 +-
 src/main/java/org/scijava/command/DefaultCommandService.java    | 2 +-
 src/main/java/org/scijava/command/DynamicCommand.java           | 2 +-
 src/main/java/org/scijava/command/DynamicCommandInfo.java       | 2 +-
 src/main/java/org/scijava/command/Inputs.java                   | 2 +-
 src/main/java/org/scijava/command/Interactive.java              | 2 +-
 src/main/java/org/scijava/command/InteractiveCommand.java       | 2 +-
 src/main/java/org/scijava/command/ModuleCommand.java            | 2 +-
 src/main/java/org/scijava/command/Previewable.java              | 2 +-
 src/main/java/org/scijava/command/UnimplementedCommand.java     | 2 +-
 src/main/java/org/scijava/command/console/RunArgument.java      | 2 +-
 src/main/java/org/scijava/command/run/CommandCodeRunner.java    | 2 +-
 src/main/java/org/scijava/console/AbstractConsoleArgument.java  | 2 +-
 src/main/java/org/scijava/console/ConsoleArgument.java          | 2 +-
 src/main/java/org/scijava/console/ConsoleService.java           | 2 +-
 src/main/java/org/scijava/console/ConsoleUtils.java             | 2 +-
 src/main/java/org/scijava/console/DefaultConsoleService.java    | 2 +-
 src/main/java/org/scijava/console/MultiOutputStream.java        | 2 +-
 src/main/java/org/scijava/console/MultiPrintStream.java         | 2 +-
 src/main/java/org/scijava/console/OutputEvent.java              | 2 +-
 src/main/java/org/scijava/console/OutputListener.java           | 2 +-
 src/main/java/org/scijava/console/SystemPropertyArgument.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConvertService.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConverter.java        | 2 +-
 .../java/org/scijava/convert/AbstractDelegateConverter.java     | 2 +-
 src/main/java/org/scijava/convert/ArrayConverters.java          | 2 +-
 src/main/java/org/scijava/convert/ArrayToStringConverter.java   | 2 +-
 src/main/java/org/scijava/convert/CastingConverter.java         | 2 +-
 src/main/java/org/scijava/convert/ConversionRequest.java        | 2 +-
 src/main/java/org/scijava/convert/ConvertService.java           | 2 +-
 src/main/java/org/scijava/convert/Converter.java                | 2 +-
 src/main/java/org/scijava/convert/DefaultConvertService.java    | 2 +-
 src/main/java/org/scijava/convert/DefaultConverter.java         | 2 +-
 src/main/java/org/scijava/convert/FileListConverters.java       | 2 +-
 src/main/java/org/scijava/convert/FileToPathConverter.java      | 2 +-
 src/main/java/org/scijava/convert/NullConverter.java            | 2 +-
 src/main/java/org/scijava/convert/NumberConverters.java         | 2 +-
 .../java/org/scijava/convert/NumberToBigDecimalConverter.java   | 2 +-
 .../java/org/scijava/convert/NumberToBigIntegerConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToDoubleConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToFloatConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToIntegerConverter.java | 2 +-
 src/main/java/org/scijava/convert/NumberToLongConverter.java    | 2 +-
 src/main/java/org/scijava/convert/NumberToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToShortConverter.java   | 2 +-
 src/main/java/org/scijava/convert/PathToFileConverter.java      | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java  | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java    | 2 +-
 src/main/java/org/scijava/convert/StringToArrayConverter.java   | 2 +-
 src/main/java/org/scijava/convert/StringToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/display/AbstractDisplay.java          | 2 +-
 .../java/org/scijava/display/ActiveDisplayPreprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DefaultDisplay.java           | 2 +-
 src/main/java/org/scijava/display/DefaultDisplayService.java    | 2 +-
 src/main/java/org/scijava/display/DefaultTextDisplay.java       | 2 +-
 src/main/java/org/scijava/display/Display.java                  | 2 +-
 src/main/java/org/scijava/display/DisplayPostprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DisplayService.java           | 2 +-
 src/main/java/org/scijava/display/Displayable.java              | 2 +-
 src/main/java/org/scijava/display/TextDisplay.java              | 2 +-
 .../java/org/scijava/display/event/DisplayActivatedEvent.java   | 2 +-
 .../java/org/scijava/display/event/DisplayCreatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/DisplayDeletedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/DisplayEvent.java       | 2 +-
 .../java/org/scijava/display/event/DisplayUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/InputEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/KyPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/KyReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyTypedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsButtonEvent.java     | 2 +-
 .../java/org/scijava/display/event/input/MsClickedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsDraggedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsEnteredEvent.java    | 2 +-
 src/main/java/org/scijava/display/event/input/MsEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/MsExitedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/MsMovedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/MsWheelEvent.java | 2 +-
 .../org/scijava/display/event/window/WinActivatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinClosedEvent.java   | 2 +-
 .../java/org/scijava/display/event/window/WinClosingEvent.java  | 2 +-
 .../org/scijava/display/event/window/WinDeactivatedEvent.java   | 2 +-
 .../org/scijava/display/event/window/WinDeiconifiedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/window/WinEvent.java    | 2 +-
 .../org/scijava/display/event/window/WinIconifiedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinOpenedEvent.java   | 2 +-
 src/main/java/org/scijava/download/DefaultDownloadService.java  | 2 +-
 src/main/java/org/scijava/download/DiskLocationCache.java       | 2 +-
 src/main/java/org/scijava/download/Download.java                | 2 +-
 src/main/java/org/scijava/download/DownloadService.java         | 2 +-
 src/main/java/org/scijava/download/LocationCache.java           | 2 +-
 src/main/java/org/scijava/download/MultiWriteHandle.java        | 2 +-
 src/main/java/org/scijava/event/ContextCreatedEvent.java        | 2 +-
 src/main/java/org/scijava/event/ContextDisposingEvent.java      | 2 +-
 src/main/java/org/scijava/event/DefaultEventBus.java            | 2 +-
 src/main/java/org/scijava/event/DefaultEventHistory.java        | 2 +-
 src/main/java/org/scijava/event/DefaultEventService.java        | 2 +-
 src/main/java/org/scijava/event/EventDetails.java               | 2 +-
 src/main/java/org/scijava/event/EventHandler.java               | 2 +-
 src/main/java/org/scijava/event/EventHistory.java               | 2 +-
 src/main/java/org/scijava/event/EventHistoryListener.java       | 2 +-
 src/main/java/org/scijava/event/EventService.java               | 2 +-
 src/main/java/org/scijava/event/EventSubscriber.java            | 2 +-
 src/main/java/org/scijava/event/SciJavaEvent.java               | 2 +-
 src/main/java/org/scijava/input/Accelerator.java                | 2 +-
 src/main/java/org/scijava/input/DefaultInputService.java        | 2 +-
 src/main/java/org/scijava/input/InputModifiers.java             | 2 +-
 src/main/java/org/scijava/input/InputService.java               | 2 +-
 src/main/java/org/scijava/input/KeyCode.java                    | 2 +-
 src/main/java/org/scijava/input/MouseCursor.java                | 2 +-
 src/main/java/org/scijava/io/AbstractIOPlugin.java              | 2 +-
 src/main/java/org/scijava/io/AbstractTypedIOService.java        | 2 +-
 src/main/java/org/scijava/io/ByteArrayByteBank.java             | 2 +-
 src/main/java/org/scijava/io/ByteBank.java                      | 2 +-
 src/main/java/org/scijava/io/DefaultIOService.java              | 2 +-
 src/main/java/org/scijava/io/DefaultRecentFileService.java      | 2 +-
 src/main/java/org/scijava/io/IOPlugin.java                      | 2 +-
 src/main/java/org/scijava/io/IOService.java                     | 2 +-
 src/main/java/org/scijava/io/RecentFileService.java             | 2 +-
 src/main/java/org/scijava/io/TypedIOService.java                | 2 +-
 src/main/java/org/scijava/io/console/OpenArgument.java          | 2 +-
 src/main/java/org/scijava/io/event/DataOpenedEvent.java         | 2 +-
 src/main/java/org/scijava/io/event/DataSavedEvent.java          | 2 +-
 src/main/java/org/scijava/io/event/IOEvent.java                 | 2 +-
 src/main/java/org/scijava/io/handle/AbstractDataHandle.java     | 2 +-
 .../java/org/scijava/io/handle/AbstractHigherOrderHandle.java   | 2 +-
 .../org/scijava/io/handle/AbstractSeekableStreamHandle.java     | 2 +-
 src/main/java/org/scijava/io/handle/AbstractStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/BytesHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/DataHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleInputStream.java  | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleOutputStream.java | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleService.java      | 2 +-
 src/main/java/org/scijava/io/handle/DataHandles.java            | 2 +-
 .../java/org/scijava/io/handle/DefaultDataHandleService.java    | 2 +-
 src/main/java/org/scijava/io/handle/DummyHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/FileHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/ResettableStreamHandle.java | 2 +-
 src/main/java/org/scijava/io/handle/SeekableStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/StreamHandle.java           | 2 +-
 src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java  | 2 +-
 src/main/java/org/scijava/io/location/AbstractLocation.java     | 2 +-
 .../java/org/scijava/io/location/AbstractLocationResolver.java  | 2 +-
 .../java/org/scijava/io/location/AbstractRemoteLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BrowsableLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BytesLocation.java        | 2 +-
 .../java/org/scijava/io/location/DefaultLocationService.java    | 2 +-
 src/main/java/org/scijava/io/location/DummyLocation.java        | 2 +-
 src/main/java/org/scijava/io/location/FileLocation.java         | 2 +-
 src/main/java/org/scijava/io/location/FileLocationResolver.java | 2 +-
 src/main/java/org/scijava/io/location/Location.java             | 2 +-
 src/main/java/org/scijava/io/location/LocationResolver.java     | 2 +-
 src/main/java/org/scijava/io/location/LocationService.java      | 2 +-
 src/main/java/org/scijava/io/location/RemoteLocation.java       | 2 +-
 src/main/java/org/scijava/io/location/URILocation.java          | 2 +-
 src/main/java/org/scijava/io/location/URLLocation.java          | 2 +-
 src/main/java/org/scijava/io/nio/ByteBufferByteBank.java        | 2 +-
 src/main/java/org/scijava/io/nio/DefaultNIOService.java         | 2 +-
 src/main/java/org/scijava/io/nio/NIOService.java                | 2 +-
 src/main/java/org/scijava/log/AbstractLogService.java           | 2 +-
 src/main/java/org/scijava/log/CallingClassUtils.java            | 2 +-
 src/main/java/org/scijava/log/DefaultLogger.java                | 2 +-
 .../java/org/scijava/log/DefaultUncaughtExceptionHandler.java   | 2 +-
 src/main/java/org/scijava/log/IgnoreAsCallingClass.java         | 2 +-
 src/main/java/org/scijava/log/LogLevel.java                     | 2 +-
 src/main/java/org/scijava/log/LogListener.java                  | 2 +-
 src/main/java/org/scijava/log/LogMessage.java                   | 2 +-
 src/main/java/org/scijava/log/LogService.java                   | 2 +-
 src/main/java/org/scijava/log/LogSource.java                    | 2 +-
 src/main/java/org/scijava/log/Logged.java                       | 2 +-
 src/main/java/org/scijava/log/Logger.java                       | 2 +-
 src/main/java/org/scijava/log/StderrLogService.java             | 2 +-
 src/main/java/org/scijava/main/DefaultMainService.java          | 2 +-
 src/main/java/org/scijava/main/MainService.java                 | 2 +-
 src/main/java/org/scijava/main/console/MainArgument.java        | 2 +-
 src/main/java/org/scijava/main/run/MainCodeRunner.java          | 2 +-
 src/main/java/org/scijava/menu/AbstractMenuCreator.java         | 2 +-
 src/main/java/org/scijava/menu/DefaultMenuService.java          | 2 +-
 src/main/java/org/scijava/menu/MenuConstants.java               | 2 +-
 src/main/java/org/scijava/menu/MenuCreator.java                 | 2 +-
 src/main/java/org/scijava/menu/MenuService.java                 | 2 +-
 src/main/java/org/scijava/menu/ShadowMenu.java                  | 2 +-
 src/main/java/org/scijava/menu/ShadowMenuIterator.java          | 2 +-
 src/main/java/org/scijava/menu/event/MenuEvent.java             | 2 +-
 src/main/java/org/scijava/menu/event/MenusAddedEvent.java       | 2 +-
 src/main/java/org/scijava/menu/event/MenusRemovedEvent.java     | 2 +-
 src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/module/AbstractModule.java            | 2 +-
 src/main/java/org/scijava/module/AbstractModuleInfo.java        | 2 +-
 src/main/java/org/scijava/module/AbstractModuleItem.java        | 2 +-
 src/main/java/org/scijava/module/DefaultModuleService.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModule.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleInfo.java  | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleItem.java  | 2 +-
 src/main/java/org/scijava/module/MethodCallException.java       | 2 +-
 src/main/java/org/scijava/module/MethodRef.java                 | 2 +-
 src/main/java/org/scijava/module/Module.java                    | 2 +-
 src/main/java/org/scijava/module/ModuleCanceledException.java   | 2 +-
 src/main/java/org/scijava/module/ModuleException.java           | 2 +-
 src/main/java/org/scijava/module/ModuleIndex.java               | 2 +-
 src/main/java/org/scijava/module/ModuleInfo.java                | 2 +-
 src/main/java/org/scijava/module/ModuleItem.java                | 2 +-
 src/main/java/org/scijava/module/ModuleRunner.java              | 2 +-
 src/main/java/org/scijava/module/ModuleService.java             | 2 +-
 src/main/java/org/scijava/module/MutableModule.java             | 2 +-
 src/main/java/org/scijava/module/MutableModuleInfo.java         | 2 +-
 src/main/java/org/scijava/module/MutableModuleItem.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleCanceledEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModuleErroredEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleEvent.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleExecutedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModuleExecutingEvent.java     | 2 +-
 .../java/org/scijava/module/event/ModuleExecutionEvent.java     | 2 +-
 src/main/java/org/scijava/module/event/ModuleFinishedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModulePostprocessEvent.java   | 2 +-
 .../java/org/scijava/module/event/ModulePreprocessEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModuleProcessEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleStartedEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModulesAddedEvent.java   | 2 +-
 src/main/java/org/scijava/module/event/ModulesListEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModulesRemovedEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java | 2 +-
 .../org/scijava/module/process/AbstractPostprocessorPlugin.java | 2 +-
 .../org/scijava/module/process/AbstractPreprocessorPlugin.java  | 2 +-
 .../scijava/module/process/AbstractSingleInputPreprocessor.java | 2 +-
 .../org/scijava/module/process/CheckInputsPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/DebugPostprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/DebugPreprocessor.java | 2 +-
 .../org/scijava/module/process/DefaultValuePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/GatewayPreprocessor.java    | 2 +-
 src/main/java/org/scijava/module/process/InitPreprocessor.java  | 2 +-
 .../java/org/scijava/module/process/LoadInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/ModulePostprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ModulePreprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/ModuleProcessor.java   | 2 +-
 .../java/org/scijava/module/process/PostprocessorPlugin.java    | 2 +-
 .../java/org/scijava/module/process/PreprocessorPlugin.java     | 2 +-
 .../java/org/scijava/module/process/SaveInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/ServicePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ValidityPreprocessor.java   | 2 +-
 src/main/java/org/scijava/module/run/ModuleCodeRunner.java      | 2 +-
 src/main/java/org/scijava/object/DefaultObjectService.java      | 2 +-
 src/main/java/org/scijava/object/LazyObjects.java               | 2 +-
 src/main/java/org/scijava/object/NamedObjectIndex.java          | 2 +-
 src/main/java/org/scijava/object/ObjectIndex.java               | 2 +-
 src/main/java/org/scijava/object/ObjectService.java             | 2 +-
 src/main/java/org/scijava/object/SortedObjectIndex.java         | 2 +-
 src/main/java/org/scijava/object/event/ListEvent.java           | 2 +-
 src/main/java/org/scijava/object/event/ObjectCreatedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectDeletedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectEvent.java         | 2 +-
 src/main/java/org/scijava/object/event/ObjectModifiedEvent.java | 2 +-
 src/main/java/org/scijava/object/event/ObjectsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/object/event/ObjectsListEvent.java    | 2 +-
 src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/options/DefaultOptionsService.java    | 2 +-
 src/main/java/org/scijava/options/OptionsPlugin.java            | 2 +-
 src/main/java/org/scijava/options/OptionsService.java           | 2 +-
 src/main/java/org/scijava/options/event/OptionsEvent.java       | 2 +-
 src/main/java/org/scijava/parse/DefaultParseService.java        | 2 +-
 src/main/java/org/scijava/parse/Item.java                       | 2 +-
 src/main/java/org/scijava/parse/Items.java                      | 2 +-
 src/main/java/org/scijava/parse/ParseService.java               | 2 +-
 src/main/java/org/scijava/platform/AbstractPlatform.java        | 2 +-
 src/main/java/org/scijava/platform/AppEventService.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultAppEventService.java  | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatform.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatformService.java  | 2 +-
 src/main/java/org/scijava/platform/Platform.java                | 2 +-
 src/main/java/org/scijava/platform/PlatformService.java         | 2 +-
 src/main/java/org/scijava/platform/event/AppAboutEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppFocusEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppMenusCreatedEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java | 2 +-
 .../java/org/scijava/platform/event/AppPreferencesEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppPrintEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppQuitEvent.java      | 2 +-
 src/main/java/org/scijava/platform/event/AppReOpenEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppScreenSleepEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppSleepEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppSystemSleepEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppUserSessionEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppVisibleEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/ApplicationEvent.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerService.java    | 2 +-
 src/main/java/org/scijava/plugin/AbstractPTService.java         | 2 +-
 src/main/java/org/scijava/plugin/AbstractRichPlugin.java        | 2 +-
 src/main/java/org/scijava/plugin/AbstractSingletonService.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedPlugin.java       | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedService.java      | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperService.java    | 2 +-
 src/main/java/org/scijava/plugin/Attr.java                      | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginFinder.java       | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginService.java      | 2 +-
 src/main/java/org/scijava/plugin/HandlerPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/HandlerService.java            | 2 +-
 src/main/java/org/scijava/plugin/HasPluginInfo.java             | 2 +-
 src/main/java/org/scijava/plugin/Menu.java                      | 2 +-
 src/main/java/org/scijava/plugin/PTService.java                 | 2 +-
 src/main/java/org/scijava/plugin/Parameter.java                 | 2 +-
 src/main/java/org/scijava/plugin/Plugin.java                    | 2 +-
 src/main/java/org/scijava/plugin/PluginFinder.java              | 2 +-
 src/main/java/org/scijava/plugin/PluginIndex.java               | 2 +-
 src/main/java/org/scijava/plugin/PluginInfo.java                | 2 +-
 src/main/java/org/scijava/plugin/PluginService.java             | 2 +-
 src/main/java/org/scijava/plugin/RichPlugin.java                | 2 +-
 src/main/java/org/scijava/plugin/SciJavaPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/SingletonPlugin.java           | 2 +-
 src/main/java/org/scijava/plugin/SingletonService.java          | 2 +-
 src/main/java/org/scijava/plugin/SortablePlugin.java            | 2 +-
 src/main/java/org/scijava/plugin/TypedPlugin.java               | 2 +-
 src/main/java/org/scijava/plugin/TypedService.java              | 2 +-
 src/main/java/org/scijava/plugin/WrapperPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/WrapperService.java            | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsListEvent.java    | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/prefs/AbstractPrefService.java        | 2 +-
 src/main/java/org/scijava/prefs/DefaultPrefService.java         | 2 +-
 src/main/java/org/scijava/prefs/PrefService.java                | 2 +-
 src/main/java/org/scijava/run/AbstractCodeRunner.java           | 2 +-
 src/main/java/org/scijava/run/CodeRunner.java                   | 2 +-
 src/main/java/org/scijava/run/DefaultRunService.java            | 2 +-
 src/main/java/org/scijava/run/RunService.java                   | 2 +-
 src/main/java/org/scijava/run/console/RunArgument.java          | 2 +-
 src/main/java/org/scijava/script/AbstractAutoCompleter.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptContext.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptEngine.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptHeader.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptLanguage.java    | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptEngine.java       | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptLanguage.java     | 2 +-
 src/main/java/org/scijava/script/AutoCompleter.java             | 2 +-
 src/main/java/org/scijava/script/AutoCompletionResult.java      | 2 +-
 src/main/java/org/scijava/script/CodeGenerator.java             | 2 +-
 src/main/java/org/scijava/script/CodeGeneratorJava.java         | 2 +-
 src/main/java/org/scijava/script/DefaultAutoCompleter.java      | 2 +-
 .../java/org/scijava/script/DefaultScriptHeaderService.java     | 2 +-
 src/main/java/org/scijava/script/DefaultScriptInterpreter.java  | 2 +-
 src/main/java/org/scijava/script/DefaultScriptService.java      | 2 +-
 src/main/java/org/scijava/script/InvocationObject.java          | 2 +-
 src/main/java/org/scijava/script/ParameterObject.java           | 2 +-
 src/main/java/org/scijava/script/ScriptCLI.java                 | 2 +-
 src/main/java/org/scijava/script/ScriptFinder.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeader.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeaderService.java       | 2 +-
 src/main/java/org/scijava/script/ScriptInfo.java                | 2 +-
 src/main/java/org/scijava/script/ScriptInterpreter.java         | 2 +-
 src/main/java/org/scijava/script/ScriptLanguage.java            | 2 +-
 src/main/java/org/scijava/script/ScriptLanguageIndex.java       | 2 +-
 src/main/java/org/scijava/script/ScriptModule.java              | 2 +-
 src/main/java/org/scijava/script/ScriptREPL.java                | 2 +-
 src/main/java/org/scijava/script/ScriptService.java             | 2 +-
 src/main/java/org/scijava/script/console/RunScriptArgument.java | 2 +-
 src/main/java/org/scijava/script/io/ScriptIOPlugin.java         | 2 +-
 .../scijava/script/process/DefaultScriptProcessorService.java   | 2 +-
 .../org/scijava/script/process/DirectiveScriptProcessor.java    | 2 +-
 .../org/scijava/script/process/ParameterScriptProcessor.java    | 2 +-
 src/main/java/org/scijava/script/process/ScriptCallback.java    | 2 +-
 .../scijava/script/process/ScriptDirectiveScriptProcessor.java  | 2 +-
 src/main/java/org/scijava/script/process/ScriptProcessor.java   | 2 +-
 .../java/org/scijava/script/process/ScriptProcessorService.java | 2 +-
 .../java/org/scijava/script/process/ShebangScriptProcessor.java | 2 +-
 src/main/java/org/scijava/script/run/ScriptCodeRunner.java      | 2 +-
 src/main/java/org/scijava/service/AbstractService.java          | 2 +-
 src/main/java/org/scijava/service/SciJavaService.java           | 2 +-
 src/main/java/org/scijava/service/Service.java                  | 2 +-
 src/main/java/org/scijava/service/ServiceHelper.java            | 2 +-
 src/main/java/org/scijava/service/ServiceIndex.java             | 2 +-
 .../java/org/scijava/service/event/ServicesLoadedEvent.java     | 2 +-
 src/main/java/org/scijava/startup/DefaultStartupService.java    | 2 +-
 src/main/java/org/scijava/startup/StartupService.java           | 2 +-
 src/main/java/org/scijava/task/DefaultTask.java                 | 2 +-
 src/main/java/org/scijava/task/DefaultTaskService.java          | 2 +-
 src/main/java/org/scijava/task/Task.java                        | 2 +-
 src/main/java/org/scijava/task/TaskService.java                 | 2 +-
 src/main/java/org/scijava/task/event/TaskEvent.java             | 2 +-
 src/main/java/org/scijava/test/TestUtils.java                   | 2 +-
 src/main/java/org/scijava/text/AbstractTextFormat.java          | 2 +-
 src/main/java/org/scijava/text/DefaultTextService.java          | 2 +-
 src/main/java/org/scijava/text/TextFormat.java                  | 2 +-
 src/main/java/org/scijava/text/TextService.java                 | 2 +-
 src/main/java/org/scijava/text/io/DefaultTextIOService.java     | 2 +-
 src/main/java/org/scijava/text/io/TextIOPlugin.java             | 2 +-
 src/main/java/org/scijava/text/io/TextIOService.java            | 2 +-
 src/main/java/org/scijava/thread/DefaultThreadService.java      | 2 +-
 src/main/java/org/scijava/thread/ThreadService.java             | 2 +-
 src/main/java/org/scijava/tool/AbstractTool.java                | 2 +-
 src/main/java/org/scijava/tool/CustomDrawnTool.java             | 2 +-
 src/main/java/org/scijava/tool/DefaultToolService.java          | 2 +-
 src/main/java/org/scijava/tool/DummyTool.java                   | 2 +-
 src/main/java/org/scijava/tool/IconDrawer.java                  | 2 +-
 src/main/java/org/scijava/tool/IconService.java                 | 2 +-
 src/main/java/org/scijava/tool/Tool.java                        | 2 +-
 src/main/java/org/scijava/tool/ToolService.java                 | 2 +-
 src/main/java/org/scijava/tool/event/ToolActivatedEvent.java    | 2 +-
 src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java  | 2 +-
 src/main/java/org/scijava/tool/event/ToolEvent.java             | 2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java                     | 2 +-
 src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java  | 2 +-
 src/main/java/org/scijava/ui/AbstractUIInputWidget.java         | 2 +-
 src/main/java/org/scijava/ui/AbstractUserInterface.java         | 2 +-
 src/main/java/org/scijava/ui/ApplicationFrame.java              | 2 +-
 src/main/java/org/scijava/ui/Arrangeable.java                   | 2 +-
 src/main/java/org/scijava/ui/CloseConfirmable.java              | 2 +-
 src/main/java/org/scijava/ui/DefaultUIService.java              | 2 +-
 src/main/java/org/scijava/ui/Desktop.java                       | 2 +-
 src/main/java/org/scijava/ui/DialogPrompt.java                  | 2 +-
 src/main/java/org/scijava/ui/FileListPreprocessor.java          | 2 +-
 src/main/java/org/scijava/ui/FilePreprocessor.java              | 2 +-
 src/main/java/org/scijava/ui/StatusBar.java                     | 2 +-
 src/main/java/org/scijava/ui/SystemClipboard.java               | 2 +-
 src/main/java/org/scijava/ui/ToolBar.java                       | 2 +-
 src/main/java/org/scijava/ui/UIPreprocessor.java                | 2 +-
 src/main/java/org/scijava/ui/UIService.java                     | 2 +-
 src/main/java/org/scijava/ui/UserInterface.java                 | 2 +-
 src/main/java/org/scijava/ui/console/AbstractConsolePane.java   | 2 +-
 src/main/java/org/scijava/ui/console/ConsolePane.java           | 2 +-
 src/main/java/org/scijava/ui/console/HeadlessArgument.java      | 2 +-
 src/main/java/org/scijava/ui/console/ShowUIArgument.java        | 2 +-
 src/main/java/org/scijava/ui/console/UIArgument.java            | 2 +-
 src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java   | 2 +-
 .../java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java     | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropData.java           | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropService.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/MIMEType.java                  | 2 +-
 .../java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java   | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java      | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DropEvent.java           | 2 +-
 src/main/java/org/scijava/ui/event/UIEvent.java                 | 2 +-
 src/main/java/org/scijava/ui/event/UIShownEvent.java            | 2 +-
 .../java/org/scijava/ui/headless/HeadlessDisplayViewer.java     | 2 +-
 src/main/java/org/scijava/ui/headless/HeadlessUI.java           | 2 +-
 src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java         | 2 +-
 src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayPanel.java           | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayViewer.java          | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayWindow.java          | 2 +-
 .../org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java   | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java | 2 +-
 src/main/java/org/scijava/util/AbstractPrimitiveArray.java      | 2 +-
 src/main/java/org/scijava/util/AppUtils.java                    | 2 +-
 src/main/java/org/scijava/util/ArrayUtils.java                  | 2 +-
 src/main/java/org/scijava/util/BoolArray.java                   | 2 +-
 src/main/java/org/scijava/util/ByteArray.java                   | 2 +-
 src/main/java/org/scijava/util/Bytes.java                       | 2 +-
 src/main/java/org/scijava/util/CharArray.java                   | 2 +-
 src/main/java/org/scijava/util/CheckSezpoz.java                 | 2 +-
 src/main/java/org/scijava/util/ClassUtils.java                  | 2 +-
 src/main/java/org/scijava/util/ColorRGB.java                    | 2 +-
 src/main/java/org/scijava/util/ColorRGBA.java                   | 2 +-
 src/main/java/org/scijava/util/Colors.java                      | 2 +-
 src/main/java/org/scijava/util/CombineAnnotations.java          | 2 +-
 src/main/java/org/scijava/util/Combiner.java                    | 2 +-
 src/main/java/org/scijava/util/ConversionUtils.java             | 2 +-
 src/main/java/org/scijava/util/DebugUtils.java                  | 2 +-
 src/main/java/org/scijava/util/DefaultTreeNode.java             | 2 +-
 src/main/java/org/scijava/util/DigestUtils.java                 | 2 +-
 src/main/java/org/scijava/util/DoubleArray.java                 | 2 +-
 src/main/java/org/scijava/util/FileUtils.java                   | 2 +-
 src/main/java/org/scijava/util/FloatArray.java                  | 2 +-
 src/main/java/org/scijava/util/GenericUtils.java                | 2 +-
 src/main/java/org/scijava/util/IntArray.java                    | 2 +-
 src/main/java/org/scijava/util/IntCoords.java                   | 2 +-
 src/main/java/org/scijava/util/IntRect.java                     | 2 +-
 src/main/java/org/scijava/util/IteratorPlus.java                | 2 +-
 src/main/java/org/scijava/util/LastRecentlyUsed.java            | 2 +-
 src/main/java/org/scijava/util/LineOutputStream.java            | 2 +-
 src/main/java/org/scijava/util/ListUtils.java                   | 2 +-
 src/main/java/org/scijava/util/LongArray.java                   | 2 +-
 src/main/java/org/scijava/util/Manifest.java                    | 2 +-
 src/main/java/org/scijava/util/MersenneTwisterFast.java         | 2 +-
 src/main/java/org/scijava/util/MetaInfCombiner.java             | 2 +-
 src/main/java/org/scijava/util/MirrorWebsite.java               | 2 +-
 src/main/java/org/scijava/util/MiscUtils.java                   | 2 +-
 src/main/java/org/scijava/util/NumberUtils.java                 | 2 +-
 src/main/java/org/scijava/util/ObjectArray.java                 | 2 +-
 src/main/java/org/scijava/util/POM.java                         | 2 +-
 src/main/java/org/scijava/util/PlatformUtils.java               | 2 +-
 src/main/java/org/scijava/util/Prefs.java                       | 2 +-
 src/main/java/org/scijava/util/PrimitiveArray.java              | 2 +-
 src/main/java/org/scijava/util/ProcessUtils.java                | 2 +-
 src/main/java/org/scijava/util/PropertiesHelper.java            | 2 +-
 src/main/java/org/scijava/util/Query.java                       | 2 +-
 src/main/java/org/scijava/util/ReadInto.java                    | 2 +-
 src/main/java/org/scijava/util/RealCoords.java                  | 2 +-
 src/main/java/org/scijava/util/RealRect.java                    | 2 +-
 src/main/java/org/scijava/util/ReflectException.java            | 2 +-
 src/main/java/org/scijava/util/ReflectedUniverse.java           | 2 +-
 src/main/java/org/scijava/util/ServiceCombiner.java             | 2 +-
 src/main/java/org/scijava/util/ShortArray.java                  | 2 +-
 src/main/java/org/scijava/util/Sizable.java                     | 2 +-
 src/main/java/org/scijava/util/SizableArrayList.java            | 2 +-
 src/main/java/org/scijava/util/StringMaker.java                 | 2 +-
 src/main/java/org/scijava/util/StringUtils.java                 | 2 +-
 src/main/java/org/scijava/util/Timing.java                      | 2 +-
 src/main/java/org/scijava/util/TreeNode.java                    | 2 +-
 src/main/java/org/scijava/util/TunePlayer.java                  | 2 +-
 src/main/java/org/scijava/util/Types.java                       | 2 +-
 src/main/java/org/scijava/util/UnitUtils.java                   | 2 +-
 src/main/java/org/scijava/util/VersionUtils.java                | 2 +-
 src/main/java/org/scijava/util/XML.java                         | 2 +-
 src/main/java/org/scijava/welcome/DefaultWelcomeService.java    | 2 +-
 src/main/java/org/scijava/welcome/WelcomeService.java           | 2 +-
 src/main/java/org/scijava/welcome/event/WelcomeEvent.java       | 2 +-
 src/main/java/org/scijava/widget/AbstractInputHarvester.java    | 2 +-
 src/main/java/org/scijava/widget/AbstractInputPanel.java        | 2 +-
 src/main/java/org/scijava/widget/AbstractInputWidget.java       | 2 +-
 src/main/java/org/scijava/widget/Button.java                    | 2 +-
 src/main/java/org/scijava/widget/ButtonWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ChoiceWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ColorWidget.java               | 2 +-
 src/main/java/org/scijava/widget/DateWidget.java                | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetModel.java        | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetService.java      | 2 +-
 src/main/java/org/scijava/widget/FileListWidget.java            | 2 +-
 src/main/java/org/scijava/widget/FileWidget.java                | 2 +-
 src/main/java/org/scijava/widget/InputHarvester.java            | 2 +-
 src/main/java/org/scijava/widget/InputPanel.java                | 2 +-
 src/main/java/org/scijava/widget/InputWidget.java               | 2 +-
 src/main/java/org/scijava/widget/MessageWidget.java             | 2 +-
 src/main/java/org/scijava/widget/NumberWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ObjectWidget.java              | 2 +-
 src/main/java/org/scijava/widget/TextWidget.java                | 2 +-
 src/main/java/org/scijava/widget/ToggleWidget.java              | 2 +-
 src/main/java/org/scijava/widget/UIComponent.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetModel.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetService.java             | 2 +-
 src/main/java/org/scijava/widget/WidgetStyle.java               | 2 +-
 src/test/java/org/scijava/ContextCreationTest.java              | 2 +-
 src/test/java/org/scijava/ContextDisposalTest.java              | 2 +-
 src/test/java/org/scijava/ContextInjectionTest.java             | 2 +-
 src/test/java/org/scijava/SciJavaTest.java                      | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedA.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedB.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedC.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedD.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedInnerClass.java  | 2 +-
 src/test/java/org/scijava/annotations/Complex.java              | 2 +-
 src/test/java/org/scijava/annotations/DirectoryIndexerTest.java | 2 +-
 src/test/java/org/scijava/annotations/EclipseHelperTest.java    | 2 +-
 src/test/java/org/scijava/annotations/Fruit.java                | 2 +-
 src/test/java/org/scijava/annotations/LegacyTest.java           | 2 +-
 src/test/java/org/scijava/annotations/Simple.java               | 2 +-
 src/test/java/org/scijava/app/StatusServiceTest.java            | 2 +-
 .../java/org/scijava/command/CommandArrayConverterTest.java     | 2 +-
 src/test/java/org/scijava/command/CommandInfoTest.java          | 2 +-
 src/test/java/org/scijava/command/CommandModuleTest.java        | 2 +-
 src/test/java/org/scijava/command/CommandServiceTest.java       | 2 +-
 src/test/java/org/scijava/command/InputsTest.java               | 2 +-
 src/test/java/org/scijava/command/InvalidCommandTest.java       | 2 +-
 .../java/org/scijava/command/run/CommandCodeRunnerTest.java     | 2 +-
 src/test/java/org/scijava/console/ConsoleServiceTest.java       | 2 +-
 .../java/org/scijava/console/SystemPropertyArgumentTest.java    | 2 +-
 .../java/org/scijava/convert/AbstractNumberConverterTests.java  | 2 +-
 .../java/org/scijava/convert/ArrayToStringConverterTest.java    | 2 +-
 .../scijava/convert/BigIntegerToBigDecimalConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ByteToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToBigIntegerConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToDoubleConverterTest.java     | 2 +-
 src/test/java/org/scijava/convert/ByteToFloatConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToIntegerConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/ByteToLongConverterTest.java  | 2 +-
 src/test/java/org/scijava/convert/ByteToShortConverterTest.java | 2 +-
 src/test/java/org/scijava/convert/ConvertServiceTest.java       | 2 +-
 src/test/java/org/scijava/convert/ConverterTest.java            | 2 +-
 src/test/java/org/scijava/convert/DefaultConverterTest.java     | 2 +-
 src/test/java/org/scijava/convert/DelegateConverterTest.java    | 2 +-
 .../org/scijava/convert/DoubleToBigDecimalConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileListConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileToPathConversionTest.java | 2 +-
 .../org/scijava/convert/FloatToBigDecimalConverterTest.java     | 2 +-
 .../java/org/scijava/convert/FloatToDoubleConverterTest.java    | 2 +-
 .../org/scijava/convert/IntegerToBigDecimalConverterTest.java   | 2 +-
 .../org/scijava/convert/IntegerToBigIntegerConverterTest.java   | 2 +-
 .../java/org/scijava/convert/IntegerToDoubleConverterTest.java  | 2 +-
 .../java/org/scijava/convert/IntegerToLongConverterTest.java    | 2 +-
 .../java/org/scijava/convert/LongToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/LongToBigIntegerConverterTest.java | 2 +-
 .../org/scijava/convert/ShortToBigDecimalConverterTest.java     | 2 +-
 .../org/scijava/convert/ShortToBigIntegerConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToDoubleConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ShortToFloatConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToIntegerConverterTest.java   | 2 +-
 src/test/java/org/scijava/convert/ShortToLongConverterTest.java | 2 +-
 .../java/org/scijava/convert/StringToArrayConverterTest.java    | 2 +-
 .../java/org/scijava/convert/StringToNumberConverterTest.java   | 2 +-
 src/test/java/org/scijava/display/DisplayTest.java              | 2 +-
 src/test/java/org/scijava/download/DownloadServiceTest.java     | 2 +-
 src/test/java/org/scijava/event/EventServiceTest.java           | 2 +-
 src/test/java/org/scijava/io/ByteArrayByteBankTest.java         | 2 +-
 src/test/java/org/scijava/io/ByteBankTest.java                  | 2 +-
 src/test/java/org/scijava/io/IOServiceTest.java                 | 2 +-
 src/test/java/org/scijava/io/TypedIOServiceTest.java            | 2 +-
 src/test/java/org/scijava/io/event/DataEventTest.java           | 2 +-
 src/test/java/org/scijava/io/handle/BytesHandleTest.java        | 2 +-
 .../java/org/scijava/io/handle/DataHandleEdgeCaseTests.java     | 2 +-
 src/test/java/org/scijava/io/handle/DataHandleTest.java         | 2 +-
 src/test/java/org/scijava/io/handle/DataHandlesTest.java        | 2 +-
 src/test/java/org/scijava/io/handle/FileHandleTest.java         | 2 +-
 .../org/scijava/io/handle/ReadBufferDataHandleMockTest.java     | 2 +-
 .../java/org/scijava/io/handle/ReadBufferDataHandleTest.java    | 2 +-
 .../java/org/scijava/io/handle/WriteBufferDataHandleTest.java   | 2 +-
 src/test/java/org/scijava/io/location/BytesLocationTest.java    | 2 +-
 .../java/org/scijava/io/location/FileLocationResolverTest.java  | 2 +-
 src/test/java/org/scijava/io/location/FileLocationTest.java     | 2 +-
 src/test/java/org/scijava/io/location/LocationServiceTest.java  | 2 +-
 src/test/java/org/scijava/io/location/URILocationTest.java      | 2 +-
 src/test/java/org/scijava/io/location/URLLocationTest.java      | 2 +-
 src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java    | 2 +-
 src/test/java/org/scijava/log/CallingClassUtilsTest.java        | 2 +-
 src/test/java/org/scijava/log/DefaultLoggerTest.java            | 2 +-
 src/test/java/org/scijava/log/LogMessageTest.java               | 2 +-
 src/test/java/org/scijava/log/LogServiceTest.java               | 2 +-
 src/test/java/org/scijava/log/LogSourceTest.java                | 2 +-
 src/test/java/org/scijava/log/StderrLogServiceTest.java         | 2 +-
 src/test/java/org/scijava/log/TestLogListener.java              | 2 +-
 src/test/java/org/scijava/main/MainServiceTest.java             | 2 +-
 src/test/java/org/scijava/main/run/MainCodeRunnerTest.java      | 2 +-
 src/test/java/org/scijava/menu/MenuServiceTest.java             | 2 +-
 src/test/java/org/scijava/menu/ShadowMenuTest.java              | 2 +-
 src/test/java/org/scijava/module/ModuleServiceTest.java         | 2 +-
 .../java/org/scijava/module/event/ModuleErroredEventTest.java   | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessorTest.java | 2 +-
 src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java  | 2 +-
 src/test/java/org/scijava/object/NamedObjectIndexTest.java      | 2 +-
 src/test/java/org/scijava/object/ObjectIndexTest.java           | 2 +-
 src/test/java/org/scijava/object/ObjectServiceTest.java         | 2 +-
 src/test/java/org/scijava/object/SortedObjectIndexTest.java     | 2 +-
 src/test/java/org/scijava/options/OptionsTest.java              | 2 +-
 src/test/java/org/scijava/parse/ParseServiceTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginFinderTest.java          | 2 +-
 src/test/java/org/scijava/plugin/PluginIndexTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginInfoTest.java            | 2 +-
 src/test/java/org/scijava/plugin/SingletonServiceTest.java      | 2 +-
 src/test/java/org/scijava/prefs/PrefServiceTest.java            | 2 +-
 src/test/java/org/scijava/run/RunServiceTest.java               | 2 +-
 .../java/org/scijava/script/AbstractScriptLanguageTest.java     | 2 +-
 src/test/java/org/scijava/script/ScriptEngineTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptFinderTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptInfoTest.java            | 2 +-
 src/test/java/org/scijava/script/ScriptServiceTest.java         | 2 +-
 .../scijava/script/process/ParameterScriptProcessorTest.java    | 2 +-
 src/test/java/org/scijava/service/ServiceIndexTest.java         | 2 +-
 src/test/java/org/scijava/task/TaskEventTest.java               | 2 +-
 src/test/java/org/scijava/task/TaskServiceTest.java             | 2 +-
 src/test/java/org/scijava/test/AbstractSciJavaTest.java         | 2 +-
 src/test/java/org/scijava/test/TestUtilsTest.java               | 2 +-
 src/test/java/org/scijava/text/TextServiceTest.java             | 2 +-
 src/test/java/org/scijava/thread/ThreadServiceTest.java         | 2 +-
 src/test/java/org/scijava/ui/UIServiceTest.java                 | 2 +-
 src/test/java/org/scijava/util/AppUtilsTest.java                | 2 +-
 src/test/java/org/scijava/util/ArrayUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/BoolArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ByteArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/CharArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ClassUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/ColorRGBTest.java                | 2 +-
 src/test/java/org/scijava/util/ConversionUtilsTest.java         | 2 +-
 src/test/java/org/scijava/util/DigestUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/DoubleArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/FileUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/FloatArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/GenericArrayTypesTest.java       | 2 +-
 src/test/java/org/scijava/util/IntArrayTest.java                | 2 +-
 src/test/java/org/scijava/util/LastRecentlyUsedTest.java        | 2 +-
 src/test/java/org/scijava/util/LongArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/NumberUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/ObjectArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/POMTest.java                     | 2 +-
 src/test/java/org/scijava/util/PrimitiveArrayTest.java          | 2 +-
 src/test/java/org/scijava/util/ProcessUtilsTest.java            | 2 +-
 src/test/java/org/scijava/util/PropertiesHelperTest.java        | 2 +-
 src/test/java/org/scijava/util/ShortArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/StringUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/TypesTest.java                   | 2 +-
 src/test/java/org/scijava/util/UnitUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/VersionUtilsTest.java            | 2 +-
 src/test/java/org/scijava/widget/WidgetStyleTest.java           | 2 +-
 757 files changed, 757 insertions(+), 757 deletions(-)

diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 0ce0ce63c..12f8b4d0a 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2024 SciJava developers.
+  Copyright (C) 2009 - 2025 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index fed9016f3..2f053786a 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index 86df895da..5301e1794 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index 451e17e42..4643aa288 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index a91b6f012..bc6a12a90 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 69b227865..02cd6280f 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2024 SciJava developers.
+  Copyright (C) 2009 - 2025 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index cea966d7b..f05f40249 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index 23a9076ba..0c76ae641 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index d6ee9b0fb..944c2dff0 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 7fd19bfdd..3590c19e3 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index de28e93bd..d2288061b 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 4b2122560..0c36b0066 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 561b53fc5..50014ad17 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 9b41674da..4d83ca900 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index 7b3db0a86..f3ac3548b 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index fdb8a624d..9222f058c 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index 5e1063ee9..a1be1c4e7 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index 972a192c9..bd7de998f 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index f5dbf14dd..7f1d82077 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index 087f2321c..e2df38650 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index afcfff5be..c4198b74b 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index d1d025569..47b0e9276 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index 1cba5940a..5184b2552 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index 7cecc891c..d436963fc 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index c81406db5..941c4a860 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index ce2a9c689..bdb669e16 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 412ac0e67..4f25b47d3 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index 58f5862fb..32eca3f18 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 04d28e792..34b10025a 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 4031ab296..8ecc6c528 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index 7b579848b..e2fbddfd0 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index a95841ce0..90a3be54c 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index 93d9c6339..552d1fd00 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index c20e67efb..896c6bb18 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index 9873e589b..4fabe278a 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index 8efd392d4..b95d1e02b 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index c146f41ed..eb5c0cda5 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 12f29e5fc..730739ca6 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 7588b762b..33338727a 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 8e4e1fc65..e9acebd7c 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 10682ca6a..98ec12da7 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index ab0024069..1f52f9565 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 0d4765e9e..07e690a01 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index a7a760df2..dd56ab83e 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index dcefa9f88..67aab711f 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index 74dd5c65d..894874238 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index f1c386bcc..deb8f7d65 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index ce6619f24..5b3d0d129 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index 96b62626a..eaa37331d 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index a18f8366e..bf4bf0721 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index c6ec110b6..582860a36 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 2906b72bb..8a97162b6 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index f93bbba71..38e3e555d 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 4af7d69c5..067184141 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 3a28d4a52..7896b9b4a 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index cabc032f8..d1c055557 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index afc2a4a6e..aaa51c43d 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index 4fddf6734..ffba4ebb4 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 456736f68..3e99f2d3f 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index 78913df7a..f0b2bd34c 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index 0d8201e18..bef02fbd5 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index ec30d678a..b9e602de5 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 6d1495ebb..502113a69 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index 3588dffac..ae9e3830e 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index 00275c0c1..f1d59a2b0 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index 8fccd9f20..5d165192d 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index 9d85a1235..738521744 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index 18272bbbb..a97d282f2 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index b1f3f999d..6f4d93375 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index 49925091a..1edf9a4b3 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index ac5b780b7..2a2bb9469 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index da9308f5a..330d8472c 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index eb8804716..763d324cf 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index 86ffa6df7..e5dac33f2 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index 5b843323e..d823f05f9 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index 811dabf8c..eff1cf185 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index edfa4ea0c..b51e8a549 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index 23c5b9a24..e869933ed 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 6314e737e..909aa3ea0 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index 535deb088..c129e56d2 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 043e5b439..1cc9803e9 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index e1f2a11c2..a194dc24d 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index 762b7f249..dddd58e36 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index 640a9dbc7..c86479e10 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index 40590ccd0..aa2f2ddfd 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 0388e601c..18d995afd 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index c80d2fbef..a7f252b3c 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index 909c6f0da..f9b979947 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index ab9cb24a8..18d5f5916 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index 1cf448747..d141d5454 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 27915c40d..1e4e80ca6 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 3486e9a5f..65ce220ba 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 14e65bae2..84e56de9d 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 3191be092..5b0544369 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index 434940368..d14e64dce 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index 15064c8d7..b9f53256d 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index 47a81053c..f4e8e86e7 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileToPathConverter.java b/src/main/java/org/scijava/convert/FileToPathConverter.java
index 7d091b9e0..9a6960566 100644
--- a/src/main/java/org/scijava/convert/FileToPathConverter.java
+++ b/src/main/java/org/scijava/convert/FileToPathConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index 9719d6afe..b43a5cecf 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index 05aa71c7c..2f52ba40d 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index 889cf75e9..34b5a22a1 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 80196b63a..6877d4b6b 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index 751badc6b..d32b0a751 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index 19579a857..cc9a6b31f 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index 149962f42..799ac9ac7 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index 7f7eef462..34df15429 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index d3b3102fe..4ad78680d 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index aed496f49..858fdd13b 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PathToFileConverter.java b/src/main/java/org/scijava/convert/PathToFileConverter.java
index 6c221f905..1a066296e 100644
--- a/src/main/java/org/scijava/convert/PathToFileConverter.java
+++ b/src/main/java/org/scijava/convert/PathToFileConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index 514077e15..32b048a30 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index dedcc8092..549527f4e 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 18e6a38d6..8b0996095 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToNumberConverter.java b/src/main/java/org/scijava/convert/StringToNumberConverter.java
index 817c0c37a..f8f407a87 100644
--- a/src/main/java/org/scijava/convert/StringToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/StringToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index 02a44cd6d..c1fbd2ee0 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index 488cc2249..fd5bc184e 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index b7058f5e9..e75317060 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index f91dddc14..b125937d4 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index df16c01cc..ab6044b12 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index 77921d195..4886b3a1e 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index 9a69d7f8e..a97064ce5 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index 23acbf0e0..dc2654396 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index ae875c217..4b38e060e 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index 29eb39843..f6eddb44f 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 0c6a12a07..7af76b8b4 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index bd6f77560..eab8406e7 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index c1420e4d5..aeda51f31 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 95e90c7cb..22bd5ffeb 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index 1be4cb353..d609a2391 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index d515f9c0a..877529707 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index ddc2f3046..3acf2bece 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 6cafacc77..2c812389b 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index acc1bdf9d..2ce597b48 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index 398fe027b..a345748ab 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index ed1d4eae4..2e728f3af 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 62f9bd622..8962c1a80 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index ec6595127..226453319 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index de13c50ee..1ee9e2cf5 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index 3836bb65c..5e1d047f0 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index 28584e4e1..f60eb58b2 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index f8be96df2..ba737a960 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index c45b5991d..19ca38bfd 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 2ad017f9c..219e62b73 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 0c723db58..8f0ec7c6b 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index a51e7132b..380cc2185 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index b54bae090..7e11f2581 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index 4bf578d83..f8573f746 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index baceef2f0..c1f8f7d03 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 882058c7a..770c05f30 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index 75a4714ea..b691b0a71 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 731cae148..4486a5630 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index 4ac6abb44..e34298e6c 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index 6775b0bc0..da91dc3e8 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index eb9f1f8a1..73471ebed 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index 313bc5840..56d00f71f 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index 7410aa1c5..abc4c8294 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index 30da5a620..ee49eed26 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index b6a7c6e1d..4c7d5ef3a 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextCreatedEvent.java b/src/main/java/org/scijava/event/ContextCreatedEvent.java
index 8f6de90ee..2f43d2105 100644
--- a/src/main/java/org/scijava/event/ContextCreatedEvent.java
+++ b/src/main/java/org/scijava/event/ContextCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 4f161ce33..472c6b03e 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 8d3f91745..72e269077 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index 0847b9b7f..c0d397cb1 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index 30194744d..d627ce668 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index be2bd9494..794e3e3fa 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 628e9a7a4..56283f452 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index f1b49e309..e54425120 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index a0da0e664..9beecf79f 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 2a7f6d95b..00ef9d7f0 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index 7bcef12d3..bb05a8f40 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index b4c8343d3..2fcc6876d 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index ffa6ca9ae..c1296cfb6 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 3f9f9b03b..2b3506c07 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index dc1fd6095..21df50b23 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index 8bb2ea10a..a38c638bc 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index c7207eeb3..2c2dc7444 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index 1ade50c90..8d6d55991 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 954e77258..7e7782572 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 520441e43..28cd7b96f 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index 196ba64c8..277f9abf2 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index 1bb062b54..fa6352140 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index a5199e76e..183dbcd07 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 299f3f387..1e7f0a85f 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index 2c12ccd6a..ed42dee25 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index 26cd44836..d26c66ce9 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index 7c549fe8b..38c6385a1 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index 746311f6a..89fffd060 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index efe0fe257..ab7aa259b 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index a034e574f..b42d9fb0f 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index d2fb9e03e..74eaa8925 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index 593cdf721..e254fb0a8 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index dcafd62cd..9a8a57973 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index 853bc4098..a27fd185c 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
index ac7318347..a28428328 100644
--- a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
index 30af9f6a0..9660e9300 100644
--- a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index 4b0051372..b4cc82b4f 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index 61d413382..f5728f2cd 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index 7613b17be..e37ef5948 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index 4e8259a8b..510a68e51 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index e55cdfd3f..16782658f 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index a8976f3fa..abdcc0afb 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index 66428855f..e820ca6ac 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index 61fe0bdf5..bb9cd70ac 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index 029c0c6b2..dbaedd134 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index 35841320b..af306b73b 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
index 6a1022e9a..c202ad53d 100644
--- a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
index fa4e1666d..bf517df16 100644
--- a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
index c33eccdab..f134315cb 100644
--- a/src/main/java/org/scijava/io/handle/StreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
index 4f3a7d818..44c8b5064 100644
--- a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index d93e29fa9..045d6fc37 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
index d05ad4c9b..675a4c775 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index 78e66e53b..2d211157f 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
index 68bbf0be3..234d2c88b 100644
--- a/src/main/java/org/scijava/io/location/BrowsableLocation.java
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index 74bc91843..d16e83c69 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index 46dd034ba..d4ea0845a 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index 1235ff829..f1e2b4f64 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index ef8b8950e..195389196 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
index 9c02c4a8f..67c57420c 100644
--- a/src/main/java/org/scijava/io/location/FileLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index efb45542f..1d2510c54 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
index dac41d9bd..0f325a002 100644
--- a/src/main/java/org/scijava/io/location/LocationResolver.java
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 08aa30759..1af4e1e26 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index ce5760565..a39282b4f 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 3bc2789aa..0e5165a4a 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index 37619be4f..73c4781f2 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 92ccd5a1f..99588b672 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 655580146..6e0ef72da 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index 4bdb6be3e..ea5c6696c 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index de30db3da..1227ea134 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index c29516b91..34a52d894 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 0cf99f33e..9f148f647 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index e59cc2c93..1d3e9704e 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index 0b18fac9f..faa0da4d8 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index 0172ed524..cc36aba55 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index b2e8dad4b..fabbfa435 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index 4a621b261..fde5af3b9 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 335abb8f6..7d7eac93f 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index b44c48556..4338e3a8a 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index c12e4fe13..7f44f3f75 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 0db237f70..8806a1dde 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 9801bb746..184f11d52 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index 79dea58cf..faffc2546 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index d8b190de1..ac21af8f0 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index 0125781da..f9139ff6c 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 6ff737b2b..627e8ece3 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index d28e3fa73..94dd1f596 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 73471d5c9..37863c869 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index 78f71535a..c68b5171c 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index 20249f21b..571ea192e 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index 1023a5fd6..8455284ac 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index f97ab4800..e0cecb326 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index 4ac49edb9..45dfc836e 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index c8ef4a79d..c1e81f70e 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index 299b7f68e..796bd039b 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index 205c13229..fe156cde6 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index ea69e3833..01df28f33 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index 4fd0aacf3..e6400f7cc 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 29379b44e..78747cacb 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index f61cfcc54..ad9b863d2 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index e4461f236..b6d3fa025 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 768d6c663..2d483797a 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index 859fe0d9b..e41f52465 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 3e3eb139c..956d245d6 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index eca6e5e5c..5dd89a0d6 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index 758f8d390..8dff15695 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index 16f555a48..a60bd7d3e 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index c39147745..cd8cb0cf4 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index 0b4339108..c178e6a39 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index 30f53e048..0b11c9f52 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index d95a56335..73e1a59a9 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index cec5cb5e2..0007ee040 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 7de66702f..49879fe71 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index ad1ae76d3..8b8ed2f51 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 487c98f00..87e839206 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index 7dd5bffdd..fd3cbbb2d 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index 73f952a7e..a3b4ccc09 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index 4ad43d60d..9016e323a 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleErroredEvent.java b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
index ce0fd6924..364772b38 100644
--- a/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index d00c7ca09..96c3ddca3 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index eecd5c063..2942ea56d 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index 2cd97f867..f1fd53f5c 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index c19ba0535..940a9d8e0 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index 9bc5604b3..692be5b92 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index f92330682..9d42be6ab 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index 92e1ab81e..760c2c55f 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index 3588bc103..b58046091 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index 5da7e5fe7..975c5e8af 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index b32385ae3..aa3b3877c 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 5f6cca8c3..95b2c1c28 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index f8a9a9780..f60959dbc 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index 075f1f826..a0a14f75d 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index 575fec9b3..8ac5886d5 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index 53cbac997..4f5f625ca 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index 0e30c3935..b373722ee 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index 545261ffc..fff89a404 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index af8bd28c2..2760cea81 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index 8e33d1088..59db93a4e 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index 28c951188..b85d7ce60 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index b59b8c8cf..c080e8100 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 89c6af4d7..7cbe03d34 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index 228058fac..abf184e9f 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 7f4b5531e..2be46df60 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index ee9a06864..528c6a815 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index a90e04b8f..a1b65e315 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 67284b0a1..696e06602 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index 21eccd05f..8c0dc970b 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index fb8765a20..2a13be6e0 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index c92e54bb8..0cabffa55 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index 75c66526e..c195ffa93 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index 47c523036..78666b9bf 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 15faa89ce..1e6ee836b 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index 7efa98f4b..ccd8218a1 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 8d90f18b0..7a2ac555a 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index a37c1eff1..a05f326f1 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index 3bc0567b0..c8c9df2c5 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 7fce98b07..478be8af1 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index bb233bf26..0ffec7b19 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index 84f8026a8..d13533817 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index 7e35c68e4..53ad97b26 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index fc5e237b6..1825bbc87 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index 6730e23d1..e2b5abe73 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index 33b1291d1..e87836338 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index 1ec22cb3a..7487ee5ed 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index d77e8f3cd..de8aaf9e2 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 938b55b8e..2bf0f49ff 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index 03379d9d8..a7239d833 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index c86b0f34d..815c640e9 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index 69353a5eb..fcb68ed08 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index 42e5cd1b7..20cc74f48 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index b8d46f0f8..b686d558b 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index 3ef55bcf4..4cba11748 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index 1b9ac7dd1..49dbaf9ad 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index 19a705bcf..ba20fb813 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index 73710dfc2..f20f49b14 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index b10605b52..16b191878 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index 55b276774..bd0c34424 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index fbd7e67f0..f9d971b58 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index 5804a11a4..e5effaaf1 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 948024f61..96e0e6743 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index c8e796e7f..68e07fe9f 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index b266a20bb..251d253a7 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 4f65243fd..8d1278a2f 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 94244046e..23b119891 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index 6a51cf9da..0a5d85fa7 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index 650200905..c5221df29 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index 7325f24cc..0c764a718 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index 002192a48..c3198e627 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index f5657e7b2..47a252476 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index 678e2e839..c78337b1a 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index c8e102725..eb3b09762 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index 5fe8a7286..8e29b17a3 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index bd99e0c74..b5d608118 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 45a9fb4e2..8a029561d 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 0038af03f..4856c0748 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index b0e475b68..995bde741 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index f2562e9ae..af501d619 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index 5170d256e..e84ad8c07 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 5f804afa7..73c37cb3f 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index fe51559aa..497528dc8 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 40929cf32..46dc75ead 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 67fe4a669..9929517f2 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index 525fd50c3..9f0281c74 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index c05cb94ad..b60bca1ae 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index 4287edcc0..717550439 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index 0b16c9d58..e2eb4949c 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index c904ffb73..8193d8d5e 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index f2fe8aaf8..33f179bfb 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 168f977d1..65a3374b8 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index 3f6cfaf1e..ee65fb550 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index d25e7fc0a..a0b504779 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 191c8064a..8157261cf 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index 1ed64c82d..c21d89fbc 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index 5a8fbc5cb..5e64f9411 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 450af2428..3539c7861 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index b1ae59bd4..73153bcb9 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index dc127f074..8e4a4ce85 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index e85bf76db..dc579969a 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index 8f5eb862b..aa5c1d546 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index b7bc4c919..4bef823d5 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 79de0e2e0..87e3afba9 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 3ba80f8ca..9171d8f8d 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index 257afa423..5b29d8a12 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index a3f6033ca..c6d04b019 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index 868144629..a49b329bb 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index 2cf9a517c..62efbea8c 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index 3225df43b..593a4f797 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index 6a1fe60fe..0caad3bfb 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index 0f28602fc..edaf3dbb1 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index 978a4e2de..1709f484c 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 7c1b98cba..1bf55eb1a 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index f174db6c0..78efeae4a 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index 30c91aa6e..d2e285d0d 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index 5d02b3634..e60bc4f64 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index d1def7ea2..9bef19655 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index 883f52e10..ef8bee6e3 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 3fd6cb61e..0c030b383 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index 373da220d..ce84a31cf 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index effad4d7f..b5b784448 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index bc2290a23..30ccac002 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index b62aa5c2f..6875cd203 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 03306775e..131ebe7bb 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index f99cba338..1aa04fbba 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index 3144c16af..3c7acd8ef 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index 084256755..449068235 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index 190dddd80..632e7498b 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index 5d65a3f36..d3eecd426 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index ae578fb40..fa2e6d624 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 69a038be1..61135865c 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index 18ebb0dcb..ef3890a16 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index fd34edbd6..3593d98da 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index 664ccc300..b0e569824 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index f8bd5e952..ba308b947 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 1e768a057..6ec2e5260 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index df2374beb..f6d2ada7d 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptCLI.java b/src/main/java/org/scijava/script/ScriptCLI.java
index db53036a3..f04d344b5 100644
--- a/src/main/java/org/scijava/script/ScriptCLI.java
+++ b/src/main/java/org/scijava/script/ScriptCLI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 55aad7ed5..27a7aa7b7 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index fbaff7497..c1a3d3269 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index c1e167ade..c697d90f2 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index f643e0a54..a6c00d5c6 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index 491847136..8faebc3c3 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index f841f32c1..4a5446292 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index fe138cd28..ddab0a36e 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index dedf744f4..b686b52a9 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 2a93a92c1..9c1b838dd 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index c1a61044d..6d1d5f5b5 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index b78065ee2..df7335169 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index b6b30209f..dec94b517 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index ded8f418d..99fd73812 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
index 4dfa5ff38..4b1fe8c34 100644
--- a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index 2e0dfd703..d3988e9ef 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index 445dd157e..eaedad35c 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index fffc58568..40b905ede 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index 415f51826..edeec681b 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index 811ab47d4..a73b4ebb7 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index f7edef985..6e3991590 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index 8d4a4a61c..d016431ee 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index 841c8c468..ce04e97e7 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index 869ce3269..eb311bd80 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index 392a6dc08..13f2c1081 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index d7ad8003e..3b06233ca 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index 962952d3e..f926883a0 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index 2b9e9a119..fe0109129 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index 356437eb4..8131b6bc2 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
index 6a47f97d1..35e747b39 100644
--- a/src/main/java/org/scijava/startup/StartupService.java
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index a275c3505..048f7b773 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
index 5ad770f25..147fd0eec 100644
--- a/src/main/java/org/scijava/task/DefaultTaskService.java
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index a91cdcf6b..1e8004e53 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
index 5bf0cb2f8..dfe5c0ffd 100644
--- a/src/main/java/org/scijava/task/TaskService.java
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
index 4173c3bc5..83a5d662c 100644
--- a/src/main/java/org/scijava/task/event/TaskEvent.java
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index 692b4fd25..c375f6994 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 3bb2edc9e..766cb0874 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index a81ed7c0e..211fd25f2 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 05ec572c7..2ef04da75 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 75bae744a..5149b2a38 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
index d27ec4657..21937f384 100644
--- a/src/main/java/org/scijava/text/io/DefaultTextIOService.java
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 16e9ba34f..3e3d20efd 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
index a218aec0f..ed48ab424 100644
--- a/src/main/java/org/scijava/text/io/TextIOService.java
+++ b/src/main/java/org/scijava/text/io/TextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index 6f48f9e34..f34c38a6a 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index aeec0d1ba..b809a9a4b 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index 4ec4bd878..e83ada645 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 10aafc9db..4222b14b0 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index e59976a8f..d7d653399 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index 6dc220279..c2e858e00 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index 2493b7880..ff4b83a40 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index 0d6349818..02be9b223 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index 31adad6d6..c2a0d00f0 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 8fe2855f9..020a3e891 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index e2eabdf0d..6df9190ef 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 5b668aa23..78569c9ea 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 553fd83e1..85aed4d60 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index b30d9df8f..ff21f7bd7 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index b29383470..a31e09d59 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index 606864da0..32d324ef1 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index a3894158b..d1b91e527 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index 98a2ce24d..57fc6083f 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index 19c8cd3a3..2385868c5 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index 729a15ed5..331f50861 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index ff5663f91..5d4d7299d 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index e851e6634..11aa766f4 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index 7a14960e2..fc59a3c05 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index 1f3227731..c18810629 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index 2076665ec..909e84c06 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 1d2c39232..19ad8acb8 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index 1a362d55e..d897285e7 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index c7e4de97b..b14ceb0fa 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index eb7780a4f..36fd91147 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 0f3958698..84f4b23ef 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index f4c6d0c70..5133008eb 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index b9de2570f..abe9177e7 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index 3db7788d4..c2214bd61 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index 601b3d3ed..ab4eea39e 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index 3c4cd4a7a..b07e618e9 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index 40ee7986f..1622d1e0d 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index dfc445dca..fe0b3da6a 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index 53b24aae6..cb25e57ce 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index fc7f00803..1c278a394 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index 5a15efe09..e18db980b 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index 8cc4e082f..4dd73dbd0 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 0377f1f03..1b793784c 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index 2319a5c41..f1de3ddb9 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 336c94e20..62684957f 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index 42c2490c4..64febfa13 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index db21cac88..4d7f01307 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index a5e0cb5b6..5298fc946 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index aa8f3c624..83b15db9e 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index b221fdadc..5c93dff04 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 268b9b0c9..0576666e8 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index fd93d52eb..df28afbb5 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index a4a6ac4fe..d1000d5d3 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index 92f876cd3..8a0892f1a 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index c5e1fb2e3..957efb500 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index 2dfa036da..af6b6c902 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 63cb32d5c..654b42e7f 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index d3f48f2fc..3c55c9cd2 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index e705cbbb7..3bda15d67 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index c51213d04..691b42687 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index de99dfc95..eb439e8f6 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index 2a45a3427..14654e681 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index a737da1f5..b53271ee6 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index 9ca4ae5be..cd53bdc2d 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index fe8343711..8799c7ec7 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index 6c1a720b2..def8f4eb9 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index 4dd310c6a..b65cce633 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index db6efcdbf..f2059c2c7 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 3ea2bee18..32ff8e8b4 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index f5eda9f65..4d7a72d28 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index 759383d73..45f8c70af 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index cdfa1de15..099db97ec 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index 235db46fd..fa9be7491 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 8569b4bd6..09961183e 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index cfc211e04..305fbbbe0 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index e78221623..4bab90ddc 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index 2f616b838..60fa3dc8c 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index dddf6046d..11ed3f879 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index 7b107d0fb..ce758eed0 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index 7a01ba31f..b902d2335 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index 78f84c6fa..e7ce7cb53 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
index e16bf02e5..8c9290a78 100644
--- a/src/main/java/org/scijava/util/DefaultTreeNode.java
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index c63b035fb..172f54a9a 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index 71aaaece8..a75b9b266 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index f98e76f69..a233d7fd5 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index 3c3bd00ce..1911dcd7a 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index d470580e3..f73fc78f6 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 32f2f027d..4916ca205 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index 23d3bc238..8110aa996 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index 4c224be75..be12b1035 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index da2c28dad..5a28e023d 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 0714ce49c..83afb110f 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index c3d95997d..2f4ad2d19 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index 79c857461..e423fa616 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index ee9a4a453..351580338 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index e5f7fab67..6e4cd5dd3 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 089299ee0..9bad0ab73 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 4cb22cb05..63582c0cc 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index 4bd72155a..ec807ab8e 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 667e7560a..4476e9a4b 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 77137ecbe..11a228345 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index 486313d8c..aa12acc08 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index afd4771a0..54c0434ab 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index 8e67ec1a3..215759cac 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index 4044f6762..72f63bac7 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 35a6c7498..51ac3f30a 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index 9f97a24d0..3b23b3c1c 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PropertiesHelper.java b/src/main/java/org/scijava/util/PropertiesHelper.java
index f56189d8c..bfbac09e2 100644
--- a/src/main/java/org/scijava/util/PropertiesHelper.java
+++ b/src/main/java/org/scijava/util/PropertiesHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index 39914f518..008b84efa 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 3aafebae3..559b87304 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index 7b49819fe..97e61e00c 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index b149ba1d5..4f355cd73 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index aa3e18849..3402b78f9 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index 54ce3cd65..fd7aa908a 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index 2a069ef5c..ea9bd034c 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 1f903b532..354d31031 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index 9c9d34a7a..a1a8d82eb 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index 89fa00b66..11eb6bdc0 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 3b2d1839c..809b1a5c9 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 5d72f80bd..90b2e9756 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index aec5a6d1e..8a4dcfe39 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
index a827556f9..20af64acc 100644
--- a/src/main/java/org/scijava/util/TreeNode.java
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index d14fd40b4..a36fa353d 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index d112b2114..a75ef8311 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index d93471c25..445f16046 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index b5306c1de..ea012b9a1 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 732b0ee0c..5a3f0a049 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index 817fc44f1..b9af9fd48 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index a2819123f..ac690f3bc 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index f6f046b81..2f38dc848 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index d1515bd17..1eaea1045 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index e2accd1af..5b6637b19 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index 420fb43ae..bedf6d594 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index 174c30d2c..0768762a2 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index 8b43645a4..a56b33065 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index 202a6e346..25ff52afe 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index fdbe7a7f5..427f64922 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index 5a849f966..4cc60c0b5 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index b1ed1cd47..7bea4bc8c 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 380746ad7..6f35b2efa 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index 87401b27f..fc310519b 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index e72d41c37..5567cb967 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index 30735f457..fe27f5480 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index 6e1396e0f..f937027bc 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 6499314bc..221c3770b 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index f096f4116..20347c3b2 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index 67d4c1030..79bfa46cd 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index 5c8b2ed81..27c9560c6 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index 4f555d8c1..716750d69 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index 336e75cd1..8a56a9662 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 20dd35301..2b7f56e0a 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 9f0f1b634..a2ee20dcd 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index 047657acb..01857a29c 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index d9c186b0c..65491717d 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 614e4a019..9b5769ef3 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextDisposalTest.java b/src/test/java/org/scijava/ContextDisposalTest.java
index e3834d3a2..4f66ab6f9 100644
--- a/src/test/java/org/scijava/ContextDisposalTest.java
+++ b/src/test/java/org/scijava/ContextDisposalTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index b5f948041..df3c46ece 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
index 1279f8861..9daf637c6 100644
--- a/src/test/java/org/scijava/SciJavaTest.java
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 799eea92f..4c9977496 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index a14106e1d..46ccb442c 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index 589a49e5f..777b949f4 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index f6e23eac6..d898df6d7 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 6f46d5864..96ed33157 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index b0c7d879e..f7cb7e0ec 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 81a96747d..8a6d243e4 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index 24daca561..6bd63ace5 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index cf484cb20..9ffb333cd 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index a9aaf12a8..6bf5d5d13 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index 193803c00..90b426367 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 1e2eed9d3..1209d4049 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
index b2a34200e..8531a3dfa 100644
--- a/src/test/java/org/scijava/command/CommandArrayConverterTest.java
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 492945766..6f1cf1128 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index cfa70fe45..9fb32074f 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index fb1fda971..ef34da9a4 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index db55f9c3e..3cdc8c35b 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index 2687d056a..e3f64b268 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index 6e488c1f7..466df6426 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index cb4728630..8a2760e85 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index b073e504c..a45c7823e 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 7b899bd4f..8e7aac26b 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index a1a1bb10a..0d1f7ef28 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index 0535224eb..228ff9e3b 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index d63cb3743..638b0caf0 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index e179deff1..381b2f5ac 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index 472e42702..43d2c62ef 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 7674190ca..286f358a5 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index 1d1747098..f4607db21 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 53f552f1c..38ffd40aa 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index b2fd5281b..c1e542e12 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 96dbe1bdf..80fe29337 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index ddb0f6c9f..cf9564346 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DefaultConverterTest.java b/src/test/java/org/scijava/convert/DefaultConverterTest.java
index b1c810d83..af04d34ad 100644
--- a/src/test/java/org/scijava/convert/DefaultConverterTest.java
+++ b/src/test/java/org/scijava/convert/DefaultConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
index b506e9e2d..ec1f4187c 100644
--- a/src/test/java/org/scijava/convert/DelegateConverterTest.java
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index aa85644ab..ff6714dba 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index 71afaa2dc..f5b40b2e4 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileToPathConversionTest.java b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
index ef8829e07..7fd087514 100644
--- a/src/test/java/org/scijava/convert/FileToPathConversionTest.java
+++ b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index 546a649c0..7d49b6878 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index 5aaf070cc..45c5c4dfb 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 48d54b3d6..4c375dcb8 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index e1430131c..79c89bcb1 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 3581c5c48..0e1106536 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index 5aa0f3b9c..5611b7f26 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 56e6da876..436730ee2 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index 57527734a..ec8a1c3ca 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index fd65d1a31..642008214 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index 7ff413922..bb39f8c50 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index 0a71d5092..336001970 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index cc93bd4c3..d893478ca 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index 11c514c59..df9c62daf 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index f396697fd..a5803241a 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index 35b45f19b..c68ddd568 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
index 779850213..34ed9d260 100644
--- a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index 07cf2967f..3d6f65de2 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index 390f06f68..a9bb2a421 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index 2d0215f41..de8c2b028 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index 1f184071a..e57db1f3e 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index fdc00f86c..fd1ff0b6a 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index ecfed72ad..bae4be289 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index 734924839..d59cb9014 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index 5a56f2fcd..0c4e8e7ea 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index 4b2d05db0..a996b4fa2 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
index deba27821..bac3ee2f2 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index b12a7592b..8e84c4087 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
index 09ff0e012..5e0a95359 100644
--- a/src/test/java/org/scijava/io/handle/DataHandlesTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 551769c30..6caa0c7e3 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index 20a637f3e..3337d4a82 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index 8196c9128..5e0fce0df 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index 813a5ab46..dd0c158f4 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index 1217c23ff..4dbcd46a4 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
index 62ec48db0..0b71e739f 100644
--- a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index 3ce55ea53..b9d189f0f 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index fb917a694..5889dae32 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index 9df45d181..49ff094ab 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index 0075c79dd..f053a1fab 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 8685dc322..76fdf7e21 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index a88c970a1..8817580ee 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index 14cc55b77..5c2f29805 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index f08f6ec18..0699ddc37 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 2d3d3b46f..78a128073 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index c5dda19d7..e6d7883a7 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index 95429dd25..42db64727 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
index e7f2bce82..94ed38813 100644
--- a/src/test/java/org/scijava/log/TestLogListener.java
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index b5d09ac31..e87501a7b 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index ea049cf18..20c0997fe 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index aad47bb73..a3b2f203f 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 2c9660b2d..5eb75a2cb 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index e8844f086..cdaf44a84 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
index 4524254df..def867107 100644
--- a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
+++ b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index 16e5e7e6d..7698f30b9 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index 9a2dcc0c4..719ed815f 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
index 4a76b6962..7ceef8e27 100644
--- a/src/test/java/org/scijava/object/NamedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 62c2e4071..95f0c9dc8 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
index bdb18ce5d..c8f27051e 100644
--- a/src/test/java/org/scijava/object/ObjectServiceTest.java
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index ad5e0e14c..3a3c31e97 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index 78b4e182a..da1b4a51a 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index 5a7cdb164..ffe1ee60d 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index a5562f3bb..7c83b3b57 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 7453aba96..76a076493 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index eb8507f43..ae9098a0d 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index 18242910f..1ef3e82de 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index 63249b4e5..7a8535ed0 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index ae3506c8c..71e2213d9 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index 192232351..8ad3ef941 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index 3df84bf5a..f8fac4dc9 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index dce377a2d..74fdc4583 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index 47951dd75..eb53d3d2d 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index 1cf9ae9ff..404550f5d 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
index 578cfe617..8e9c5b653 100644
--- a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index 2629c8195..ea3f6cc8c 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
index eb939fbf0..82d98f85f 100644
--- a/src/test/java/org/scijava/task/TaskEventTest.java
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index a8c99505f..00b320b0a 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index 5f8dab9a0..3b859e001 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 3bba34708..69beb2bd2 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/text/TextServiceTest.java b/src/test/java/org/scijava/text/TextServiceTest.java
index e969da2aa..fd16a40f3 100644
--- a/src/test/java/org/scijava/text/TextServiceTest.java
+++ b/src/test/java/org/scijava/text/TextServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 83e5dd336..29ce7b4dd 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 7a53b6e58..9aba1641c 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index 2bce17e08..a67e4b758 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index 15e953adc..2ce778bb9 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index 2da00516f..9b8239e68 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index ab862f915..0e8108951 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 9aa855f27..9d4403e75 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 0e8e022f1..1e3f809d4 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index d09e01721..8f5225b58 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index 3daac3f50..f19b7f8e4 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index 0b1e15f24..c9b37378b 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index 6d382c09c..385b8ee31 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index dd240f593..0bbc6645e 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index a76c12349..9a8516ac9 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/GenericArrayTypesTest.java b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
index fee6a2504..5c6e06e9d 100644
--- a/src/test/java/org/scijava/util/GenericArrayTypesTest.java
+++ b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index 7536716d3..b28b46390 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 8eeb5c5db..10d11e427 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index a18997343..c0a384b7a 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/NumberUtilsTest.java b/src/test/java/org/scijava/util/NumberUtilsTest.java
index 5ce6b3780..28cef6cea 100644
--- a/src/test/java/org/scijava/util/NumberUtilsTest.java
+++ b/src/test/java/org/scijava/util/NumberUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index 1c96cec41..8bcdf73ee 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 86a800515..2ca1ea072 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index 0fde7de05..64a74492b 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index dc529b96b..ce3346a2c 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PropertiesHelperTest.java b/src/test/java/org/scijava/util/PropertiesHelperTest.java
index 35202c9f5..3e3cc57fb 100644
--- a/src/test/java/org/scijava/util/PropertiesHelperTest.java
+++ b/src/test/java/org/scijava/util/PropertiesHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index 3626aa063..005718285 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 86555e910..95b0cd431 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index 3ffa1edea..d3529cb0c 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index 96f54eae7..e253a0319 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index 35554427b..f56be8426 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
index 2391ecb8a..0043dba69 100644
--- a/src/test/java/org/scijava/widget/WidgetStyleTest.java
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2024 SciJava developers.
+ * Copyright (C) 2009 - 2025 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From 321668723c01e551f2e56204d5fb6fbe83d6d77e Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 12 May 2025 16:33:10 -0500
Subject: [PATCH 1177/1208] POM: update parent to pom-scijava 40.0.0

---
 LICENSE.txt | 2 +-
 pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index e37abf5e1..142f26652 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2024, SciJava developers.
+Copyright (c) 2009 - 2025, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/pom.xml b/pom.xml
index 4e188fa32..58b55bf01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>37.0.0</version>
+		<version>40.0.0</version>
 		<relativePath />
 	</parent>
 

From 8f8a277df6b6d14fa42b9cc451dbe2cf266c4e53 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 12 May 2025 16:42:53 -0500
Subject: [PATCH 1178/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 58b55bf01..7462349d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.99.1-SNAPSHOT</version>
+	<version>2.99.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 29255db02499ebc6b70c1066562b48696beb2913 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 May 2025 19:49:02 -0500
Subject: [PATCH 1179/1208] Be less noisy about overlapping script languages

We really only need to know about these things in debug mode.
---
 src/main/java/org/scijava/script/ScriptLanguageIndex.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index ddab0a36e..f3680e18b 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -146,8 +146,8 @@ private boolean put(final String type, final Map<String, ScriptLanguage> map,
 			// Conflicting value; behavior depends on mode.
 			if (gently) {
 				// Do not overwrite the previous value.
-				if (log != null && log.isWarn()) {
-					log.warn(overwriteMessage(false, type, key, value, existing));
+				if (log != null && log.isDebug()) {
+					log.debug(overwriteMessage(false, type, key, value, existing));
 				}
 				return false;
 			}

From c720bf0ef6b67ec2d54758a7162f7b2e41fa0c41 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 27 May 2025 22:11:29 -0500
Subject: [PATCH 1180/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7462349d6..7270aa62e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.99.2-SNAPSHOT</version>
+	<version>2.99.3-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 6679961e0d6a900e22e86b096b634f478529a2b2 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 23 Sep 2025 16:05:50 -0500
Subject: [PATCH 1181/1208] Slightly improve the scary missing object message

Instead of "A ___ is required but none exists", we now use the
slightly less scary "A(n) ___ is required but none is available."
---
 .../org/scijava/widget/AbstractInputHarvester.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 1eaea1045..5b9e59ec5 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -30,6 +30,7 @@
 package org.scijava.widget;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -120,8 +121,15 @@ private <T> WidgetModel addInput(final InputPanel<P, W> inputPanel,
 		}
 
 		if (item.isRequired()) {
-			throw new ModuleException("A " + type.getSimpleName() +
-				" is required but none exist.");
+			final List<String> vowelSoundPrefixes = Arrays.asList(
+				"a", "e", "i", "o", "u", "honor", "honour", "hour", "xml"
+			);
+			final String typeName = type.getSimpleName();
+			final String article = vowelSoundPrefixes.stream().anyMatch(
+				prefix -> typeName.toLowerCase().startsWith(prefix)
+			) ? "An" : "A";
+			throw new ModuleException(article + " " + typeName +
+				" is required but none is available.");
 		}
 
 		// item is not required; we can skip it

From dbf2a7aab578c0b6ff37a2a5827e4021ba2be1c1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 4 Nov 2025 12:53:39 -0600
Subject: [PATCH 1182/1208] Make KeyCode hex codes consistently low-case

---
 src/main/java/org/scijava/input/KeyCode.java | 148 +++++++++----------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 2c2dc7444..234353ca3 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -52,7 +52,7 @@ public enum KeyCode {
 	CANCEL(0x03),
 
 	/** Clear. */
-	CLEAR(0x0C),
+	CLEAR(0x0c),
 
 	/** Shift (left or right). */
 	SHIFT(0x10),
@@ -70,7 +70,7 @@ public enum KeyCode {
 	CAPS_LOCK(0x14),
 
 	/** Escape. */
-	ESCAPE(0x1B),
+	ESCAPE(0x1b),
 
 	/** Space (' '). */
 	SPACE(0x20),
@@ -100,16 +100,16 @@ public enum KeyCode {
 	DOWN(0x28),
 
 	/** Comma (','). */
-	COMMA(0x2C),
+	COMMA(0x2c),
 
 	/** Minus ('-'). */
-	MINUS(0x2D),
+	MINUS(0x2d),
 
 	/** Period ('.'). */
-	PERIOD(0x2E),
+	PERIOD(0x2e),
 
 	/** Forward slash ('/'). */
-	SLASH(0x2F),
+	SLASH(0x2f),
 
 	/** Zero ('0', non-numpad). */
 	NUM0(0x30),
@@ -142,10 +142,10 @@ public enum KeyCode {
 	NUM9(0x39),
 
 	/** Semicolon (';'). */
-	SEMICOLON(0x3B),
+	SEMICOLON(0x3b),
 
 	/** Equals ('='). */
-	EQUALS(0x3D),
+	EQUALS(0x3d),
 
 	/** The letter A. */
 	A(0x41),
@@ -175,22 +175,22 @@ public enum KeyCode {
 	I(0x49),
 
 	/** The letter J. */
-	J(0x4A),
+	J(0x4a),
 
 	/** The letter K. */
-	K(0x4B),
+	K(0x4b),
 
 	/** The letter L. */
-	L(0x4C),
+	L(0x4c),
 
 	/** The letter M. */
-	M(0x4D),
+	M(0x4d),
 
 	/** The letter N. */
-	N(0x4E),
+	N(0x4e),
 
 	/** The letter O. */
-	O(0x4F),
+	O(0x4f),
 
 	/** The letter P. */
 	P(0x50),
@@ -223,16 +223,16 @@ public enum KeyCode {
 	Y(0x59),
 
 	/** The letter Z. */
-	Z(0x5A),
+	Z(0x5a),
 
 	/** Left bracket ('['). */
-	OPEN_BRACKET(0x5B),
+	OPEN_BRACKET(0x5b),
 
 	/** Backslash ('\\'). */
-	BACK_SLASH(0x5C),
+	BACK_SLASH(0x5c),
 
 	/** Right bracket (']'). */
-	CLOSE_BRACKET(0x5D),
+	CLOSE_BRACKET(0x5d),
 
 	/** Zero ('0') on numeric keypad. */
 	NUMPAD_0(0x60),
@@ -265,24 +265,24 @@ public enum KeyCode {
 	NUMPAD_9(0x69),
 
 	/** Asterisk ('*') on numeric keypad. */
-	NUMPAD_ASTERISK(0x6A),
+	NUMPAD_ASTERISK(0x6a),
 
 	/** Plus ('+') on numeric keypad. */
-	NUMPAD_PLUS(0x6B),
+	NUMPAD_PLUS(0x6b),
 
-	NUMPAD_SEPARATOR(0x6C),
+	NUMPAD_SEPARATOR(0x6c),
 
 	/** Minus ('-') on numeric keypad. */
-	NUMPAD_MINUS(0x6D),
+	NUMPAD_MINUS(0x6d),
 
 	/** Period ('.') on numeric keypad. */
-	NUMPAD_PERIOD(0x6E),
+	NUMPAD_PERIOD(0x6e),
 
 	/** Slash ('/') on numeric keypad. */
-	NUMPAD_SLASH(0x6F),
+	NUMPAD_SLASH(0x6f),
 
 	/** Delete (non-numpad). */
-	DELETE(0x7F),
+	DELETE(0x7f),
 
 	/** Num Lock. */
 	NUM_LOCK(0x90),
@@ -321,76 +321,76 @@ public enum KeyCode {
 	F10(0x79),
 
 	/** F11. */
-	F11(0x7A),
+	F11(0x7a),
 
 	/** F12. */
-	F12(0x7B),
+	F12(0x7b),
 
 	/** F13. */
-	F13(0xF000),
+	F13(0xf000),
 
 	/** F14. */
-	F14(0xF001),
+	F14(0xf001),
 
 	/** F15. */
-	F15(0xF002),
+	F15(0xf002),
 
 	/** F16. */
-	F16(0xF003),
+	F16(0xf003),
 
 	/** F17. */
-	F17(0xF004),
+	F17(0xf004),
 
 	/** F18 */
-	F18(0xF005),
+	F18(0xf005),
 
 	/** F19. */
-	F19(0xF006),
+	F19(0xf006),
 
 	/** F20. */
-	F20(0xF007),
+	F20(0xf007),
 
 	/** F21. */
-	F21(0xF008),
+	F21(0xf008),
 
 	/** F22. */
-	F22(0xF009),
+	F22(0xf009),
 
 	/** F23. */
-	F23(0xF00A),
+	F23(0xf00a),
 
 	/** F24. */
-	F24(0xF00B),
+	F24(0xf00b),
 
 	/** Print Screen. */
-	PRINTSCREEN(0x9A),
+	PRINTSCREEN(0x9a),
 
 	/** Insert. */
-	INSERT(0x9B),
+	INSERT(0x9b),
 
 	/** Help. */
-	HELP(0x9C),
+	HELP(0x9c),
 
 	/** Meta. */
-	META(0x9D),
+	META(0x9d),
 
 	/** Backquote ('`'). */
-	BACK_QUOTE(0xC0),
+	BACK_QUOTE(0xc0),
 
 	/** Single quote ('\''). */
-	QUOTE(0xDE),
+	QUOTE(0xde),
 
 	/** Up arrow on numeric keypad. */
-	KP_UP(0xE0),
+	KP_UP(0xe0),
 
 	/** Down arrow on numeric keypad. */
-	KP_DOWN(0xE1),
+	KP_DOWN(0xe1),
 
 	/** Left arrow on numeric keypad. */
-	KP_LEFT(0xE2),
+	KP_LEFT(0xe2),
 
 	/** Right arrow on numeric keypad. */
-	KP_RIGHT(0xE3),
+	KP_RIGHT(0xe3),
 
 	/** TODO. */
 	DEAD_GRAVE(0x80),
@@ -492,51 +492,51 @@ public enum KeyCode {
 	PLUS(0x0209),
 
 	/** Right parenthesis (')'). */
-	RIGHT_PARENTHESIS(0x020A),
+	RIGHT_PARENTHESIS(0x020a),
 
 	/** Underscore ('_'). */
-	UNDERSCORE(0x020B),
+	UNDERSCORE(0x020b),
 
 	/** Windows key (both left and right). */
-	WINDOWS(0x020C),
+	WINDOWS(0x020c),
 
 	/** Windows Context Menu key. */
-	CONTEXT_MENU(0x020D),
+	CONTEXT_MENU(0x020d),
 
 	FINAL(0x0018),
 
 	/** Convert function key. */
-	CONVERT(0x001C),
+	CONVERT(0x001c),
 
 	/** Don't Convert function key. */
-	NONCONVERT(0x001D),
+	NONCONVERT(0x001d),
 
 	/** Accept or Commit function key. */
-	ACCEPT(0x001E),
+	ACCEPT(0x001e),
 
-	MODECHANGE(0x001F),
+	MODECHANGE(0x001f),
 
 	KANA(0x0015),
 
 	KANJI(0x0019),
 
 	/** Alphanumeric function key. */
-	ALPHANUMERIC(0x00F0),
+	ALPHANUMERIC(0x00f0),
 
 	/** Katakana function key. */
-	KATAKANA(0x00F1),
+	KATAKANA(0x00f1),
 
 	/** Hiragana function key. */
-	HIRAGANA(0x00F2),
+	HIRAGANA(0x00f2),
 
 	/** Full-Width Characters function key. */
-	FULL_WIDTH(0x00F3),
+	FULL_WIDTH(0x00f3),
 
 	/** Half-Width Characters function key. */
-	HALF_WIDTH(0x00F4),
+	HALF_WIDTH(0x00f4),
 
 	/** Roman Characters function key. */
-	ROMAN_CHARACTERS(0x00F5),
+	ROMAN_CHARACTERS(0x00f5),
 
 	/** All Candidates function key. */
 	ALL_CANDIDATES(0x0100),
@@ -563,37 +563,37 @@ public enum KeyCode {
 	INPUT_METHOD_ON_OFF(0x0107),
 
 	/** Cut (Sun keyboard). */
-	CUT(0xFFD1),
+	CUT(0xffd1),
 
 	/** Copy (Sun keyboard). */
-	COPY(0xFFCD),
+	COPY(0xffcd),
 
 	/** Paste (Sun keyboard). */
-	PASTE(0xFFCF),
+	PASTE(0xffcf),
 
 	/** Undo (Sun keyboard). */
-	UNDO(0xFFCB),
+	UNDO(0xffcb),
 
 	/** Again (Sun keyboard). */
-	AGAIN(0xFFC9),
+	AGAIN(0xffc9),
 
 	/** Find (Sun keyboard). */
-	FIND(0xFFD0),
+	FIND(0xffd0),
 
 	/** Props (Sun keyboard). */
-	PROPS(0xFFCA),
+	PROPS(0xffca),
 
 	/** Stop (Sun keyboard). */
-	STOP(0xFFC8),
+	STOP(0xffc8),
 
 	/** Compose function key. */
-	COMPOSE(0xFF20),
+	COMPOSE(0xff20),
 
 	/** AltGraph function key. */
-	ALT_GRAPH(0xFF7E),
+	ALT_GRAPH(0xff7e),
 
 	/** Begin key. */
-	BEGIN(0xFF58),
+	BEGIN(0xff58),
 
 	/** Unknown code. */
 	UNDEFINED(0x0);

From a012ce1027f0aab78f464c759b5eed2c04b73283 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 4 Nov 2025 12:53:58 -0600
Subject: [PATCH 1183/1208] Add KeyCode.get(char) method

Previously, passing a char to KeyCode would call KeyCode.get(int), which
does not do what one might expect. For example, calling KeyCode.get('a')
would convert the 'a' character to integer/ASCII code 97, which
corresponds to KeyCode.NUMPAD_0!

This commit introduces a function that behaves as one would expect
KeyCode.get(char) to behave: mapping the actual character value to the
key code constant associated with it. So now, KeyCode.get('a') returns
KeyCode.A as one might expect.

Unfortunately, not all codes have clean character values, and not all
characters map unambiguously to key codes; e.g.:

* Both 'a' and 'A' map to KeyCode.A
* '0' maps to KeyCode.NUM0, not KeyCode.NUMPAD_0
* '/' maps to KeyCode.SLASH, not KeyCode.NUMPAD_SLASH

But it's still a big step forward in abiding by PoLA.
---
 src/main/java/org/scijava/input/KeyCode.java  | 81 +++++++++++++++++
 .../java/org/scijava/input/KeyCodeTest.java   | 89 +++++++++++++++++++
 2 files changed, 170 insertions(+)
 create mode 100644 src/test/java/org/scijava/input/KeyCodeTest.java

diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 234353ca3..0a6d20e0c 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -632,6 +632,87 @@ public static KeyCode get(final int code) {
 		return keyCode;
 	}
 
+	/**
+	 * Gets the KeyCode corresponding to the given character,
+	 * or {@link #UNDEFINED} if no such code.
+	 */
+	public static KeyCode get(final char c) {
+		switch (c) {
+			case '\n': case '\r': return ENTER;
+			case '\b': return BACK_SPACE;
+			case '\t': return TAB;
+			case 0x1b: return ESCAPE;
+			case ' ': return SPACE;
+			case ',': return COMMA;
+			case '-': return MINUS;
+			case '.': return PERIOD;
+			case '/': return SLASH;
+			case '0': return NUM0;
+			case '1': return NUM1;
+			case '2': return NUM2;
+			case '3': return NUM3;
+			case '4': return NUM4;
+			case '5': return NUM5;
+			case '6': return NUM6;
+			case '7': return NUM7;
+			case '8': return NUM8;
+			case '9': return NUM9;
+			case ';': return SEMICOLON;
+			case '=': return EQUALS;
+			case 'a': case 'A': return A;
+			case 'b': case 'B': return B;
+			case 'c': case 'C': return C;
+			case 'd': case 'D': return D;
+			case 'e': case 'E': return E;
+			case 'f': case 'F': return F;
+			case 'g': case 'G': return G;
+			case 'h': case 'H': return H;
+			case 'i': case 'I': return I;
+			case 'j': case 'J': return J;
+			case 'k': case 'K': return K;
+			case 'l': case 'L': return L;
+			case 'm': case 'M': return M;
+			case 'n': case 'N': return N;
+			case 'o': case 'O': return O;
+			case 'p': case 'P': return P;
+			case 'q': case 'Q': return Q;
+			case 'r': case 'R': return R;
+			case 's': case 'S': return S;
+			case 't': case 'T': return T;
+			case 'u': case 'U': return U;
+			case 'v': case 'V': return V;
+			case 'w': case 'W': return W;
+			case 'x': case 'X': return X;
+			case 'y': case 'Y': return Y;
+			case 'z': case 'Z': return Z;
+			case '[': return OPEN_BRACKET;
+			case '\\': return BACK_SLASH;
+			case ']': return CLOSE_BRACKET;
+			case '`': return BACK_QUOTE;
+			case '\'': return QUOTE;
+			case '&': return AMPERSAND;
+			case '*': return ASTERISK;
+			case '"': return QUOTEDBL;
+			case '<': return LESS;
+			case '>': return GREATER;
+			case '{': return BRACELEFT;
+			case '}': return BRACERIGHT;
+			case '@': return AT;
+			case ':': return COLON;
+			case '^': return CIRCUMFLEX;
+			case '$': return DOLLAR;
+			case '€': return EURO_SIGN;
+			case '!': return EXCLAMATION_MARK;
+			case 161: return INVERTED_EXCLAMATION_MARK;
+			case '(': return LEFT_PARENTHESIS;
+			case '#': return NUMBER_SIGN;
+			case '+': return PLUS;
+			case ')': return RIGHT_PARENTHESIS;
+			case '_': return UNDERSCORE;
+		}
+		return UNDEFINED;
+	}
+
 	/**
 	 * Gets the KeyCode with the given name, or {@link #UNDEFINED} if no such
 	 * code.
diff --git a/src/test/java/org/scijava/input/KeyCodeTest.java b/src/test/java/org/scijava/input/KeyCodeTest.java
new file mode 100644
index 000000000..3b08ed552
--- /dev/null
+++ b/src/test/java/org/scijava/input/KeyCodeTest.java
@@ -0,0 +1,89 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2025 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.input;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+import org.scijava.plugin.PluginInfo;
+
+/**
+ * Tests {@link KeyCode}.
+ * 
+ * @author Curtis Rueden
+ */
+public class KeyCodeTest {
+
+	@Test
+	public void testGetInt() {
+		assertEquals(KeyCode.ENTER, KeyCode.get(0x0a));
+		assertEquals(KeyCode.PLUS, KeyCode.get(0x0209));
+		assertEquals(KeyCode.NUM0, KeyCode.get(0x30));
+		assertEquals(KeyCode.NUMPAD_0, KeyCode.get(0x60));
+		assertEquals(KeyCode.A, KeyCode.get(0x41));
+		assertEquals(KeyCode.Z, KeyCode.get(0x5a));
+
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get(0xaaaa));
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get(0xffff));
+	}
+
+	@Test
+	public void testGetChar() {
+		assertEquals(KeyCode.ENTER, KeyCode.get('\n'));
+		assertEquals(KeyCode.ENTER, KeyCode.get('\r'));
+		assertEquals(KeyCode.PLUS, KeyCode.get('+'));
+		assertEquals(KeyCode.NUM0, KeyCode.get('0'));
+		assertEquals(KeyCode.A, KeyCode.get('a'));
+		assertEquals(KeyCode.A, KeyCode.get('A'));
+		assertEquals(KeyCode.Z, KeyCode.get('z'));
+		assertEquals(KeyCode.Z, KeyCode.get('Z'));
+
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get('\0'));
+
+		// The following should maybe be considered a bug.
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get('|'));
+	}
+
+	@Test
+	public void testGetString() {
+		assertEquals(KeyCode.PLUS, KeyCode.get("PLUS"));
+		assertEquals(KeyCode.NUM0, KeyCode.get("NUM0"));
+		assertEquals(KeyCode.NUMPAD_0, KeyCode.get("NUMPAD_0"));
+		assertEquals(KeyCode.A, KeyCode.get("A"));
+		assertEquals(KeyCode.Z, KeyCode.get("Z"));
+
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get("UNDEFINED"));
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get(""));
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get("aa"));
+		assertEquals(KeyCode.UNDEFINED, KeyCode.get("asdf"));
+	}
+}

From b6df2fcb96e520d2b10e6f271acb735e36f0636f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 4 Nov 2025 13:19:10 -0600
Subject: [PATCH 1184/1208] Let KeyCode.get(String) fall back to get(char)

This makes KeyCode.get(String) behave less surprisingly: e.g.,
KeyCode.get("a") now returns KeyCode.A instead of KeyCode.UNDEFINED.
---
 src/main/java/org/scijava/input/KeyCode.java     | 6 ++++--
 src/test/java/org/scijava/input/KeyCodeTest.java | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 0a6d20e0c..0e0ec35e1 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -719,8 +719,10 @@ public static KeyCode get(final char c) {
 	 */
 	public static KeyCode get(final String name) {
 		final KeyCode keyCode = NAMES.get(name);
-		if (keyCode == null) return UNDEFINED;
-		return keyCode;
+		if (keyCode != null) return keyCode;
+		// Not a code name, but maybe a direct character value?
+		if (name.length() == 1) return KeyCode.get(name.charAt(0));
+		return UNDEFINED;
 	}
 
 }
diff --git a/src/test/java/org/scijava/input/KeyCodeTest.java b/src/test/java/org/scijava/input/KeyCodeTest.java
index 3b08ed552..fec7f8b9e 100644
--- a/src/test/java/org/scijava/input/KeyCodeTest.java
+++ b/src/test/java/org/scijava/input/KeyCodeTest.java
@@ -81,6 +81,11 @@ public void testGetString() {
 		assertEquals(KeyCode.A, KeyCode.get("A"));
 		assertEquals(KeyCode.Z, KeyCode.get("Z"));
 
+		// The next ones should fall back to get(char).
+		assertEquals(KeyCode.NUM0, KeyCode.get("0"));
+		assertEquals(KeyCode.A, KeyCode.get("a"));
+		assertEquals(KeyCode.Z, KeyCode.get("z"));
+
 		assertEquals(KeyCode.UNDEFINED, KeyCode.get("UNDEFINED"));
 		assertEquals(KeyCode.UNDEFINED, KeyCode.get(""));
 		assertEquals(KeyCode.UNDEFINED, KeyCode.get("aa"));

From e0441ccab57fb32d2f1ea8416a22653400eca97f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 4 Nov 2025 13:55:05 -0600
Subject: [PATCH 1185/1208] KeyCode: remove unneeded imports

---
 src/test/java/org/scijava/input/KeyCodeTest.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/test/java/org/scijava/input/KeyCodeTest.java b/src/test/java/org/scijava/input/KeyCodeTest.java
index fec7f8b9e..6370089b5 100644
--- a/src/test/java/org/scijava/input/KeyCodeTest.java
+++ b/src/test/java/org/scijava/input/KeyCodeTest.java
@@ -30,11 +30,8 @@
 package org.scijava.input;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
-import org.scijava.plugin.PluginInfo;
 
 /**
  * Tests {@link KeyCode}.

From 0788f72831368c8fab59dedf29d72631c053901b Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 4 Nov 2025 13:55:48 -0600
Subject: [PATCH 1186/1208] Add unit tests for Accelerator class

---
 .../org/scijava/input/AcceleratorTest.java    | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 src/test/java/org/scijava/input/AcceleratorTest.java

diff --git a/src/test/java/org/scijava/input/AcceleratorTest.java b/src/test/java/org/scijava/input/AcceleratorTest.java
new file mode 100644
index 000000000..3270287df
--- /dev/null
+++ b/src/test/java/org/scijava/input/AcceleratorTest.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2025 SciJava developers.
+ * %%
+ * 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
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.input;
+
+import org.junit.Test;
+import org.scijava.util.PlatformUtils;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests {@link Accelerator}.
+ * 
+ * @author Curtis Rueden
+ */
+public class AcceleratorTest {
+
+	/** Tests {@link Accelerator#create}. */
+	@Test
+	public void testCreate() {
+		assertAccelerator("*", KeyCode.ASTERISK, false, false, false, false, false);
+		assertAccelerator("0", KeyCode.NUM0, false, false, false, false, false);
+		assertAccelerator("NUMPAD_0", KeyCode.NUMPAD_0, false, false, false, false, false);
+		assertAccelerator("+", KeyCode.PLUS, false, false, false, false, false);
+		assertAccelerator("shift minus", KeyCode.MINUS, false, false, false, false, true);
+		assertAccelerator("ctrl shift +", KeyCode.PLUS, false, false, true, false, true);
+		assertAccelerator("meta /", KeyCode.SLASH, false, false, false, true, false);
+		assertAccelerator("alt altGr ctrl meta shift a", KeyCode.A, true, true, true, true, true);
+
+		// Test caret shortcut symbol.
+		final boolean macos = PlatformUtils.isMac();
+		assertAccelerator("^Z", KeyCode.Z, false, false, !macos, macos, false);
+	}
+
+	private void assertAccelerator(String shortcut,
+		KeyCode keyCode,
+		final boolean alt,
+		final boolean altGr,
+		final boolean ctrl,
+		final boolean meta,
+		final boolean shift)
+	{
+		Accelerator acc = Accelerator.create(shortcut);
+		assertEquals(acc.getKeyCode(), keyCode);
+		InputModifiers mods = acc.getModifiers();
+		assertNotNull(mods);
+		assertEquals(alt, mods.isAltDown());
+		assertEquals(altGr, mods.isAltGrDown());
+		assertEquals(ctrl, mods.isCtrlDown());
+		assertEquals(meta, mods.isMetaDown());
+		assertEquals(shift, mods.isShiftDown());
+		assertFalse(mods.isLeftButtonDown());
+		assertFalse(mods.isMiddleButtonDown());
+		assertFalse(mods.isRightButtonDown());
+	}
+}

From 2b73a8a713f050ce7309122a3d76a2a501e6537c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 12 Nov 2025 12:30:36 -0600
Subject: [PATCH 1187/1208] Emit debug messages if Platform#open(URL) fails

---
 .../java/org/scijava/platform/DefaultPlatform.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index f9d971b58..96e18fded 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -33,6 +33,8 @@
 import java.net.URL;
 
 import org.scijava.Priority;
+import org.scijava.log.LogService;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -44,6 +46,9 @@
 @Plugin(type = Platform.class, name = "Default", priority = Priority.VERY_LOW)
 public class DefaultPlatform extends AbstractPlatform {
 
+	@Parameter(required = false)
+	private LogService log;
+
 	// -- PlatformHandler methods --
 
 	/**
@@ -66,9 +71,14 @@ public void open(final URL url) throws IOException {
 			try {
 				final int exitCode = getPlatformService().exec(browser, url.toString());
 				if (exitCode == 0) return;
+				else if (log != null) {
+					log.debug("Command '" + browser +
+						"' failed with exit code " + exitCode);
+				}
 			}
 			catch (final IOException e) {
 				// browser executable was invalid; try the next one
+				if (log != null) log.debug("Command '" + browser + "' failed", e);
 			}
 		}
 		throw new IOException("Could not open " + url);

From b15c606cb12b74f400578951c7d3bd198125b848 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Nov 2025 10:24:47 -0600
Subject: [PATCH 1188/1208] POM: update parent to pom-scijava 43.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7270aa62e..f97d074a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>40.0.0</version>
+		<version>43.0.0</version>
 		<relativePath />
 	</parent>
 

From f5fa73e154e8b0d5fcd07c4fee85dbe4d116ecb3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Nov 2025 10:29:47 -0600
Subject: [PATCH 1189/1208] CI: update to current best practices

---
 .github/build.sh            | 2 +-
 .github/setup.sh            | 2 +-
 .github/workflows/build.yml | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/build.sh b/.github/build.sh
index 7da42622b..523abeb87 100755
--- a/.github/build.sh
+++ b/.github/build.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
 sh ci-build.sh
diff --git a/.github/setup.sh b/.github/setup.sh
index d06d5a746..0ebca586f 100755
--- a/.github/setup.sh
+++ b/.github/setup.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
+curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
 sh ci-setup-github-actions.sh
 
 # Let the Linux build handle artifact deployment.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 64b606407..a57c0df0b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,9 +19,9 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'zulu'
@@ -37,6 +37,6 @@ jobs:
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
-          OSSRH_USER: ${{ secrets.OSSRH_USER }}
-          OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
+          CENTRAL_USER: ${{ secrets.CENTRAL_USER }}
+          CENTRAL_PASS: ${{ secrets.CENTRAL_PASS }}
           SIGNING_ASC: ${{ secrets.SIGNING_ASC }}

From 89b7a8e76eea0997c31bddbdc83a52cf72678e79 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 26 Nov 2025 10:32:05 -0600
Subject: [PATCH 1190/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f97d074a9..59020e2a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.99.3-SNAPSHOT</version>
+	<version>2.99.4-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 9a62ef8f28430ff9cd56fd31dbc11fb466cddb44 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Tue, 26 Aug 2025 11:30:51 -0500
Subject: [PATCH 1191/1208] Let scripts declare their language

---
 .../ScriptDirectiveScriptProcessor.java       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index 40b905ede..634d4cbc4 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -38,6 +38,8 @@
 import org.scijava.module.ModuleService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.script.ScriptLanguage;
+import org.scijava.script.ScriptService;
 
 /**
  * A {@link ScriptProcessor} which parses the {@code #@script} directive.
@@ -97,7 +99,7 @@
 public class ScriptDirectiveScriptProcessor extends DirectiveScriptProcessor {
 
 	public ScriptDirectiveScriptProcessor() {
-		super(directive -> "script".equals(directive));
+		super("script"::equals);
 	}
 
 	@Parameter
@@ -106,6 +108,9 @@ public ScriptDirectiveScriptProcessor() {
 	@Parameter
 	private ModuleService moduleService;
 
+	@Parameter
+	private ScriptService scriptService;
+
 	// -- Internal DirectiveScriptProcessor methods --
 
 	@Override
@@ -125,6 +130,10 @@ private <T> void assignAttribute(final String k, final Object v) {
 		if (is(k, "name")) info().setName(as(v, String.class));
 		else if (is(k, "label")) info().setLabel(as(v, String.class));
 		else if (is(k, "description")) info().setDescription(as(v, String.class));
+		else if (is(k, "language")) {
+			ScriptLanguage lang = parseScriptLanguage(v.toString());
+			if (lang != null) info().setLanguage(lang);
+		}
 		else if (is(k, "menuPath")) {
 			info().setMenuPath(new MenuPath(as(v, String.class)));
 		}
@@ -161,4 +170,12 @@ private Double priority(final Object p) {
 		if (lString.matches("last")) return Priority.LAST;
 		return null;
 	}
+
+	private ScriptLanguage parseScriptLanguage(final Object v) {
+		final String langHint = v.toString();
+		ScriptLanguage lang = scriptService.getLanguageByName(langHint);
+		if (lang == null) lang = scriptService.getLanguageByExtension(langHint);
+		if (lang == null) log.warn("Unknown script language: " + langHint);
+		return lang;
+	}
 }

From 5a4d2c33399fa6e0f2a93ddfb186bb4c425af681 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Mon, 2 Mar 2026 16:54:37 +0100
Subject: [PATCH 1192/1208] Test that the #@script language directive works

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../org/scijava/script/ScriptInfoTest.java    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index eb53d3d2d..d16555dc0 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -31,6 +31,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -337,6 +339,35 @@ public void testScriptDirective() {
 		assertEquals("bar", info.get("foo"));
 	}
 
+	/** Tests the {@code language} key of the {@code #@script} directive. */
+	@Test
+	public void testScriptDirectiveLanguage() {
+		// Use a .txt extension so language is NOT auto-inferred from the path.
+		// Confirm it starts out null (no language for .txt).
+		final String scriptByName = "#@script(language=\"BindingSizes\")\nWOOT\n";
+		final ScriptInfo infoByName =
+			new ScriptInfo(context, "test.txt", new StringReader(scriptByName));
+		assertNull(infoByName.getLanguage()); // no language yet
+		infoByName.inputs(); // trigger parsing
+		assertNotNull(infoByName.getLanguage());
+		assertTrue(infoByName.getLanguage().getNames().contains("BindingSizes"));
+
+		// Also confirm lookup by file extension works.
+		final String scriptByExt = "#@script(language=\"bsizes\")\nWOOT\n";
+		final ScriptInfo infoByExt =
+			new ScriptInfo(context, "test.txt", new StringReader(scriptByExt));
+		infoByExt.inputs();
+		assertNotNull(infoByExt.getLanguage());
+		assertTrue(infoByExt.getLanguage().getExtensions().contains("bsizes"));
+
+		// Unknown language name should leave language unset (null for .txt path).
+		final String scriptBogus = "#@script(language=\"no-such-language\")\nWOOT\n";
+		final ScriptInfo infoBogus =
+			new ScriptInfo(context, "test.txt", new StringReader(scriptBogus));
+		infoBogus.inputs();
+		assertNull(infoBogus.getLanguage());
+	}
+
 	/**
 	 * Ensures the ScriptInfos Reader can be reused for multiple executions of the
 	 * script.

From d97d79ca0e70a71546ec0ae31650f1c6770dd997 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 5 Mar 2026 16:54:10 +0100
Subject: [PATCH 1193/1208] Update copyright headers for 2026

---
 LICENSE.txt                                                     | 2 +-
 src/it/apt-test/pom.xml                                         | 2 +-
 src/it/apt-test/setup.bsh                                       | 2 +-
 .../src/main/java/org/scijava/annotation/its/Annotated.java     | 2 +-
 .../main/java/org/scijava/annotation/its/CustomAnnotation.java  | 2 +-
 src/it/apt-test/verify.bsh                                      | 2 +-
 src/it/settings.xml                                             | 2 +-
 src/main/java/org/scijava/AbstractBasicDetails.java             | 2 +-
 src/main/java/org/scijava/AbstractContextual.java               | 2 +-
 src/main/java/org/scijava/AbstractGateway.java                  | 2 +-
 src/main/java/org/scijava/AbstractUIDetails.java                | 2 +-
 src/main/java/org/scijava/BasicDetails.java                     | 2 +-
 src/main/java/org/scijava/Cancelable.java                       | 2 +-
 src/main/java/org/scijava/Context.java                          | 2 +-
 src/main/java/org/scijava/Contextual.java                       | 2 +-
 src/main/java/org/scijava/Disposable.java                       | 2 +-
 src/main/java/org/scijava/Gateway.java                          | 2 +-
 src/main/java/org/scijava/Identifiable.java                     | 2 +-
 src/main/java/org/scijava/Initializable.java                    | 2 +-
 src/main/java/org/scijava/Instantiable.java                     | 2 +-
 src/main/java/org/scijava/InstantiableException.java            | 2 +-
 src/main/java/org/scijava/ItemIO.java                           | 2 +-
 src/main/java/org/scijava/ItemVisibility.java                   | 2 +-
 src/main/java/org/scijava/Locatable.java                        | 2 +-
 src/main/java/org/scijava/MenuEntry.java                        | 2 +-
 src/main/java/org/scijava/MenuPath.java                         | 2 +-
 src/main/java/org/scijava/Named.java                            | 2 +-
 src/main/java/org/scijava/NoSuchServiceException.java           | 2 +-
 src/main/java/org/scijava/NullContextException.java             | 2 +-
 src/main/java/org/scijava/Optional.java                         | 2 +-
 src/main/java/org/scijava/Prioritized.java                      | 2 +-
 src/main/java/org/scijava/Priority.java                         | 2 +-
 src/main/java/org/scijava/SciJava.java                          | 2 +-
 src/main/java/org/scijava/Typed.java                            | 2 +-
 src/main/java/org/scijava/UIDetails.java                        | 2 +-
 src/main/java/org/scijava/Validated.java                        | 2 +-
 src/main/java/org/scijava/ValidityProblem.java                  | 2 +-
 src/main/java/org/scijava/Versioned.java                        | 2 +-
 src/main/java/org/scijava/annotations/AbstractIndexWriter.java  | 2 +-
 src/main/java/org/scijava/annotations/AnnotationCombiner.java   | 2 +-
 src/main/java/org/scijava/annotations/AnnotationProcessor.java  | 2 +-
 src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java     | 2 +-
 src/main/java/org/scijava/annotations/DirectoryIndexer.java     | 2 +-
 src/main/java/org/scijava/annotations/EclipseHelper.java        | 2 +-
 src/main/java/org/scijava/annotations/Index.java                | 2 +-
 src/main/java/org/scijava/annotations/IndexItem.java            | 2 +-
 src/main/java/org/scijava/annotations/IndexReader.java          | 2 +-
 src/main/java/org/scijava/annotations/Indexable.java            | 2 +-
 src/main/java/org/scijava/annotations/legacy/LegacyReader.java  | 2 +-
 src/main/java/org/scijava/app/AbstractApp.java                  | 2 +-
 src/main/java/org/scijava/app/App.java                          | 2 +-
 src/main/java/org/scijava/app/AppService.java                   | 2 +-
 src/main/java/org/scijava/app/DefaultAppService.java            | 2 +-
 src/main/java/org/scijava/app/DefaultStatusService.java         | 2 +-
 src/main/java/org/scijava/app/SciJavaApp.java                   | 2 +-
 src/main/java/org/scijava/app/StatusService.java                | 2 +-
 src/main/java/org/scijava/app/event/StatusEvent.java            | 2 +-
 src/main/java/org/scijava/cache/CacheService.java               | 2 +-
 src/main/java/org/scijava/cache/DefaultCacheService.java        | 2 +-
 src/main/java/org/scijava/command/Command.java                  | 2 +-
 src/main/java/org/scijava/command/CommandInfo.java              | 2 +-
 src/main/java/org/scijava/command/CommandModule.java            | 2 +-
 src/main/java/org/scijava/command/CommandModuleItem.java        | 2 +-
 src/main/java/org/scijava/command/CommandService.java           | 2 +-
 src/main/java/org/scijava/command/ContextCommand.java           | 2 +-
 src/main/java/org/scijava/command/DefaultCommandService.java    | 2 +-
 src/main/java/org/scijava/command/DynamicCommand.java           | 2 +-
 src/main/java/org/scijava/command/DynamicCommandInfo.java       | 2 +-
 src/main/java/org/scijava/command/Inputs.java                   | 2 +-
 src/main/java/org/scijava/command/Interactive.java              | 2 +-
 src/main/java/org/scijava/command/InteractiveCommand.java       | 2 +-
 src/main/java/org/scijava/command/ModuleCommand.java            | 2 +-
 src/main/java/org/scijava/command/Previewable.java              | 2 +-
 src/main/java/org/scijava/command/UnimplementedCommand.java     | 2 +-
 src/main/java/org/scijava/command/console/RunArgument.java      | 2 +-
 src/main/java/org/scijava/command/run/CommandCodeRunner.java    | 2 +-
 src/main/java/org/scijava/console/AbstractConsoleArgument.java  | 2 +-
 src/main/java/org/scijava/console/ConsoleArgument.java          | 2 +-
 src/main/java/org/scijava/console/ConsoleService.java           | 2 +-
 src/main/java/org/scijava/console/ConsoleUtils.java             | 2 +-
 src/main/java/org/scijava/console/DefaultConsoleService.java    | 2 +-
 src/main/java/org/scijava/console/MultiOutputStream.java        | 2 +-
 src/main/java/org/scijava/console/MultiPrintStream.java         | 2 +-
 src/main/java/org/scijava/console/OutputEvent.java              | 2 +-
 src/main/java/org/scijava/console/OutputListener.java           | 2 +-
 src/main/java/org/scijava/console/SystemPropertyArgument.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConvertService.java   | 2 +-
 src/main/java/org/scijava/convert/AbstractConverter.java        | 2 +-
 .../java/org/scijava/convert/AbstractDelegateConverter.java     | 2 +-
 src/main/java/org/scijava/convert/ArrayConverters.java          | 2 +-
 src/main/java/org/scijava/convert/ArrayToStringConverter.java   | 2 +-
 src/main/java/org/scijava/convert/CastingConverter.java         | 2 +-
 src/main/java/org/scijava/convert/ConversionRequest.java        | 2 +-
 src/main/java/org/scijava/convert/ConvertService.java           | 2 +-
 src/main/java/org/scijava/convert/Converter.java                | 2 +-
 src/main/java/org/scijava/convert/DefaultConvertService.java    | 2 +-
 src/main/java/org/scijava/convert/DefaultConverter.java         | 2 +-
 src/main/java/org/scijava/convert/FileListConverters.java       | 2 +-
 src/main/java/org/scijava/convert/FileToPathConverter.java      | 2 +-
 src/main/java/org/scijava/convert/NullConverter.java            | 2 +-
 src/main/java/org/scijava/convert/NumberConverters.java         | 2 +-
 .../java/org/scijava/convert/NumberToBigDecimalConverter.java   | 2 +-
 .../java/org/scijava/convert/NumberToBigIntegerConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToDoubleConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToFloatConverter.java   | 2 +-
 src/main/java/org/scijava/convert/NumberToIntegerConverter.java | 2 +-
 src/main/java/org/scijava/convert/NumberToLongConverter.java    | 2 +-
 src/main/java/org/scijava/convert/NumberToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/convert/NumberToShortConverter.java   | 2 +-
 src/main/java/org/scijava/convert/PathToFileConverter.java      | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java  | 2 +-
 src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java    | 2 +-
 src/main/java/org/scijava/convert/StringToArrayConverter.java   | 2 +-
 src/main/java/org/scijava/convert/StringToNumberConverter.java  | 2 +-
 src/main/java/org/scijava/display/AbstractDisplay.java          | 2 +-
 .../java/org/scijava/display/ActiveDisplayPreprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DefaultDisplay.java           | 2 +-
 src/main/java/org/scijava/display/DefaultDisplayService.java    | 2 +-
 src/main/java/org/scijava/display/DefaultTextDisplay.java       | 2 +-
 src/main/java/org/scijava/display/Display.java                  | 2 +-
 src/main/java/org/scijava/display/DisplayPostprocessor.java     | 2 +-
 src/main/java/org/scijava/display/DisplayService.java           | 2 +-
 src/main/java/org/scijava/display/Displayable.java              | 2 +-
 src/main/java/org/scijava/display/TextDisplay.java              | 2 +-
 .../java/org/scijava/display/event/DisplayActivatedEvent.java   | 2 +-
 .../java/org/scijava/display/event/DisplayCreatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/DisplayDeletedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/DisplayEvent.java       | 2 +-
 .../java/org/scijava/display/event/DisplayUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/InputEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/KyPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/KyReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/KyTypedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsButtonEvent.java     | 2 +-
 .../java/org/scijava/display/event/input/MsClickedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsDraggedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsEnteredEvent.java    | 2 +-
 src/main/java/org/scijava/display/event/input/MsEvent.java      | 2 +-
 .../java/org/scijava/display/event/input/MsExitedEvent.java     | 2 +-
 src/main/java/org/scijava/display/event/input/MsMovedEvent.java | 2 +-
 .../java/org/scijava/display/event/input/MsPressedEvent.java    | 2 +-
 .../java/org/scijava/display/event/input/MsReleasedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/input/MsWheelEvent.java | 2 +-
 .../org/scijava/display/event/window/WinActivatedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinClosedEvent.java   | 2 +-
 .../java/org/scijava/display/event/window/WinClosingEvent.java  | 2 +-
 .../org/scijava/display/event/window/WinDeactivatedEvent.java   | 2 +-
 .../org/scijava/display/event/window/WinDeiconifiedEvent.java   | 2 +-
 src/main/java/org/scijava/display/event/window/WinEvent.java    | 2 +-
 .../org/scijava/display/event/window/WinIconifiedEvent.java     | 2 +-
 .../java/org/scijava/display/event/window/WinOpenedEvent.java   | 2 +-
 src/main/java/org/scijava/download/DefaultDownloadService.java  | 2 +-
 src/main/java/org/scijava/download/DiskLocationCache.java       | 2 +-
 src/main/java/org/scijava/download/Download.java                | 2 +-
 src/main/java/org/scijava/download/DownloadService.java         | 2 +-
 src/main/java/org/scijava/download/LocationCache.java           | 2 +-
 src/main/java/org/scijava/download/MultiWriteHandle.java        | 2 +-
 src/main/java/org/scijava/event/ContextCreatedEvent.java        | 2 +-
 src/main/java/org/scijava/event/ContextDisposingEvent.java      | 2 +-
 src/main/java/org/scijava/event/DefaultEventBus.java            | 2 +-
 src/main/java/org/scijava/event/DefaultEventHistory.java        | 2 +-
 src/main/java/org/scijava/event/DefaultEventService.java        | 2 +-
 src/main/java/org/scijava/event/EventDetails.java               | 2 +-
 src/main/java/org/scijava/event/EventHandler.java               | 2 +-
 src/main/java/org/scijava/event/EventHistory.java               | 2 +-
 src/main/java/org/scijava/event/EventHistoryListener.java       | 2 +-
 src/main/java/org/scijava/event/EventService.java               | 2 +-
 src/main/java/org/scijava/event/EventSubscriber.java            | 2 +-
 src/main/java/org/scijava/event/SciJavaEvent.java               | 2 +-
 src/main/java/org/scijava/input/Accelerator.java                | 2 +-
 src/main/java/org/scijava/input/DefaultInputService.java        | 2 +-
 src/main/java/org/scijava/input/InputModifiers.java             | 2 +-
 src/main/java/org/scijava/input/InputService.java               | 2 +-
 src/main/java/org/scijava/input/KeyCode.java                    | 2 +-
 src/main/java/org/scijava/input/MouseCursor.java                | 2 +-
 src/main/java/org/scijava/io/AbstractIOPlugin.java              | 2 +-
 src/main/java/org/scijava/io/AbstractTypedIOService.java        | 2 +-
 src/main/java/org/scijava/io/ByteArrayByteBank.java             | 2 +-
 src/main/java/org/scijava/io/ByteBank.java                      | 2 +-
 src/main/java/org/scijava/io/DefaultIOService.java              | 2 +-
 src/main/java/org/scijava/io/DefaultRecentFileService.java      | 2 +-
 src/main/java/org/scijava/io/IOPlugin.java                      | 2 +-
 src/main/java/org/scijava/io/IOService.java                     | 2 +-
 src/main/java/org/scijava/io/RecentFileService.java             | 2 +-
 src/main/java/org/scijava/io/TypedIOService.java                | 2 +-
 src/main/java/org/scijava/io/console/OpenArgument.java          | 2 +-
 src/main/java/org/scijava/io/event/DataOpenedEvent.java         | 2 +-
 src/main/java/org/scijava/io/event/DataSavedEvent.java          | 2 +-
 src/main/java/org/scijava/io/event/IOEvent.java                 | 2 +-
 src/main/java/org/scijava/io/handle/AbstractDataHandle.java     | 2 +-
 .../java/org/scijava/io/handle/AbstractHigherOrderHandle.java   | 2 +-
 .../org/scijava/io/handle/AbstractSeekableStreamHandle.java     | 2 +-
 src/main/java/org/scijava/io/handle/AbstractStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/BytesHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/DataHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleInputStream.java  | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleOutputStream.java | 2 +-
 src/main/java/org/scijava/io/handle/DataHandleService.java      | 2 +-
 src/main/java/org/scijava/io/handle/DataHandles.java            | 2 +-
 .../java/org/scijava/io/handle/DefaultDataHandleService.java    | 2 +-
 src/main/java/org/scijava/io/handle/DummyHandle.java            | 2 +-
 src/main/java/org/scijava/io/handle/FileHandle.java             | 2 +-
 src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/ResettableStreamHandle.java | 2 +-
 src/main/java/org/scijava/io/handle/SeekableStreamHandle.java   | 2 +-
 src/main/java/org/scijava/io/handle/StreamHandle.java           | 2 +-
 src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java  | 2 +-
 src/main/java/org/scijava/io/location/AbstractLocation.java     | 2 +-
 .../java/org/scijava/io/location/AbstractLocationResolver.java  | 2 +-
 .../java/org/scijava/io/location/AbstractRemoteLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BrowsableLocation.java    | 2 +-
 src/main/java/org/scijava/io/location/BytesLocation.java        | 2 +-
 .../java/org/scijava/io/location/DefaultLocationService.java    | 2 +-
 src/main/java/org/scijava/io/location/DummyLocation.java        | 2 +-
 src/main/java/org/scijava/io/location/FileLocation.java         | 2 +-
 src/main/java/org/scijava/io/location/FileLocationResolver.java | 2 +-
 src/main/java/org/scijava/io/location/Location.java             | 2 +-
 src/main/java/org/scijava/io/location/LocationResolver.java     | 2 +-
 src/main/java/org/scijava/io/location/LocationService.java      | 2 +-
 src/main/java/org/scijava/io/location/RemoteLocation.java       | 2 +-
 src/main/java/org/scijava/io/location/URILocation.java          | 2 +-
 src/main/java/org/scijava/io/location/URLLocation.java          | 2 +-
 src/main/java/org/scijava/io/nio/ByteBufferByteBank.java        | 2 +-
 src/main/java/org/scijava/io/nio/DefaultNIOService.java         | 2 +-
 src/main/java/org/scijava/io/nio/NIOService.java                | 2 +-
 src/main/java/org/scijava/log/AbstractLogService.java           | 2 +-
 src/main/java/org/scijava/log/CallingClassUtils.java            | 2 +-
 src/main/java/org/scijava/log/DefaultLogger.java                | 2 +-
 .../java/org/scijava/log/DefaultUncaughtExceptionHandler.java   | 2 +-
 src/main/java/org/scijava/log/IgnoreAsCallingClass.java         | 2 +-
 src/main/java/org/scijava/log/LogLevel.java                     | 2 +-
 src/main/java/org/scijava/log/LogListener.java                  | 2 +-
 src/main/java/org/scijava/log/LogMessage.java                   | 2 +-
 src/main/java/org/scijava/log/LogService.java                   | 2 +-
 src/main/java/org/scijava/log/LogSource.java                    | 2 +-
 src/main/java/org/scijava/log/Logged.java                       | 2 +-
 src/main/java/org/scijava/log/Logger.java                       | 2 +-
 src/main/java/org/scijava/log/StderrLogService.java             | 2 +-
 src/main/java/org/scijava/main/DefaultMainService.java          | 2 +-
 src/main/java/org/scijava/main/MainService.java                 | 2 +-
 src/main/java/org/scijava/main/console/MainArgument.java        | 2 +-
 src/main/java/org/scijava/main/run/MainCodeRunner.java          | 2 +-
 src/main/java/org/scijava/menu/AbstractMenuCreator.java         | 2 +-
 src/main/java/org/scijava/menu/DefaultMenuService.java          | 2 +-
 src/main/java/org/scijava/menu/MenuConstants.java               | 2 +-
 src/main/java/org/scijava/menu/MenuCreator.java                 | 2 +-
 src/main/java/org/scijava/menu/MenuService.java                 | 2 +-
 src/main/java/org/scijava/menu/ShadowMenu.java                  | 2 +-
 src/main/java/org/scijava/menu/ShadowMenuIterator.java          | 2 +-
 src/main/java/org/scijava/menu/event/MenuEvent.java             | 2 +-
 src/main/java/org/scijava/menu/event/MenusAddedEvent.java       | 2 +-
 src/main/java/org/scijava/menu/event/MenusRemovedEvent.java     | 2 +-
 src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java     | 2 +-
 src/main/java/org/scijava/module/AbstractModule.java            | 2 +-
 src/main/java/org/scijava/module/AbstractModuleInfo.java        | 2 +-
 src/main/java/org/scijava/module/AbstractModuleItem.java        | 2 +-
 src/main/java/org/scijava/module/DefaultModuleService.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModule.java      | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleInfo.java  | 2 +-
 src/main/java/org/scijava/module/DefaultMutableModuleItem.java  | 2 +-
 src/main/java/org/scijava/module/MethodCallException.java       | 2 +-
 src/main/java/org/scijava/module/MethodRef.java                 | 2 +-
 src/main/java/org/scijava/module/Module.java                    | 2 +-
 src/main/java/org/scijava/module/ModuleCanceledException.java   | 2 +-
 src/main/java/org/scijava/module/ModuleException.java           | 2 +-
 src/main/java/org/scijava/module/ModuleIndex.java               | 2 +-
 src/main/java/org/scijava/module/ModuleInfo.java                | 2 +-
 src/main/java/org/scijava/module/ModuleItem.java                | 2 +-
 src/main/java/org/scijava/module/ModuleRunner.java              | 2 +-
 src/main/java/org/scijava/module/ModuleService.java             | 2 +-
 src/main/java/org/scijava/module/MutableModule.java             | 2 +-
 src/main/java/org/scijava/module/MutableModuleInfo.java         | 2 +-
 src/main/java/org/scijava/module/MutableModuleItem.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleCanceledEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModuleErroredEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleEvent.java         | 2 +-
 src/main/java/org/scijava/module/event/ModuleExecutedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModuleExecutingEvent.java     | 2 +-
 .../java/org/scijava/module/event/ModuleExecutionEvent.java     | 2 +-
 src/main/java/org/scijava/module/event/ModuleFinishedEvent.java | 2 +-
 .../java/org/scijava/module/event/ModulePostprocessEvent.java   | 2 +-
 .../java/org/scijava/module/event/ModulePreprocessEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModuleProcessEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModuleStartedEvent.java  | 2 +-
 src/main/java/org/scijava/module/event/ModulesAddedEvent.java   | 2 +-
 src/main/java/org/scijava/module/event/ModulesListEvent.java    | 2 +-
 src/main/java/org/scijava/module/event/ModulesRemovedEvent.java | 2 +-
 src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java | 2 +-
 .../org/scijava/module/process/AbstractPostprocessorPlugin.java | 2 +-
 .../org/scijava/module/process/AbstractPreprocessorPlugin.java  | 2 +-
 .../scijava/module/process/AbstractSingleInputPreprocessor.java | 2 +-
 .../org/scijava/module/process/CheckInputsPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/DebugPostprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/DebugPreprocessor.java | 2 +-
 .../org/scijava/module/process/DefaultValuePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/GatewayPreprocessor.java    | 2 +-
 src/main/java/org/scijava/module/process/InitPreprocessor.java  | 2 +-
 .../java/org/scijava/module/process/LoadInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessor.java     | 2 +-
 .../java/org/scijava/module/process/ModulePostprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ModulePreprocessor.java     | 2 +-
 src/main/java/org/scijava/module/process/ModuleProcessor.java   | 2 +-
 .../java/org/scijava/module/process/PostprocessorPlugin.java    | 2 +-
 .../java/org/scijava/module/process/PreprocessorPlugin.java     | 2 +-
 .../java/org/scijava/module/process/SaveInputsPreprocessor.java | 2 +-
 .../java/org/scijava/module/process/ServicePreprocessor.java    | 2 +-
 .../java/org/scijava/module/process/ValidityPreprocessor.java   | 2 +-
 src/main/java/org/scijava/module/run/ModuleCodeRunner.java      | 2 +-
 src/main/java/org/scijava/object/DefaultObjectService.java      | 2 +-
 src/main/java/org/scijava/object/LazyObjects.java               | 2 +-
 src/main/java/org/scijava/object/NamedObjectIndex.java          | 2 +-
 src/main/java/org/scijava/object/ObjectIndex.java               | 2 +-
 src/main/java/org/scijava/object/ObjectService.java             | 2 +-
 src/main/java/org/scijava/object/SortedObjectIndex.java         | 2 +-
 src/main/java/org/scijava/object/event/ListEvent.java           | 2 +-
 src/main/java/org/scijava/object/event/ObjectCreatedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectDeletedEvent.java  | 2 +-
 src/main/java/org/scijava/object/event/ObjectEvent.java         | 2 +-
 src/main/java/org/scijava/object/event/ObjectModifiedEvent.java | 2 +-
 src/main/java/org/scijava/object/event/ObjectsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/object/event/ObjectsListEvent.java    | 2 +-
 src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/options/DefaultOptionsService.java    | 2 +-
 src/main/java/org/scijava/options/OptionsPlugin.java            | 2 +-
 src/main/java/org/scijava/options/OptionsService.java           | 2 +-
 src/main/java/org/scijava/options/event/OptionsEvent.java       | 2 +-
 src/main/java/org/scijava/parse/DefaultParseService.java        | 2 +-
 src/main/java/org/scijava/parse/Item.java                       | 2 +-
 src/main/java/org/scijava/parse/Items.java                      | 2 +-
 src/main/java/org/scijava/parse/ParseService.java               | 2 +-
 src/main/java/org/scijava/platform/AbstractPlatform.java        | 2 +-
 src/main/java/org/scijava/platform/AppEventService.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultAppEventService.java  | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatform.java         | 2 +-
 src/main/java/org/scijava/platform/DefaultPlatformService.java  | 2 +-
 src/main/java/org/scijava/platform/Platform.java                | 2 +-
 src/main/java/org/scijava/platform/PlatformService.java         | 2 +-
 src/main/java/org/scijava/platform/event/AppAboutEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppFocusEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppMenusCreatedEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java | 2 +-
 .../java/org/scijava/platform/event/AppPreferencesEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppPrintEvent.java     | 2 +-
 src/main/java/org/scijava/platform/event/AppQuitEvent.java      | 2 +-
 src/main/java/org/scijava/platform/event/AppReOpenEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppScreenSleepEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppSleepEvent.java     | 2 +-
 .../java/org/scijava/platform/event/AppSystemSleepEvent.java    | 2 +-
 .../java/org/scijava/platform/event/AppUserSessionEvent.java    | 2 +-
 src/main/java/org/scijava/platform/event/AppVisibleEvent.java   | 2 +-
 src/main/java/org/scijava/platform/event/ApplicationEvent.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractHandlerService.java    | 2 +-
 src/main/java/org/scijava/plugin/AbstractPTService.java         | 2 +-
 src/main/java/org/scijava/plugin/AbstractRichPlugin.java        | 2 +-
 src/main/java/org/scijava/plugin/AbstractSingletonService.java  | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedPlugin.java       | 2 +-
 src/main/java/org/scijava/plugin/AbstractTypedService.java      | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java     | 2 +-
 src/main/java/org/scijava/plugin/AbstractWrapperService.java    | 2 +-
 src/main/java/org/scijava/plugin/Attr.java                      | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginFinder.java       | 2 +-
 src/main/java/org/scijava/plugin/DefaultPluginService.java      | 2 +-
 src/main/java/org/scijava/plugin/HandlerPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/HandlerService.java            | 2 +-
 src/main/java/org/scijava/plugin/HasPluginInfo.java             | 2 +-
 src/main/java/org/scijava/plugin/Menu.java                      | 2 +-
 src/main/java/org/scijava/plugin/PTService.java                 | 2 +-
 src/main/java/org/scijava/plugin/Parameter.java                 | 2 +-
 src/main/java/org/scijava/plugin/Plugin.java                    | 2 +-
 src/main/java/org/scijava/plugin/PluginFinder.java              | 2 +-
 src/main/java/org/scijava/plugin/PluginIndex.java               | 2 +-
 src/main/java/org/scijava/plugin/PluginInfo.java                | 2 +-
 src/main/java/org/scijava/plugin/PluginService.java             | 2 +-
 src/main/java/org/scijava/plugin/RichPlugin.java                | 2 +-
 src/main/java/org/scijava/plugin/SciJavaPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/SingletonPlugin.java           | 2 +-
 src/main/java/org/scijava/plugin/SingletonService.java          | 2 +-
 src/main/java/org/scijava/plugin/SortablePlugin.java            | 2 +-
 src/main/java/org/scijava/plugin/TypedPlugin.java               | 2 +-
 src/main/java/org/scijava/plugin/TypedService.java              | 2 +-
 src/main/java/org/scijava/plugin/WrapperPlugin.java             | 2 +-
 src/main/java/org/scijava/plugin/WrapperService.java            | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java   | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsListEvent.java    | 2 +-
 src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java | 2 +-
 src/main/java/org/scijava/prefs/AbstractPrefService.java        | 2 +-
 src/main/java/org/scijava/prefs/DefaultPrefService.java         | 2 +-
 src/main/java/org/scijava/prefs/PrefService.java                | 2 +-
 src/main/java/org/scijava/run/AbstractCodeRunner.java           | 2 +-
 src/main/java/org/scijava/run/CodeRunner.java                   | 2 +-
 src/main/java/org/scijava/run/DefaultRunService.java            | 2 +-
 src/main/java/org/scijava/run/RunService.java                   | 2 +-
 src/main/java/org/scijava/run/console/RunArgument.java          | 2 +-
 src/main/java/org/scijava/script/AbstractAutoCompleter.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptContext.java     | 2 +-
 src/main/java/org/scijava/script/AbstractScriptEngine.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptHeader.java      | 2 +-
 src/main/java/org/scijava/script/AbstractScriptLanguage.java    | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptEngine.java       | 2 +-
 src/main/java/org/scijava/script/AdaptedScriptLanguage.java     | 2 +-
 src/main/java/org/scijava/script/AutoCompleter.java             | 2 +-
 src/main/java/org/scijava/script/AutoCompletionResult.java      | 2 +-
 src/main/java/org/scijava/script/CodeGenerator.java             | 2 +-
 src/main/java/org/scijava/script/CodeGeneratorJava.java         | 2 +-
 src/main/java/org/scijava/script/DefaultAutoCompleter.java      | 2 +-
 .../java/org/scijava/script/DefaultScriptHeaderService.java     | 2 +-
 src/main/java/org/scijava/script/DefaultScriptInterpreter.java  | 2 +-
 src/main/java/org/scijava/script/DefaultScriptService.java      | 2 +-
 src/main/java/org/scijava/script/InvocationObject.java          | 2 +-
 src/main/java/org/scijava/script/ParameterObject.java           | 2 +-
 src/main/java/org/scijava/script/ScriptCLI.java                 | 2 +-
 src/main/java/org/scijava/script/ScriptFinder.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeader.java              | 2 +-
 src/main/java/org/scijava/script/ScriptHeaderService.java       | 2 +-
 src/main/java/org/scijava/script/ScriptInfo.java                | 2 +-
 src/main/java/org/scijava/script/ScriptInterpreter.java         | 2 +-
 src/main/java/org/scijava/script/ScriptLanguage.java            | 2 +-
 src/main/java/org/scijava/script/ScriptLanguageIndex.java       | 2 +-
 src/main/java/org/scijava/script/ScriptModule.java              | 2 +-
 src/main/java/org/scijava/script/ScriptREPL.java                | 2 +-
 src/main/java/org/scijava/script/ScriptService.java             | 2 +-
 src/main/java/org/scijava/script/console/RunScriptArgument.java | 2 +-
 src/main/java/org/scijava/script/io/ScriptIOPlugin.java         | 2 +-
 .../scijava/script/process/DefaultScriptProcessorService.java   | 2 +-
 .../org/scijava/script/process/DirectiveScriptProcessor.java    | 2 +-
 .../org/scijava/script/process/ParameterScriptProcessor.java    | 2 +-
 src/main/java/org/scijava/script/process/ScriptCallback.java    | 2 +-
 .../scijava/script/process/ScriptDirectiveScriptProcessor.java  | 2 +-
 src/main/java/org/scijava/script/process/ScriptProcessor.java   | 2 +-
 .../java/org/scijava/script/process/ScriptProcessorService.java | 2 +-
 .../java/org/scijava/script/process/ShebangScriptProcessor.java | 2 +-
 src/main/java/org/scijava/script/run/ScriptCodeRunner.java      | 2 +-
 src/main/java/org/scijava/service/AbstractService.java          | 2 +-
 src/main/java/org/scijava/service/SciJavaService.java           | 2 +-
 src/main/java/org/scijava/service/Service.java                  | 2 +-
 src/main/java/org/scijava/service/ServiceHelper.java            | 2 +-
 src/main/java/org/scijava/service/ServiceIndex.java             | 2 +-
 .../java/org/scijava/service/event/ServicesLoadedEvent.java     | 2 +-
 src/main/java/org/scijava/startup/DefaultStartupService.java    | 2 +-
 src/main/java/org/scijava/startup/StartupService.java           | 2 +-
 src/main/java/org/scijava/task/DefaultTask.java                 | 2 +-
 src/main/java/org/scijava/task/DefaultTaskService.java          | 2 +-
 src/main/java/org/scijava/task/Task.java                        | 2 +-
 src/main/java/org/scijava/task/TaskService.java                 | 2 +-
 src/main/java/org/scijava/task/event/TaskEvent.java             | 2 +-
 src/main/java/org/scijava/test/TestUtils.java                   | 2 +-
 src/main/java/org/scijava/text/AbstractTextFormat.java          | 2 +-
 src/main/java/org/scijava/text/DefaultTextService.java          | 2 +-
 src/main/java/org/scijava/text/TextFormat.java                  | 2 +-
 src/main/java/org/scijava/text/TextService.java                 | 2 +-
 src/main/java/org/scijava/text/io/DefaultTextIOService.java     | 2 +-
 src/main/java/org/scijava/text/io/TextIOPlugin.java             | 2 +-
 src/main/java/org/scijava/text/io/TextIOService.java            | 2 +-
 src/main/java/org/scijava/thread/DefaultThreadService.java      | 2 +-
 src/main/java/org/scijava/thread/ThreadService.java             | 2 +-
 src/main/java/org/scijava/tool/AbstractTool.java                | 2 +-
 src/main/java/org/scijava/tool/CustomDrawnTool.java             | 2 +-
 src/main/java/org/scijava/tool/DefaultToolService.java          | 2 +-
 src/main/java/org/scijava/tool/DummyTool.java                   | 2 +-
 src/main/java/org/scijava/tool/IconDrawer.java                  | 2 +-
 src/main/java/org/scijava/tool/IconService.java                 | 2 +-
 src/main/java/org/scijava/tool/Tool.java                        | 2 +-
 src/main/java/org/scijava/tool/ToolService.java                 | 2 +-
 src/main/java/org/scijava/tool/event/ToolActivatedEvent.java    | 2 +-
 src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java  | 2 +-
 src/main/java/org/scijava/tool/event/ToolEvent.java             | 2 +-
 src/main/java/org/scijava/ui/ARGBPlane.java                     | 2 +-
 src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java  | 2 +-
 src/main/java/org/scijava/ui/AbstractUIInputWidget.java         | 2 +-
 src/main/java/org/scijava/ui/AbstractUserInterface.java         | 2 +-
 src/main/java/org/scijava/ui/ApplicationFrame.java              | 2 +-
 src/main/java/org/scijava/ui/Arrangeable.java                   | 2 +-
 src/main/java/org/scijava/ui/CloseConfirmable.java              | 2 +-
 src/main/java/org/scijava/ui/DefaultUIService.java              | 2 +-
 src/main/java/org/scijava/ui/Desktop.java                       | 2 +-
 src/main/java/org/scijava/ui/DialogPrompt.java                  | 2 +-
 src/main/java/org/scijava/ui/FileListPreprocessor.java          | 2 +-
 src/main/java/org/scijava/ui/FilePreprocessor.java              | 2 +-
 src/main/java/org/scijava/ui/StatusBar.java                     | 2 +-
 src/main/java/org/scijava/ui/SystemClipboard.java               | 2 +-
 src/main/java/org/scijava/ui/ToolBar.java                       | 2 +-
 src/main/java/org/scijava/ui/UIPreprocessor.java                | 2 +-
 src/main/java/org/scijava/ui/UIService.java                     | 2 +-
 src/main/java/org/scijava/ui/UserInterface.java                 | 2 +-
 src/main/java/org/scijava/ui/console/AbstractConsolePane.java   | 2 +-
 src/main/java/org/scijava/ui/console/ConsolePane.java           | 2 +-
 src/main/java/org/scijava/ui/console/HeadlessArgument.java      | 2 +-
 src/main/java/org/scijava/ui/console/ShowUIArgument.java        | 2 +-
 src/main/java/org/scijava/ui/console/UIArgument.java            | 2 +-
 src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java   | 2 +-
 .../java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java     | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropData.java           | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/DragAndDropService.java        | 2 +-
 src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/MIMEType.java                  | 2 +-
 .../java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java   | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java    | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java      | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java       | 2 +-
 src/main/java/org/scijava/ui/dnd/event/DropEvent.java           | 2 +-
 src/main/java/org/scijava/ui/event/UIEvent.java                 | 2 +-
 src/main/java/org/scijava/ui/event/UIShownEvent.java            | 2 +-
 .../java/org/scijava/ui/headless/HeadlessDisplayViewer.java     | 2 +-
 src/main/java/org/scijava/ui/headless/HeadlessUI.java           | 2 +-
 src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java         | 2 +-
 src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayPanel.java           | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayViewer.java          | 2 +-
 src/main/java/org/scijava/ui/viewer/DisplayWindow.java          | 2 +-
 .../org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java   | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java  | 2 +-
 src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java | 2 +-
 src/main/java/org/scijava/util/AbstractPrimitiveArray.java      | 2 +-
 src/main/java/org/scijava/util/AppUtils.java                    | 2 +-
 src/main/java/org/scijava/util/ArrayUtils.java                  | 2 +-
 src/main/java/org/scijava/util/BoolArray.java                   | 2 +-
 src/main/java/org/scijava/util/ByteArray.java                   | 2 +-
 src/main/java/org/scijava/util/Bytes.java                       | 2 +-
 src/main/java/org/scijava/util/CharArray.java                   | 2 +-
 src/main/java/org/scijava/util/CheckSezpoz.java                 | 2 +-
 src/main/java/org/scijava/util/ClassUtils.java                  | 2 +-
 src/main/java/org/scijava/util/ColorRGB.java                    | 2 +-
 src/main/java/org/scijava/util/ColorRGBA.java                   | 2 +-
 src/main/java/org/scijava/util/Colors.java                      | 2 +-
 src/main/java/org/scijava/util/CombineAnnotations.java          | 2 +-
 src/main/java/org/scijava/util/Combiner.java                    | 2 +-
 src/main/java/org/scijava/util/ConversionUtils.java             | 2 +-
 src/main/java/org/scijava/util/DebugUtils.java                  | 2 +-
 src/main/java/org/scijava/util/DefaultTreeNode.java             | 2 +-
 src/main/java/org/scijava/util/DigestUtils.java                 | 2 +-
 src/main/java/org/scijava/util/DoubleArray.java                 | 2 +-
 src/main/java/org/scijava/util/FileUtils.java                   | 2 +-
 src/main/java/org/scijava/util/FloatArray.java                  | 2 +-
 src/main/java/org/scijava/util/GenericUtils.java                | 2 +-
 src/main/java/org/scijava/util/IntArray.java                    | 2 +-
 src/main/java/org/scijava/util/IntCoords.java                   | 2 +-
 src/main/java/org/scijava/util/IntRect.java                     | 2 +-
 src/main/java/org/scijava/util/IteratorPlus.java                | 2 +-
 src/main/java/org/scijava/util/LastRecentlyUsed.java            | 2 +-
 src/main/java/org/scijava/util/LineOutputStream.java            | 2 +-
 src/main/java/org/scijava/util/ListUtils.java                   | 2 +-
 src/main/java/org/scijava/util/LongArray.java                   | 2 +-
 src/main/java/org/scijava/util/Manifest.java                    | 2 +-
 src/main/java/org/scijava/util/MersenneTwisterFast.java         | 2 +-
 src/main/java/org/scijava/util/MetaInfCombiner.java             | 2 +-
 src/main/java/org/scijava/util/MirrorWebsite.java               | 2 +-
 src/main/java/org/scijava/util/MiscUtils.java                   | 2 +-
 src/main/java/org/scijava/util/NumberUtils.java                 | 2 +-
 src/main/java/org/scijava/util/ObjectArray.java                 | 2 +-
 src/main/java/org/scijava/util/POM.java                         | 2 +-
 src/main/java/org/scijava/util/PlatformUtils.java               | 2 +-
 src/main/java/org/scijava/util/Prefs.java                       | 2 +-
 src/main/java/org/scijava/util/PrimitiveArray.java              | 2 +-
 src/main/java/org/scijava/util/ProcessUtils.java                | 2 +-
 src/main/java/org/scijava/util/PropertiesHelper.java            | 2 +-
 src/main/java/org/scijava/util/Query.java                       | 2 +-
 src/main/java/org/scijava/util/ReadInto.java                    | 2 +-
 src/main/java/org/scijava/util/RealCoords.java                  | 2 +-
 src/main/java/org/scijava/util/RealRect.java                    | 2 +-
 src/main/java/org/scijava/util/ReflectException.java            | 2 +-
 src/main/java/org/scijava/util/ReflectedUniverse.java           | 2 +-
 src/main/java/org/scijava/util/ServiceCombiner.java             | 2 +-
 src/main/java/org/scijava/util/ShortArray.java                  | 2 +-
 src/main/java/org/scijava/util/Sizable.java                     | 2 +-
 src/main/java/org/scijava/util/SizableArrayList.java            | 2 +-
 src/main/java/org/scijava/util/StringMaker.java                 | 2 +-
 src/main/java/org/scijava/util/StringUtils.java                 | 2 +-
 src/main/java/org/scijava/util/Timing.java                      | 2 +-
 src/main/java/org/scijava/util/TreeNode.java                    | 2 +-
 src/main/java/org/scijava/util/TunePlayer.java                  | 2 +-
 src/main/java/org/scijava/util/Types.java                       | 2 +-
 src/main/java/org/scijava/util/UnitUtils.java                   | 2 +-
 src/main/java/org/scijava/util/VersionUtils.java                | 2 +-
 src/main/java/org/scijava/util/XML.java                         | 2 +-
 src/main/java/org/scijava/welcome/DefaultWelcomeService.java    | 2 +-
 src/main/java/org/scijava/welcome/WelcomeService.java           | 2 +-
 src/main/java/org/scijava/welcome/event/WelcomeEvent.java       | 2 +-
 src/main/java/org/scijava/widget/AbstractInputHarvester.java    | 2 +-
 src/main/java/org/scijava/widget/AbstractInputPanel.java        | 2 +-
 src/main/java/org/scijava/widget/AbstractInputWidget.java       | 2 +-
 src/main/java/org/scijava/widget/Button.java                    | 2 +-
 src/main/java/org/scijava/widget/ButtonWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ChoiceWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ColorWidget.java               | 2 +-
 src/main/java/org/scijava/widget/DateWidget.java                | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetModel.java        | 2 +-
 src/main/java/org/scijava/widget/DefaultWidgetService.java      | 2 +-
 src/main/java/org/scijava/widget/FileListWidget.java            | 2 +-
 src/main/java/org/scijava/widget/FileWidget.java                | 2 +-
 src/main/java/org/scijava/widget/InputHarvester.java            | 2 +-
 src/main/java/org/scijava/widget/InputPanel.java                | 2 +-
 src/main/java/org/scijava/widget/InputWidget.java               | 2 +-
 src/main/java/org/scijava/widget/MessageWidget.java             | 2 +-
 src/main/java/org/scijava/widget/NumberWidget.java              | 2 +-
 src/main/java/org/scijava/widget/ObjectWidget.java              | 2 +-
 src/main/java/org/scijava/widget/TextWidget.java                | 2 +-
 src/main/java/org/scijava/widget/ToggleWidget.java              | 2 +-
 src/main/java/org/scijava/widget/UIComponent.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetModel.java               | 2 +-
 src/main/java/org/scijava/widget/WidgetService.java             | 2 +-
 src/main/java/org/scijava/widget/WidgetStyle.java               | 2 +-
 src/test/java/org/scijava/ContextCreationTest.java              | 2 +-
 src/test/java/org/scijava/ContextDisposalTest.java              | 2 +-
 src/test/java/org/scijava/ContextInjectionTest.java             | 2 +-
 src/test/java/org/scijava/SciJavaTest.java                      | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedA.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedB.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedC.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedD.java           | 2 +-
 src/test/java/org/scijava/annotations/AnnotatedInnerClass.java  | 2 +-
 src/test/java/org/scijava/annotations/Complex.java              | 2 +-
 src/test/java/org/scijava/annotations/DirectoryIndexerTest.java | 2 +-
 src/test/java/org/scijava/annotations/EclipseHelperTest.java    | 2 +-
 src/test/java/org/scijava/annotations/Fruit.java                | 2 +-
 src/test/java/org/scijava/annotations/LegacyTest.java           | 2 +-
 src/test/java/org/scijava/annotations/Simple.java               | 2 +-
 src/test/java/org/scijava/app/StatusServiceTest.java            | 2 +-
 .../java/org/scijava/command/CommandArrayConverterTest.java     | 2 +-
 src/test/java/org/scijava/command/CommandInfoTest.java          | 2 +-
 src/test/java/org/scijava/command/CommandModuleTest.java        | 2 +-
 src/test/java/org/scijava/command/CommandServiceTest.java       | 2 +-
 src/test/java/org/scijava/command/InputsTest.java               | 2 +-
 src/test/java/org/scijava/command/InvalidCommandTest.java       | 2 +-
 .../java/org/scijava/command/run/CommandCodeRunnerTest.java     | 2 +-
 src/test/java/org/scijava/console/ConsoleServiceTest.java       | 2 +-
 .../java/org/scijava/console/SystemPropertyArgumentTest.java    | 2 +-
 .../java/org/scijava/convert/AbstractNumberConverterTests.java  | 2 +-
 .../java/org/scijava/convert/ArrayToStringConverterTest.java    | 2 +-
 .../scijava/convert/BigIntegerToBigDecimalConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ByteToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToBigIntegerConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToDoubleConverterTest.java     | 2 +-
 src/test/java/org/scijava/convert/ByteToFloatConverterTest.java | 2 +-
 .../java/org/scijava/convert/ByteToIntegerConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/ByteToLongConverterTest.java  | 2 +-
 src/test/java/org/scijava/convert/ByteToShortConverterTest.java | 2 +-
 src/test/java/org/scijava/convert/ConvertServiceTest.java       | 2 +-
 src/test/java/org/scijava/convert/ConverterTest.java            | 2 +-
 src/test/java/org/scijava/convert/DefaultConverterTest.java     | 2 +-
 src/test/java/org/scijava/convert/DelegateConverterTest.java    | 2 +-
 .../org/scijava/convert/DoubleToBigDecimalConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileListConverterTest.java    | 2 +-
 src/test/java/org/scijava/convert/FileToPathConversionTest.java | 2 +-
 .../org/scijava/convert/FloatToBigDecimalConverterTest.java     | 2 +-
 .../java/org/scijava/convert/FloatToDoubleConverterTest.java    | 2 +-
 .../org/scijava/convert/IntegerToBigDecimalConverterTest.java   | 2 +-
 .../org/scijava/convert/IntegerToBigIntegerConverterTest.java   | 2 +-
 .../java/org/scijava/convert/IntegerToDoubleConverterTest.java  | 2 +-
 .../java/org/scijava/convert/IntegerToLongConverterTest.java    | 2 +-
 .../java/org/scijava/convert/LongToBigDecimalConverterTest.java | 2 +-
 .../java/org/scijava/convert/LongToBigIntegerConverterTest.java | 2 +-
 .../org/scijava/convert/ShortToBigDecimalConverterTest.java     | 2 +-
 .../org/scijava/convert/ShortToBigIntegerConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToDoubleConverterTest.java    | 2 +-
 .../java/org/scijava/convert/ShortToFloatConverterTest.java     | 2 +-
 .../java/org/scijava/convert/ShortToIntegerConverterTest.java   | 2 +-
 src/test/java/org/scijava/convert/ShortToLongConverterTest.java | 2 +-
 .../java/org/scijava/convert/StringToArrayConverterTest.java    | 2 +-
 .../java/org/scijava/convert/StringToNumberConverterTest.java   | 2 +-
 src/test/java/org/scijava/display/DisplayTest.java              | 2 +-
 src/test/java/org/scijava/download/DownloadServiceTest.java     | 2 +-
 src/test/java/org/scijava/event/EventServiceTest.java           | 2 +-
 src/test/java/org/scijava/input/AcceleratorTest.java            | 2 +-
 src/test/java/org/scijava/input/KeyCodeTest.java                | 2 +-
 src/test/java/org/scijava/io/ByteArrayByteBankTest.java         | 2 +-
 src/test/java/org/scijava/io/ByteBankTest.java                  | 2 +-
 src/test/java/org/scijava/io/IOServiceTest.java                 | 2 +-
 src/test/java/org/scijava/io/TypedIOServiceTest.java            | 2 +-
 src/test/java/org/scijava/io/event/DataEventTest.java           | 2 +-
 src/test/java/org/scijava/io/handle/BytesHandleTest.java        | 2 +-
 .../java/org/scijava/io/handle/DataHandleEdgeCaseTests.java     | 2 +-
 src/test/java/org/scijava/io/handle/DataHandleTest.java         | 2 +-
 src/test/java/org/scijava/io/handle/DataHandlesTest.java        | 2 +-
 src/test/java/org/scijava/io/handle/FileHandleTest.java         | 2 +-
 .../org/scijava/io/handle/ReadBufferDataHandleMockTest.java     | 2 +-
 .../java/org/scijava/io/handle/ReadBufferDataHandleTest.java    | 2 +-
 .../java/org/scijava/io/handle/WriteBufferDataHandleTest.java   | 2 +-
 src/test/java/org/scijava/io/location/BytesLocationTest.java    | 2 +-
 .../java/org/scijava/io/location/FileLocationResolverTest.java  | 2 +-
 src/test/java/org/scijava/io/location/FileLocationTest.java     | 2 +-
 src/test/java/org/scijava/io/location/LocationServiceTest.java  | 2 +-
 src/test/java/org/scijava/io/location/URILocationTest.java      | 2 +-
 src/test/java/org/scijava/io/location/URLLocationTest.java      | 2 +-
 src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java    | 2 +-
 src/test/java/org/scijava/log/CallingClassUtilsTest.java        | 2 +-
 src/test/java/org/scijava/log/DefaultLoggerTest.java            | 2 +-
 src/test/java/org/scijava/log/LogMessageTest.java               | 2 +-
 src/test/java/org/scijava/log/LogServiceTest.java               | 2 +-
 src/test/java/org/scijava/log/LogSourceTest.java                | 2 +-
 src/test/java/org/scijava/log/StderrLogServiceTest.java         | 2 +-
 src/test/java/org/scijava/log/TestLogListener.java              | 2 +-
 src/test/java/org/scijava/main/MainServiceTest.java             | 2 +-
 src/test/java/org/scijava/main/run/MainCodeRunnerTest.java      | 2 +-
 src/test/java/org/scijava/menu/MenuServiceTest.java             | 2 +-
 src/test/java/org/scijava/menu/ShadowMenuTest.java              | 2 +-
 src/test/java/org/scijava/module/ModuleServiceTest.java         | 2 +-
 .../java/org/scijava/module/event/ModuleErroredEventTest.java   | 2 +-
 .../java/org/scijava/module/process/LoggerPreprocessorTest.java | 2 +-
 src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java  | 2 +-
 src/test/java/org/scijava/object/NamedObjectIndexTest.java      | 2 +-
 src/test/java/org/scijava/object/ObjectIndexTest.java           | 2 +-
 src/test/java/org/scijava/object/ObjectServiceTest.java         | 2 +-
 src/test/java/org/scijava/object/SortedObjectIndexTest.java     | 2 +-
 src/test/java/org/scijava/options/OptionsTest.java              | 2 +-
 src/test/java/org/scijava/parse/ParseServiceTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginFinderTest.java          | 2 +-
 src/test/java/org/scijava/plugin/PluginIndexTest.java           | 2 +-
 src/test/java/org/scijava/plugin/PluginInfoTest.java            | 2 +-
 src/test/java/org/scijava/plugin/SingletonServiceTest.java      | 2 +-
 src/test/java/org/scijava/prefs/PrefServiceTest.java            | 2 +-
 src/test/java/org/scijava/run/RunServiceTest.java               | 2 +-
 .../java/org/scijava/script/AbstractScriptLanguageTest.java     | 2 +-
 src/test/java/org/scijava/script/ScriptEngineTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptFinderTest.java          | 2 +-
 src/test/java/org/scijava/script/ScriptInfoTest.java            | 2 +-
 src/test/java/org/scijava/script/ScriptServiceTest.java         | 2 +-
 .../scijava/script/process/ParameterScriptProcessorTest.java    | 2 +-
 src/test/java/org/scijava/service/ServiceIndexTest.java         | 2 +-
 src/test/java/org/scijava/task/TaskEventTest.java               | 2 +-
 src/test/java/org/scijava/task/TaskServiceTest.java             | 2 +-
 src/test/java/org/scijava/test/AbstractSciJavaTest.java         | 2 +-
 src/test/java/org/scijava/test/TestUtilsTest.java               | 2 +-
 src/test/java/org/scijava/text/TextServiceTest.java             | 2 +-
 src/test/java/org/scijava/thread/ThreadServiceTest.java         | 2 +-
 src/test/java/org/scijava/ui/UIServiceTest.java                 | 2 +-
 src/test/java/org/scijava/util/AppUtilsTest.java                | 2 +-
 src/test/java/org/scijava/util/ArrayUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/BoolArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ByteArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/CharArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/ClassUtilsTest.java              | 2 +-
 src/test/java/org/scijava/util/ColorRGBTest.java                | 2 +-
 src/test/java/org/scijava/util/ConversionUtilsTest.java         | 2 +-
 src/test/java/org/scijava/util/DigestUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/DoubleArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/FileUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/FloatArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/GenericArrayTypesTest.java       | 2 +-
 src/test/java/org/scijava/util/IntArrayTest.java                | 2 +-
 src/test/java/org/scijava/util/LastRecentlyUsedTest.java        | 2 +-
 src/test/java/org/scijava/util/LongArrayTest.java               | 2 +-
 src/test/java/org/scijava/util/NumberUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/ObjectArrayTest.java             | 2 +-
 src/test/java/org/scijava/util/POMTest.java                     | 2 +-
 src/test/java/org/scijava/util/PrimitiveArrayTest.java          | 2 +-
 src/test/java/org/scijava/util/ProcessUtilsTest.java            | 2 +-
 src/test/java/org/scijava/util/PropertiesHelperTest.java        | 2 +-
 src/test/java/org/scijava/util/ShortArrayTest.java              | 2 +-
 src/test/java/org/scijava/util/StringUtilsTest.java             | 2 +-
 src/test/java/org/scijava/util/TypesTest.java                   | 2 +-
 src/test/java/org/scijava/util/UnitUtilsTest.java               | 2 +-
 src/test/java/org/scijava/util/VersionUtilsTest.java            | 2 +-
 src/test/java/org/scijava/widget/WidgetStyleTest.java           | 2 +-
 760 files changed, 760 insertions(+), 760 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 142f26652..55024a7c5 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2025, SciJava developers.
+Copyright (c) 2009 - 2026, SciJava developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/it/apt-test/pom.xml b/src/it/apt-test/pom.xml
index 12f8b4d0a..c416a3860 100644
--- a/src/it/apt-test/pom.xml
+++ b/src/it/apt-test/pom.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2025 SciJava developers.
+  Copyright (C) 2009 - 2026 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/setup.bsh b/src/it/apt-test/setup.bsh
index 2f053786a..30380371c 100644
--- a/src/it/apt-test/setup.bsh
+++ b/src/it/apt-test/setup.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
index 5301e1794..2d9e5d420 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/Annotated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
index 4643aa288..1b456f1c3 100644
--- a/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
+++ b/src/it/apt-test/src/main/java/org/scijava/annotation/its/CustomAnnotation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/apt-test/verify.bsh b/src/it/apt-test/verify.bsh
index bc6a12a90..679bbf6ed 100644
--- a/src/it/apt-test/verify.bsh
+++ b/src/it/apt-test/verify.bsh
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 02cd6280f..b3042e9e1 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -3,7 +3,7 @@
   #%L
   SciJava Common shared library for SciJava software.
   %%
-  Copyright (C) 2009 - 2025 SciJava developers.
+  Copyright (C) 2009 - 2026 SciJava developers.
   %%
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractBasicDetails.java b/src/main/java/org/scijava/AbstractBasicDetails.java
index f05f40249..75e28c611 100644
--- a/src/main/java/org/scijava/AbstractBasicDetails.java
+++ b/src/main/java/org/scijava/AbstractBasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractContextual.java b/src/main/java/org/scijava/AbstractContextual.java
index 0c76ae641..6d47180bf 100644
--- a/src/main/java/org/scijava/AbstractContextual.java
+++ b/src/main/java/org/scijava/AbstractContextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractGateway.java b/src/main/java/org/scijava/AbstractGateway.java
index 944c2dff0..14f066a7f 100644
--- a/src/main/java/org/scijava/AbstractGateway.java
+++ b/src/main/java/org/scijava/AbstractGateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/AbstractUIDetails.java b/src/main/java/org/scijava/AbstractUIDetails.java
index 3590c19e3..11476a03a 100644
--- a/src/main/java/org/scijava/AbstractUIDetails.java
+++ b/src/main/java/org/scijava/AbstractUIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/BasicDetails.java b/src/main/java/org/scijava/BasicDetails.java
index d2288061b..6c37807e6 100644
--- a/src/main/java/org/scijava/BasicDetails.java
+++ b/src/main/java/org/scijava/BasicDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Cancelable.java b/src/main/java/org/scijava/Cancelable.java
index 0c36b0066..5bc0fe61c 100644
--- a/src/main/java/org/scijava/Cancelable.java
+++ b/src/main/java/org/scijava/Cancelable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Context.java b/src/main/java/org/scijava/Context.java
index 50014ad17..bfb118099 100644
--- a/src/main/java/org/scijava/Context.java
+++ b/src/main/java/org/scijava/Context.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Contextual.java b/src/main/java/org/scijava/Contextual.java
index 4d83ca900..f76c7fc0d 100644
--- a/src/main/java/org/scijava/Contextual.java
+++ b/src/main/java/org/scijava/Contextual.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Disposable.java b/src/main/java/org/scijava/Disposable.java
index f3ac3548b..ac72c90b4 100644
--- a/src/main/java/org/scijava/Disposable.java
+++ b/src/main/java/org/scijava/Disposable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Gateway.java b/src/main/java/org/scijava/Gateway.java
index 9222f058c..7cd98413e 100644
--- a/src/main/java/org/scijava/Gateway.java
+++ b/src/main/java/org/scijava/Gateway.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Identifiable.java b/src/main/java/org/scijava/Identifiable.java
index a1be1c4e7..53db16039 100644
--- a/src/main/java/org/scijava/Identifiable.java
+++ b/src/main/java/org/scijava/Identifiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Initializable.java b/src/main/java/org/scijava/Initializable.java
index bd7de998f..56aa725ae 100644
--- a/src/main/java/org/scijava/Initializable.java
+++ b/src/main/java/org/scijava/Initializable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Instantiable.java b/src/main/java/org/scijava/Instantiable.java
index 7f1d82077..3edca09a4 100644
--- a/src/main/java/org/scijava/Instantiable.java
+++ b/src/main/java/org/scijava/Instantiable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/InstantiableException.java b/src/main/java/org/scijava/InstantiableException.java
index e2df38650..0ad031f7b 100644
--- a/src/main/java/org/scijava/InstantiableException.java
+++ b/src/main/java/org/scijava/InstantiableException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemIO.java b/src/main/java/org/scijava/ItemIO.java
index c4198b74b..fa8b68684 100644
--- a/src/main/java/org/scijava/ItemIO.java
+++ b/src/main/java/org/scijava/ItemIO.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ItemVisibility.java b/src/main/java/org/scijava/ItemVisibility.java
index 47b0e9276..47897a359 100644
--- a/src/main/java/org/scijava/ItemVisibility.java
+++ b/src/main/java/org/scijava/ItemVisibility.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Locatable.java b/src/main/java/org/scijava/Locatable.java
index 5184b2552..a7da30625 100644
--- a/src/main/java/org/scijava/Locatable.java
+++ b/src/main/java/org/scijava/Locatable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuEntry.java b/src/main/java/org/scijava/MenuEntry.java
index d436963fc..4a2b33bb9 100644
--- a/src/main/java/org/scijava/MenuEntry.java
+++ b/src/main/java/org/scijava/MenuEntry.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/MenuPath.java b/src/main/java/org/scijava/MenuPath.java
index 941c4a860..533fd2461 100644
--- a/src/main/java/org/scijava/MenuPath.java
+++ b/src/main/java/org/scijava/MenuPath.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Named.java b/src/main/java/org/scijava/Named.java
index bdb669e16..9a381ee3a 100644
--- a/src/main/java/org/scijava/Named.java
+++ b/src/main/java/org/scijava/Named.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NoSuchServiceException.java b/src/main/java/org/scijava/NoSuchServiceException.java
index 4f25b47d3..d97d95647 100644
--- a/src/main/java/org/scijava/NoSuchServiceException.java
+++ b/src/main/java/org/scijava/NoSuchServiceException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/NullContextException.java b/src/main/java/org/scijava/NullContextException.java
index 32eca3f18..794926da9 100644
--- a/src/main/java/org/scijava/NullContextException.java
+++ b/src/main/java/org/scijava/NullContextException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Optional.java b/src/main/java/org/scijava/Optional.java
index 34b10025a..2ab55b3c9 100644
--- a/src/main/java/org/scijava/Optional.java
+++ b/src/main/java/org/scijava/Optional.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Prioritized.java b/src/main/java/org/scijava/Prioritized.java
index 8ecc6c528..86bd0691a 100644
--- a/src/main/java/org/scijava/Prioritized.java
+++ b/src/main/java/org/scijava/Prioritized.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Priority.java b/src/main/java/org/scijava/Priority.java
index e2fbddfd0..69da7767e 100644
--- a/src/main/java/org/scijava/Priority.java
+++ b/src/main/java/org/scijava/Priority.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/SciJava.java b/src/main/java/org/scijava/SciJava.java
index 90a3be54c..81375dcd6 100644
--- a/src/main/java/org/scijava/SciJava.java
+++ b/src/main/java/org/scijava/SciJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Typed.java b/src/main/java/org/scijava/Typed.java
index 552d1fd00..cfb55d690 100644
--- a/src/main/java/org/scijava/Typed.java
+++ b/src/main/java/org/scijava/Typed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/UIDetails.java b/src/main/java/org/scijava/UIDetails.java
index 896c6bb18..ccf12c261 100644
--- a/src/main/java/org/scijava/UIDetails.java
+++ b/src/main/java/org/scijava/UIDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Validated.java b/src/main/java/org/scijava/Validated.java
index 4fabe278a..11835ba5c 100644
--- a/src/main/java/org/scijava/Validated.java
+++ b/src/main/java/org/scijava/Validated.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ValidityProblem.java b/src/main/java/org/scijava/ValidityProblem.java
index b95d1e02b..782bcc642 100644
--- a/src/main/java/org/scijava/ValidityProblem.java
+++ b/src/main/java/org/scijava/ValidityProblem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/Versioned.java b/src/main/java/org/scijava/Versioned.java
index eb5c0cda5..6e746dad4 100644
--- a/src/main/java/org/scijava/Versioned.java
+++ b/src/main/java/org/scijava/Versioned.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
index 730739ca6..28fe310a5 100644
--- a/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
+++ b/src/main/java/org/scijava/annotations/AbstractIndexWriter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
index 33338727a..9b152b924 100644
--- a/src/main/java/org/scijava/annotations/AnnotationCombiner.java
+++ b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index e9acebd7c..8355dcda9 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
index 98ec12da7..915d9148f 100644
--- a/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
+++ b/src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/DirectoryIndexer.java b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
index 1f52f9565..ac6be8fcd 100644
--- a/src/main/java/org/scijava/annotations/DirectoryIndexer.java
+++ b/src/main/java/org/scijava/annotations/DirectoryIndexer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/EclipseHelper.java b/src/main/java/org/scijava/annotations/EclipseHelper.java
index 07e690a01..67f17ff7d 100644
--- a/src/main/java/org/scijava/annotations/EclipseHelper.java
+++ b/src/main/java/org/scijava/annotations/EclipseHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Index.java b/src/main/java/org/scijava/annotations/Index.java
index dd56ab83e..244b00d37 100644
--- a/src/main/java/org/scijava/annotations/Index.java
+++ b/src/main/java/org/scijava/annotations/Index.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexItem.java b/src/main/java/org/scijava/annotations/IndexItem.java
index 67aab711f..e5265fc21 100644
--- a/src/main/java/org/scijava/annotations/IndexItem.java
+++ b/src/main/java/org/scijava/annotations/IndexItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/IndexReader.java b/src/main/java/org/scijava/annotations/IndexReader.java
index 894874238..4eab67552 100644
--- a/src/main/java/org/scijava/annotations/IndexReader.java
+++ b/src/main/java/org/scijava/annotations/IndexReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/Indexable.java b/src/main/java/org/scijava/annotations/Indexable.java
index deb8f7d65..325739efd 100644
--- a/src/main/java/org/scijava/annotations/Indexable.java
+++ b/src/main/java/org/scijava/annotations/Indexable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
index 5b3d0d129..9df62abcc 100644
--- a/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
+++ b/src/main/java/org/scijava/annotations/legacy/LegacyReader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AbstractApp.java b/src/main/java/org/scijava/app/AbstractApp.java
index eaa37331d..33ff29ff4 100644
--- a/src/main/java/org/scijava/app/AbstractApp.java
+++ b/src/main/java/org/scijava/app/AbstractApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/App.java b/src/main/java/org/scijava/app/App.java
index bf4bf0721..95cf249e7 100644
--- a/src/main/java/org/scijava/app/App.java
+++ b/src/main/java/org/scijava/app/App.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/AppService.java b/src/main/java/org/scijava/app/AppService.java
index 582860a36..2d9c7e3de 100644
--- a/src/main/java/org/scijava/app/AppService.java
+++ b/src/main/java/org/scijava/app/AppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultAppService.java b/src/main/java/org/scijava/app/DefaultAppService.java
index 8a97162b6..9c8afc0c3 100644
--- a/src/main/java/org/scijava/app/DefaultAppService.java
+++ b/src/main/java/org/scijava/app/DefaultAppService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/DefaultStatusService.java b/src/main/java/org/scijava/app/DefaultStatusService.java
index 38e3e555d..1b68a27ba 100644
--- a/src/main/java/org/scijava/app/DefaultStatusService.java
+++ b/src/main/java/org/scijava/app/DefaultStatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/SciJavaApp.java b/src/main/java/org/scijava/app/SciJavaApp.java
index 067184141..b7604ca14 100644
--- a/src/main/java/org/scijava/app/SciJavaApp.java
+++ b/src/main/java/org/scijava/app/SciJavaApp.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/StatusService.java b/src/main/java/org/scijava/app/StatusService.java
index 7896b9b4a..70d0edf75 100644
--- a/src/main/java/org/scijava/app/StatusService.java
+++ b/src/main/java/org/scijava/app/StatusService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/app/event/StatusEvent.java b/src/main/java/org/scijava/app/event/StatusEvent.java
index d1c055557..653aefb8e 100644
--- a/src/main/java/org/scijava/app/event/StatusEvent.java
+++ b/src/main/java/org/scijava/app/event/StatusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/CacheService.java b/src/main/java/org/scijava/cache/CacheService.java
index aaa51c43d..ca5808918 100644
--- a/src/main/java/org/scijava/cache/CacheService.java
+++ b/src/main/java/org/scijava/cache/CacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/cache/DefaultCacheService.java b/src/main/java/org/scijava/cache/DefaultCacheService.java
index ffba4ebb4..667ffdb30 100644
--- a/src/main/java/org/scijava/cache/DefaultCacheService.java
+++ b/src/main/java/org/scijava/cache/DefaultCacheService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Command.java b/src/main/java/org/scijava/command/Command.java
index 3e99f2d3f..17a37ebb1 100644
--- a/src/main/java/org/scijava/command/Command.java
+++ b/src/main/java/org/scijava/command/Command.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandInfo.java b/src/main/java/org/scijava/command/CommandInfo.java
index f0b2bd34c..f25c213db 100644
--- a/src/main/java/org/scijava/command/CommandInfo.java
+++ b/src/main/java/org/scijava/command/CommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModule.java b/src/main/java/org/scijava/command/CommandModule.java
index bef02fbd5..226edc678 100644
--- a/src/main/java/org/scijava/command/CommandModule.java
+++ b/src/main/java/org/scijava/command/CommandModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandModuleItem.java b/src/main/java/org/scijava/command/CommandModuleItem.java
index b9e602de5..079193311 100644
--- a/src/main/java/org/scijava/command/CommandModuleItem.java
+++ b/src/main/java/org/scijava/command/CommandModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 502113a69..9cd4f5841 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ContextCommand.java b/src/main/java/org/scijava/command/ContextCommand.java
index ae9e3830e..c40649d53 100644
--- a/src/main/java/org/scijava/command/ContextCommand.java
+++ b/src/main/java/org/scijava/command/ContextCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DefaultCommandService.java b/src/main/java/org/scijava/command/DefaultCommandService.java
index f1d59a2b0..29756debb 100644
--- a/src/main/java/org/scijava/command/DefaultCommandService.java
+++ b/src/main/java/org/scijava/command/DefaultCommandService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommand.java b/src/main/java/org/scijava/command/DynamicCommand.java
index 5d165192d..5cc3ab4b1 100644
--- a/src/main/java/org/scijava/command/DynamicCommand.java
+++ b/src/main/java/org/scijava/command/DynamicCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/DynamicCommandInfo.java b/src/main/java/org/scijava/command/DynamicCommandInfo.java
index 738521744..06c4a16e7 100644
--- a/src/main/java/org/scijava/command/DynamicCommandInfo.java
+++ b/src/main/java/org/scijava/command/DynamicCommandInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Inputs.java b/src/main/java/org/scijava/command/Inputs.java
index a97d282f2..b2f5e4217 100644
--- a/src/main/java/org/scijava/command/Inputs.java
+++ b/src/main/java/org/scijava/command/Inputs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Interactive.java b/src/main/java/org/scijava/command/Interactive.java
index 6f4d93375..9714f4a6e 100644
--- a/src/main/java/org/scijava/command/Interactive.java
+++ b/src/main/java/org/scijava/command/Interactive.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/InteractiveCommand.java b/src/main/java/org/scijava/command/InteractiveCommand.java
index 1edf9a4b3..b45e3f21f 100644
--- a/src/main/java/org/scijava/command/InteractiveCommand.java
+++ b/src/main/java/org/scijava/command/InteractiveCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/ModuleCommand.java b/src/main/java/org/scijava/command/ModuleCommand.java
index 2a2bb9469..c09ad922c 100644
--- a/src/main/java/org/scijava/command/ModuleCommand.java
+++ b/src/main/java/org/scijava/command/ModuleCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/Previewable.java b/src/main/java/org/scijava/command/Previewable.java
index 330d8472c..4fbeaebb9 100644
--- a/src/main/java/org/scijava/command/Previewable.java
+++ b/src/main/java/org/scijava/command/Previewable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/UnimplementedCommand.java b/src/main/java/org/scijava/command/UnimplementedCommand.java
index 763d324cf..f1103751a 100644
--- a/src/main/java/org/scijava/command/UnimplementedCommand.java
+++ b/src/main/java/org/scijava/command/UnimplementedCommand.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/console/RunArgument.java b/src/main/java/org/scijava/command/console/RunArgument.java
index e5dac33f2..b2529d279 100644
--- a/src/main/java/org/scijava/command/console/RunArgument.java
+++ b/src/main/java/org/scijava/command/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/command/run/CommandCodeRunner.java b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
index d823f05f9..bc8550275 100644
--- a/src/main/java/org/scijava/command/run/CommandCodeRunner.java
+++ b/src/main/java/org/scijava/command/run/CommandCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/AbstractConsoleArgument.java b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
index eff1cf185..76040544d 100644
--- a/src/main/java/org/scijava/console/AbstractConsoleArgument.java
+++ b/src/main/java/org/scijava/console/AbstractConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleArgument.java b/src/main/java/org/scijava/console/ConsoleArgument.java
index b51e8a549..44d058211 100644
--- a/src/main/java/org/scijava/console/ConsoleArgument.java
+++ b/src/main/java/org/scijava/console/ConsoleArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleService.java b/src/main/java/org/scijava/console/ConsoleService.java
index e869933ed..3003892a4 100644
--- a/src/main/java/org/scijava/console/ConsoleService.java
+++ b/src/main/java/org/scijava/console/ConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/ConsoleUtils.java b/src/main/java/org/scijava/console/ConsoleUtils.java
index 909aa3ea0..2f62f0c14 100644
--- a/src/main/java/org/scijava/console/ConsoleUtils.java
+++ b/src/main/java/org/scijava/console/ConsoleUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/DefaultConsoleService.java b/src/main/java/org/scijava/console/DefaultConsoleService.java
index c129e56d2..b3a1ef64b 100644
--- a/src/main/java/org/scijava/console/DefaultConsoleService.java
+++ b/src/main/java/org/scijava/console/DefaultConsoleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiOutputStream.java b/src/main/java/org/scijava/console/MultiOutputStream.java
index 1cc9803e9..a8d8238fd 100644
--- a/src/main/java/org/scijava/console/MultiOutputStream.java
+++ b/src/main/java/org/scijava/console/MultiOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/MultiPrintStream.java b/src/main/java/org/scijava/console/MultiPrintStream.java
index a194dc24d..c27df7e9b 100644
--- a/src/main/java/org/scijava/console/MultiPrintStream.java
+++ b/src/main/java/org/scijava/console/MultiPrintStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputEvent.java b/src/main/java/org/scijava/console/OutputEvent.java
index dddd58e36..c408bcaa3 100644
--- a/src/main/java/org/scijava/console/OutputEvent.java
+++ b/src/main/java/org/scijava/console/OutputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/OutputListener.java b/src/main/java/org/scijava/console/OutputListener.java
index c86479e10..b1543d339 100644
--- a/src/main/java/org/scijava/console/OutputListener.java
+++ b/src/main/java/org/scijava/console/OutputListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/console/SystemPropertyArgument.java b/src/main/java/org/scijava/console/SystemPropertyArgument.java
index aa2f2ddfd..33ba2771f 100644
--- a/src/main/java/org/scijava/console/SystemPropertyArgument.java
+++ b/src/main/java/org/scijava/console/SystemPropertyArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConvertService.java b/src/main/java/org/scijava/convert/AbstractConvertService.java
index 18d995afd..c3a56ae47 100644
--- a/src/main/java/org/scijava/convert/AbstractConvertService.java
+++ b/src/main/java/org/scijava/convert/AbstractConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractConverter.java b/src/main/java/org/scijava/convert/AbstractConverter.java
index a7f252b3c..c6132c396 100644
--- a/src/main/java/org/scijava/convert/AbstractConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
index f9b979947..97b8b23ea 100644
--- a/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
+++ b/src/main/java/org/scijava/convert/AbstractDelegateConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayConverters.java b/src/main/java/org/scijava/convert/ArrayConverters.java
index 18d5f5916..0c16551a0 100644
--- a/src/main/java/org/scijava/convert/ArrayConverters.java
+++ b/src/main/java/org/scijava/convert/ArrayConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ArrayToStringConverter.java b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
index d141d5454..e1e3ce96b 100644
--- a/src/main/java/org/scijava/convert/ArrayToStringConverter.java
+++ b/src/main/java/org/scijava/convert/ArrayToStringConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/CastingConverter.java b/src/main/java/org/scijava/convert/CastingConverter.java
index 1e4e80ca6..3b5a4e91f 100644
--- a/src/main/java/org/scijava/convert/CastingConverter.java
+++ b/src/main/java/org/scijava/convert/CastingConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConversionRequest.java b/src/main/java/org/scijava/convert/ConversionRequest.java
index 65ce220ba..c4ee0fd2b 100644
--- a/src/main/java/org/scijava/convert/ConversionRequest.java
+++ b/src/main/java/org/scijava/convert/ConversionRequest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/ConvertService.java b/src/main/java/org/scijava/convert/ConvertService.java
index 84e56de9d..ff3309baf 100644
--- a/src/main/java/org/scijava/convert/ConvertService.java
+++ b/src/main/java/org/scijava/convert/ConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/Converter.java b/src/main/java/org/scijava/convert/Converter.java
index 5b0544369..1578a96dd 100644
--- a/src/main/java/org/scijava/convert/Converter.java
+++ b/src/main/java/org/scijava/convert/Converter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConvertService.java b/src/main/java/org/scijava/convert/DefaultConvertService.java
index d14e64dce..2ddd292ad 100644
--- a/src/main/java/org/scijava/convert/DefaultConvertService.java
+++ b/src/main/java/org/scijava/convert/DefaultConvertService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/DefaultConverter.java b/src/main/java/org/scijava/convert/DefaultConverter.java
index b9f53256d..c99c5a889 100644
--- a/src/main/java/org/scijava/convert/DefaultConverter.java
+++ b/src/main/java/org/scijava/convert/DefaultConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileListConverters.java b/src/main/java/org/scijava/convert/FileListConverters.java
index f4e8e86e7..8b5d86b73 100644
--- a/src/main/java/org/scijava/convert/FileListConverters.java
+++ b/src/main/java/org/scijava/convert/FileListConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/FileToPathConverter.java b/src/main/java/org/scijava/convert/FileToPathConverter.java
index 9a6960566..9c8717286 100644
--- a/src/main/java/org/scijava/convert/FileToPathConverter.java
+++ b/src/main/java/org/scijava/convert/FileToPathConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NullConverter.java b/src/main/java/org/scijava/convert/NullConverter.java
index b43a5cecf..5c91943db 100644
--- a/src/main/java/org/scijava/convert/NullConverter.java
+++ b/src/main/java/org/scijava/convert/NullConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberConverters.java b/src/main/java/org/scijava/convert/NumberConverters.java
index 2f52ba40d..4046d6503 100644
--- a/src/main/java/org/scijava/convert/NumberConverters.java
+++ b/src/main/java/org/scijava/convert/NumberConverters.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
index 34b5a22a1..910d5a02a 100644
--- a/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigDecimalConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
index 6877d4b6b..ba3279439 100644
--- a/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToBigIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
index d32b0a751..302ea4d22 100644
--- a/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToDoubleConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToFloatConverter.java b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
index cc9a6b31f..afd969dbe 100644
--- a/src/main/java/org/scijava/convert/NumberToFloatConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToFloatConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
index 799ac9ac7..e68c4cf29 100644
--- a/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToIntegerConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToLongConverter.java b/src/main/java/org/scijava/convert/NumberToLongConverter.java
index 34df15429..40c2c0bb8 100644
--- a/src/main/java/org/scijava/convert/NumberToLongConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToLongConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToNumberConverter.java b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
index 4ad78680d..40035dc1f 100644
--- a/src/main/java/org/scijava/convert/NumberToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/NumberToShortConverter.java b/src/main/java/org/scijava/convert/NumberToShortConverter.java
index 858fdd13b..eda48e07f 100644
--- a/src/main/java/org/scijava/convert/NumberToShortConverter.java
+++ b/src/main/java/org/scijava/convert/NumberToShortConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PathToFileConverter.java b/src/main/java/org/scijava/convert/PathToFileConverter.java
index 1a066296e..cc8aa967d 100644
--- a/src/main/java/org/scijava/convert/PathToFileConverter.java
+++ b/src/main/java/org/scijava/convert/PathToFileConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
index 32b048a30..6292aee6d 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayUnwrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
index 549527f4e..f022900a8 100644
--- a/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
+++ b/src/main/java/org/scijava/convert/PrimitiveArrayWrapper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToArrayConverter.java b/src/main/java/org/scijava/convert/StringToArrayConverter.java
index 8b0996095..deeb58010 100644
--- a/src/main/java/org/scijava/convert/StringToArrayConverter.java
+++ b/src/main/java/org/scijava/convert/StringToArrayConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/convert/StringToNumberConverter.java b/src/main/java/org/scijava/convert/StringToNumberConverter.java
index f8f407a87..00a3f2640 100644
--- a/src/main/java/org/scijava/convert/StringToNumberConverter.java
+++ b/src/main/java/org/scijava/convert/StringToNumberConverter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/AbstractDisplay.java b/src/main/java/org/scijava/display/AbstractDisplay.java
index c1fbd2ee0..e190f844c 100644
--- a/src/main/java/org/scijava/display/AbstractDisplay.java
+++ b/src/main/java/org/scijava/display/AbstractDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
index fd5bc184e..5997d66e8 100644
--- a/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
+++ b/src/main/java/org/scijava/display/ActiveDisplayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplay.java b/src/main/java/org/scijava/display/DefaultDisplay.java
index e75317060..8b7755d44 100644
--- a/src/main/java/org/scijava/display/DefaultDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultDisplayService.java b/src/main/java/org/scijava/display/DefaultDisplayService.java
index b125937d4..23a0c9c7f 100644
--- a/src/main/java/org/scijava/display/DefaultDisplayService.java
+++ b/src/main/java/org/scijava/display/DefaultDisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DefaultTextDisplay.java b/src/main/java/org/scijava/display/DefaultTextDisplay.java
index ab6044b12..380507bdf 100644
--- a/src/main/java/org/scijava/display/DefaultTextDisplay.java
+++ b/src/main/java/org/scijava/display/DefaultTextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Display.java b/src/main/java/org/scijava/display/Display.java
index 4886b3a1e..2221db211 100644
--- a/src/main/java/org/scijava/display/Display.java
+++ b/src/main/java/org/scijava/display/Display.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayPostprocessor.java b/src/main/java/org/scijava/display/DisplayPostprocessor.java
index a97064ce5..7a6c54264 100644
--- a/src/main/java/org/scijava/display/DisplayPostprocessor.java
+++ b/src/main/java/org/scijava/display/DisplayPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/DisplayService.java b/src/main/java/org/scijava/display/DisplayService.java
index dc2654396..fcc13e0a0 100644
--- a/src/main/java/org/scijava/display/DisplayService.java
+++ b/src/main/java/org/scijava/display/DisplayService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/Displayable.java b/src/main/java/org/scijava/display/Displayable.java
index 4b38e060e..67c0e26ee 100644
--- a/src/main/java/org/scijava/display/Displayable.java
+++ b/src/main/java/org/scijava/display/Displayable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/TextDisplay.java b/src/main/java/org/scijava/display/TextDisplay.java
index f6eddb44f..0ada43aad 100644
--- a/src/main/java/org/scijava/display/TextDisplay.java
+++ b/src/main/java/org/scijava/display/TextDisplay.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
index 7af76b8b4..1fe30c96c 100644
--- a/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
index eab8406e7..347557f2f 100644
--- a/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
index aeda51f31..125ce25e3 100644
--- a/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayEvent.java b/src/main/java/org/scijava/display/event/DisplayEvent.java
index 22bd5ffeb..99deab3ea 100644
--- a/src/main/java/org/scijava/display/event/DisplayEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
index d609a2391..cbb1fc3ab 100644
--- a/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
+++ b/src/main/java/org/scijava/display/event/DisplayUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/InputEvent.java b/src/main/java/org/scijava/display/event/input/InputEvent.java
index 877529707..4e278a185 100644
--- a/src/main/java/org/scijava/display/event/input/InputEvent.java
+++ b/src/main/java/org/scijava/display/event/input/InputEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyEvent.java b/src/main/java/org/scijava/display/event/input/KyEvent.java
index 3acf2bece..058c986dc 100644
--- a/src/main/java/org/scijava/display/event/input/KyEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
index 2c812389b..e74dae63d 100644
--- a/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
index 2ce597b48..15659de2d 100644
--- a/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
index a345748ab..9f5d96c6e 100644
--- a/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/KyTypedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
index 2e728f3af..09a91dabd 100644
--- a/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsButtonEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
index 8962c1a80..f13524996 100644
--- a/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsClickedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
index 226453319..f683dc4b9 100644
--- a/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsDraggedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
index 1ee9e2cf5..310bcb444 100644
--- a/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEnteredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsEvent.java b/src/main/java/org/scijava/display/event/input/MsEvent.java
index 5e1d047f0..b370e1e79 100644
--- a/src/main/java/org/scijava/display/event/input/MsEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
index f60eb58b2..921e674f1 100644
--- a/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsExitedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
index ba737a960..658b1b904 100644
--- a/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsMovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
index 19ca38bfd..ea2593493 100644
--- a/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsPressedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
index 219e62b73..61786d727 100644
--- a/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsReleasedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
index 8f0ec7c6b..32d92bd2f 100644
--- a/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
+++ b/src/main/java/org/scijava/display/event/input/MsWheelEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
index 380cc2185..f8c81ec30 100644
--- a/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
index 7e11f2581..24476f5aa 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
index f8573f746..ea6192681 100644
--- a/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinClosingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
index c1f8f7d03..8a27cfdce 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
index 770c05f30..b6f620918 100644
--- a/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinDeiconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinEvent.java b/src/main/java/org/scijava/display/event/window/WinEvent.java
index b691b0a71..8190bfcde 100644
--- a/src/main/java/org/scijava/display/event/window/WinEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
index 4486a5630..044182b2f 100644
--- a/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinIconifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
index e34298e6c..4f10240f0 100644
--- a/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
+++ b/src/main/java/org/scijava/display/event/window/WinOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DefaultDownloadService.java b/src/main/java/org/scijava/download/DefaultDownloadService.java
index da91dc3e8..44c1b9aac 100644
--- a/src/main/java/org/scijava/download/DefaultDownloadService.java
+++ b/src/main/java/org/scijava/download/DefaultDownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DiskLocationCache.java b/src/main/java/org/scijava/download/DiskLocationCache.java
index 73471ebed..ed576b4c4 100644
--- a/src/main/java/org/scijava/download/DiskLocationCache.java
+++ b/src/main/java/org/scijava/download/DiskLocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/Download.java b/src/main/java/org/scijava/download/Download.java
index 56d00f71f..f311000b4 100644
--- a/src/main/java/org/scijava/download/Download.java
+++ b/src/main/java/org/scijava/download/Download.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/DownloadService.java b/src/main/java/org/scijava/download/DownloadService.java
index abc4c8294..ecf576475 100644
--- a/src/main/java/org/scijava/download/DownloadService.java
+++ b/src/main/java/org/scijava/download/DownloadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/LocationCache.java b/src/main/java/org/scijava/download/LocationCache.java
index ee49eed26..3a5f7c031 100644
--- a/src/main/java/org/scijava/download/LocationCache.java
+++ b/src/main/java/org/scijava/download/LocationCache.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/download/MultiWriteHandle.java b/src/main/java/org/scijava/download/MultiWriteHandle.java
index 4c7d5ef3a..4dd40b874 100644
--- a/src/main/java/org/scijava/download/MultiWriteHandle.java
+++ b/src/main/java/org/scijava/download/MultiWriteHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextCreatedEvent.java b/src/main/java/org/scijava/event/ContextCreatedEvent.java
index 2f43d2105..c279e9a7e 100644
--- a/src/main/java/org/scijava/event/ContextCreatedEvent.java
+++ b/src/main/java/org/scijava/event/ContextCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/ContextDisposingEvent.java b/src/main/java/org/scijava/event/ContextDisposingEvent.java
index 472c6b03e..570c0974c 100644
--- a/src/main/java/org/scijava/event/ContextDisposingEvent.java
+++ b/src/main/java/org/scijava/event/ContextDisposingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventBus.java b/src/main/java/org/scijava/event/DefaultEventBus.java
index 72e269077..5587f6d59 100644
--- a/src/main/java/org/scijava/event/DefaultEventBus.java
+++ b/src/main/java/org/scijava/event/DefaultEventBus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventHistory.java b/src/main/java/org/scijava/event/DefaultEventHistory.java
index c0d397cb1..4b94b8bc3 100644
--- a/src/main/java/org/scijava/event/DefaultEventHistory.java
+++ b/src/main/java/org/scijava/event/DefaultEventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/DefaultEventService.java b/src/main/java/org/scijava/event/DefaultEventService.java
index d627ce668..3eca42db0 100644
--- a/src/main/java/org/scijava/event/DefaultEventService.java
+++ b/src/main/java/org/scijava/event/DefaultEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventDetails.java b/src/main/java/org/scijava/event/EventDetails.java
index 794e3e3fa..5e9344b24 100644
--- a/src/main/java/org/scijava/event/EventDetails.java
+++ b/src/main/java/org/scijava/event/EventDetails.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHandler.java b/src/main/java/org/scijava/event/EventHandler.java
index 56283f452..fa59a2a50 100644
--- a/src/main/java/org/scijava/event/EventHandler.java
+++ b/src/main/java/org/scijava/event/EventHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistory.java b/src/main/java/org/scijava/event/EventHistory.java
index e54425120..7caaaf022 100644
--- a/src/main/java/org/scijava/event/EventHistory.java
+++ b/src/main/java/org/scijava/event/EventHistory.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventHistoryListener.java b/src/main/java/org/scijava/event/EventHistoryListener.java
index 9beecf79f..30a305c83 100644
--- a/src/main/java/org/scijava/event/EventHistoryListener.java
+++ b/src/main/java/org/scijava/event/EventHistoryListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventService.java b/src/main/java/org/scijava/event/EventService.java
index 00ef9d7f0..1b0907f7a 100644
--- a/src/main/java/org/scijava/event/EventService.java
+++ b/src/main/java/org/scijava/event/EventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/EventSubscriber.java b/src/main/java/org/scijava/event/EventSubscriber.java
index bb05a8f40..9dcd25d94 100644
--- a/src/main/java/org/scijava/event/EventSubscriber.java
+++ b/src/main/java/org/scijava/event/EventSubscriber.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/event/SciJavaEvent.java b/src/main/java/org/scijava/event/SciJavaEvent.java
index 2fcc6876d..4e51d775f 100644
--- a/src/main/java/org/scijava/event/SciJavaEvent.java
+++ b/src/main/java/org/scijava/event/SciJavaEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/Accelerator.java b/src/main/java/org/scijava/input/Accelerator.java
index c1296cfb6..73878ca15 100644
--- a/src/main/java/org/scijava/input/Accelerator.java
+++ b/src/main/java/org/scijava/input/Accelerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/DefaultInputService.java b/src/main/java/org/scijava/input/DefaultInputService.java
index 2b3506c07..392dc250d 100644
--- a/src/main/java/org/scijava/input/DefaultInputService.java
+++ b/src/main/java/org/scijava/input/DefaultInputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputModifiers.java b/src/main/java/org/scijava/input/InputModifiers.java
index 21df50b23..50dba7820 100644
--- a/src/main/java/org/scijava/input/InputModifiers.java
+++ b/src/main/java/org/scijava/input/InputModifiers.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/InputService.java b/src/main/java/org/scijava/input/InputService.java
index a38c638bc..0c7adae95 100644
--- a/src/main/java/org/scijava/input/InputService.java
+++ b/src/main/java/org/scijava/input/InputService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/KeyCode.java b/src/main/java/org/scijava/input/KeyCode.java
index 0e0ec35e1..a8eeccaad 100644
--- a/src/main/java/org/scijava/input/KeyCode.java
+++ b/src/main/java/org/scijava/input/KeyCode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/input/MouseCursor.java b/src/main/java/org/scijava/input/MouseCursor.java
index 8d6d55991..15bb0ccc8 100644
--- a/src/main/java/org/scijava/input/MouseCursor.java
+++ b/src/main/java/org/scijava/input/MouseCursor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractIOPlugin.java b/src/main/java/org/scijava/io/AbstractIOPlugin.java
index 7e7782572..3c965739a 100644
--- a/src/main/java/org/scijava/io/AbstractIOPlugin.java
+++ b/src/main/java/org/scijava/io/AbstractIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 28cd7b96f..4d75bfb3e 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteArrayByteBank.java b/src/main/java/org/scijava/io/ByteArrayByteBank.java
index 277f9abf2..f0183f2d8 100644
--- a/src/main/java/org/scijava/io/ByteArrayByteBank.java
+++ b/src/main/java/org/scijava/io/ByteArrayByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/ByteBank.java b/src/main/java/org/scijava/io/ByteBank.java
index fa6352140..8d466e8ce 100644
--- a/src/main/java/org/scijava/io/ByteBank.java
+++ b/src/main/java/org/scijava/io/ByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultIOService.java b/src/main/java/org/scijava/io/DefaultIOService.java
index 183dbcd07..0b67ce690 100644
--- a/src/main/java/org/scijava/io/DefaultIOService.java
+++ b/src/main/java/org/scijava/io/DefaultIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/DefaultRecentFileService.java b/src/main/java/org/scijava/io/DefaultRecentFileService.java
index 1e7f0a85f..3cef6fb1a 100644
--- a/src/main/java/org/scijava/io/DefaultRecentFileService.java
+++ b/src/main/java/org/scijava/io/DefaultRecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOPlugin.java b/src/main/java/org/scijava/io/IOPlugin.java
index ed42dee25..b8c69cc18 100644
--- a/src/main/java/org/scijava/io/IOPlugin.java
+++ b/src/main/java/org/scijava/io/IOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/IOService.java b/src/main/java/org/scijava/io/IOService.java
index d26c66ce9..672ba9f9b 100644
--- a/src/main/java/org/scijava/io/IOService.java
+++ b/src/main/java/org/scijava/io/IOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/RecentFileService.java b/src/main/java/org/scijava/io/RecentFileService.java
index 38c6385a1..20a6ad9c8 100644
--- a/src/main/java/org/scijava/io/RecentFileService.java
+++ b/src/main/java/org/scijava/io/RecentFileService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/TypedIOService.java b/src/main/java/org/scijava/io/TypedIOService.java
index 89fffd060..e6882fc95 100644
--- a/src/main/java/org/scijava/io/TypedIOService.java
+++ b/src/main/java/org/scijava/io/TypedIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/console/OpenArgument.java b/src/main/java/org/scijava/io/console/OpenArgument.java
index ab7aa259b..bfdc3dbdd 100644
--- a/src/main/java/org/scijava/io/console/OpenArgument.java
+++ b/src/main/java/org/scijava/io/console/OpenArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataOpenedEvent.java b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
index b42d9fb0f..c177c9195 100644
--- a/src/main/java/org/scijava/io/event/DataOpenedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataOpenedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/DataSavedEvent.java b/src/main/java/org/scijava/io/event/DataSavedEvent.java
index 74eaa8925..ec75495c9 100644
--- a/src/main/java/org/scijava/io/event/DataSavedEvent.java
+++ b/src/main/java/org/scijava/io/event/DataSavedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/event/IOEvent.java b/src/main/java/org/scijava/io/event/IOEvent.java
index e254fb0a8..20a28a191 100644
--- a/src/main/java/org/scijava/io/event/IOEvent.java
+++ b/src/main/java/org/scijava/io/event/IOEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
index 9a8a57973..f2446f90a 100644
--- a/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
index a27fd185c..7fa3d8df9 100644
--- a/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractHigherOrderHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
index a28428328..5b56c5e93 100644
--- a/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractSeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
index 9660e9300..75a9f4939 100644
--- a/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/AbstractStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/BytesHandle.java b/src/main/java/org/scijava/io/handle/BytesHandle.java
index b4cc82b4f..b09228673 100644
--- a/src/main/java/org/scijava/io/handle/BytesHandle.java
+++ b/src/main/java/org/scijava/io/handle/BytesHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandle.java b/src/main/java/org/scijava/io/handle/DataHandle.java
index f5728f2cd..18cddadcb 100644
--- a/src/main/java/org/scijava/io/handle/DataHandle.java
+++ b/src/main/java/org/scijava/io/handle/DataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
index e37ef5948..10e6b84e9 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleInputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
index 510a68e51..3328a4e0a 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandleService.java b/src/main/java/org/scijava/io/handle/DataHandleService.java
index 16782658f..fae0e7f4a 100644
--- a/src/main/java/org/scijava/io/handle/DataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index abdcc0afb..7e9843edb 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
index e820ca6ac..1cdbcdf46 100644
--- a/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
+++ b/src/main/java/org/scijava/io/handle/DefaultDataHandleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/DummyHandle.java b/src/main/java/org/scijava/io/handle/DummyHandle.java
index bb9cd70ac..74b2d24ab 100644
--- a/src/main/java/org/scijava/io/handle/DummyHandle.java
+++ b/src/main/java/org/scijava/io/handle/DummyHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/FileHandle.java b/src/main/java/org/scijava/io/handle/FileHandle.java
index dbaedd134..3734f7ebb 100644
--- a/src/main/java/org/scijava/io/handle/FileHandle.java
+++ b/src/main/java/org/scijava/io/handle/FileHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
index af306b73b..fed7de110 100644
--- a/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/ReadBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
index c202ad53d..b4a7310f8 100644
--- a/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/ResettableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
index bf517df16..6b4746f56 100644
--- a/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/SeekableStreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/StreamHandle.java b/src/main/java/org/scijava/io/handle/StreamHandle.java
index f134315cb..30a3e88ba 100644
--- a/src/main/java/org/scijava/io/handle/StreamHandle.java
+++ b/src/main/java/org/scijava/io/handle/StreamHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
index 44c8b5064..f1549aa30 100644
--- a/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
+++ b/src/main/java/org/scijava/io/handle/WriteBufferDataHandle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocation.java b/src/main/java/org/scijava/io/location/AbstractLocation.java
index 045d6fc37..007a1a8a9 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
index 675a4c775..b40f6c0d9 100644
--- a/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/AbstractLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
index 2d211157f..61b3f9735 100644
--- a/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/AbstractRemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BrowsableLocation.java b/src/main/java/org/scijava/io/location/BrowsableLocation.java
index 234d2c88b..f6efc3b99 100644
--- a/src/main/java/org/scijava/io/location/BrowsableLocation.java
+++ b/src/main/java/org/scijava/io/location/BrowsableLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/BytesLocation.java b/src/main/java/org/scijava/io/location/BytesLocation.java
index d16e83c69..0b7f604ed 100644
--- a/src/main/java/org/scijava/io/location/BytesLocation.java
+++ b/src/main/java/org/scijava/io/location/BytesLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DefaultLocationService.java b/src/main/java/org/scijava/io/location/DefaultLocationService.java
index d4ea0845a..028dd807e 100644
--- a/src/main/java/org/scijava/io/location/DefaultLocationService.java
+++ b/src/main/java/org/scijava/io/location/DefaultLocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/DummyLocation.java b/src/main/java/org/scijava/io/location/DummyLocation.java
index f1e2b4f64..0a9dd546f 100644
--- a/src/main/java/org/scijava/io/location/DummyLocation.java
+++ b/src/main/java/org/scijava/io/location/DummyLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocation.java b/src/main/java/org/scijava/io/location/FileLocation.java
index 195389196..4cf688d3b 100644
--- a/src/main/java/org/scijava/io/location/FileLocation.java
+++ b/src/main/java/org/scijava/io/location/FileLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/FileLocationResolver.java b/src/main/java/org/scijava/io/location/FileLocationResolver.java
index 67c57420c..5e6b19df0 100644
--- a/src/main/java/org/scijava/io/location/FileLocationResolver.java
+++ b/src/main/java/org/scijava/io/location/FileLocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/Location.java b/src/main/java/org/scijava/io/location/Location.java
index 1d2510c54..2c579ad7e 100644
--- a/src/main/java/org/scijava/io/location/Location.java
+++ b/src/main/java/org/scijava/io/location/Location.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationResolver.java b/src/main/java/org/scijava/io/location/LocationResolver.java
index 0f325a002..e4c60eada 100644
--- a/src/main/java/org/scijava/io/location/LocationResolver.java
+++ b/src/main/java/org/scijava/io/location/LocationResolver.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/LocationService.java b/src/main/java/org/scijava/io/location/LocationService.java
index 1af4e1e26..078eca44c 100644
--- a/src/main/java/org/scijava/io/location/LocationService.java
+++ b/src/main/java/org/scijava/io/location/LocationService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/RemoteLocation.java b/src/main/java/org/scijava/io/location/RemoteLocation.java
index a39282b4f..20fd65fef 100644
--- a/src/main/java/org/scijava/io/location/RemoteLocation.java
+++ b/src/main/java/org/scijava/io/location/RemoteLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URILocation.java b/src/main/java/org/scijava/io/location/URILocation.java
index 0e5165a4a..52621ea91 100644
--- a/src/main/java/org/scijava/io/location/URILocation.java
+++ b/src/main/java/org/scijava/io/location/URILocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/location/URLLocation.java b/src/main/java/org/scijava/io/location/URLLocation.java
index 73c4781f2..396dedeae 100644
--- a/src/main/java/org/scijava/io/location/URLLocation.java
+++ b/src/main/java/org/scijava/io/location/URLLocation.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
index 99588b672..6f9ec504d 100644
--- a/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
+++ b/src/main/java/org/scijava/io/nio/ByteBufferByteBank.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/DefaultNIOService.java b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
index 6e0ef72da..2550caab8 100644
--- a/src/main/java/org/scijava/io/nio/DefaultNIOService.java
+++ b/src/main/java/org/scijava/io/nio/DefaultNIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/io/nio/NIOService.java b/src/main/java/org/scijava/io/nio/NIOService.java
index ea5c6696c..5e90ced72 100644
--- a/src/main/java/org/scijava/io/nio/NIOService.java
+++ b/src/main/java/org/scijava/io/nio/NIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java
index 1227ea134..099750f95 100644
--- a/src/main/java/org/scijava/log/AbstractLogService.java
+++ b/src/main/java/org/scijava/log/AbstractLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/CallingClassUtils.java b/src/main/java/org/scijava/log/CallingClassUtils.java
index 34a52d894..3a615a5b2 100644
--- a/src/main/java/org/scijava/log/CallingClassUtils.java
+++ b/src/main/java/org/scijava/log/CallingClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultLogger.java b/src/main/java/org/scijava/log/DefaultLogger.java
index 9f148f647..a5522aa50 100644
--- a/src/main/java/org/scijava/log/DefaultLogger.java
+++ b/src/main/java/org/scijava/log/DefaultLogger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
index 1d3e9704e..d562921e5 100644
--- a/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
+++ b/src/main/java/org/scijava/log/DefaultUncaughtExceptionHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
index faa0da4d8..5aa4a690a 100644
--- a/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
+++ b/src/main/java/org/scijava/log/IgnoreAsCallingClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogLevel.java b/src/main/java/org/scijava/log/LogLevel.java
index cc36aba55..aabab92aa 100644
--- a/src/main/java/org/scijava/log/LogLevel.java
+++ b/src/main/java/org/scijava/log/LogLevel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogListener.java b/src/main/java/org/scijava/log/LogListener.java
index fabbfa435..19c03c71f 100644
--- a/src/main/java/org/scijava/log/LogListener.java
+++ b/src/main/java/org/scijava/log/LogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogMessage.java b/src/main/java/org/scijava/log/LogMessage.java
index fde5af3b9..dce591878 100644
--- a/src/main/java/org/scijava/log/LogMessage.java
+++ b/src/main/java/org/scijava/log/LogMessage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogService.java b/src/main/java/org/scijava/log/LogService.java
index 7d7eac93f..ad9cdb40b 100644
--- a/src/main/java/org/scijava/log/LogService.java
+++ b/src/main/java/org/scijava/log/LogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/LogSource.java b/src/main/java/org/scijava/log/LogSource.java
index 4338e3a8a..5f03b1870 100644
--- a/src/main/java/org/scijava/log/LogSource.java
+++ b/src/main/java/org/scijava/log/LogSource.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logged.java b/src/main/java/org/scijava/log/Logged.java
index 7f44f3f75..bee37e0fa 100644
--- a/src/main/java/org/scijava/log/Logged.java
+++ b/src/main/java/org/scijava/log/Logged.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/Logger.java b/src/main/java/org/scijava/log/Logger.java
index 8806a1dde..c2657b0b0 100644
--- a/src/main/java/org/scijava/log/Logger.java
+++ b/src/main/java/org/scijava/log/Logger.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/log/StderrLogService.java b/src/main/java/org/scijava/log/StderrLogService.java
index 184f11d52..8c67b082b 100644
--- a/src/main/java/org/scijava/log/StderrLogService.java
+++ b/src/main/java/org/scijava/log/StderrLogService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/DefaultMainService.java b/src/main/java/org/scijava/main/DefaultMainService.java
index faffc2546..699a78132 100644
--- a/src/main/java/org/scijava/main/DefaultMainService.java
+++ b/src/main/java/org/scijava/main/DefaultMainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/MainService.java b/src/main/java/org/scijava/main/MainService.java
index ac21af8f0..36b92b89b 100644
--- a/src/main/java/org/scijava/main/MainService.java
+++ b/src/main/java/org/scijava/main/MainService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/console/MainArgument.java b/src/main/java/org/scijava/main/console/MainArgument.java
index f9139ff6c..0e0ebe29d 100644
--- a/src/main/java/org/scijava/main/console/MainArgument.java
+++ b/src/main/java/org/scijava/main/console/MainArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/main/run/MainCodeRunner.java b/src/main/java/org/scijava/main/run/MainCodeRunner.java
index 627e8ece3..a18ae6b3b 100644
--- a/src/main/java/org/scijava/main/run/MainCodeRunner.java
+++ b/src/main/java/org/scijava/main/run/MainCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/AbstractMenuCreator.java b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
index 94dd1f596..726639ae8 100644
--- a/src/main/java/org/scijava/menu/AbstractMenuCreator.java
+++ b/src/main/java/org/scijava/menu/AbstractMenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/DefaultMenuService.java b/src/main/java/org/scijava/menu/DefaultMenuService.java
index 37863c869..74ed27285 100644
--- a/src/main/java/org/scijava/menu/DefaultMenuService.java
+++ b/src/main/java/org/scijava/menu/DefaultMenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuConstants.java b/src/main/java/org/scijava/menu/MenuConstants.java
index c68b5171c..8c38942c9 100644
--- a/src/main/java/org/scijava/menu/MenuConstants.java
+++ b/src/main/java/org/scijava/menu/MenuConstants.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuCreator.java b/src/main/java/org/scijava/menu/MenuCreator.java
index 571ea192e..386771672 100644
--- a/src/main/java/org/scijava/menu/MenuCreator.java
+++ b/src/main/java/org/scijava/menu/MenuCreator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/MenuService.java b/src/main/java/org/scijava/menu/MenuService.java
index 8455284ac..ce9a5d36c 100644
--- a/src/main/java/org/scijava/menu/MenuService.java
+++ b/src/main/java/org/scijava/menu/MenuService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
index e0cecb326..c5eaea4cd 100644
--- a/src/main/java/org/scijava/menu/ShadowMenu.java
+++ b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/ShadowMenuIterator.java b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
index 45dfc836e..ea69e7a2f 100644
--- a/src/main/java/org/scijava/menu/ShadowMenuIterator.java
+++ b/src/main/java/org/scijava/menu/ShadowMenuIterator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenuEvent.java b/src/main/java/org/scijava/menu/event/MenuEvent.java
index c1e81f70e..ae0deaa13 100644
--- a/src/main/java/org/scijava/menu/event/MenuEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenuEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
index 796bd039b..a3fd70e2f 100644
--- a/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
index fe156cde6..24e3a8f93 100644
--- a/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
index 01df28f33..951daace8 100644
--- a/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
+++ b/src/main/java/org/scijava/menu/event/MenusUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index e6400f7cc..ddbaaaa1f 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 78747cacb..704ac4cd3 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index ad9b863d2..0dbb4a6f7 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultModuleService.java b/src/main/java/org/scijava/module/DefaultModuleService.java
index b6d3fa025..c6dee7f42 100644
--- a/src/main/java/org/scijava/module/DefaultModuleService.java
+++ b/src/main/java/org/scijava/module/DefaultModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModule.java b/src/main/java/org/scijava/module/DefaultMutableModule.java
index 2d483797a..0e646a212 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModule.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
index e41f52465..372776ab9 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
index 956d245d6..c16ea80ec 100644
--- a/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
+++ b/src/main/java/org/scijava/module/DefaultMutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodCallException.java b/src/main/java/org/scijava/module/MethodCallException.java
index 5dd89a0d6..fc37d1313 100644
--- a/src/main/java/org/scijava/module/MethodCallException.java
+++ b/src/main/java/org/scijava/module/MethodCallException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index 8dff15695..76773c5e4 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/Module.java b/src/main/java/org/scijava/module/Module.java
index a60bd7d3e..21e6730bf 100644
--- a/src/main/java/org/scijava/module/Module.java
+++ b/src/main/java/org/scijava/module/Module.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleCanceledException.java b/src/main/java/org/scijava/module/ModuleCanceledException.java
index cd8cb0cf4..f500a4167 100644
--- a/src/main/java/org/scijava/module/ModuleCanceledException.java
+++ b/src/main/java/org/scijava/module/ModuleCanceledException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleException.java b/src/main/java/org/scijava/module/ModuleException.java
index c178e6a39..9f9f3cb7c 100644
--- a/src/main/java/org/scijava/module/ModuleException.java
+++ b/src/main/java/org/scijava/module/ModuleException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleIndex.java b/src/main/java/org/scijava/module/ModuleIndex.java
index 0b11c9f52..998568f10 100644
--- a/src/main/java/org/scijava/module/ModuleIndex.java
+++ b/src/main/java/org/scijava/module/ModuleIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleInfo.java b/src/main/java/org/scijava/module/ModuleInfo.java
index 73e1a59a9..c9b687177 100644
--- a/src/main/java/org/scijava/module/ModuleInfo.java
+++ b/src/main/java/org/scijava/module/ModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 0007ee040..39d129465 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleRunner.java b/src/main/java/org/scijava/module/ModuleRunner.java
index 49879fe71..ece995d8a 100644
--- a/src/main/java/org/scijava/module/ModuleRunner.java
+++ b/src/main/java/org/scijava/module/ModuleRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 8b8ed2f51..3f97a56e4 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModule.java b/src/main/java/org/scijava/module/MutableModule.java
index 87e839206..3a907c854 100644
--- a/src/main/java/org/scijava/module/MutableModule.java
+++ b/src/main/java/org/scijava/module/MutableModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleInfo.java b/src/main/java/org/scijava/module/MutableModuleInfo.java
index fd3cbbb2d..31aeb7280 100644
--- a/src/main/java/org/scijava/module/MutableModuleInfo.java
+++ b/src/main/java/org/scijava/module/MutableModuleInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/MutableModuleItem.java b/src/main/java/org/scijava/module/MutableModuleItem.java
index a3b4ccc09..413950216 100644
--- a/src/main/java/org/scijava/module/MutableModuleItem.java
+++ b/src/main/java/org/scijava/module/MutableModuleItem.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
index 9016e323a..baa6ce737 100644
--- a/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleCanceledEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleErroredEvent.java b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
index 364772b38..381cc0a4e 100644
--- a/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleErroredEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleEvent.java b/src/main/java/org/scijava/module/event/ModuleEvent.java
index 96c3ddca3..9d402399a 100644
--- a/src/main/java/org/scijava/module/event/ModuleEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
index 2942ea56d..c8ec50ca5 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
index f1fd53f5c..5110625e8 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutingEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
index 940a9d8e0..73bfa9d14 100644
--- a/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleExecutionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
index 692be5b92..4c0f71dbf 100644
--- a/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleFinishedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
index 9d42be6ab..e59f94ff2 100644
--- a/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePostprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
index 760c2c55f..7efdc11c7 100644
--- a/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulePreprocessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
index b58046091..f5ac20fe8 100644
--- a/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleProcessEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
index 975c5e8af..2b8f59393 100644
--- a/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModuleStartedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
index aa3b3877c..30107c4e7 100644
--- a/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesListEvent.java b/src/main/java/org/scijava/module/event/ModulesListEvent.java
index 95b2c1c28..051edef8d 100644
--- a/src/main/java/org/scijava/module/event/ModulesListEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
index f60959dbc..495f9e7e2 100644
--- a/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
index a0a14f75d..df5a9065d 100644
--- a/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
+++ b/src/main/java/org/scijava/module/event/ModulesUpdatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
index 8ac5886d5..6e786753b 100644
--- a/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
index 4f5f625ca..b9cb5de9d 100644
--- a/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/AbstractPreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
index b373722ee..63e07cd2b 100644
--- a/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/AbstractSingleInputPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
index fff89a404..8bbfac881 100644
--- a/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/CheckInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPostprocessor.java b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
index 2760cea81..e614afada 100644
--- a/src/main/java/org/scijava/module/process/DebugPostprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DebugPreprocessor.java b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
index 59db93a4e..15f6afe1f 100644
--- a/src/main/java/org/scijava/module/process/DebugPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DebugPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
index b85d7ce60..fed93f7e9 100644
--- a/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/DefaultValuePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
index c080e8100..b3889d479 100644
--- a/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/GatewayPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/InitPreprocessor.java b/src/main/java/org/scijava/module/process/InitPreprocessor.java
index 7cbe03d34..d135614d6 100644
--- a/src/main/java/org/scijava/module/process/InitPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/InitPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
index abf184e9f..eb405b424 100644
--- a/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoadInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
index 2be46df60..b096c5593 100644
--- a/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/LoggerPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePostprocessor.java b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
index 528c6a815..50a82900e 100644
--- a/src/main/java/org/scijava/module/process/ModulePostprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePostprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModulePreprocessor.java b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
index a1b65e315..ee9d2af22 100644
--- a/src/main/java/org/scijava/module/process/ModulePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ModulePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ModuleProcessor.java b/src/main/java/org/scijava/module/process/ModuleProcessor.java
index 696e06602..605194d03 100644
--- a/src/main/java/org/scijava/module/process/ModuleProcessor.java
+++ b/src/main/java/org/scijava/module/process/ModuleProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
index 8c0dc970b..a010e0a6f 100644
--- a/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PostprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
index 2a13be6e0..57ccdc92f 100644
--- a/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
+++ b/src/main/java/org/scijava/module/process/PreprocessorPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
index 0cabffa55..8f4596f76 100644
--- a/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/SaveInputsPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ServicePreprocessor.java b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
index c195ffa93..15ac626c5 100644
--- a/src/main/java/org/scijava/module/process/ServicePreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ServicePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
index 78666b9bf..e1cbdb29e 100644
--- a/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
+++ b/src/main/java/org/scijava/module/process/ValidityPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
index 1e6ee836b..0369dee67 100644
--- a/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
+++ b/src/main/java/org/scijava/module/run/ModuleCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/DefaultObjectService.java b/src/main/java/org/scijava/object/DefaultObjectService.java
index ccd8218a1..885f2025c 100644
--- a/src/main/java/org/scijava/object/DefaultObjectService.java
+++ b/src/main/java/org/scijava/object/DefaultObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/LazyObjects.java b/src/main/java/org/scijava/object/LazyObjects.java
index 7a2ac555a..3676085bb 100644
--- a/src/main/java/org/scijava/object/LazyObjects.java
+++ b/src/main/java/org/scijava/object/LazyObjects.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/NamedObjectIndex.java b/src/main/java/org/scijava/object/NamedObjectIndex.java
index a05f326f1..0d807d166 100644
--- a/src/main/java/org/scijava/object/NamedObjectIndex.java
+++ b/src/main/java/org/scijava/object/NamedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
index c8c9df2c5..5eb81dde1 100644
--- a/src/main/java/org/scijava/object/ObjectIndex.java
+++ b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/ObjectService.java b/src/main/java/org/scijava/object/ObjectService.java
index 478be8af1..fac395e5d 100644
--- a/src/main/java/org/scijava/object/ObjectService.java
+++ b/src/main/java/org/scijava/object/ObjectService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
index 0ffec7b19..a9d2d1f21 100644
--- a/src/main/java/org/scijava/object/SortedObjectIndex.java
+++ b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ListEvent.java b/src/main/java/org/scijava/object/event/ListEvent.java
index d13533817..e7e5214f7 100644
--- a/src/main/java/org/scijava/object/event/ListEvent.java
+++ b/src/main/java/org/scijava/object/event/ListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
index 53ad97b26..0cbd3dad0 100644
--- a/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
index 1825bbc87..793a20c02 100644
--- a/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectDeletedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectEvent.java b/src/main/java/org/scijava/object/event/ObjectEvent.java
index e2b5abe73..7b1370612 100644
--- a/src/main/java/org/scijava/object/event/ObjectEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
index e87836338..6e51bb9d2 100644
--- a/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectModifiedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
index 7487ee5ed..c4ce0e854 100644
--- a/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsListEvent.java b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
index de8aaf9e2..9bab39b51 100644
--- a/src/main/java/org/scijava/object/event/ObjectsListEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
index 2bf0f49ff..c042a73f8 100644
--- a/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
+++ b/src/main/java/org/scijava/object/event/ObjectsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/DefaultOptionsService.java b/src/main/java/org/scijava/options/DefaultOptionsService.java
index a7239d833..aa6792276 100644
--- a/src/main/java/org/scijava/options/DefaultOptionsService.java
+++ b/src/main/java/org/scijava/options/DefaultOptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsPlugin.java b/src/main/java/org/scijava/options/OptionsPlugin.java
index 815c640e9..24208055c 100644
--- a/src/main/java/org/scijava/options/OptionsPlugin.java
+++ b/src/main/java/org/scijava/options/OptionsPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/OptionsService.java b/src/main/java/org/scijava/options/OptionsService.java
index fcb68ed08..6e659e1c9 100644
--- a/src/main/java/org/scijava/options/OptionsService.java
+++ b/src/main/java/org/scijava/options/OptionsService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/options/event/OptionsEvent.java b/src/main/java/org/scijava/options/event/OptionsEvent.java
index 20cc74f48..9ecea6af8 100644
--- a/src/main/java/org/scijava/options/event/OptionsEvent.java
+++ b/src/main/java/org/scijava/options/event/OptionsEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/DefaultParseService.java b/src/main/java/org/scijava/parse/DefaultParseService.java
index b686d558b..0924ab884 100644
--- a/src/main/java/org/scijava/parse/DefaultParseService.java
+++ b/src/main/java/org/scijava/parse/DefaultParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Item.java b/src/main/java/org/scijava/parse/Item.java
index 4cba11748..416538777 100644
--- a/src/main/java/org/scijava/parse/Item.java
+++ b/src/main/java/org/scijava/parse/Item.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/Items.java b/src/main/java/org/scijava/parse/Items.java
index 49dbaf9ad..0b3b6becb 100644
--- a/src/main/java/org/scijava/parse/Items.java
+++ b/src/main/java/org/scijava/parse/Items.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/parse/ParseService.java b/src/main/java/org/scijava/parse/ParseService.java
index ba20fb813..fe7ff2946 100644
--- a/src/main/java/org/scijava/parse/ParseService.java
+++ b/src/main/java/org/scijava/parse/ParseService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AbstractPlatform.java b/src/main/java/org/scijava/platform/AbstractPlatform.java
index f20f49b14..9005f3024 100644
--- a/src/main/java/org/scijava/platform/AbstractPlatform.java
+++ b/src/main/java/org/scijava/platform/AbstractPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/AppEventService.java b/src/main/java/org/scijava/platform/AppEventService.java
index 16b191878..6227d6563 100644
--- a/src/main/java/org/scijava/platform/AppEventService.java
+++ b/src/main/java/org/scijava/platform/AppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultAppEventService.java b/src/main/java/org/scijava/platform/DefaultAppEventService.java
index bd0c34424..07809297d 100644
--- a/src/main/java/org/scijava/platform/DefaultAppEventService.java
+++ b/src/main/java/org/scijava/platform/DefaultAppEventService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatform.java b/src/main/java/org/scijava/platform/DefaultPlatform.java
index 96e18fded..18473f650 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatform.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java
index e5effaaf1..bb8c962a6 100644
--- a/src/main/java/org/scijava/platform/DefaultPlatformService.java
+++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/Platform.java b/src/main/java/org/scijava/platform/Platform.java
index 96e0e6743..31cc2e86a 100644
--- a/src/main/java/org/scijava/platform/Platform.java
+++ b/src/main/java/org/scijava/platform/Platform.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/PlatformService.java b/src/main/java/org/scijava/platform/PlatformService.java
index 68e07fe9f..ff66f8939 100644
--- a/src/main/java/org/scijava/platform/PlatformService.java
+++ b/src/main/java/org/scijava/platform/PlatformService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppAboutEvent.java b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
index 251d253a7..cd39d4764 100644
--- a/src/main/java/org/scijava/platform/event/AppAboutEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppAboutEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppFocusEvent.java b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
index 8d1278a2f..e18e88a14 100644
--- a/src/main/java/org/scijava/platform/event/AppFocusEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppFocusEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
index 23b119891..3f8b80e0f 100644
--- a/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppMenusCreatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
index 0a5d85fa7..cf42e0a73 100644
--- a/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppOpenFilesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
index c5221df29..f6cf5ce81 100644
--- a/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPreferencesEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppPrintEvent.java b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
index 0c764a718..2cfd3a56e 100644
--- a/src/main/java/org/scijava/platform/event/AppPrintEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppPrintEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppQuitEvent.java b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
index c3198e627..0b5f5f1ac 100644
--- a/src/main/java/org/scijava/platform/event/AppQuitEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppQuitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
index 47a252476..a9db284a5 100644
--- a/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppReOpenEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
index c78337b1a..d499a62db 100644
--- a/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppScreenSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
index eb3b09762..5ba427317 100644
--- a/src/main/java/org/scijava/platform/event/AppSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
index 8e29b17a3..9e86cadf2 100644
--- a/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppSystemSleepEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
index b5d608118..fb202cbc3 100644
--- a/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppUserSessionEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
index 8a029561d..1b6fd77d2 100644
--- a/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
+++ b/src/main/java/org/scijava/platform/event/AppVisibleEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/platform/event/ApplicationEvent.java b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
index 4856c0748..da0a2f3a1 100644
--- a/src/main/java/org/scijava/platform/event/ApplicationEvent.java
+++ b/src/main/java/org/scijava/platform/event/ApplicationEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
index 995bde741..2077a94c0 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractHandlerService.java b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
index af501d619..65873e6eb 100644
--- a/src/main/java/org/scijava/plugin/AbstractHandlerService.java
+++ b/src/main/java/org/scijava/plugin/AbstractHandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractPTService.java b/src/main/java/org/scijava/plugin/AbstractPTService.java
index e84ad8c07..5273d007b 100644
--- a/src/main/java/org/scijava/plugin/AbstractPTService.java
+++ b/src/main/java/org/scijava/plugin/AbstractPTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
index 73c37cb3f..205d8ce8c 100644
--- a/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractRichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
index 497528dc8..b7f65c684 100644
--- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java
+++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
index 46dc75ead..a9a12fb89 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractTypedService.java b/src/main/java/org/scijava/plugin/AbstractTypedService.java
index 9929517f2..c747223f3 100644
--- a/src/main/java/org/scijava/plugin/AbstractTypedService.java
+++ b/src/main/java/org/scijava/plugin/AbstractTypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
index 9f0281c74..4a8d11412 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
index b60bca1ae..9bd224855 100644
--- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java
+++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Attr.java b/src/main/java/org/scijava/plugin/Attr.java
index 717550439..1dce1f4d7 100644
--- a/src/main/java/org/scijava/plugin/Attr.java
+++ b/src/main/java/org/scijava/plugin/Attr.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
index e2eb4949c..bd3a0eb08 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
index 8193d8d5e..096e75c92 100644
--- a/src/main/java/org/scijava/plugin/DefaultPluginService.java
+++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerPlugin.java b/src/main/java/org/scijava/plugin/HandlerPlugin.java
index 33f179bfb..8abcba382 100644
--- a/src/main/java/org/scijava/plugin/HandlerPlugin.java
+++ b/src/main/java/org/scijava/plugin/HandlerPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HandlerService.java b/src/main/java/org/scijava/plugin/HandlerService.java
index 65a3374b8..dec2d71b5 100644
--- a/src/main/java/org/scijava/plugin/HandlerService.java
+++ b/src/main/java/org/scijava/plugin/HandlerService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/HasPluginInfo.java b/src/main/java/org/scijava/plugin/HasPluginInfo.java
index ee65fb550..622429d98 100644
--- a/src/main/java/org/scijava/plugin/HasPluginInfo.java
+++ b/src/main/java/org/scijava/plugin/HasPluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Menu.java b/src/main/java/org/scijava/plugin/Menu.java
index a0b504779..ce861c6b6 100644
--- a/src/main/java/org/scijava/plugin/Menu.java
+++ b/src/main/java/org/scijava/plugin/Menu.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PTService.java b/src/main/java/org/scijava/plugin/PTService.java
index 8157261cf..d0e61a997 100644
--- a/src/main/java/org/scijava/plugin/PTService.java
+++ b/src/main/java/org/scijava/plugin/PTService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Parameter.java b/src/main/java/org/scijava/plugin/Parameter.java
index c21d89fbc..edc1da1af 100644
--- a/src/main/java/org/scijava/plugin/Parameter.java
+++ b/src/main/java/org/scijava/plugin/Parameter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/Plugin.java b/src/main/java/org/scijava/plugin/Plugin.java
index 5e64f9411..cd1701881 100644
--- a/src/main/java/org/scijava/plugin/Plugin.java
+++ b/src/main/java/org/scijava/plugin/Plugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginFinder.java b/src/main/java/org/scijava/plugin/PluginFinder.java
index 3539c7861..9f193a90e 100644
--- a/src/main/java/org/scijava/plugin/PluginFinder.java
+++ b/src/main/java/org/scijava/plugin/PluginFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginIndex.java b/src/main/java/org/scijava/plugin/PluginIndex.java
index 73153bcb9..ea3aa8fdc 100644
--- a/src/main/java/org/scijava/plugin/PluginIndex.java
+++ b/src/main/java/org/scijava/plugin/PluginIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginInfo.java b/src/main/java/org/scijava/plugin/PluginInfo.java
index 8e4a4ce85..85bab5954 100644
--- a/src/main/java/org/scijava/plugin/PluginInfo.java
+++ b/src/main/java/org/scijava/plugin/PluginInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index dc579969a..644268b87 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/RichPlugin.java b/src/main/java/org/scijava/plugin/RichPlugin.java
index aa5c1d546..891cc7822 100644
--- a/src/main/java/org/scijava/plugin/RichPlugin.java
+++ b/src/main/java/org/scijava/plugin/RichPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
index 4bef823d5..97675e8bc 100644
--- a/src/main/java/org/scijava/plugin/SciJavaPlugin.java
+++ b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonPlugin.java b/src/main/java/org/scijava/plugin/SingletonPlugin.java
index 87e3afba9..72b5da303 100644
--- a/src/main/java/org/scijava/plugin/SingletonPlugin.java
+++ b/src/main/java/org/scijava/plugin/SingletonPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SingletonService.java b/src/main/java/org/scijava/plugin/SingletonService.java
index 9171d8f8d..a60622eac 100644
--- a/src/main/java/org/scijava/plugin/SingletonService.java
+++ b/src/main/java/org/scijava/plugin/SingletonService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/SortablePlugin.java b/src/main/java/org/scijava/plugin/SortablePlugin.java
index 5b29d8a12..e7f005db9 100644
--- a/src/main/java/org/scijava/plugin/SortablePlugin.java
+++ b/src/main/java/org/scijava/plugin/SortablePlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedPlugin.java b/src/main/java/org/scijava/plugin/TypedPlugin.java
index c6d04b019..31153089a 100644
--- a/src/main/java/org/scijava/plugin/TypedPlugin.java
+++ b/src/main/java/org/scijava/plugin/TypedPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/TypedService.java b/src/main/java/org/scijava/plugin/TypedService.java
index a49b329bb..74701f46c 100644
--- a/src/main/java/org/scijava/plugin/TypedService.java
+++ b/src/main/java/org/scijava/plugin/TypedService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperPlugin.java b/src/main/java/org/scijava/plugin/WrapperPlugin.java
index 62efbea8c..651bf634e 100644
--- a/src/main/java/org/scijava/plugin/WrapperPlugin.java
+++ b/src/main/java/org/scijava/plugin/WrapperPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/WrapperService.java b/src/main/java/org/scijava/plugin/WrapperService.java
index 593a4f797..4274f16e8 100644
--- a/src/main/java/org/scijava/plugin/WrapperService.java
+++ b/src/main/java/org/scijava/plugin/WrapperService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
index 0caad3bfb..edfc5b32e 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsAddedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
index edaf3dbb1..af6bf4dc3 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsListEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
index 1709f484c..baf9961a3 100644
--- a/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
+++ b/src/main/java/org/scijava/plugin/event/PluginsRemovedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/AbstractPrefService.java b/src/main/java/org/scijava/prefs/AbstractPrefService.java
index 1bf55eb1a..052603404 100644
--- a/src/main/java/org/scijava/prefs/AbstractPrefService.java
+++ b/src/main/java/org/scijava/prefs/AbstractPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/DefaultPrefService.java b/src/main/java/org/scijava/prefs/DefaultPrefService.java
index 78efeae4a..3c192f62b 100644
--- a/src/main/java/org/scijava/prefs/DefaultPrefService.java
+++ b/src/main/java/org/scijava/prefs/DefaultPrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/prefs/PrefService.java b/src/main/java/org/scijava/prefs/PrefService.java
index d2e285d0d..98115b323 100644
--- a/src/main/java/org/scijava/prefs/PrefService.java
+++ b/src/main/java/org/scijava/prefs/PrefService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/AbstractCodeRunner.java b/src/main/java/org/scijava/run/AbstractCodeRunner.java
index e60bc4f64..a10bd9205 100644
--- a/src/main/java/org/scijava/run/AbstractCodeRunner.java
+++ b/src/main/java/org/scijava/run/AbstractCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/CodeRunner.java b/src/main/java/org/scijava/run/CodeRunner.java
index 9bef19655..2efa316e2 100644
--- a/src/main/java/org/scijava/run/CodeRunner.java
+++ b/src/main/java/org/scijava/run/CodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/DefaultRunService.java b/src/main/java/org/scijava/run/DefaultRunService.java
index ef8bee6e3..68239a4d7 100644
--- a/src/main/java/org/scijava/run/DefaultRunService.java
+++ b/src/main/java/org/scijava/run/DefaultRunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/RunService.java b/src/main/java/org/scijava/run/RunService.java
index 0c030b383..738cfb078 100644
--- a/src/main/java/org/scijava/run/RunService.java
+++ b/src/main/java/org/scijava/run/RunService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/run/console/RunArgument.java b/src/main/java/org/scijava/run/console/RunArgument.java
index ce84a31cf..028440a5e 100644
--- a/src/main/java/org/scijava/run/console/RunArgument.java
+++ b/src/main/java/org/scijava/run/console/RunArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractAutoCompleter.java b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
index b5b784448..ae255f5a2 100644
--- a/src/main/java/org/scijava/script/AbstractAutoCompleter.java
+++ b/src/main/java/org/scijava/script/AbstractAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptContext.java b/src/main/java/org/scijava/script/AbstractScriptContext.java
index 30ccac002..3f69d608a 100644
--- a/src/main/java/org/scijava/script/AbstractScriptContext.java
+++ b/src/main/java/org/scijava/script/AbstractScriptContext.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptEngine.java b/src/main/java/org/scijava/script/AbstractScriptEngine.java
index 6875cd203..c64f967c3 100644
--- a/src/main/java/org/scijava/script/AbstractScriptEngine.java
+++ b/src/main/java/org/scijava/script/AbstractScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptHeader.java b/src/main/java/org/scijava/script/AbstractScriptHeader.java
index 131ebe7bb..6dcf2650c 100644
--- a/src/main/java/org/scijava/script/AbstractScriptHeader.java
+++ b/src/main/java/org/scijava/script/AbstractScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AbstractScriptLanguage.java b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
index 1aa04fbba..6f048fc89 100644
--- a/src/main/java/org/scijava/script/AbstractScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AbstractScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptEngine.java b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
index 3c7acd8ef..14e0d5a72 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptEngine.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptEngine.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
index 449068235..695c214a9 100644
--- a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
+++ b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompleter.java b/src/main/java/org/scijava/script/AutoCompleter.java
index 632e7498b..334addd58 100644
--- a/src/main/java/org/scijava/script/AutoCompleter.java
+++ b/src/main/java/org/scijava/script/AutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/AutoCompletionResult.java b/src/main/java/org/scijava/script/AutoCompletionResult.java
index d3eecd426..8f5ac4d5c 100644
--- a/src/main/java/org/scijava/script/AutoCompletionResult.java
+++ b/src/main/java/org/scijava/script/AutoCompletionResult.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGenerator.java b/src/main/java/org/scijava/script/CodeGenerator.java
index fa2e6d624..894ce8f54 100644
--- a/src/main/java/org/scijava/script/CodeGenerator.java
+++ b/src/main/java/org/scijava/script/CodeGenerator.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/CodeGeneratorJava.java b/src/main/java/org/scijava/script/CodeGeneratorJava.java
index 61135865c..84e9e09c1 100644
--- a/src/main/java/org/scijava/script/CodeGeneratorJava.java
+++ b/src/main/java/org/scijava/script/CodeGeneratorJava.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultAutoCompleter.java b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
index ef3890a16..2de11644b 100644
--- a/src/main/java/org/scijava/script/DefaultAutoCompleter.java
+++ b/src/main/java/org/scijava/script/DefaultAutoCompleter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
index 3593d98da..284479134 100644
--- a/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
index b0e569824..d3448d373 100644
--- a/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/DefaultScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/DefaultScriptService.java b/src/main/java/org/scijava/script/DefaultScriptService.java
index ba308b947..72b2403d3 100644
--- a/src/main/java/org/scijava/script/DefaultScriptService.java
+++ b/src/main/java/org/scijava/script/DefaultScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/InvocationObject.java b/src/main/java/org/scijava/script/InvocationObject.java
index 6ec2e5260..3d9c0ce55 100644
--- a/src/main/java/org/scijava/script/InvocationObject.java
+++ b/src/main/java/org/scijava/script/InvocationObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ParameterObject.java b/src/main/java/org/scijava/script/ParameterObject.java
index f6d2ada7d..2f18323b8 100644
--- a/src/main/java/org/scijava/script/ParameterObject.java
+++ b/src/main/java/org/scijava/script/ParameterObject.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptCLI.java b/src/main/java/org/scijava/script/ScriptCLI.java
index f04d344b5..e20cf8918 100644
--- a/src/main/java/org/scijava/script/ScriptCLI.java
+++ b/src/main/java/org/scijava/script/ScriptCLI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java
index 27a7aa7b7..89e4c1b16 100644
--- a/src/main/java/org/scijava/script/ScriptFinder.java
+++ b/src/main/java/org/scijava/script/ScriptFinder.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeader.java b/src/main/java/org/scijava/script/ScriptHeader.java
index c1a3d3269..417551358 100644
--- a/src/main/java/org/scijava/script/ScriptHeader.java
+++ b/src/main/java/org/scijava/script/ScriptHeader.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptHeaderService.java b/src/main/java/org/scijava/script/ScriptHeaderService.java
index c697d90f2..a58dd7f81 100644
--- a/src/main/java/org/scijava/script/ScriptHeaderService.java
+++ b/src/main/java/org/scijava/script/ScriptHeaderService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
index a6c00d5c6..8b9f1734e 100644
--- a/src/main/java/org/scijava/script/ScriptInfo.java
+++ b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptInterpreter.java b/src/main/java/org/scijava/script/ScriptInterpreter.java
index 8faebc3c3..b48ad3254 100644
--- a/src/main/java/org/scijava/script/ScriptInterpreter.java
+++ b/src/main/java/org/scijava/script/ScriptInterpreter.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguage.java b/src/main/java/org/scijava/script/ScriptLanguage.java
index 4a5446292..af1c27fc5 100644
--- a/src/main/java/org/scijava/script/ScriptLanguage.java
+++ b/src/main/java/org/scijava/script/ScriptLanguage.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptLanguageIndex.java b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
index f3680e18b..b9e07d602 100644
--- a/src/main/java/org/scijava/script/ScriptLanguageIndex.java
+++ b/src/main/java/org/scijava/script/ScriptLanguageIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptModule.java b/src/main/java/org/scijava/script/ScriptModule.java
index b686b52a9..87fc5fb0d 100644
--- a/src/main/java/org/scijava/script/ScriptModule.java
+++ b/src/main/java/org/scijava/script/ScriptModule.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptREPL.java b/src/main/java/org/scijava/script/ScriptREPL.java
index 9c1b838dd..ec9e088c4 100644
--- a/src/main/java/org/scijava/script/ScriptREPL.java
+++ b/src/main/java/org/scijava/script/ScriptREPL.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/ScriptService.java b/src/main/java/org/scijava/script/ScriptService.java
index 6d1d5f5b5..e18e38d59 100644
--- a/src/main/java/org/scijava/script/ScriptService.java
+++ b/src/main/java/org/scijava/script/ScriptService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/console/RunScriptArgument.java b/src/main/java/org/scijava/script/console/RunScriptArgument.java
index df7335169..de6f3cbc6 100644
--- a/src/main/java/org/scijava/script/console/RunScriptArgument.java
+++ b/src/main/java/org/scijava/script/console/RunScriptArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
index dec94b517..6f466accd 100644
--- a/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
+++ b/src/main/java/org/scijava/script/io/ScriptIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
index 99fd73812..5995b618e 100644
--- a/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/DefaultScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
index 4b1fe8c34..c3646466e 100644
--- a/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/DirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
index d3988e9ef..cb030c8d2 100644
--- a/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ParameterScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptCallback.java b/src/main/java/org/scijava/script/process/ScriptCallback.java
index eaedad35c..849ab5f27 100644
--- a/src/main/java/org/scijava/script/process/ScriptCallback.java
+++ b/src/main/java/org/scijava/script/process/ScriptCallback.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
index 634d4cbc4..51c891acb 100644
--- a/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptDirectiveScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessor.java b/src/main/java/org/scijava/script/process/ScriptProcessor.java
index edeec681b..7e5347932 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ScriptProcessorService.java b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
index a73b4ebb7..e78250b4d 100644
--- a/src/main/java/org/scijava/script/process/ScriptProcessorService.java
+++ b/src/main/java/org/scijava/script/process/ScriptProcessorService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
index 6e3991590..188f50906 100644
--- a/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
+++ b/src/main/java/org/scijava/script/process/ShebangScriptProcessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
index d016431ee..86c73042b 100644
--- a/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
+++ b/src/main/java/org/scijava/script/run/ScriptCodeRunner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/AbstractService.java b/src/main/java/org/scijava/service/AbstractService.java
index ce04e97e7..d8f3ef1da 100644
--- a/src/main/java/org/scijava/service/AbstractService.java
+++ b/src/main/java/org/scijava/service/AbstractService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/SciJavaService.java b/src/main/java/org/scijava/service/SciJavaService.java
index eb311bd80..d252e1b52 100644
--- a/src/main/java/org/scijava/service/SciJavaService.java
+++ b/src/main/java/org/scijava/service/SciJavaService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/Service.java b/src/main/java/org/scijava/service/Service.java
index 13f2c1081..a7119ba21 100644
--- a/src/main/java/org/scijava/service/Service.java
+++ b/src/main/java/org/scijava/service/Service.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceHelper.java b/src/main/java/org/scijava/service/ServiceHelper.java
index 3b06233ca..0cf2a21ed 100644
--- a/src/main/java/org/scijava/service/ServiceHelper.java
+++ b/src/main/java/org/scijava/service/ServiceHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/ServiceIndex.java b/src/main/java/org/scijava/service/ServiceIndex.java
index f926883a0..910c6273d 100644
--- a/src/main/java/org/scijava/service/ServiceIndex.java
+++ b/src/main/java/org/scijava/service/ServiceIndex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
index fe0109129..e2fc6e3fe 100644
--- a/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
+++ b/src/main/java/org/scijava/service/event/ServicesLoadedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/DefaultStartupService.java b/src/main/java/org/scijava/startup/DefaultStartupService.java
index 8131b6bc2..d3b253a58 100644
--- a/src/main/java/org/scijava/startup/DefaultStartupService.java
+++ b/src/main/java/org/scijava/startup/DefaultStartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/startup/StartupService.java b/src/main/java/org/scijava/startup/StartupService.java
index 35e747b39..6446b3447 100644
--- a/src/main/java/org/scijava/startup/StartupService.java
+++ b/src/main/java/org/scijava/startup/StartupService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTask.java b/src/main/java/org/scijava/task/DefaultTask.java
index 048f7b773..310dd8f15 100644
--- a/src/main/java/org/scijava/task/DefaultTask.java
+++ b/src/main/java/org/scijava/task/DefaultTask.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/DefaultTaskService.java b/src/main/java/org/scijava/task/DefaultTaskService.java
index 147fd0eec..7a2016f51 100644
--- a/src/main/java/org/scijava/task/DefaultTaskService.java
+++ b/src/main/java/org/scijava/task/DefaultTaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/Task.java b/src/main/java/org/scijava/task/Task.java
index 1e8004e53..1dd539ab5 100644
--- a/src/main/java/org/scijava/task/Task.java
+++ b/src/main/java/org/scijava/task/Task.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/TaskService.java b/src/main/java/org/scijava/task/TaskService.java
index dfe5c0ffd..d3a46b7f9 100644
--- a/src/main/java/org/scijava/task/TaskService.java
+++ b/src/main/java/org/scijava/task/TaskService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/task/event/TaskEvent.java b/src/main/java/org/scijava/task/event/TaskEvent.java
index 83a5d662c..bb4cfb4dd 100644
--- a/src/main/java/org/scijava/task/event/TaskEvent.java
+++ b/src/main/java/org/scijava/task/event/TaskEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/test/TestUtils.java b/src/main/java/org/scijava/test/TestUtils.java
index c375f6994..fd4ed17c7 100644
--- a/src/main/java/org/scijava/test/TestUtils.java
+++ b/src/main/java/org/scijava/test/TestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/AbstractTextFormat.java b/src/main/java/org/scijava/text/AbstractTextFormat.java
index 766cb0874..f07498edd 100644
--- a/src/main/java/org/scijava/text/AbstractTextFormat.java
+++ b/src/main/java/org/scijava/text/AbstractTextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/DefaultTextService.java b/src/main/java/org/scijava/text/DefaultTextService.java
index 211fd25f2..9a562a334 100644
--- a/src/main/java/org/scijava/text/DefaultTextService.java
+++ b/src/main/java/org/scijava/text/DefaultTextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextFormat.java b/src/main/java/org/scijava/text/TextFormat.java
index 2ef04da75..66f5fc405 100644
--- a/src/main/java/org/scijava/text/TextFormat.java
+++ b/src/main/java/org/scijava/text/TextFormat.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/TextService.java b/src/main/java/org/scijava/text/TextService.java
index 5149b2a38..6884d700f 100644
--- a/src/main/java/org/scijava/text/TextService.java
+++ b/src/main/java/org/scijava/text/TextService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/DefaultTextIOService.java b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
index 21937f384..a16fc1933 100644
--- a/src/main/java/org/scijava/text/io/DefaultTextIOService.java
+++ b/src/main/java/org/scijava/text/io/DefaultTextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOPlugin.java b/src/main/java/org/scijava/text/io/TextIOPlugin.java
index 3e3d20efd..cd4d4e5c4 100644
--- a/src/main/java/org/scijava/text/io/TextIOPlugin.java
+++ b/src/main/java/org/scijava/text/io/TextIOPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/text/io/TextIOService.java b/src/main/java/org/scijava/text/io/TextIOService.java
index ed48ab424..d21d11c87 100644
--- a/src/main/java/org/scijava/text/io/TextIOService.java
+++ b/src/main/java/org/scijava/text/io/TextIOService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/DefaultThreadService.java b/src/main/java/org/scijava/thread/DefaultThreadService.java
index f34c38a6a..121dc74e1 100644
--- a/src/main/java/org/scijava/thread/DefaultThreadService.java
+++ b/src/main/java/org/scijava/thread/DefaultThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/thread/ThreadService.java b/src/main/java/org/scijava/thread/ThreadService.java
index b809a9a4b..3531fc2a3 100644
--- a/src/main/java/org/scijava/thread/ThreadService.java
+++ b/src/main/java/org/scijava/thread/ThreadService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/AbstractTool.java b/src/main/java/org/scijava/tool/AbstractTool.java
index e83ada645..35f3d0d0d 100644
--- a/src/main/java/org/scijava/tool/AbstractTool.java
+++ b/src/main/java/org/scijava/tool/AbstractTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/CustomDrawnTool.java b/src/main/java/org/scijava/tool/CustomDrawnTool.java
index 4222b14b0..b7e766542 100644
--- a/src/main/java/org/scijava/tool/CustomDrawnTool.java
+++ b/src/main/java/org/scijava/tool/CustomDrawnTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DefaultToolService.java b/src/main/java/org/scijava/tool/DefaultToolService.java
index d7d653399..a8ae89fe7 100644
--- a/src/main/java/org/scijava/tool/DefaultToolService.java
+++ b/src/main/java/org/scijava/tool/DefaultToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/DummyTool.java b/src/main/java/org/scijava/tool/DummyTool.java
index c2e858e00..f8b90807e 100644
--- a/src/main/java/org/scijava/tool/DummyTool.java
+++ b/src/main/java/org/scijava/tool/DummyTool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconDrawer.java b/src/main/java/org/scijava/tool/IconDrawer.java
index ff4b83a40..1c4778eb1 100644
--- a/src/main/java/org/scijava/tool/IconDrawer.java
+++ b/src/main/java/org/scijava/tool/IconDrawer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/IconService.java b/src/main/java/org/scijava/tool/IconService.java
index 02be9b223..8c7473dcb 100644
--- a/src/main/java/org/scijava/tool/IconService.java
+++ b/src/main/java/org/scijava/tool/IconService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/Tool.java b/src/main/java/org/scijava/tool/Tool.java
index c2a0d00f0..b42af857e 100644
--- a/src/main/java/org/scijava/tool/Tool.java
+++ b/src/main/java/org/scijava/tool/Tool.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/ToolService.java b/src/main/java/org/scijava/tool/ToolService.java
index 020a3e891..061f3fed4 100644
--- a/src/main/java/org/scijava/tool/ToolService.java
+++ b/src/main/java/org/scijava/tool/ToolService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
index 6df9190ef..3ab52fca2 100644
--- a/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolActivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
index 78569c9ea..fc61e8332 100644
--- a/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolDeactivatedEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/tool/event/ToolEvent.java b/src/main/java/org/scijava/tool/event/ToolEvent.java
index 85aed4d60..f55392dc8 100644
--- a/src/main/java/org/scijava/tool/event/ToolEvent.java
+++ b/src/main/java/org/scijava/tool/event/ToolEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ARGBPlane.java b/src/main/java/org/scijava/ui/ARGBPlane.java
index ff21f7bd7..7d158e366 100644
--- a/src/main/java/org/scijava/ui/ARGBPlane.java
+++ b/src/main/java/org/scijava/ui/ARGBPlane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
index a31e09d59..71afdf0cc 100644
--- a/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
+++ b/src/main/java/org/scijava/ui/AbstractInputHarvesterPlugin.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
index 32d324ef1..04561a123 100644
--- a/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
+++ b/src/main/java/org/scijava/ui/AbstractUIInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/AbstractUserInterface.java b/src/main/java/org/scijava/ui/AbstractUserInterface.java
index d1b91e527..8b5e426a5 100644
--- a/src/main/java/org/scijava/ui/AbstractUserInterface.java
+++ b/src/main/java/org/scijava/ui/AbstractUserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ApplicationFrame.java b/src/main/java/org/scijava/ui/ApplicationFrame.java
index 57fc6083f..571ab621e 100644
--- a/src/main/java/org/scijava/ui/ApplicationFrame.java
+++ b/src/main/java/org/scijava/ui/ApplicationFrame.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Arrangeable.java b/src/main/java/org/scijava/ui/Arrangeable.java
index 2385868c5..1b92b5768 100644
--- a/src/main/java/org/scijava/ui/Arrangeable.java
+++ b/src/main/java/org/scijava/ui/Arrangeable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/CloseConfirmable.java b/src/main/java/org/scijava/ui/CloseConfirmable.java
index 331f50861..73e657b63 100644
--- a/src/main/java/org/scijava/ui/CloseConfirmable.java
+++ b/src/main/java/org/scijava/ui/CloseConfirmable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java
index 5d4d7299d..7c8103a4c 100644
--- a/src/main/java/org/scijava/ui/DefaultUIService.java
+++ b/src/main/java/org/scijava/ui/DefaultUIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/Desktop.java b/src/main/java/org/scijava/ui/Desktop.java
index 11aa766f4..4e39f09dd 100644
--- a/src/main/java/org/scijava/ui/Desktop.java
+++ b/src/main/java/org/scijava/ui/Desktop.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/DialogPrompt.java b/src/main/java/org/scijava/ui/DialogPrompt.java
index fc59a3c05..0f598875a 100644
--- a/src/main/java/org/scijava/ui/DialogPrompt.java
+++ b/src/main/java/org/scijava/ui/DialogPrompt.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FileListPreprocessor.java b/src/main/java/org/scijava/ui/FileListPreprocessor.java
index c18810629..9d8da8f0b 100644
--- a/src/main/java/org/scijava/ui/FileListPreprocessor.java
+++ b/src/main/java/org/scijava/ui/FileListPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/FilePreprocessor.java b/src/main/java/org/scijava/ui/FilePreprocessor.java
index 909e84c06..0e4a52d97 100644
--- a/src/main/java/org/scijava/ui/FilePreprocessor.java
+++ b/src/main/java/org/scijava/ui/FilePreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/StatusBar.java b/src/main/java/org/scijava/ui/StatusBar.java
index 19ad8acb8..009a5a7e0 100644
--- a/src/main/java/org/scijava/ui/StatusBar.java
+++ b/src/main/java/org/scijava/ui/StatusBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/SystemClipboard.java b/src/main/java/org/scijava/ui/SystemClipboard.java
index d897285e7..a2f5b2c59 100644
--- a/src/main/java/org/scijava/ui/SystemClipboard.java
+++ b/src/main/java/org/scijava/ui/SystemClipboard.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/ToolBar.java b/src/main/java/org/scijava/ui/ToolBar.java
index b14ceb0fa..289dbc8b4 100644
--- a/src/main/java/org/scijava/ui/ToolBar.java
+++ b/src/main/java/org/scijava/ui/ToolBar.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIPreprocessor.java b/src/main/java/org/scijava/ui/UIPreprocessor.java
index 36fd91147..d9af6ebca 100644
--- a/src/main/java/org/scijava/ui/UIPreprocessor.java
+++ b/src/main/java/org/scijava/ui/UIPreprocessor.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UIService.java b/src/main/java/org/scijava/ui/UIService.java
index 84f4b23ef..a86652b8e 100644
--- a/src/main/java/org/scijava/ui/UIService.java
+++ b/src/main/java/org/scijava/ui/UIService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/UserInterface.java b/src/main/java/org/scijava/ui/UserInterface.java
index 5133008eb..c2808bdc1 100644
--- a/src/main/java/org/scijava/ui/UserInterface.java
+++ b/src/main/java/org/scijava/ui/UserInterface.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
index abe9177e7..1657a42e4 100644
--- a/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/AbstractConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ConsolePane.java b/src/main/java/org/scijava/ui/console/ConsolePane.java
index c2214bd61..de3c876b0 100644
--- a/src/main/java/org/scijava/ui/console/ConsolePane.java
+++ b/src/main/java/org/scijava/ui/console/ConsolePane.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/HeadlessArgument.java b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
index ab4eea39e..821dd516e 100644
--- a/src/main/java/org/scijava/ui/console/HeadlessArgument.java
+++ b/src/main/java/org/scijava/ui/console/HeadlessArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/ShowUIArgument.java b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
index b07e618e9..00b7a192f 100644
--- a/src/main/java/org/scijava/ui/console/ShowUIArgument.java
+++ b/src/main/java/org/scijava/ui/console/ShowUIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/console/UIArgument.java b/src/main/java/org/scijava/ui/console/UIArgument.java
index 1622d1e0d..8f962fbe7 100644
--- a/src/main/java/org/scijava/ui/console/UIArgument.java
+++ b/src/main/java/org/scijava/ui/console/UIArgument.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
index fe0b3da6a..0e9d59514 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
index cb25e57ce..77bf71ca0 100644
--- a/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/AbstractDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
index 1c278a394..e6095d0ea 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
index e18db980b..4b36ad97d 100644
--- a/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DefaultDragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
index 4dd73dbd0..2d3c6f856 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropData.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
index 1b793784c..419ef09e6 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
index f1de3ddb9..d63c06e53 100644
--- a/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
+++ b/src/main/java/org/scijava/ui/dnd/DragAndDropService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
index 62684957f..4e16054f7 100644
--- a/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/FileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
index 64febfa13..0057d863e 100644
--- a/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ListDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/MIMEType.java b/src/main/java/org/scijava/ui/dnd/MIMEType.java
index 4d7f01307..71e1f13f1 100644
--- a/src/main/java/org/scijava/ui/dnd/MIMEType.java
+++ b/src/main/java/org/scijava/ui/dnd/MIMEType.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
index 5298fc946..f456671ae 100644
--- a/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
+++ b/src/main/java/org/scijava/ui/dnd/ScriptFileDragAndDropHandler.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
index 83b15db9e..4aecd6b8b 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragAndDropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
index 5c93dff04..7b09815ba 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragEnterEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
index 0576666e8..5f07f0b9d 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragExitEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
index df28afbb5..7baeaa77e 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DragOverEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
index d1000d5d3..2775e56f0 100644
--- a/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
+++ b/src/main/java/org/scijava/ui/dnd/event/DropEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIEvent.java b/src/main/java/org/scijava/ui/event/UIEvent.java
index 8a0892f1a..84a32ed63 100644
--- a/src/main/java/org/scijava/ui/event/UIEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/event/UIShownEvent.java b/src/main/java/org/scijava/ui/event/UIShownEvent.java
index 957efb500..2de7f2685 100644
--- a/src/main/java/org/scijava/ui/event/UIShownEvent.java
+++ b/src/main/java/org/scijava/ui/event/UIShownEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
index af6b6c902..dc65aae76 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headless/HeadlessUI.java b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
index 654b42e7f..04536a6c0 100644
--- a/src/main/java/org/scijava/ui/headless/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headless/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
index 3c55c9cd2..d473685b3 100644
--- a/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
+++ b/src/main/java/org/scijava/ui/headlessUI/HeadlessUI.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
index 3bda15d67..418f43830 100644
--- a/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/AbstractDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
index 691b42687..3f88949e4 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
index eb439e8f6..9698cb56e 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
index 14654e681..c6397ed6e 100644
--- a/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
+++ b/src/main/java/org/scijava/ui/viewer/DisplayWindow.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
index b53271ee6..e19a33e18 100644
--- a/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/AbstractTextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
index cd53bdc2d..107d46aa8 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
index 8799c7ec7..4efb2adb1 100644
--- a/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
+++ b/src/main/java/org/scijava/ui/viewer/text/TextDisplayViewer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
index def8f4eb9..6b284c0c3 100644
--- a/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
+++ b/src/main/java/org/scijava/util/AbstractPrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/AppUtils.java b/src/main/java/org/scijava/util/AppUtils.java
index b65cce633..134aa2ac4 100644
--- a/src/main/java/org/scijava/util/AppUtils.java
+++ b/src/main/java/org/scijava/util/AppUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ArrayUtils.java b/src/main/java/org/scijava/util/ArrayUtils.java
index f2059c2c7..42afdfbcb 100644
--- a/src/main/java/org/scijava/util/ArrayUtils.java
+++ b/src/main/java/org/scijava/util/ArrayUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/BoolArray.java b/src/main/java/org/scijava/util/BoolArray.java
index 32ff8e8b4..d0d6589b7 100644
--- a/src/main/java/org/scijava/util/BoolArray.java
+++ b/src/main/java/org/scijava/util/BoolArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ByteArray.java b/src/main/java/org/scijava/util/ByteArray.java
index 4d7a72d28..ad092abb5 100644
--- a/src/main/java/org/scijava/util/ByteArray.java
+++ b/src/main/java/org/scijava/util/ByteArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Bytes.java b/src/main/java/org/scijava/util/Bytes.java
index 45f8c70af..5b56f8d03 100644
--- a/src/main/java/org/scijava/util/Bytes.java
+++ b/src/main/java/org/scijava/util/Bytes.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CharArray.java b/src/main/java/org/scijava/util/CharArray.java
index 099db97ec..8459597da 100644
--- a/src/main/java/org/scijava/util/CharArray.java
+++ b/src/main/java/org/scijava/util/CharArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CheckSezpoz.java b/src/main/java/org/scijava/util/CheckSezpoz.java
index fa9be7491..d5f384f9e 100644
--- a/src/main/java/org/scijava/util/CheckSezpoz.java
+++ b/src/main/java/org/scijava/util/CheckSezpoz.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ClassUtils.java b/src/main/java/org/scijava/util/ClassUtils.java
index 09961183e..e9e7e4dc0 100644
--- a/src/main/java/org/scijava/util/ClassUtils.java
+++ b/src/main/java/org/scijava/util/ClassUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGB.java b/src/main/java/org/scijava/util/ColorRGB.java
index 305fbbbe0..5cbcfb181 100644
--- a/src/main/java/org/scijava/util/ColorRGB.java
+++ b/src/main/java/org/scijava/util/ColorRGB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ColorRGBA.java b/src/main/java/org/scijava/util/ColorRGBA.java
index 4bab90ddc..34f2dac25 100644
--- a/src/main/java/org/scijava/util/ColorRGBA.java
+++ b/src/main/java/org/scijava/util/ColorRGBA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index 60fa3dc8c..fcc65027b 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/CombineAnnotations.java b/src/main/java/org/scijava/util/CombineAnnotations.java
index 11ed3f879..b248d64b3 100644
--- a/src/main/java/org/scijava/util/CombineAnnotations.java
+++ b/src/main/java/org/scijava/util/CombineAnnotations.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Combiner.java b/src/main/java/org/scijava/util/Combiner.java
index ce758eed0..209c57c08 100644
--- a/src/main/java/org/scijava/util/Combiner.java
+++ b/src/main/java/org/scijava/util/Combiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ConversionUtils.java b/src/main/java/org/scijava/util/ConversionUtils.java
index b902d2335..e1dd17570 100644
--- a/src/main/java/org/scijava/util/ConversionUtils.java
+++ b/src/main/java/org/scijava/util/ConversionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DebugUtils.java b/src/main/java/org/scijava/util/DebugUtils.java
index e7ce7cb53..44e28f780 100644
--- a/src/main/java/org/scijava/util/DebugUtils.java
+++ b/src/main/java/org/scijava/util/DebugUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DefaultTreeNode.java b/src/main/java/org/scijava/util/DefaultTreeNode.java
index 8c9290a78..e2c97985d 100644
--- a/src/main/java/org/scijava/util/DefaultTreeNode.java
+++ b/src/main/java/org/scijava/util/DefaultTreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DigestUtils.java b/src/main/java/org/scijava/util/DigestUtils.java
index 172f54a9a..84a79eb66 100644
--- a/src/main/java/org/scijava/util/DigestUtils.java
+++ b/src/main/java/org/scijava/util/DigestUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/DoubleArray.java b/src/main/java/org/scijava/util/DoubleArray.java
index a75b9b266..de007478c 100644
--- a/src/main/java/org/scijava/util/DoubleArray.java
+++ b/src/main/java/org/scijava/util/DoubleArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index a233d7fd5..2761edf73 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/FloatArray.java b/src/main/java/org/scijava/util/FloatArray.java
index 1911dcd7a..49046497a 100644
--- a/src/main/java/org/scijava/util/FloatArray.java
+++ b/src/main/java/org/scijava/util/FloatArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/GenericUtils.java b/src/main/java/org/scijava/util/GenericUtils.java
index f73fc78f6..9cdb71614 100644
--- a/src/main/java/org/scijava/util/GenericUtils.java
+++ b/src/main/java/org/scijava/util/GenericUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntArray.java b/src/main/java/org/scijava/util/IntArray.java
index 4916ca205..f3c6a8e71 100644
--- a/src/main/java/org/scijava/util/IntArray.java
+++ b/src/main/java/org/scijava/util/IntArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntCoords.java b/src/main/java/org/scijava/util/IntCoords.java
index 8110aa996..d0498a7f3 100644
--- a/src/main/java/org/scijava/util/IntCoords.java
+++ b/src/main/java/org/scijava/util/IntCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IntRect.java b/src/main/java/org/scijava/util/IntRect.java
index be12b1035..33670744f 100644
--- a/src/main/java/org/scijava/util/IntRect.java
+++ b/src/main/java/org/scijava/util/IntRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/IteratorPlus.java b/src/main/java/org/scijava/util/IteratorPlus.java
index 5a28e023d..35c9cd3b6 100644
--- a/src/main/java/org/scijava/util/IteratorPlus.java
+++ b/src/main/java/org/scijava/util/IteratorPlus.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LastRecentlyUsed.java b/src/main/java/org/scijava/util/LastRecentlyUsed.java
index 83afb110f..50d292856 100644
--- a/src/main/java/org/scijava/util/LastRecentlyUsed.java
+++ b/src/main/java/org/scijava/util/LastRecentlyUsed.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LineOutputStream.java b/src/main/java/org/scijava/util/LineOutputStream.java
index 2f4ad2d19..b0cd47e87 100644
--- a/src/main/java/org/scijava/util/LineOutputStream.java
+++ b/src/main/java/org/scijava/util/LineOutputStream.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ListUtils.java b/src/main/java/org/scijava/util/ListUtils.java
index e423fa616..8f07d06a3 100644
--- a/src/main/java/org/scijava/util/ListUtils.java
+++ b/src/main/java/org/scijava/util/ListUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/LongArray.java b/src/main/java/org/scijava/util/LongArray.java
index 351580338..12ae4a737 100644
--- a/src/main/java/org/scijava/util/LongArray.java
+++ b/src/main/java/org/scijava/util/LongArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Manifest.java b/src/main/java/org/scijava/util/Manifest.java
index 6e4cd5dd3..58100535e 100644
--- a/src/main/java/org/scijava/util/Manifest.java
+++ b/src/main/java/org/scijava/util/Manifest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index 9bad0ab73..e1cdb4a48 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MetaInfCombiner.java b/src/main/java/org/scijava/util/MetaInfCombiner.java
index 63582c0cc..3d03195f6 100644
--- a/src/main/java/org/scijava/util/MetaInfCombiner.java
+++ b/src/main/java/org/scijava/util/MetaInfCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MirrorWebsite.java b/src/main/java/org/scijava/util/MirrorWebsite.java
index ec807ab8e..2b5bdf4f9 100644
--- a/src/main/java/org/scijava/util/MirrorWebsite.java
+++ b/src/main/java/org/scijava/util/MirrorWebsite.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/MiscUtils.java b/src/main/java/org/scijava/util/MiscUtils.java
index 4476e9a4b..eb9fad0c1 100644
--- a/src/main/java/org/scijava/util/MiscUtils.java
+++ b/src/main/java/org/scijava/util/MiscUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
index 11a228345..ba3fdc6d9 100644
--- a/src/main/java/org/scijava/util/NumberUtils.java
+++ b/src/main/java/org/scijava/util/NumberUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
index aa12acc08..daaa6e7ed 100644
--- a/src/main/java/org/scijava/util/ObjectArray.java
+++ b/src/main/java/org/scijava/util/ObjectArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/POM.java b/src/main/java/org/scijava/util/POM.java
index 54c0434ab..ed7dc8009 100644
--- a/src/main/java/org/scijava/util/POM.java
+++ b/src/main/java/org/scijava/util/POM.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PlatformUtils.java b/src/main/java/org/scijava/util/PlatformUtils.java
index 215759cac..a8b8cf909 100644
--- a/src/main/java/org/scijava/util/PlatformUtils.java
+++ b/src/main/java/org/scijava/util/PlatformUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Prefs.java b/src/main/java/org/scijava/util/Prefs.java
index 72f63bac7..f70bd70d1 100644
--- a/src/main/java/org/scijava/util/Prefs.java
+++ b/src/main/java/org/scijava/util/Prefs.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PrimitiveArray.java b/src/main/java/org/scijava/util/PrimitiveArray.java
index 51ac3f30a..6efb5e463 100644
--- a/src/main/java/org/scijava/util/PrimitiveArray.java
+++ b/src/main/java/org/scijava/util/PrimitiveArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ProcessUtils.java b/src/main/java/org/scijava/util/ProcessUtils.java
index 3b23b3c1c..2e5cb62e5 100644
--- a/src/main/java/org/scijava/util/ProcessUtils.java
+++ b/src/main/java/org/scijava/util/ProcessUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/PropertiesHelper.java b/src/main/java/org/scijava/util/PropertiesHelper.java
index bfbac09e2..c2abeb78b 100644
--- a/src/main/java/org/scijava/util/PropertiesHelper.java
+++ b/src/main/java/org/scijava/util/PropertiesHelper.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Query.java b/src/main/java/org/scijava/util/Query.java
index 008b84efa..7217b290e 100644
--- a/src/main/java/org/scijava/util/Query.java
+++ b/src/main/java/org/scijava/util/Query.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReadInto.java b/src/main/java/org/scijava/util/ReadInto.java
index 559b87304..cefca34fd 100644
--- a/src/main/java/org/scijava/util/ReadInto.java
+++ b/src/main/java/org/scijava/util/ReadInto.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealCoords.java b/src/main/java/org/scijava/util/RealCoords.java
index 97e61e00c..fd949dbbf 100644
--- a/src/main/java/org/scijava/util/RealCoords.java
+++ b/src/main/java/org/scijava/util/RealCoords.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/RealRect.java b/src/main/java/org/scijava/util/RealRect.java
index 4f355cd73..507406235 100644
--- a/src/main/java/org/scijava/util/RealRect.java
+++ b/src/main/java/org/scijava/util/RealRect.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectException.java b/src/main/java/org/scijava/util/ReflectException.java
index 3402b78f9..bc4e0f246 100644
--- a/src/main/java/org/scijava/util/ReflectException.java
+++ b/src/main/java/org/scijava/util/ReflectException.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ReflectedUniverse.java b/src/main/java/org/scijava/util/ReflectedUniverse.java
index fd7aa908a..c43a05dab 100644
--- a/src/main/java/org/scijava/util/ReflectedUniverse.java
+++ b/src/main/java/org/scijava/util/ReflectedUniverse.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ServiceCombiner.java b/src/main/java/org/scijava/util/ServiceCombiner.java
index ea9bd034c..64053aa7c 100644
--- a/src/main/java/org/scijava/util/ServiceCombiner.java
+++ b/src/main/java/org/scijava/util/ServiceCombiner.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/ShortArray.java b/src/main/java/org/scijava/util/ShortArray.java
index 354d31031..935bf6b96 100644
--- a/src/main/java/org/scijava/util/ShortArray.java
+++ b/src/main/java/org/scijava/util/ShortArray.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Sizable.java b/src/main/java/org/scijava/util/Sizable.java
index a1a8d82eb..21a1466d7 100644
--- a/src/main/java/org/scijava/util/Sizable.java
+++ b/src/main/java/org/scijava/util/Sizable.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index 11eb6bdc0..889135a44 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringMaker.java b/src/main/java/org/scijava/util/StringMaker.java
index 809b1a5c9..3df9b8786 100644
--- a/src/main/java/org/scijava/util/StringMaker.java
+++ b/src/main/java/org/scijava/util/StringMaker.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/StringUtils.java b/src/main/java/org/scijava/util/StringUtils.java
index 90b2e9756..a38afb144 100644
--- a/src/main/java/org/scijava/util/StringUtils.java
+++ b/src/main/java/org/scijava/util/StringUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Timing.java b/src/main/java/org/scijava/util/Timing.java
index 8a4dcfe39..9cd4a1863 100644
--- a/src/main/java/org/scijava/util/Timing.java
+++ b/src/main/java/org/scijava/util/Timing.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TreeNode.java b/src/main/java/org/scijava/util/TreeNode.java
index 20af64acc..f302f9e59 100644
--- a/src/main/java/org/scijava/util/TreeNode.java
+++ b/src/main/java/org/scijava/util/TreeNode.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/TunePlayer.java b/src/main/java/org/scijava/util/TunePlayer.java
index a36fa353d..8ade8a695 100644
--- a/src/main/java/org/scijava/util/TunePlayer.java
+++ b/src/main/java/org/scijava/util/TunePlayer.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index a75ef8311..f9c9068a9 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
index 445f16046..43c13f1cb 100644
--- a/src/main/java/org/scijava/util/UnitUtils.java
+++ b/src/main/java/org/scijava/util/UnitUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/VersionUtils.java b/src/main/java/org/scijava/util/VersionUtils.java
index ea012b9a1..2d7e97a32 100644
--- a/src/main/java/org/scijava/util/VersionUtils.java
+++ b/src/main/java/org/scijava/util/VersionUtils.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/util/XML.java b/src/main/java/org/scijava/util/XML.java
index 5a3f0a049..0dcbb1126 100644
--- a/src/main/java/org/scijava/util/XML.java
+++ b/src/main/java/org/scijava/util/XML.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
index b9af9fd48..8977b0001 100644
--- a/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
+++ b/src/main/java/org/scijava/welcome/DefaultWelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/WelcomeService.java b/src/main/java/org/scijava/welcome/WelcomeService.java
index ac690f3bc..8e2f77aec 100644
--- a/src/main/java/org/scijava/welcome/WelcomeService.java
+++ b/src/main/java/org/scijava/welcome/WelcomeService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
index 2f38dc848..6f9c5946c 100644
--- a/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
+++ b/src/main/java/org/scijava/welcome/event/WelcomeEvent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputHarvester.java b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
index 5b9e59ec5..0785fa157 100644
--- a/src/main/java/org/scijava/widget/AbstractInputHarvester.java
+++ b/src/main/java/org/scijava/widget/AbstractInputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputPanel.java b/src/main/java/org/scijava/widget/AbstractInputPanel.java
index 5b6637b19..756f5ed15 100644
--- a/src/main/java/org/scijava/widget/AbstractInputPanel.java
+++ b/src/main/java/org/scijava/widget/AbstractInputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/AbstractInputWidget.java b/src/main/java/org/scijava/widget/AbstractInputWidget.java
index bedf6d594..b6304cfd3 100644
--- a/src/main/java/org/scijava/widget/AbstractInputWidget.java
+++ b/src/main/java/org/scijava/widget/AbstractInputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/Button.java b/src/main/java/org/scijava/widget/Button.java
index 0768762a2..3ddfa0217 100644
--- a/src/main/java/org/scijava/widget/Button.java
+++ b/src/main/java/org/scijava/widget/Button.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ButtonWidget.java b/src/main/java/org/scijava/widget/ButtonWidget.java
index a56b33065..c836c522d 100644
--- a/src/main/java/org/scijava/widget/ButtonWidget.java
+++ b/src/main/java/org/scijava/widget/ButtonWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ChoiceWidget.java b/src/main/java/org/scijava/widget/ChoiceWidget.java
index 25ff52afe..275b39607 100644
--- a/src/main/java/org/scijava/widget/ChoiceWidget.java
+++ b/src/main/java/org/scijava/widget/ChoiceWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ColorWidget.java b/src/main/java/org/scijava/widget/ColorWidget.java
index 427f64922..93573a5ca 100644
--- a/src/main/java/org/scijava/widget/ColorWidget.java
+++ b/src/main/java/org/scijava/widget/ColorWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DateWidget.java b/src/main/java/org/scijava/widget/DateWidget.java
index 4cc60c0b5..ecd9953cb 100644
--- a/src/main/java/org/scijava/widget/DateWidget.java
+++ b/src/main/java/org/scijava/widget/DateWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 7bea4bc8c..0fa35593f 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetService.java b/src/main/java/org/scijava/widget/DefaultWidgetService.java
index 6f35b2efa..7ceaf2c45 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetService.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileListWidget.java b/src/main/java/org/scijava/widget/FileListWidget.java
index fc310519b..466f51d2f 100644
--- a/src/main/java/org/scijava/widget/FileListWidget.java
+++ b/src/main/java/org/scijava/widget/FileListWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/FileWidget.java b/src/main/java/org/scijava/widget/FileWidget.java
index 5567cb967..dcf38039d 100644
--- a/src/main/java/org/scijava/widget/FileWidget.java
+++ b/src/main/java/org/scijava/widget/FileWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputHarvester.java b/src/main/java/org/scijava/widget/InputHarvester.java
index fe27f5480..c0638cd96 100644
--- a/src/main/java/org/scijava/widget/InputHarvester.java
+++ b/src/main/java/org/scijava/widget/InputHarvester.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputPanel.java b/src/main/java/org/scijava/widget/InputPanel.java
index f937027bc..27869b777 100644
--- a/src/main/java/org/scijava/widget/InputPanel.java
+++ b/src/main/java/org/scijava/widget/InputPanel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/InputWidget.java b/src/main/java/org/scijava/widget/InputWidget.java
index 221c3770b..fe12174a0 100644
--- a/src/main/java/org/scijava/widget/InputWidget.java
+++ b/src/main/java/org/scijava/widget/InputWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/MessageWidget.java b/src/main/java/org/scijava/widget/MessageWidget.java
index 20347c3b2..fe4877975 100644
--- a/src/main/java/org/scijava/widget/MessageWidget.java
+++ b/src/main/java/org/scijava/widget/MessageWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/NumberWidget.java b/src/main/java/org/scijava/widget/NumberWidget.java
index 79bfa46cd..f0aaefe28 100644
--- a/src/main/java/org/scijava/widget/NumberWidget.java
+++ b/src/main/java/org/scijava/widget/NumberWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ObjectWidget.java b/src/main/java/org/scijava/widget/ObjectWidget.java
index 27c9560c6..925826ab9 100644
--- a/src/main/java/org/scijava/widget/ObjectWidget.java
+++ b/src/main/java/org/scijava/widget/ObjectWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/TextWidget.java b/src/main/java/org/scijava/widget/TextWidget.java
index 716750d69..401d22076 100644
--- a/src/main/java/org/scijava/widget/TextWidget.java
+++ b/src/main/java/org/scijava/widget/TextWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/ToggleWidget.java b/src/main/java/org/scijava/widget/ToggleWidget.java
index 8a56a9662..11c028862 100644
--- a/src/main/java/org/scijava/widget/ToggleWidget.java
+++ b/src/main/java/org/scijava/widget/ToggleWidget.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/UIComponent.java b/src/main/java/org/scijava/widget/UIComponent.java
index 2b7f56e0a..e36fcd919 100644
--- a/src/main/java/org/scijava/widget/UIComponent.java
+++ b/src/main/java/org/scijava/widget/UIComponent.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index a2ee20dcd..7175a44de 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetService.java b/src/main/java/org/scijava/widget/WidgetService.java
index 01857a29c..88bb00e93 100644
--- a/src/main/java/org/scijava/widget/WidgetService.java
+++ b/src/main/java/org/scijava/widget/WidgetService.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/main/java/org/scijava/widget/WidgetStyle.java b/src/main/java/org/scijava/widget/WidgetStyle.java
index 65491717d..ddd56824d 100644
--- a/src/main/java/org/scijava/widget/WidgetStyle.java
+++ b/src/main/java/org/scijava/widget/WidgetStyle.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
index 9b5769ef3..4760fa340 100644
--- a/src/test/java/org/scijava/ContextCreationTest.java
+++ b/src/test/java/org/scijava/ContextCreationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextDisposalTest.java b/src/test/java/org/scijava/ContextDisposalTest.java
index 4f66ab6f9..50f4a1369 100644
--- a/src/test/java/org/scijava/ContextDisposalTest.java
+++ b/src/test/java/org/scijava/ContextDisposalTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ContextInjectionTest.java b/src/test/java/org/scijava/ContextInjectionTest.java
index df3c46ece..7393056fc 100644
--- a/src/test/java/org/scijava/ContextInjectionTest.java
+++ b/src/test/java/org/scijava/ContextInjectionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/SciJavaTest.java b/src/test/java/org/scijava/SciJavaTest.java
index 9daf637c6..2a34e6607 100644
--- a/src/test/java/org/scijava/SciJavaTest.java
+++ b/src/test/java/org/scijava/SciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedA.java b/src/test/java/org/scijava/annotations/AnnotatedA.java
index 4c9977496..6bf9c3864 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedA.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedA.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedB.java b/src/test/java/org/scijava/annotations/AnnotatedB.java
index 46ccb442c..d723d0e76 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedB.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedB.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedC.java b/src/test/java/org/scijava/annotations/AnnotatedC.java
index 777b949f4..a5e4977b4 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedC.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedC.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedD.java b/src/test/java/org/scijava/annotations/AnnotatedD.java
index d898df6d7..d1a42b98e 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedD.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedD.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
index 96ed33157..9f2304ff5 100644
--- a/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
+++ b/src/test/java/org/scijava/annotations/AnnotatedInnerClass.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Complex.java b/src/test/java/org/scijava/annotations/Complex.java
index f7cb7e0ec..554afabee 100644
--- a/src/test/java/org/scijava/annotations/Complex.java
+++ b/src/test/java/org/scijava/annotations/Complex.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
index 8a6d243e4..0046a6c7a 100644
--- a/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
+++ b/src/test/java/org/scijava/annotations/DirectoryIndexerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/EclipseHelperTest.java b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
index 6bd63ace5..9acf9e1d9 100644
--- a/src/test/java/org/scijava/annotations/EclipseHelperTest.java
+++ b/src/test/java/org/scijava/annotations/EclipseHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Fruit.java b/src/test/java/org/scijava/annotations/Fruit.java
index 9ffb333cd..59fd00b47 100644
--- a/src/test/java/org/scijava/annotations/Fruit.java
+++ b/src/test/java/org/scijava/annotations/Fruit.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/LegacyTest.java b/src/test/java/org/scijava/annotations/LegacyTest.java
index 6bf5d5d13..4734a4763 100644
--- a/src/test/java/org/scijava/annotations/LegacyTest.java
+++ b/src/test/java/org/scijava/annotations/LegacyTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
index 90b426367..87a63ddf7 100644
--- a/src/test/java/org/scijava/annotations/Simple.java
+++ b/src/test/java/org/scijava/annotations/Simple.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/app/StatusServiceTest.java b/src/test/java/org/scijava/app/StatusServiceTest.java
index 1209d4049..dbca89909 100644
--- a/src/test/java/org/scijava/app/StatusServiceTest.java
+++ b/src/test/java/org/scijava/app/StatusServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandArrayConverterTest.java b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
index 8531a3dfa..7a9915a47 100644
--- a/src/test/java/org/scijava/command/CommandArrayConverterTest.java
+++ b/src/test/java/org/scijava/command/CommandArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandInfoTest.java b/src/test/java/org/scijava/command/CommandInfoTest.java
index 6f1cf1128..0811f0f44 100644
--- a/src/test/java/org/scijava/command/CommandInfoTest.java
+++ b/src/test/java/org/scijava/command/CommandInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandModuleTest.java b/src/test/java/org/scijava/command/CommandModuleTest.java
index 9fb32074f..50080055d 100644
--- a/src/test/java/org/scijava/command/CommandModuleTest.java
+++ b/src/test/java/org/scijava/command/CommandModuleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/CommandServiceTest.java b/src/test/java/org/scijava/command/CommandServiceTest.java
index ef34da9a4..9465b37ff 100644
--- a/src/test/java/org/scijava/command/CommandServiceTest.java
+++ b/src/test/java/org/scijava/command/CommandServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InputsTest.java b/src/test/java/org/scijava/command/InputsTest.java
index 3cdc8c35b..9ca5e46b2 100644
--- a/src/test/java/org/scijava/command/InputsTest.java
+++ b/src/test/java/org/scijava/command/InputsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/InvalidCommandTest.java b/src/test/java/org/scijava/command/InvalidCommandTest.java
index e3f64b268..84a60851d 100644
--- a/src/test/java/org/scijava/command/InvalidCommandTest.java
+++ b/src/test/java/org/scijava/command/InvalidCommandTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
index 466df6426..d45954aa7 100644
--- a/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
+++ b/src/test/java/org/scijava/command/run/CommandCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/ConsoleServiceTest.java b/src/test/java/org/scijava/console/ConsoleServiceTest.java
index 8a2760e85..f7e36062a 100644
--- a/src/test/java/org/scijava/console/ConsoleServiceTest.java
+++ b/src/test/java/org/scijava/console/ConsoleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
index a45c7823e..63aae7e48 100644
--- a/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
+++ b/src/test/java/org/scijava/console/SystemPropertyArgumentTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
index 8e7aac26b..d6427e3fc 100644
--- a/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
+++ b/src/test/java/org/scijava/convert/AbstractNumberConverterTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
index 0d1f7ef28..7393d0261 100644
--- a/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
+++ b/src/test/java/org/scijava/convert/ArrayToStringConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
index 228ff9e3b..9b166ee23 100644
--- a/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/BigIntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
index 638b0caf0..50e44776d 100644
--- a/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
index 381b2f5ac..11ac2238b 100644
--- a/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
index 43d2c62ef..f871cfeff 100644
--- a/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
index 286f358a5..ff08de5b4 100644
--- a/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
index f4607db21..c19a70311 100644
--- a/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
index 38ffd40aa..58a68e7bc 100644
--- a/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
index c1e542e12..598e9857f 100644
--- a/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
+++ b/src/test/java/org/scijava/convert/ByteToShortConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConvertServiceTest.java b/src/test/java/org/scijava/convert/ConvertServiceTest.java
index 80fe29337..ddb50acab 100644
--- a/src/test/java/org/scijava/convert/ConvertServiceTest.java
+++ b/src/test/java/org/scijava/convert/ConvertServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ConverterTest.java b/src/test/java/org/scijava/convert/ConverterTest.java
index cf9564346..3b29ac76f 100644
--- a/src/test/java/org/scijava/convert/ConverterTest.java
+++ b/src/test/java/org/scijava/convert/ConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DefaultConverterTest.java b/src/test/java/org/scijava/convert/DefaultConverterTest.java
index af04d34ad..e591ae82b 100644
--- a/src/test/java/org/scijava/convert/DefaultConverterTest.java
+++ b/src/test/java/org/scijava/convert/DefaultConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DelegateConverterTest.java b/src/test/java/org/scijava/convert/DelegateConverterTest.java
index ec1f4187c..22470f4a3 100644
--- a/src/test/java/org/scijava/convert/DelegateConverterTest.java
+++ b/src/test/java/org/scijava/convert/DelegateConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
index ff6714dba..6f2f09886 100644
--- a/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/DoubleToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileListConverterTest.java b/src/test/java/org/scijava/convert/FileListConverterTest.java
index f5b40b2e4..8d077c8a4 100644
--- a/src/test/java/org/scijava/convert/FileListConverterTest.java
+++ b/src/test/java/org/scijava/convert/FileListConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FileToPathConversionTest.java b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
index 7fd087514..ef020a279 100644
--- a/src/test/java/org/scijava/convert/FileToPathConversionTest.java
+++ b/src/test/java/org/scijava/convert/FileToPathConversionTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
index 7d49b6878..426f5af68 100644
--- a/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
index 45c5c4dfb..79ab0ddb1 100644
--- a/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/FloatToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
index 4c375dcb8..8405d7489 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
index 79c89bcb1..5f58d847b 100644
--- a/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
index 0e1106536..a480aa4b2 100644
--- a/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
index 5611b7f26..e9ded24c7 100644
--- a/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/IntegerToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
index 436730ee2..4ea3bd95e 100644
--- a/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
index ec8a1c3ca..e5d8a412e 100644
--- a/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/LongToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
index 642008214..fe4aea074 100644
--- a/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigDecimalConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
index bb39f8c50..dcd7145b6 100644
--- a/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToBigIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
index 336001970..05b3e93c3 100644
--- a/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToDoubleConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
index d893478ca..e4fc125eb 100644
--- a/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToFloatConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
index df9c62daf..43d50e217 100644
--- a/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToIntegerConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
index a5803241a..03cb6e6d3 100644
--- a/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
+++ b/src/test/java/org/scijava/convert/ShortToLongConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
index c68ddd568..2107a85a9 100644
--- a/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToArrayConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
index 34ed9d260..b3650344b 100644
--- a/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
+++ b/src/test/java/org/scijava/convert/StringToNumberConverterTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/display/DisplayTest.java b/src/test/java/org/scijava/display/DisplayTest.java
index 3d6f65de2..16e43f04c 100644
--- a/src/test/java/org/scijava/display/DisplayTest.java
+++ b/src/test/java/org/scijava/display/DisplayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/download/DownloadServiceTest.java b/src/test/java/org/scijava/download/DownloadServiceTest.java
index a9bb2a421..4d6fb2f6e 100644
--- a/src/test/java/org/scijava/download/DownloadServiceTest.java
+++ b/src/test/java/org/scijava/download/DownloadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/event/EventServiceTest.java b/src/test/java/org/scijava/event/EventServiceTest.java
index de8c2b028..a055a0f4b 100644
--- a/src/test/java/org/scijava/event/EventServiceTest.java
+++ b/src/test/java/org/scijava/event/EventServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/input/AcceleratorTest.java b/src/test/java/org/scijava/input/AcceleratorTest.java
index 3270287df..762489389 100644
--- a/src/test/java/org/scijava/input/AcceleratorTest.java
+++ b/src/test/java/org/scijava/input/AcceleratorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/input/KeyCodeTest.java b/src/test/java/org/scijava/input/KeyCodeTest.java
index 6370089b5..e094dc551 100644
--- a/src/test/java/org/scijava/input/KeyCodeTest.java
+++ b/src/test/java/org/scijava/input/KeyCodeTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
index e57db1f3e..e648071ca 100644
--- a/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteArrayByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/ByteBankTest.java b/src/test/java/org/scijava/io/ByteBankTest.java
index fd1ff0b6a..8956d1b01 100644
--- a/src/test/java/org/scijava/io/ByteBankTest.java
+++ b/src/test/java/org/scijava/io/ByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/IOServiceTest.java b/src/test/java/org/scijava/io/IOServiceTest.java
index bae4be289..6ac3b1cb9 100644
--- a/src/test/java/org/scijava/io/IOServiceTest.java
+++ b/src/test/java/org/scijava/io/IOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/TypedIOServiceTest.java b/src/test/java/org/scijava/io/TypedIOServiceTest.java
index d59cb9014..d1268e2e3 100644
--- a/src/test/java/org/scijava/io/TypedIOServiceTest.java
+++ b/src/test/java/org/scijava/io/TypedIOServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/event/DataEventTest.java b/src/test/java/org/scijava/io/event/DataEventTest.java
index 0c4e8e7ea..5318ea04e 100644
--- a/src/test/java/org/scijava/io/event/DataEventTest.java
+++ b/src/test/java/org/scijava/io/event/DataEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/BytesHandleTest.java b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
index a996b4fa2..23c8631bc 100644
--- a/src/test/java/org/scijava/io/handle/BytesHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/BytesHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
index bac3ee2f2..4ac6dfe70 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleEdgeCaseTests.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandleTest.java b/src/test/java/org/scijava/io/handle/DataHandleTest.java
index 8e84c4087..8bdd827a7 100644
--- a/src/test/java/org/scijava/io/handle/DataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/DataHandlesTest.java b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
index 5e0a95359..003f25265 100644
--- a/src/test/java/org/scijava/io/handle/DataHandlesTest.java
+++ b/src/test/java/org/scijava/io/handle/DataHandlesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/FileHandleTest.java b/src/test/java/org/scijava/io/handle/FileHandleTest.java
index 6caa0c7e3..83a65cb79 100644
--- a/src/test/java/org/scijava/io/handle/FileHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/FileHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
index 3337d4a82..458faa566 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleMockTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
index 5e0fce0df..f7bd863f2 100644
--- a/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/ReadBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
index dd0c158f4..380c789bb 100644
--- a/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
+++ b/src/test/java/org/scijava/io/handle/WriteBufferDataHandleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/BytesLocationTest.java b/src/test/java/org/scijava/io/location/BytesLocationTest.java
index 4dbcd46a4..28cffaccf 100644
--- a/src/test/java/org/scijava/io/location/BytesLocationTest.java
+++ b/src/test/java/org/scijava/io/location/BytesLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
index 0b71e739f..00a68d04a 100644
--- a/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationResolverTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/FileLocationTest.java b/src/test/java/org/scijava/io/location/FileLocationTest.java
index b9d189f0f..d558bb338 100644
--- a/src/test/java/org/scijava/io/location/FileLocationTest.java
+++ b/src/test/java/org/scijava/io/location/FileLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/LocationServiceTest.java b/src/test/java/org/scijava/io/location/LocationServiceTest.java
index 5889dae32..1943a0f35 100644
--- a/src/test/java/org/scijava/io/location/LocationServiceTest.java
+++ b/src/test/java/org/scijava/io/location/LocationServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URILocationTest.java b/src/test/java/org/scijava/io/location/URILocationTest.java
index 49ff094ab..9bb1bfcc7 100644
--- a/src/test/java/org/scijava/io/location/URILocationTest.java
+++ b/src/test/java/org/scijava/io/location/URILocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/location/URLLocationTest.java b/src/test/java/org/scijava/io/location/URLLocationTest.java
index f053a1fab..d3d0e24c0 100644
--- a/src/test/java/org/scijava/io/location/URLLocationTest.java
+++ b/src/test/java/org/scijava/io/location/URLLocationTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
index 76fdf7e21..cd904fe7f 100644
--- a/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
+++ b/src/test/java/org/scijava/io/nio/ByteBufferByteBankTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/CallingClassUtilsTest.java b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
index 8817580ee..a2aa73763 100644
--- a/src/test/java/org/scijava/log/CallingClassUtilsTest.java
+++ b/src/test/java/org/scijava/log/CallingClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/DefaultLoggerTest.java b/src/test/java/org/scijava/log/DefaultLoggerTest.java
index 5c2f29805..d19a8189b 100644
--- a/src/test/java/org/scijava/log/DefaultLoggerTest.java
+++ b/src/test/java/org/scijava/log/DefaultLoggerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogMessageTest.java b/src/test/java/org/scijava/log/LogMessageTest.java
index 0699ddc37..40bf7aeab 100644
--- a/src/test/java/org/scijava/log/LogMessageTest.java
+++ b/src/test/java/org/scijava/log/LogMessageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogServiceTest.java b/src/test/java/org/scijava/log/LogServiceTest.java
index 78a128073..b0fe0e83c 100644
--- a/src/test/java/org/scijava/log/LogServiceTest.java
+++ b/src/test/java/org/scijava/log/LogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/LogSourceTest.java b/src/test/java/org/scijava/log/LogSourceTest.java
index e6d7883a7..d9bed1ef4 100644
--- a/src/test/java/org/scijava/log/LogSourceTest.java
+++ b/src/test/java/org/scijava/log/LogSourceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/StderrLogServiceTest.java b/src/test/java/org/scijava/log/StderrLogServiceTest.java
index 42db64727..6745f0aaf 100644
--- a/src/test/java/org/scijava/log/StderrLogServiceTest.java
+++ b/src/test/java/org/scijava/log/StderrLogServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/log/TestLogListener.java b/src/test/java/org/scijava/log/TestLogListener.java
index 94ed38813..8368e0142 100644
--- a/src/test/java/org/scijava/log/TestLogListener.java
+++ b/src/test/java/org/scijava/log/TestLogListener.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/MainServiceTest.java b/src/test/java/org/scijava/main/MainServiceTest.java
index e87501a7b..f1bc97136 100644
--- a/src/test/java/org/scijava/main/MainServiceTest.java
+++ b/src/test/java/org/scijava/main/MainServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
index 20c0997fe..523fc3bf8 100644
--- a/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
+++ b/src/test/java/org/scijava/main/run/MainCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/MenuServiceTest.java b/src/test/java/org/scijava/menu/MenuServiceTest.java
index a3b2f203f..ea23052c8 100644
--- a/src/test/java/org/scijava/menu/MenuServiceTest.java
+++ b/src/test/java/org/scijava/menu/MenuServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/menu/ShadowMenuTest.java b/src/test/java/org/scijava/menu/ShadowMenuTest.java
index 5eb75a2cb..8972dacfa 100644
--- a/src/test/java/org/scijava/menu/ShadowMenuTest.java
+++ b/src/test/java/org/scijava/menu/ShadowMenuTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/ModuleServiceTest.java b/src/test/java/org/scijava/module/ModuleServiceTest.java
index cdaf44a84..e0fee870f 100644
--- a/src/test/java/org/scijava/module/ModuleServiceTest.java
+++ b/src/test/java/org/scijava/module/ModuleServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
index def867107..25bb195ba 100644
--- a/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
+++ b/src/test/java/org/scijava/module/event/ModuleErroredEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
index 7698f30b9..030413018 100644
--- a/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
+++ b/src/test/java/org/scijava/module/process/LoggerPreprocessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
index 719ed815f..62507cdc1 100644
--- a/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
+++ b/src/test/java/org/scijava/module/run/ModuleCodeRunnerTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/NamedObjectIndexTest.java b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
index 7ceef8e27..15a995519 100644
--- a/src/test/java/org/scijava/object/NamedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/NamedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectIndexTest.java b/src/test/java/org/scijava/object/ObjectIndexTest.java
index 95f0c9dc8..7bf973ea8 100644
--- a/src/test/java/org/scijava/object/ObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/ObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/ObjectServiceTest.java b/src/test/java/org/scijava/object/ObjectServiceTest.java
index c8f27051e..871babfe1 100644
--- a/src/test/java/org/scijava/object/ObjectServiceTest.java
+++ b/src/test/java/org/scijava/object/ObjectServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/object/SortedObjectIndexTest.java b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
index 3a3c31e97..7086dc505 100644
--- a/src/test/java/org/scijava/object/SortedObjectIndexTest.java
+++ b/src/test/java/org/scijava/object/SortedObjectIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/options/OptionsTest.java b/src/test/java/org/scijava/options/OptionsTest.java
index da1b4a51a..8ca77769c 100644
--- a/src/test/java/org/scijava/options/OptionsTest.java
+++ b/src/test/java/org/scijava/options/OptionsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/parse/ParseServiceTest.java b/src/test/java/org/scijava/parse/ParseServiceTest.java
index ffe1ee60d..47d77939a 100644
--- a/src/test/java/org/scijava/parse/ParseServiceTest.java
+++ b/src/test/java/org/scijava/parse/ParseServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginFinderTest.java b/src/test/java/org/scijava/plugin/PluginFinderTest.java
index 7c83b3b57..20fc70ce7 100644
--- a/src/test/java/org/scijava/plugin/PluginFinderTest.java
+++ b/src/test/java/org/scijava/plugin/PluginFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginIndexTest.java b/src/test/java/org/scijava/plugin/PluginIndexTest.java
index 76a076493..f4727f067 100644
--- a/src/test/java/org/scijava/plugin/PluginIndexTest.java
+++ b/src/test/java/org/scijava/plugin/PluginIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/PluginInfoTest.java b/src/test/java/org/scijava/plugin/PluginInfoTest.java
index ae9098a0d..7df6a64d7 100644
--- a/src/test/java/org/scijava/plugin/PluginInfoTest.java
+++ b/src/test/java/org/scijava/plugin/PluginInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index 1ef3e82de..59d035333 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/prefs/PrefServiceTest.java b/src/test/java/org/scijava/prefs/PrefServiceTest.java
index 7a8535ed0..d0635a962 100644
--- a/src/test/java/org/scijava/prefs/PrefServiceTest.java
+++ b/src/test/java/org/scijava/prefs/PrefServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/run/RunServiceTest.java b/src/test/java/org/scijava/run/RunServiceTest.java
index 71e2213d9..16103455d 100644
--- a/src/test/java/org/scijava/run/RunServiceTest.java
+++ b/src/test/java/org/scijava/run/RunServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
index 8ad3ef941..731d9182a 100644
--- a/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
+++ b/src/test/java/org/scijava/script/AbstractScriptLanguageTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptEngineTest.java b/src/test/java/org/scijava/script/ScriptEngineTest.java
index f8fac4dc9..f8ad95821 100644
--- a/src/test/java/org/scijava/script/ScriptEngineTest.java
+++ b/src/test/java/org/scijava/script/ScriptEngineTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptFinderTest.java b/src/test/java/org/scijava/script/ScriptFinderTest.java
index 74fdc4583..04ca2d02d 100644
--- a/src/test/java/org/scijava/script/ScriptFinderTest.java
+++ b/src/test/java/org/scijava/script/ScriptFinderTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptInfoTest.java b/src/test/java/org/scijava/script/ScriptInfoTest.java
index d16555dc0..a2cf4c375 100644
--- a/src/test/java/org/scijava/script/ScriptInfoTest.java
+++ b/src/test/java/org/scijava/script/ScriptInfoTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/ScriptServiceTest.java b/src/test/java/org/scijava/script/ScriptServiceTest.java
index 404550f5d..6379c0fb0 100644
--- a/src/test/java/org/scijava/script/ScriptServiceTest.java
+++ b/src/test/java/org/scijava/script/ScriptServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
index 8e9c5b653..df50fe820 100644
--- a/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
+++ b/src/test/java/org/scijava/script/process/ParameterScriptProcessorTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/service/ServiceIndexTest.java b/src/test/java/org/scijava/service/ServiceIndexTest.java
index ea3f6cc8c..595c57581 100644
--- a/src/test/java/org/scijava/service/ServiceIndexTest.java
+++ b/src/test/java/org/scijava/service/ServiceIndexTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskEventTest.java b/src/test/java/org/scijava/task/TaskEventTest.java
index 82d98f85f..542a8a52a 100644
--- a/src/test/java/org/scijava/task/TaskEventTest.java
+++ b/src/test/java/org/scijava/task/TaskEventTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/task/TaskServiceTest.java b/src/test/java/org/scijava/task/TaskServiceTest.java
index 00b320b0a..14ab2f27f 100644
--- a/src/test/java/org/scijava/task/TaskServiceTest.java
+++ b/src/test/java/org/scijava/task/TaskServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/AbstractSciJavaTest.java b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
index 3b859e001..fdc4a8375 100644
--- a/src/test/java/org/scijava/test/AbstractSciJavaTest.java
+++ b/src/test/java/org/scijava/test/AbstractSciJavaTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/test/TestUtilsTest.java b/src/test/java/org/scijava/test/TestUtilsTest.java
index 69beb2bd2..19717064b 100644
--- a/src/test/java/org/scijava/test/TestUtilsTest.java
+++ b/src/test/java/org/scijava/test/TestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/text/TextServiceTest.java b/src/test/java/org/scijava/text/TextServiceTest.java
index fd16a40f3..999779004 100644
--- a/src/test/java/org/scijava/text/TextServiceTest.java
+++ b/src/test/java/org/scijava/text/TextServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/thread/ThreadServiceTest.java b/src/test/java/org/scijava/thread/ThreadServiceTest.java
index 29ce7b4dd..569c15314 100644
--- a/src/test/java/org/scijava/thread/ThreadServiceTest.java
+++ b/src/test/java/org/scijava/thread/ThreadServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/ui/UIServiceTest.java b/src/test/java/org/scijava/ui/UIServiceTest.java
index 9aba1641c..69a9ec6e7 100644
--- a/src/test/java/org/scijava/ui/UIServiceTest.java
+++ b/src/test/java/org/scijava/ui/UIServiceTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/AppUtilsTest.java b/src/test/java/org/scijava/util/AppUtilsTest.java
index a67e4b758..23412f0e7 100644
--- a/src/test/java/org/scijava/util/AppUtilsTest.java
+++ b/src/test/java/org/scijava/util/AppUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ArrayUtilsTest.java b/src/test/java/org/scijava/util/ArrayUtilsTest.java
index 2ce778bb9..69a277f7a 100644
--- a/src/test/java/org/scijava/util/ArrayUtilsTest.java
+++ b/src/test/java/org/scijava/util/ArrayUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/BoolArrayTest.java b/src/test/java/org/scijava/util/BoolArrayTest.java
index 9b8239e68..952a6d2bc 100644
--- a/src/test/java/org/scijava/util/BoolArrayTest.java
+++ b/src/test/java/org/scijava/util/BoolArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ByteArrayTest.java b/src/test/java/org/scijava/util/ByteArrayTest.java
index 0e8108951..160124723 100644
--- a/src/test/java/org/scijava/util/ByteArrayTest.java
+++ b/src/test/java/org/scijava/util/ByteArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/CharArrayTest.java b/src/test/java/org/scijava/util/CharArrayTest.java
index 9d4403e75..7fa1827fb 100644
--- a/src/test/java/org/scijava/util/CharArrayTest.java
+++ b/src/test/java/org/scijava/util/CharArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ClassUtilsTest.java b/src/test/java/org/scijava/util/ClassUtilsTest.java
index 1e3f809d4..25a673326 100644
--- a/src/test/java/org/scijava/util/ClassUtilsTest.java
+++ b/src/test/java/org/scijava/util/ClassUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ColorRGBTest.java b/src/test/java/org/scijava/util/ColorRGBTest.java
index 8f5225b58..fea5f3d29 100644
--- a/src/test/java/org/scijava/util/ColorRGBTest.java
+++ b/src/test/java/org/scijava/util/ColorRGBTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ConversionUtilsTest.java b/src/test/java/org/scijava/util/ConversionUtilsTest.java
index f19b7f8e4..5c63c2d03 100644
--- a/src/test/java/org/scijava/util/ConversionUtilsTest.java
+++ b/src/test/java/org/scijava/util/ConversionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DigestUtilsTest.java b/src/test/java/org/scijava/util/DigestUtilsTest.java
index c9b37378b..c19510ab5 100644
--- a/src/test/java/org/scijava/util/DigestUtilsTest.java
+++ b/src/test/java/org/scijava/util/DigestUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/DoubleArrayTest.java b/src/test/java/org/scijava/util/DoubleArrayTest.java
index 385b8ee31..aeeaeb9ff 100644
--- a/src/test/java/org/scijava/util/DoubleArrayTest.java
+++ b/src/test/java/org/scijava/util/DoubleArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FileUtilsTest.java b/src/test/java/org/scijava/util/FileUtilsTest.java
index 0bbc6645e..bbeb81232 100644
--- a/src/test/java/org/scijava/util/FileUtilsTest.java
+++ b/src/test/java/org/scijava/util/FileUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/FloatArrayTest.java b/src/test/java/org/scijava/util/FloatArrayTest.java
index 9a8516ac9..2f5274973 100644
--- a/src/test/java/org/scijava/util/FloatArrayTest.java
+++ b/src/test/java/org/scijava/util/FloatArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/GenericArrayTypesTest.java b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
index 5c6e06e9d..f153471e0 100644
--- a/src/test/java/org/scijava/util/GenericArrayTypesTest.java
+++ b/src/test/java/org/scijava/util/GenericArrayTypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/IntArrayTest.java b/src/test/java/org/scijava/util/IntArrayTest.java
index b28b46390..7e0f8f42a 100644
--- a/src/test/java/org/scijava/util/IntArrayTest.java
+++ b/src/test/java/org/scijava/util/IntArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
index 10d11e427..5cac06fea 100644
--- a/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
+++ b/src/test/java/org/scijava/util/LastRecentlyUsedTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/LongArrayTest.java b/src/test/java/org/scijava/util/LongArrayTest.java
index c0a384b7a..1452fa43c 100644
--- a/src/test/java/org/scijava/util/LongArrayTest.java
+++ b/src/test/java/org/scijava/util/LongArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/NumberUtilsTest.java b/src/test/java/org/scijava/util/NumberUtilsTest.java
index 28cef6cea..67c9f3743 100644
--- a/src/test/java/org/scijava/util/NumberUtilsTest.java
+++ b/src/test/java/org/scijava/util/NumberUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ObjectArrayTest.java b/src/test/java/org/scijava/util/ObjectArrayTest.java
index 8bcdf73ee..0e9a94f4c 100644
--- a/src/test/java/org/scijava/util/ObjectArrayTest.java
+++ b/src/test/java/org/scijava/util/ObjectArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/POMTest.java b/src/test/java/org/scijava/util/POMTest.java
index 2ca1ea072..7ac2f0eef 100644
--- a/src/test/java/org/scijava/util/POMTest.java
+++ b/src/test/java/org/scijava/util/POMTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PrimitiveArrayTest.java b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
index 64a74492b..5612174d0 100644
--- a/src/test/java/org/scijava/util/PrimitiveArrayTest.java
+++ b/src/test/java/org/scijava/util/PrimitiveArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ProcessUtilsTest.java b/src/test/java/org/scijava/util/ProcessUtilsTest.java
index ce3346a2c..056ffac37 100644
--- a/src/test/java/org/scijava/util/ProcessUtilsTest.java
+++ b/src/test/java/org/scijava/util/ProcessUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/PropertiesHelperTest.java b/src/test/java/org/scijava/util/PropertiesHelperTest.java
index 3e3cc57fb..528dc25dc 100644
--- a/src/test/java/org/scijava/util/PropertiesHelperTest.java
+++ b/src/test/java/org/scijava/util/PropertiesHelperTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/ShortArrayTest.java b/src/test/java/org/scijava/util/ShortArrayTest.java
index 005718285..24adec352 100644
--- a/src/test/java/org/scijava/util/ShortArrayTest.java
+++ b/src/test/java/org/scijava/util/ShortArrayTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/StringUtilsTest.java b/src/test/java/org/scijava/util/StringUtilsTest.java
index 95b0cd431..a04bc3236 100644
--- a/src/test/java/org/scijava/util/StringUtilsTest.java
+++ b/src/test/java/org/scijava/util/StringUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/TypesTest.java b/src/test/java/org/scijava/util/TypesTest.java
index d3529cb0c..1eb1707a5 100644
--- a/src/test/java/org/scijava/util/TypesTest.java
+++ b/src/test/java/org/scijava/util/TypesTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/UnitUtilsTest.java b/src/test/java/org/scijava/util/UnitUtilsTest.java
index e253a0319..7977d0a7b 100644
--- a/src/test/java/org/scijava/util/UnitUtilsTest.java
+++ b/src/test/java/org/scijava/util/UnitUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/util/VersionUtilsTest.java b/src/test/java/org/scijava/util/VersionUtilsTest.java
index f56be8426..de09b9888 100644
--- a/src/test/java/org/scijava/util/VersionUtilsTest.java
+++ b/src/test/java/org/scijava/util/VersionUtilsTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/test/java/org/scijava/widget/WidgetStyleTest.java b/src/test/java/org/scijava/widget/WidgetStyleTest.java
index 0043dba69..dbe4f8c83 100644
--- a/src/test/java/org/scijava/widget/WidgetStyleTest.java
+++ b/src/test/java/org/scijava/widget/WidgetStyleTest.java
@@ -2,7 +2,7 @@
  * #%L
  * SciJava Common shared library for SciJava software.
  * %%
- * Copyright (C) 2009 - 2025 SciJava developers.
+ * Copyright (C) 2009 - 2026 SciJava developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

From 719b91c6ea0ac9bc89da9086b4a715e6dfbaaaf6 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Thu, 5 Mar 2026 18:34:33 +0100
Subject: [PATCH 1194/1208] Improve input validation mechanism

---
 pom.xml                                       |  2 +-
 .../org/scijava/module/AbstractModule.java    |  9 +++-
 .../scijava/module/AbstractModuleItem.java    |  7 ++-
 .../java/org/scijava/module/MethodRef.java    | 10 ++++-
 .../java/org/scijava/module/ModuleItem.java   | 43 ++++++++++++++++++-
 .../scijava/widget/DefaultWidgetModel.java    | 17 ++++++++
 .../java/org/scijava/widget/WidgetModel.java  | 21 +++++++++
 7 files changed, 102 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 59020e2a3..2e7ca6018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.99.4-SNAPSHOT</version>
+	<version>2.100.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>
diff --git a/src/main/java/org/scijava/module/AbstractModule.java b/src/main/java/org/scijava/module/AbstractModule.java
index ddbaaaa1f..4ca6a4528 100644
--- a/src/main/java/org/scijava/module/AbstractModule.java
+++ b/src/main/java/org/scijava/module/AbstractModule.java
@@ -160,8 +160,13 @@ public void resolveInput(final String name) {
 				item.validate(this);
 			}
 			catch (final MethodCallException exc) {
-				// NB: Hacky, but avoids changing the API signature.
-				throw new RuntimeException(exc);
+				// NB: resolveInput cannot declare checked exceptions, so we wrap.
+				// Prefer the cause's message (the user-facing validation error) when
+				// available; otherwise fall back to the MethodCallException's message.
+				final Throwable cause = exc.getCause();
+				final String message = (cause != null && cause.getMessage() != null &&
+					!cause.getMessage().isEmpty()) ? cause.getMessage() : exc.getMessage();
+				throw new RuntimeException(message, exc);
 			}
 		}
 		resolvedInputs.add(name);
diff --git a/src/main/java/org/scijava/module/AbstractModuleItem.java b/src/main/java/org/scijava/module/AbstractModuleItem.java
index 0dbb4a6f7..e2648cd2f 100644
--- a/src/main/java/org/scijava/module/AbstractModuleItem.java
+++ b/src/main/java/org/scijava/module/AbstractModuleItem.java
@@ -210,7 +210,12 @@ public void validate(final Module module) throws MethodCallException {
 		if (validaterRef == null) {
 			validaterRef = new MethodRef(delegateObject.getClass(), getValidater());
 		}
-		validaterRef.execute(module.getDelegateObject());
+		final Object result = validaterRef.executeWithResult(module.getDelegateObject());
+		// If the validater returns a non-empty String, treat it as an error message.
+		if (result instanceof String) {
+			final String message = (String) result;
+			if (!message.isEmpty()) throw new MethodCallException(message);
+		}
 	}
 
 	@Override
diff --git a/src/main/java/org/scijava/module/MethodRef.java b/src/main/java/org/scijava/module/MethodRef.java
index 76773c5e4..f77883204 100644
--- a/src/main/java/org/scijava/module/MethodRef.java
+++ b/src/main/java/org/scijava/module/MethodRef.java
@@ -62,9 +62,15 @@ public MethodRef(final Class<?> clazz, final String methodName,
 	public void execute(final Object obj, final Object... args)
 		throws MethodCallException
 	{
-		if (method == null) return;
+		executeWithResult(obj, args);
+	}
+
+	public Object executeWithResult(final Object obj, final Object... args)
+		throws MethodCallException
+	{
+		if (method == null) return null;
 		try {
-			method.invoke(obj, args);
+			return method.invoke(obj, args);
 		}
 		catch (final Exception exc) {
 			// NB: Several types of exceptions; simpler to handle them all the same.
diff --git a/src/main/java/org/scijava/module/ModuleItem.java b/src/main/java/org/scijava/module/ModuleItem.java
index 39d129465..95ea748b4 100644
--- a/src/main/java/org/scijava/module/ModuleItem.java
+++ b/src/main/java/org/scijava/module/ModuleItem.java
@@ -126,11 +126,52 @@ public interface ModuleItem<T> extends BasicDetails {
 
 	/**
 	 * Invokes this item's validation function, if any, on the given module.
-	 * 
+	 * <p>
+	 * The validation function may signal failure either by throwing an exception
+	 * or by returning a non-empty {@link String} error message.
+	 * </p>
+	 *
+	 * @throws MethodCallException if validation fails or the method cannot be
+	 *           invoked. When the validater returns a non-empty String, a
+	 *           {@link MethodCallException} is thrown with that string as its
+	 *           message.
 	 * @see #getValidater()
+	 * @see #validateMessage(Module)
 	 */
 	void validate(Module module) throws MethodCallException;
 
+	/**
+	 * Validates this item's value in the given module, returning any error
+	 * message rather than throwing.
+	 * <p>
+	 * The validation function may signal failure either by throwing an exception
+	 * or by returning a non-empty {@link String} error message. This method
+	 * catches both cases and returns the error message as a string, or
+	 * {@code null} if the value is valid.
+	 * </p>
+	 *
+	 * @return an error message if the value is invalid, or {@code null} if valid.
+	 * @see #getValidater()
+	 * @see #validate(Module)
+	 */
+	default String validateMessage(final Module module) {
+		try {
+			validate(module);
+			return null;
+		}
+		catch (final MethodCallException exc) {
+			// Unwrap to find the most informative message.
+			final Throwable cause = exc.getCause();
+			if (cause != null && cause.getMessage() != null &&
+				!cause.getMessage().isEmpty())
+			{
+				return cause.getMessage();
+			}
+			final String msg = exc.getMessage();
+			return msg != null && !msg.isEmpty() ? msg : exc.toString();
+		}
+	}
+
 	/**
 	 * Gets the function that is called whenever this item changes.
 	 * <p>
diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
index 0fa35593f..e7d6b9352 100644
--- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java
+++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java
@@ -79,6 +79,8 @@ public class DefaultWidgetModel extends AbstractContextual implements WidgetMode
 
 	private boolean initialized;
 
+	private String validationMessage;
+
 	public DefaultWidgetModel(final Context context, final InputPanel<?, ?> inputPanel,
 		final Module module, final ModuleItem<?> item, final List<?> objectPool)
 	{
@@ -167,6 +169,11 @@ public void setValue(final Object value) {
 		if (initialized) {
 			threadService.queue(() -> {
 				callback();
+				// Revalidate all inputs: changing one value may affect others' validity.
+				for (final ModuleItem<?> anyItem : module.getInfo().inputs()) {
+					final InputWidget<?, ?> w = inputPanel.getWidget(anyItem.getName());
+					if (w != null) w.get().updateValidation();
+				}
 				inputPanel.refresh(); // must be on AWT thread?
 				module.preview();
 			});
@@ -284,6 +291,16 @@ public boolean isInitialized() {
 		return initialized;
 	}
 
+	@Override
+	public String getValidationMessage() {
+		return validationMessage;
+	}
+
+	@Override
+	public void updateValidation() {
+		validationMessage = item.validateMessage(module);
+	}
+
 	// -- Helper methods --
 
 	/**
diff --git a/src/main/java/org/scijava/widget/WidgetModel.java b/src/main/java/org/scijava/widget/WidgetModel.java
index 7175a44de..4eb8e2703 100644
--- a/src/main/java/org/scijava/widget/WidgetModel.java
+++ b/src/main/java/org/scijava/widget/WidgetModel.java
@@ -187,6 +187,27 @@ public interface WidgetModel extends Contextual {
 	/** Gets whether the input is compatible with the given type. */
 	boolean isType(Class<?> type);
 
+	/**
+	 * Gets the current validation error message for this widget.
+	 *
+	 * @return the error message from the most recent validation run, or
+	 *         {@code null} if the last validation passed or no validation has
+	 *         been run yet.
+	 * @see org.scijava.module.ModuleItem#validateMessage(org.scijava.module.Module)
+	 */
+	String getValidationMessage();
+
+	/**
+	 * Re-runs this item's validation and updates the stored validation message.
+	 * <p>
+	 * This should be called on all widgets whenever any parameter value changes,
+	 * since a change to one parameter may affect the validity of others.
+	 * </p>
+	 *
+	 * @see #getValidationMessage()
+	 */
+	void updateValidation();
+
 	/**
 	 * Toggles the widget's initialization state. An initialized widget can be
 	 * assumed to be an active part of a container {@link InputPanel}.

From d14ad9b3a9276ade46035f66cf61db0e17151dcd Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 8 Mar 2026 18:16:22 -0500
Subject: [PATCH 1195/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2e7ca6018..30c6d9a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.100.0-SNAPSHOT</version>
+	<version>2.100.1-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From dee35f1445e5cc4b74a3a70335268e47522ad485 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 15 Mar 2026 17:43:15 -0500
Subject: [PATCH 1196/1208] DataHandles: Eliminate reflection hack

This patch replaces the reflection hack with a direct implementation
of the modified UTF-8 encoding per the DataOutput spec, allowing the
org.scijava.io.handle.WriteBufferDataHandleTest to pass with Java 21.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../org/scijava/io/handle/DataHandles.java    | 68 +++++++++----------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/main/java/org/scijava/io/handle/DataHandles.java b/src/main/java/org/scijava/io/handle/DataHandles.java
index 7e9843edb..1464f637e 100644
--- a/src/main/java/org/scijava/io/handle/DataHandles.java
+++ b/src/main/java/org/scijava/io/handle/DataHandles.java
@@ -30,10 +30,8 @@
 package org.scijava.io.handle;
 
 import java.io.DataOutput;
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.io.UTFDataFormatException;
 
 import org.scijava.io.location.Location;
 import org.scijava.task.Task;
@@ -46,8 +44,6 @@
  */
 public final class DataHandles {
 
-	private static Method utfMethod;
-
 	private DataHandles() {
 		// Prevent instantiation of utility class.
 	}
@@ -74,40 +70,38 @@ private DataHandles() {
 	public static int writeUTF(final String str, final DataOutput out)
 		throws IOException
 	{
-		// HACK: Strangely, DataOutputStream.writeUTF(String, DataOutput)
-		// has package-private access. We work around it via reflection.
-		try {
-			return (Integer) utfMethod().invoke(null, str, out);
-		}
-		catch (final IllegalAccessException | IllegalArgumentException
-				| InvocationTargetException exc)
-		{
-			throw new IllegalStateException(
-				"Cannot invoke DataOutputStream.writeUTF(String, DataOutput)", exc);
+		// Encode string as modified UTF-8 per java.io.DataOutput specification.
+		final int strlen = str.length();
+		int utflen = 0;
+		for (int i = 0; i < strlen; i++) {
+			final char c = str.charAt(i);
+			if (c >= '\u0001' && c <= '\u007F') utflen += 1;
+			else if (c <= '\u07FF') utflen += 2;
+			else utflen += 3;
 		}
-	}
-
-	// -- Helper methods --
-
-	/** Gets the {@link #utfMethod} field, initializing if needed. */
-	private static Method utfMethod() {
-		if (utfMethod == null) initUTFMethod();
-		return utfMethod;
-	}
-
-	/** Initializes the {@link #utfMethod} field. */
-	private static synchronized void initUTFMethod() {
-		if (utfMethod != null) return;
-		try {
-			final Method m = DataOutputStream.class.getDeclaredMethod("writeUTF",
-				String.class, DataOutput.class);
-			m.setAccessible(true);
-			utfMethod = m;
-		}
-		catch (final NoSuchMethodException | SecurityException exc) {
-			throw new IllegalStateException(
-				"No usable DataOutputStream.writeUTF(String, DataOutput)", exc);
+		if (utflen > 65535) throw new UTFDataFormatException(
+			"encoded string too long: " + utflen + " bytes");
+		final byte[] bytes = new byte[utflen + 2];
+		bytes[0] = (byte) ((utflen >>> 8) & 0xFF);
+		bytes[1] = (byte) (utflen & 0xFF);
+		int pos = 2;
+		for (int i = 0; i < strlen; i++) {
+			final char c = str.charAt(i);
+			if (c >= '\u0001' && c <= '\u007F') {
+				bytes[pos++] = (byte) c;
+			}
+			else if (c <= '\u07FF') {
+				bytes[pos++] = (byte) (0xC0 | ((c >> 6) & 0x1F));
+				bytes[pos++] = (byte) (0x80 | (c & 0x3F));
+			}
+			else {
+				bytes[pos++] = (byte) (0xE0 | ((c >> 12) & 0x0F));
+				bytes[pos++] = (byte) (0x80 | ((c >> 6) & 0x3F));
+				bytes[pos++] = (byte) (0x80 | (c & 0x3F));
+			}
 		}
+		out.write(bytes);
+		return utflen + 2;
 	}
 	
 	protected static IOException readOnlyException() {

From 2c3ab68095b1d8cf0dbd81c89efff08e40dac24a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Mar 2026 11:48:20 -0500
Subject: [PATCH 1197/1208] Remove SizableArrayList reflection hack

I doubt that addAll with a collection of nulls can approach the
performance of just hacking the size value -- it's hard to beat
O(1), and in Java newly allocated object arrays are already filled
with nulls, so needing to addAll these nulls on top is frustratingly
wasteful. But Java 17+ tightens the screws on reflection, making the
reflection-based approach too fraught to use anymore. C'est la vie.
---
 .../org/scijava/util/SizableArrayList.java    | 38 +------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/src/main/java/org/scijava/util/SizableArrayList.java b/src/main/java/org/scijava/util/SizableArrayList.java
index 889135a44..21ecdf0ac 100644
--- a/src/main/java/org/scijava/util/SizableArrayList.java
+++ b/src/main/java/org/scijava/util/SizableArrayList.java
@@ -29,9 +29,9 @@
 
 package org.scijava.util;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * An {@link ArrayList} whose size can be adjusted more efficiently.
@@ -84,42 +84,8 @@ public void setSize(final int size) {
 		else {
 			// need to add some elements
 			ensureCapacity(size);
-			final boolean hackSuccessful = hackSize(size);
-			if (!hackSuccessful) {
-				// explicitly increase the size by adding nulls
-				while (size() < size) add(null);
-			}
+			addAll(Collections.nCopies(size - oldSize, null));
 		}
 	}
 
-	// -- Helper methods --
-
-	private boolean hackSize(final int size) {
-		// HACK: Override the size field directly.
-		final int oldSize;
-		try {
-			final Field sizeField = ArrayList.class.getDeclaredField("size");
-			sizeField.setAccessible(true);
-			oldSize = (Integer) sizeField.get(this);
-			sizeField.set(this, size);
-
-			// NB: Check that it worked. In the case of Java 1.7.0_45, it is possible
-			// for the capacity to not *actually* be ensured, in which case
-			// subsequently attempting to get the (size - 1)th value results in
-			// ArrayIndexOutOfBoundsException. So let's be safe and verify it here.
-			try {
-				get(size - 1);
-			}
-			catch (final Exception exc) {
-				// NB: Restore the previous size, then fail.
-				sizeField.set(this, oldSize);
-				return false;
-			}
-		}
-		catch (final Exception exc) {
-			return false;
-		}
-		return true;
-	}
-
 }

From 5fe77409b2e8a85fdd04a349c5b4f29a8c5e1ae7 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 20 Mar 2026 11:52:45 -0500
Subject: [PATCH 1198/1208] Fix annotation of test-scope plugins with Java 9+

The build-time hack using EclipseHelper to index SciJava Common's
plugins was running only in conjunction with main class compilation,
not test class compilation. The reason SciJava Common's test classes
still got their plugins indexed is because there is an additional
invocation of EclipseHelper at runtime when tests are executed --
which works as long as the runtime class loader is a URLClassLoader.
But in Java 9+, the runtime class loader is not a URLClassLoader
anymore, so this late-stage runtime indexing of test-scoped plugins
does not occur. The result: when building with Java 9+, a bunch of
the tests were failing due to unindexed plugins in src/test/java.

The fix: run the EclipseHelper again during process-test-classes,
which is the proper phase for doing postprocessing to test classes.

This change lets Java 9+ compile SciJava Common with passing tests.
---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 30c6d9a53..c3715d0b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,11 +223,22 @@
 				<artifactId>exec-maven-plugin</artifactId>
 				<executions>
 					<execution>
+						<id>index-annotations</id>
 						<phase>process-classes</phase>
 						<goals>
 							<goal>java</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>index-test-annotations</id>
+						<phase>process-test-classes</phase>
+						<goals>
+							<goal>java</goal>
+						</goals>
+						<configuration>
+							<classpathScope>test</classpathScope>
+						</configuration>
+					</execution>
 				</executions>
 				<configuration>
 					<mainClass>org.scijava.annotations.EclipseHelper</mainClass>

From 041acb4c1a252f727b5df0a21cb18126f49e776f Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 21 Mar 2026 17:22:35 -0500
Subject: [PATCH 1199/1208] Improve reflection usage for Java 9+

SciJava Common's core use of reflection -- dependency injection -- still
requires reflection, and therefore SciJava Common is far from being
JPMS-modularizable. But these fixes do help SJC run better with Java 9+.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../event/bushe/AbstractProxySubscriber.java  | 24 ++++++++++++-------
 src/main/java/org/scijava/util/Colors.java    | 13 ++++------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java b/src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java
index f0db8aac1..bd745a92c 100644
--- a/src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java
+++ b/src/main/java/org/scijava/event/bushe/AbstractProxySubscriber.java
@@ -1,9 +1,9 @@
 package org.scijava.event.bushe;
 
 import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 /**
  * Common base class for EventService Proxies.
@@ -104,18 +104,26 @@ protected boolean retryReflectiveCallUsingAccessibleObject(Object[] args, Method
          AccessibleObject[] accessibleMethod = {subscriptionMethod};
          try {
             AccessibleObject.setAccessible(accessibleMethod, true);
-            Object returnValue = subscriptionMethod.invoke(obj, args);
-            return Boolean.valueOf(returnValue+"");
          } catch (SecurityException ex) {
+            // SecurityManager (Java 8 and earlier) denied setAccessible
+            accessibleTriedAndFailed = true;
+         } catch (RuntimeException ex) {
+            // InaccessibleObjectException (Java 9+) or similar denied setAccessible
             accessibleTriedAndFailed = true;
-         } catch (InvocationTargetException e1) {
-            throw new RuntimeException(message, e);
-         } catch (IllegalAccessException e1) {
-            throw new RuntimeException(message, e);
+         }
+         if (!accessibleTriedAndFailed) {
+            try {
+               Object returnValue = subscriptionMethod.invoke(obj, args);
+               return Boolean.valueOf(returnValue+"");
+            } catch (InvocationTargetException e1) {
+               throw new RuntimeException(message, e);
+            } catch (IllegalAccessException e1) {
+               throw new RuntimeException(message, e);
+            }
          }
       }
       if (accessibleTriedAndFailed) {
-         message = message + ".  An attempt was made to make the method accessible, but the SecurityManager denied the attempt.";
+         message = message + ".  An attempt was made to make the method accessible, but access was denied.";
       }
       throw new RuntimeException(message, e);
    }
diff --git a/src/main/java/org/scijava/util/Colors.java b/src/main/java/org/scijava/util/Colors.java
index fcc65027b..c8d70d55f 100644
--- a/src/main/java/org/scijava/util/Colors.java
+++ b/src/main/java/org/scijava/util/Colors.java
@@ -115,8 +115,7 @@ public final class Colors {
 	public static final ColorRGB LIGHTBLUE = new ColorRGB(173, 216, 230);
 	public static final ColorRGB LIGHTCORAL = new ColorRGB(240, 128, 128);
 	public static final ColorRGB LIGHTCYAN = new ColorRGB(224, 255, 255);
-	public static final ColorRGB LIGHTGOLDENRODYELLOW = new ColorRGB(250, 250,
-		210);
+	public static final ColorRGB LIGHTGOLDENRODYELLOW = new ColorRGB(250, 250, 210);
 	public static final ColorRGB LIGHTGRAY = new ColorRGB(211, 211, 211);
 	public static final ColorRGB LIGHTGREEN = new ColorRGB(144, 238, 144);
 	public static final ColorRGB LIGHTGREY = LIGHTGRAY;
@@ -194,19 +193,15 @@ public final class Colors {
 	public static final ColorRGB YELLOW = new ColorRGB(255, 255, 0);
 	public static final ColorRGB YELLOWGREEN = new ColorRGB(154, 205, 50);
 
-	private static final Map<String, ColorRGB> COLORS =
-		new HashMap<>();
+	private static final Map<String, ColorRGB> COLORS = new HashMap<>();
 
 	static {
-		for (final Field f : Colors.class.getDeclaredFields()) {
+		for (final Field f : Colors.class.getFields()) {
 			final Object value;
 			try {
 				value = f.get(null);
 			}
-			catch (final IllegalArgumentException e) {
-				continue;
-			}
-			catch (final IllegalAccessException e) {
+			catch (final IllegalAccessException | IllegalArgumentException e) {
 				continue;
 			}
 			if (!(value instanceof ColorRGB)) continue; // not a color

From e4ae9eef2645ca15541378f82ae15f45f530c059 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Fri, 27 Mar 2026 17:53:54 -0500
Subject: [PATCH 1200/1208] Add test for singleton plugin injecting its
 managing service

Regression test for the circular reference scenario where a
SingletonPlugin has an @Parameter for its managing SingletonService.
Historically the service's not-yet-complete initialization could prevent
the parameter from being filled.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../scijava/plugin/SingletonServiceTest.java  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/test/java/org/scijava/plugin/SingletonServiceTest.java b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
index 59d035333..17d59a380 100644
--- a/src/test/java/org/scijava/plugin/SingletonServiceTest.java
+++ b/src/test/java/org/scijava/plugin/SingletonServiceTest.java
@@ -34,6 +34,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
@@ -249,6 +250,49 @@ public void testListenToRemove() {
 			.getInstances().size());
 	}
 
+	/**
+	 * Tests that a {@link SingletonPlugin} with an {@code @Parameter} for its
+	 * managing {@link SingletonService} has that parameter successfully injected.
+	 * This is a circular reference scenario: the service instantiates plugins
+	 * during initialization, and those plugins in turn require the service itself
+	 * to be injected. Historically SciJava Common had trouble with this pattern.
+	 */
+	@Test
+	public void testSingletonPluginInjectsManagingService() {
+		final Context ctx = new Context(PluginService.class, FooService.class);
+		try {
+			final FooService fooService = ctx.getService(FooService.class);
+
+			final List<FooPlugin> instances = fooService.getInstances();
+			assertEquals(1, instances.size());
+
+			final FooPlugin fooPlugin = instances.get(0);
+			assertNotNull("FooService was not injected into FooPlugin",
+				fooPlugin.fooService);
+			assertSame(fooService, fooPlugin.fooService);
+		}
+		finally {
+			ctx.dispose();
+		}
+	}
+
+	@Plugin(type = FooPlugin.class)
+	public static class FooPlugin extends AbstractRichPlugin implements
+		SingletonPlugin
+	{
+
+		@Parameter
+		FooService fooService;
+	}
+
+	public static class FooService extends AbstractSingletonService<FooPlugin> {
+
+		@Override
+		public Class<FooPlugin> getPluginType() {
+			return FooPlugin.class;
+		}
+	}
+
 	@Plugin(type = DummyPlugin.class)
 	public static class DummyPlugin extends AbstractRichPlugin implements
 		SingletonPlugin

From a1ae2195606c0f2120c44fbb2cd69845a61f259a Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Wed, 15 Apr 2026 14:43:57 -0500
Subject: [PATCH 1201/1208] Put lazy init methods before other helper methods

Consistency!
---
 .../scijava/module/AbstractModuleInfo.java    | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/scijava/module/AbstractModuleInfo.java b/src/main/java/org/scijava/module/AbstractModuleInfo.java
index 704ac4cd3..c11351573 100644
--- a/src/main/java/org/scijava/module/AbstractModuleInfo.java
+++ b/src/main/java/org/scijava/module/AbstractModuleInfo.java
@@ -158,23 +158,6 @@ protected List<ModuleItem<?>> outputList() {
 		return outputList;
 	}
 
-	// -- Helper methods --
-
-	private <T> ModuleItem<T> castItem(final ModuleItem<?> item,
-		final Class<T> type)
-	{
-		final Class<?> itemType = item.getType();
-		// if (!type.isAssignableFrom(itemType)) {
-		final Class<?> saneItemType = Types.box(itemType);
-		if (!Types.isAssignable(type, saneItemType)) {
-			throw new IllegalArgumentException("Type " + type.getName() +
-				" is incompatible with item of type " + itemType.getName());
-		}
-		@SuppressWarnings("unchecked")
-		final ModuleItem<T> typedItem = (ModuleItem<T>) item;
-		return typedItem;
-	}
-
 	// -- Helper methods - lazy initialization --
 
 	/** Initializes data structures and parses parameters. */
@@ -191,4 +174,20 @@ private synchronized void initParameters() {
 		initialized = true;
 	}
 
+	// -- Helper methods --
+
+	private <T> ModuleItem<T> castItem(final ModuleItem<?> item,
+		final Class<T> type)
+	{
+		final Class<?> itemType = item.getType();
+		// if (!type.isAssignableFrom(itemType)) {
+		final Class<?> saneItemType = Types.box(itemType);
+		if (!Types.isAssignable(type, saneItemType)) {
+			throw new IllegalArgumentException("Type " + type.getName() +
+				" is incompatible with item of type " + itemType.getName());
+		}
+		@SuppressWarnings("unchecked")
+		final ModuleItem<T> typedItem = (ModuleItem<T>) item;
+		return typedItem;
+	}
 }

From 85d4bd0a8512298a098bea23ab00686ebfc5ccd3 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 24 May 2026 11:27:54 -0500
Subject: [PATCH 1202/1208] AbstractTypedIOService: fix bracket whitespace

---
 .../org/scijava/io/AbstractTypedIOService.java    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 4d75bfb3e..385196583 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -56,7 +56,8 @@ public abstract class AbstractTypedIOService<D> extends AbstractHandlerService<L
 	public D open(String source) throws IOException {
 		try {
 			return open(locationService.resolve(source));
-		} catch (URISyntaxException e) {
+		}
+		catch (URISyntaxException e) {
 			throw new IOException(e);
 		}
 	}
@@ -77,7 +78,8 @@ public D open(Location source) throws IOException {
 	public void save(D data, String destination) throws IOException {
 		try {
 			save(data, locationService.resolve(destination));
-		} catch (URISyntaxException e) {
+		}
+		catch (URISyntaxException e) {
 			throw new IOException(e);
 		}
 	}
@@ -97,7 +99,8 @@ public void save(D data, Location destination) throws IOException {
 	public boolean canOpen(String source) {
 		try {
 			return canOpen(locationService.resolve(source));
-		} catch (URISyntaxException e) {
+		}
+		catch (URISyntaxException e) {
 			return false;
 		}
 	}
@@ -109,7 +112,8 @@ public boolean canOpen(Location source) {
 		try {
 			Class<D> ignored = (Class<D>) (opener.getDataType());
 			return true;
-		} catch(ClassCastException e) {
+		}
+		catch(ClassCastException e) {
 			return false;
 		}
 	}
@@ -118,7 +122,8 @@ public boolean canOpen(Location source) {
 	public boolean canSave(D data, String source) {
 		try {
 			return canSave(data, locationService.resolve(source));
-		} catch (URISyntaxException e) {
+		}
+		catch (URISyntaxException e) {
 			return false;
 		}
 	}

From d85453daae30e4aac4bdbae336e4e030baae7851 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 24 May 2026 11:28:14 -0500
Subject: [PATCH 1203/1208] Improve error when no suitable opener found

Rather than throwing NPE when opener is null, report clearly that none
was found. And when one *is* found but returns an incompatible data
type, report that more clearly as well.
---
 src/main/java/org/scijava/io/AbstractTypedIOService.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/io/AbstractTypedIOService.java b/src/main/java/org/scijava/io/AbstractTypedIOService.java
index 385196583..fd7effc63 100644
--- a/src/main/java/org/scijava/io/AbstractTypedIOService.java
+++ b/src/main/java/org/scijava/io/AbstractTypedIOService.java
@@ -65,12 +65,15 @@ public D open(String source) throws IOException {
 	@Override
 	public D open(Location source) throws IOException {
 		IOPlugin<?> opener = ioService().getOpener(source);
+		if (opener == null) {
+			throw new UnsupportedOperationException("No compatible opener found.");
+		}
 		try {
-			Class<D> ignored = (Class<D>) opener.getDataType();
 			return (D) opener.open(source);
 		}
-		catch(ClassCastException e) {
-			throw new UnsupportedOperationException("No compatible opener found.");
+		catch (ClassCastException e) {
+			throw new UnsupportedOperationException(
+				"Opened data does not conform to requested type.", e);
 		}
 	}
 

From 5b3f06255366eff0be7ff7002d0c6ce84a318c25 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 24 May 2026 11:31:47 -0500
Subject: [PATCH 1204/1208] POM: update parent to pom-scijava 44.0.0

This brings in a newer mockito that requires Java 11+, so
set the test JDK version to 11 to match, and use 11 on CI.
---
 .github/workflows/build.yml | 2 +-
 pom.xml                     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a57c0df0b..82b666db0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'zulu'
           cache: 'maven'
       - name: Set up CI environment
diff --git a/pom.xml b/pom.xml
index c3715d0b5..47a59b504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>43.0.0</version>
+		<version>44.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -168,6 +168,8 @@
 
 	<properties>
 		<package-name>org.scijava</package-name>
+		<scijava.jvm.version>8</scijava.jvm.version>
+		<scijava.jvm.test.version>11</scijava.jvm.test.version>
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.projectName>SciJava Common shared library for SciJava software.</license.projectName>

From 3579c628cbfed8309d85196405aa11ce5dba5e6c Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 24 May 2026 11:35:58 -0500
Subject: [PATCH 1205/1208] Rename master branch to main

---
 .github/workflows/build.yml                           | 4 ++--
 src/main/java/org/scijava/command/CommandService.java | 2 +-
 src/main/java/org/scijava/module/ModuleService.java   | 2 +-
 src/main/java/org/scijava/plugin/PluginService.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82b666db0..c0ac58830 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,12 +3,12 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - "*-[0-9]+.*"
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:
diff --git a/src/main/java/org/scijava/command/CommandService.java b/src/main/java/org/scijava/command/CommandService.java
index 9cd4f5841..c1f78460c 100644
--- a/src/main/java/org/scijava/command/CommandService.java
+++ b/src/main/java/org/scijava/command/CommandService.java
@@ -50,7 +50,7 @@
  * A <em>command</em> is a particular type of plugin that is also a
  * {@link Module}; i.e., it is {@link Runnable}, with typed inputs and outputs.
  * <p>
- * The command service keeps a master index of all commands known to the system.
+ * The command service keeps a central index of all commands known to the system.
  * It asks the {@link PluginService} for available commands, then takes care of
  * registering them with the {@link ModuleService}.
  * </p>
diff --git a/src/main/java/org/scijava/module/ModuleService.java b/src/main/java/org/scijava/module/ModuleService.java
index 3f97a56e4..25bc64947 100644
--- a/src/main/java/org/scijava/module/ModuleService.java
+++ b/src/main/java/org/scijava/module/ModuleService.java
@@ -47,7 +47,7 @@
 /**
  * Interface for service that tracks and executes available modules.
  * <p>
- * The module service keeps a master index of all modules known to the system.
+ * The module service keeps a central index of all modules known to the system.
  * At heart, a module is a {@link Runnable} piece of code, but with explicit
  * typed input and output parameters.
  * </p>
diff --git a/src/main/java/org/scijava/plugin/PluginService.java b/src/main/java/org/scijava/plugin/PluginService.java
index 644268b87..1eab51413 100644
--- a/src/main/java/org/scijava/plugin/PluginService.java
+++ b/src/main/java/org/scijava/plugin/PluginService.java
@@ -44,7 +44,7 @@
 /**
  * Interface for service that keeps track of available plugins.
  * <p>
- * The plugin service keeps a master index of all plugins known to the system.
+ * The plugin service keeps a central index of all plugins known to the system.
  * At heart, a plugin is a piece of functionality that extends a program's
  * capabilities. Plugins take many forms; see {@link SciJavaPlugin} for details.
  * </p>

From 59aa8eebfbaba14b3cf860305c4f2b17914fd7f1 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 24 May 2026 11:53:41 -0500
Subject: [PATCH 1206/1208] Fix Java 11's new javadoc lint errors

---
 .../event/bushe/ThreadSafeEventService.java   | 18 ++---
 src/main/java/org/scijava/util/FileUtils.java |  2 +-
 .../org/scijava/util/MersenneTwisterFast.java | 12 ++--
 src/main/java/org/scijava/util/Types.java     | 70 +++++++++----------
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
index 920d0add4..6863f6466 100644
--- a/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
+++ b/src/main/java/org/scijava/event/bushe/ThreadSafeEventService.java
@@ -110,21 +110,21 @@
  * Cleanup is pretty rare in general.  Not only are stale subscribers cleaned up with regular usage, stale 
  * subscribers on abandoned topics and classes do not take up a lot of memory, hence, they are allowed to build up to a certain degree.
  * Cleanup does not occur until the number of WeakReferences and SubscriptionsProxy's with WeakReference strength
- * subscribed to an EventService for all the EventService's subscriptions in total exceed the <tt>cleanupStartThreshhold</tt>, 
- * which is set to <tt>CLEANUP_START_THRESHOLD_DEFAULT</tt> (500) by default.  The default is overridable in the constructor 
+ * subscribed to an EventService for all the EventService's subscriptions in total exceed the <code>cleanupStartThreshhold</code>, 
+ * which is set to <code>CLEANUP_START_THRESHOLD_DEFAULT</code> (500) by default.  The default is overridable in the constructor 
  * or via #setCleanupStartThreshhold(Integer).  If set to null, cleanup will never start.  
  * </p>
  * <p>
- * Once the cleanup start threshold is exceeded, a <tt>java.util.Timer</tt> is started to clean up stale subscribers periodically 
- * in another thread.  The timer will fire every <tt>cleanupPeriodMS</tt> milliseconds, which is set to the 
- * <tt>CLEANUP_PERIOD_MS_DEFAULT</tt> (20 minutes) by default.  The default is overridable in the constructor or 
- * via #setCleanupPeriodMS(Integer).  If set to null, cleanup will not start.  This is implemented with a <tt>java.util.Timer</tt>,
+ * Once the cleanup start threshold is exceeded, a <code>java.util.Timer</code> is started to clean up stale subscribers periodically 
+ * in another thread.  The timer will fire every <code>cleanupPeriodMS</code> milliseconds, which is set to the 
+ * <code>CLEANUP_PERIOD_MS_DEFAULT</code> (20 minutes) by default.  The default is overridable in the constructor or 
+ * via #setCleanupPeriodMS(Integer).  If set to null, cleanup will not start.  This is implemented with a <code>java.util.Timer</code>,
  * so Timer's warnings apply - setting this too low will cause cleanups to bunch up and hog the cleanup thread.
  * </p>
  * <p>
- * After a cleanup cycle completes, if the number of stale subscribers falls at or below the <tt>cleanupStopThreshhold</tt> 
- * cleanup stops until the <tt>cleanupStartThreshhold</tt> is exceeded again. The <tt>cleanupStopThreshhold</tt> is set 
- * to <tt>CLEANUP_STOP_THRESHOLD_DEFAULT</tt> (100) by default.  The default is overridable in the constructor or via 
+ * After a cleanup cycle completes, if the number of stale subscribers falls at or below the <code>cleanupStopThreshhold</code> 
+ * cleanup stops until the <code>cleanupStartThreshhold</code> is exceeded again. The <code>cleanupStopThreshhold</code> is set 
+ * to <code>CLEANUP_STOP_THRESHOLD_DEFAULT</code> (100) by default.  The default is overridable in the constructor or via 
  * #setCleanupStopThreshhold(Integer).  If set to null or 0, cleanup will not stop if it is ever started.  
  * </p>
  * <p>
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
index 2761edf73..897893e0d 100644
--- a/src/main/java/org/scijava/util/FileUtils.java
+++ b/src/main/java/org/scijava/util/FileUtils.java
@@ -465,7 +465,7 @@ public static File createTemporaryDirectory(final String prefix,
 	 *          see {@link File#createTempFile(String, String, File)}
 	 * @param directory The directory in which the file is to be created, or null
 	 *          if the default temporary-file directory is to be used
-	 * @return: An abstract pathname denoting a newly-created empty directory
+	 * @return An abstract pathname denoting a newly-created empty directory
 	 * @throws IOException
 	 */
 	public static File createTemporaryDirectory(final String prefix,
diff --git a/src/main/java/org/scijava/util/MersenneTwisterFast.java b/src/main/java/org/scijava/util/MersenneTwisterFast.java
index e1cdb4a48..852880483 100644
--- a/src/main/java/org/scijava/util/MersenneTwisterFast.java
+++ b/src/main/java/org/scijava/util/MersenneTwisterFast.java
@@ -521,8 +521,8 @@ public final boolean nextBoolean()
 
 
 
-    /** This generates a coin flip with a probability <tt>probability</tt>
-        of returning true, else returning false.  <tt>probability</tt> must
+    /** This generates a coin flip with a probability <code>probability</code>
+        of returning true, else returning false.  <code>probability</code> must
         be between 0.0 and 1.0, inclusive.   Not as precise a random real
         event as nextBoolean(double), but twice as fast. To explicitly
         use this, remember you may need to cast to float first. */
@@ -567,8 +567,8 @@ public final boolean nextBoolean(final float probability)
         }
 
 
-    /** This generates a coin flip with a probability <tt>probability</tt>
-        of returning true, else returning false.  <tt>probability</tt> must
+    /** This generates a coin flip with a probability <code>probability</code>
+        of returning true, else returning false.  <code>probability</code> must
         be between 0.0 and 1.0, inclusive. */
 
     public final boolean nextBoolean(final double probability)
@@ -928,7 +928,7 @@ public final double nextDouble()
 
     /** Returns a double in the range from 0.0 to 1.0, possibly inclusive of 0.0 and 1.0 themselves.  Thus:
 
-        <table border=0 summary="Table">
+        <table><caption>Table</caption>
         <tr><th>Expression</th><th>Interval</th></tr>
         <tr><td>nextDouble(false, false)</td><td>(0.0, 1.0)</td></tr>
         <tr><td>nextDouble(true, false)</td><td>[0.0, 1.0)</td></tr>
@@ -1141,7 +1141,7 @@ public final float nextFloat()
 
     /** Returns a float in the range from 0.0f to 1.0f, possibly inclusive of 0.0f and 1.0f themselves.  Thus:
 
-        <table border=0 summary="Table">
+        <table><caption>Table</caption>
         <tr><th>Expression</th><th>Interval</th></tr>
         <tr><td>nextFloat(false, false)</td><td>(0.0f, 1.0f)</td></tr>
         <tr><td>nextFloat(true, false)</td><td>[0.0f, 1.0f)</td></tr>
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
index f9c9068a9..495ca4a40 100644
--- a/src/main/java/org/scijava/util/Types.java
+++ b/src/main/java/org/scijava/util/Types.java
@@ -3257,8 +3257,8 @@ else if (type instanceof ParameterizedType) {
 		/**
 		 * Returns a type representing the class, with all type parameters the
 		 * unbound wildcard ("?"). For example,
-		 * <tt>addWildcardParameters(Map.class)</tt> returns a type representing
-		 * <tt>Map&lt;?,?&gt;</tt>.
+		 * <code>addWildcardParameters(Map.class)</code> returns a type representing
+		 * <code>Map&lt;?,?&gt;</code>.
 		 * 
 		 * @return
 		 *         <ul>
@@ -3288,27 +3288,27 @@ else if (isMissingTypeParameters(clazz)) {
 		}
 
 		/**
-		 * Finds the most specific supertype of <tt>type</tt> whose erasure is
-		 * <tt>searchClass</tt>. In other words, returns a type representing the
-		 * class <tt>searchClass</tt> plus its exact type parameters in
-		 * <tt>type</tt>.
+		 * Finds the most specific supertype of <code>type</code> whose erasure is
+		 * <code>searchClass</code>. In other words, returns a type representing the
+		 * class <code>searchClass</code> plus its exact type parameters in
+		 * <code>type</code>.
 		 * <ul>
 		 * <li>Returns an instance of {@link ParameterizedType} if
-		 * <tt>searchClass</tt> is a real class or interface and <tt>type</tt> has
+		 * <code>searchClass</code> is a real class or interface and <code>type</code> has
 		 * parameters for it</li>
 		 * <li>Returns an instance of {@link GenericArrayType} if
-		 * <tt>searchClass</tt> is an array type, and <tt>type</tt> has type
+		 * <code>searchClass</code> is an array type, and <code>type</code> has type
 		 * parameters for it</li>
-		 * <li>Returns an instance of {@link Class} if <tt>type</tt> is a raw type,
-		 * or has no type parameters for <tt>searchClass</tt></li>
-		 * <li>Returns null if <tt>searchClass</tt> is not a superclass of type.
+		 * <li>Returns an instance of {@link Class} if <code>type</code> is a raw type,
+		 * or has no type parameters for <code>searchClass</code></li>
+		 * <li>Returns null if <code>searchClass</code> is not a superclass of type.
 		 * </li>
 		 * </ul>
 		 * <p>
 		 * For example, with
-		 * <tt>class StringList implements List&lt;String&gt;</tt>,
-		 * <tt>getExactSuperType(StringList.class, Collection.class)</tt> returns a
-		 * {@link ParameterizedType} representing <tt>Collection&lt;String&gt;</tt>.
+		 * <code>class StringList implements List&lt;String&gt;</code>,
+		 * <code>getExactSuperType(StringList.class, Collection.class)</code> returns a
+		 * {@link ParameterizedType} representing <code>Collection&lt;String&gt;</code>.
 		 * </p>
 		 */
 		public static Type getExactSuperType(final Type type,
@@ -3337,9 +3337,9 @@ public static Type getExactSuperType(final Type type,
 		/**
 		 * Gets the type parameter for a given type that is the value for a given
 		 * type variable. For example, with
-		 * <tt>class StringList implements List&lt;String&gt;</tt>,
-		 * <tt>getTypeParameter(StringList.class, Collection.class.getTypeParameters()[0])</tt>
-		 * returns <tt>String</tt>.
+		 * <code>class StringList implements List&lt;String&gt;</code>,
+		 * <code>getTypeParameter(StringList.class, Collection.class.getTypeParameters()[0])</code>
+		 * returns <code>String</code>.
 		 * 
 		 * @param type The type to inspect.
 		 * @param variable The type variable to find the value for.
@@ -3569,9 +3569,9 @@ private static Type[] getArrayExactDirectSuperTypes(final Type arrayType) {
 
 		/**
 		 * Returns the exact return type of the given method in the given type. This
-		 * may be different from <tt>m.getGenericReturnType()</tt> when the method
-		 * was declared in a superclass, or <tt>type</tt> has a type parameter that
-		 * is used in the return type, or <tt>type</tt> is a raw type.
+		 * may be different from <code>m.getGenericReturnType()</code> when the method
+		 * was declared in a superclass, or <code>type</code> has a type parameter that
+		 * is used in the return type, or <code>type</code> is a raw type.
 		 */
 		public static Type getExactReturnType(final Method m, final Type type) {
 			final Type returnType = m.getGenericReturnType();
@@ -3587,9 +3587,9 @@ public static Type getExactReturnType(final Method m, final Type type) {
 
 		/**
 		 * Returns the exact type of the given field in the given type. This may be
-		 * different from <tt>f.getGenericType()</tt> when the field was declared in
-		 * a superclass, or <tt>type</tt> has a type parameter that is used in the
-		 * type of the field, or <tt>type</tt> is a raw type.
+		 * different from <code>f.getGenericType()</code> when the field was declared in
+		 * a superclass, or <code>type</code> has a type parameter that is used in the
+		 * type of the field, or <code>type</code> is a raw type.
 		 */
 		public static Type getExactFieldType(final Field f, final Type type) {
 			final Type returnType = f.getGenericType();
@@ -3605,9 +3605,9 @@ public static Type getExactFieldType(final Field f, final Type type) {
 
 		/**
 		 * Returns the exact parameter types of the given method in the given type.
-		 * This may be different from <tt>m.getGenericParameterTypes()</tt> when the
-		 * method was declared in a superclass, or <tt>type</tt> has a type
-		 * parameter that is used in one of the parameters, or <tt>type</tt> is a
+		 * This may be different from <code>m.getGenericParameterTypes()</code> when the
+		 * method was declared in a superclass, or <code>type</code> has a type
+		 * parameter that is used in one of the parameters, or <code>type</code> is a
 		 * raw type.
 		 */
 		public static Type[] getExactParameterTypes(final Method m,
@@ -3666,14 +3666,14 @@ public static Type capture(final Type type) {
 		/**
 		 * Returns list of classes and interfaces that are supertypes of the given
 		 * type. For example given this class:
-		 * <tt>class Foo&lt;A extends Number & Iterable&lt;A&gt;, B extends A&gt;</tt>
+		 * <code>class Foo&lt;A extends Number & Iterable&lt;A&gt;, B extends A&gt;</code>
 		 * <br>
-		 * calling this method on type parameters <tt>B</tt>
-		 * (<tt>Foo.class.getTypeParameters()[1]</tt>) returns a list containing
-		 * <tt>Number</tt> and <tt>Iterable</tt>.
+		 * calling this method on type parameters <code>B</code>
+		 * (<code>Foo.class.getTypeParameters()[1]</code>) returns a list containing
+		 * <code>Number</code> and <code>Iterable</code>.
 		 * <p>
 		 * This is mostly useful if you get a type from one of the other methods in
-		 * <tt>GenericTypeReflector</tt>, but you don't want to deal with all the
+		 * <code>GenericTypeReflector</code>, but you don't want to deal with all the
 		 * different sorts of types, and you are only really interested in concrete
 		 * classes and interfaces.
 		 * </p>
@@ -3719,17 +3719,17 @@ private static void buildUpperBoundClassAndInterfaces(final Type type,
 	private interface CaptureType extends Type {
 
 		/**
-		 * Returns an array of <tt>Type</tt> objects representing the upper bound(s)
+		 * Returns an array of <code>Type</code> objects representing the upper bound(s)
 		 * of this capture. This includes both the upper bound of a
-		 * <tt>? extends</tt> wildcard, and the bounds declared with the type
+		 * <code>? extends</code> wildcard, and the bounds declared with the type
 		 * variable. References to other (or the same) type variables in bounds
 		 * coming from the type variable are replaced by their matching capture.
 		 */
 		Type[] getUpperBounds();
 
 		/**
-		 * Returns an array of <tt>Type</tt> objects representing the lower bound(s)
-		 * of this type variable. This is the bound of a <tt>? super</tt> wildcard.
+		 * Returns an array of <code>Type</code> objects representing the lower bound(s)
+		 * of this type variable. This is the bound of a <code>? super</code> wildcard.
 		 * This normally contains only one or no types; it is an array for
 		 * consistency with {@link WildcardType#getLowerBounds()}.
 		 */

From afbd606d6ff14b15550fac77205bf750542212ef Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 24 May 2026 11:59:25 -0500
Subject: [PATCH 1207/1208] Bump to next development cycle

Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 47a59b504..771234c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.100.1-SNAPSHOT</version>
+	<version>2.100.2-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

From 551f62ae76d6ab94cfce3e60bd1d0ace5571bc72 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sun, 14 Jun 2026 19:32:55 -0500
Subject: [PATCH 1208/1208] AnnotationProcessor: do not warn about Java >8

And improve the javadoc to describe more the purpose of this very
general annotation processor.
---
 .../annotations/AnnotationProcessor.java      | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/scijava/annotations/AnnotationProcessor.java b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
index 8355dcda9..e17d707a9 100644
--- a/src/main/java/org/scijava/annotations/AnnotationProcessor.java
+++ b/src/main/java/org/scijava/annotations/AnnotationProcessor.java
@@ -50,7 +50,6 @@
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
@@ -69,16 +68,38 @@
 import org.scijava.annotations.AbstractIndexWriter.StreamFactory;
 
 /**
- * The annotation processor for use with Java 8 and earlier.
+ * An annotation processor for indexing {@link Indexable} annotations at
+ * compile time. The design is inspired by
+ * <a href="https://github.com/jglick/sezpoz">Sezpoz</a>, a compile-time
+ * indexing library by Jesse Glick.
+ * <p>
+ * For each annotated class, this processor writes a JSON record of the
+ * annotation's attributes into {@code META-INF/json/} under a file named after
+ * the annotation type. At runtime, the index can be read to discover annotated
+ * classes and inspect their annotation values without loading (and therefore
+ * initializing) those classes — avoiding the cost and side-effects of a full
+ * classpath scan.
+ * </p>
+ * <p>
+ * For example, SciJava Common's {@link org.scijava.plugin.Plugin} annotation
+ * enables the {@link org.scijava.Context} application container to discover
+ * and prepare the application including all its plugins without needing to
+ * load all of those plugins in advance. Rather, they can be loaded upon first
+ * use in each appropriate context, greatly reducing application startup cost.
+ * </p>
  * 
  * @author Johannes Schindelin
  */
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes("*")
 public class AnnotationProcessor extends AbstractProcessor {
 
 	private RoundEnvironment roundEnv;
 
+	@Override
+	public SourceVersion getSupportedSourceVersion() {
+		return SourceVersion.latestSupported();
+	}
+
 	@Override
 	public boolean process(final Set<? extends TypeElement> elements,
 		final RoundEnvironment env)